From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: To: From: Benjamin Herrenschmidt Date: Fri, 10 Nov 2006 18:45:00 +1100 Subject: [PATCH 20/32] powerpc: Add "parent" struct device for PCI host bridges In-Reply-To: <1163144683.554182.685908332811.qpush@grosgo> Message-Id: <20061110074504.116FD67EED@ozlabs.org> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Add a "parent" struct device to our PCI host bridge data structure so that PCI can be rooted off another device in sysfs. Note that arch/ppc doesn't use it, only arch/powerpc, though it's available for both 32 and 64 bits. Signed-off-by: Benjamin Herrenschmidt arch/powerpc/kernel/pci_32.c | 5 ++++- arch/powerpc/kernel/pci_64.c | 2 +- include/asm-powerpc/pci-bridge.h | 1 + include/asm-ppc/pci-bridge.h | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) Index: linux-cell/arch/powerpc/kernel/pci_32.c =================================================================== --- linux-cell.orig/arch/powerpc/kernel/pci_32.c 2006-11-10 16:24:32.000000000 +1100 +++ linux-cell/arch/powerpc/kernel/pci_32.c 2006-11-10 16:40:49.000000000 +1100 @@ -1269,7 +1269,10 @@ pcibios_init(void) if (pci_assign_all_buses) hose->first_busno = next_busno; hose->last_busno = 0xff; - bus = pci_scan_bus(hose->first_busno, hose->ops, hose); + bus = pci_scan_bus_parented(hose->parent, hose->first_busno, + hose->ops, hose); + if (bus) + pci_bus_add_devices(bus); hose->last_busno = bus->subordinate; if (pci_assign_all_buses || next_busno <= hose->last_busno) next_busno = hose->last_busno + pcibios_assign_bus_offset; Index: linux-cell/arch/powerpc/kernel/pci_64.c =================================================================== --- linux-cell.orig/arch/powerpc/kernel/pci_64.c 2006-11-10 16:40:42.000000000 +1100 +++ linux-cell/arch/powerpc/kernel/pci_64.c 2006-11-10 16:40:49.000000000 +1100 @@ -517,7 +517,7 @@ void __devinit scan_phb(struct pci_contr DBG("Scanning PHB %s\n", node ? node->full_name : ""); - bus = pci_create_bus(NULL, hose->first_busno, hose->ops, node); + bus = pci_create_bus(hose->parent, hose->first_busno, hose->ops, node); if (bus == NULL) { printk(KERN_ERR "Failed to create bus for PCI domain %04x\n", hose->global_number); Index: linux-cell/include/asm-powerpc/pci-bridge.h =================================================================== --- linux-cell.orig/include/asm-powerpc/pci-bridge.h 2006-10-09 12:03:34.000000000 +1000 +++ linux-cell/include/asm-powerpc/pci-bridge.h 2006-11-10 16:40:49.000000000 +1100 @@ -25,6 +25,7 @@ struct pci_controller { int node; void *arch_data; struct list_head list_node; + struct device *parent; int first_busno; int last_busno; Index: linux-cell/include/asm-ppc/pci-bridge.h =================================================================== --- linux-cell.orig/include/asm-ppc/pci-bridge.h 2006-01-14 14:43:33.000000000 +1100 +++ linux-cell/include/asm-ppc/pci-bridge.h 2006-11-10 16:40:49.000000000 +1100 @@ -43,6 +43,7 @@ struct pci_controller { struct pci_controller *next; struct pci_bus *bus; void *arch_data; + struct device *parent; int first_busno; int last_busno;