git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-powerpc
/
pci-bridge.h
diff --git
a/include/asm-powerpc/pci-bridge.h
b/include/asm-powerpc/pci-bridge.h
index
38de92d
..
cb02c9d
100644
(file)
--- a/
include/asm-powerpc/pci-bridge.h
+++ b/
include/asm-powerpc/pci-bridge.h
@@
-22,19
+22,21
@@
struct pci_controller {
struct pci_bus *bus;
char is_dynamic;
struct pci_controller {
struct pci_bus *bus;
char is_dynamic;
+ int node;
void *arch_data;
struct list_head list_node;
void *arch_data;
struct list_head list_node;
+ struct device *parent;
int first_busno;
int last_busno;
void __iomem *io_base_virt;
int first_busno;
int last_busno;
void __iomem *io_base_virt;
-
unsigned long
io_base_phys;
+
resource_size_t
io_base_phys;
/* Some machines have a non 1:1 mapping of
* the PCI memory space in the CPU bus space
*/
/* Some machines have a non 1:1 mapping of
* the PCI memory space in the CPU bus space
*/
-
unsigned long
pci_mem_offset;
+
resource_size_t
pci_mem_offset;
unsigned long pci_io_size;
struct pci_ops *ops;
unsigned long pci_io_size;
struct pci_ops *ops;
@@
-78,12
+80,6
@@
struct pci_dn {
struct iommu_table *iommu_table; /* for phb's or bridges */
struct pci_dev *pcidev; /* back-pointer to the pci device */
struct device_node *node; /* back-pointer to the device_node */
struct iommu_table *iommu_table; /* for phb's or bridges */
struct pci_dev *pcidev; /* back-pointer to the pci device */
struct device_node *node; /* back-pointer to the device_node */
-#ifdef CONFIG_PPC_ISERIES
- struct list_head Device_List;
- int Irq; /* Assigned IRQ */
- int Flags; /* Possible flags(disable/bist)*/
- u8 LogicalSlot; /* Hv Slot Index for Tces */
-#endif
u32 config_space[16]; /* saved PCI config space */
};
u32 config_space[16]; /* saved PCI config space */
};
@@
-171,6
+167,12
@@
static inline unsigned long pci_address_to_pio(phys_addr_t address)
#define PCI_PROBE_NORMAL 0 /* Do normal PCI probing */
#define PCI_PROBE_DEVTREE 1 /* Instantiate from device tree */
#define PCI_PROBE_NORMAL 0 /* Do normal PCI probing */
#define PCI_PROBE_DEVTREE 1 /* Instantiate from device tree */
+#ifdef CONFIG_NUMA
+#define PHB_SET_NODE(PHB, NODE) ((PHB)->node = (NODE))
+#else
+#define PHB_SET_NODE(PHB, NODE) ((PHB)->node = -1)
+#endif
+
#endif /* CONFIG_PPC64 */
#endif /* __KERNEL__ */
#endif
#endif /* CONFIG_PPC64 */
#endif /* __KERNEL__ */
#endif