Messages in this thread Patch in this message | | | Date | Mon, 7 Mar 2005 21:11:34 +1100 | From | Paul Mackerras <> | Subject | [PATCH] PPC64 set pci_io_base dynamically if necessary |
| |
This patch is from John Rose <johnrose@austin.ibm.com>.
Upon DLPAR addition of a PCI Host Brige to a system with purely virtual I/O, set pci_io_base as necessary.
Signed-off-by: John Rose <johnrose@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
diff -urN linux-2.5/arch/ppc64/kernel/pSeries_pci.c test/arch/ppc64/kernel/pSeries_pci.c --- linux-2.5/arch/ppc64/kernel/pSeries_pci.c 2005-01-12 18:20:48.000000000 +1100 +++ test/arch/ppc64/kernel/pSeries_pci.c 2005-03-07 21:04:02.000000000 +1100 @@ -424,16 +424,18 @@ unsigned int root_size_cells = 0; struct pci_controller *phb; struct pci_bus *bus; + int primary; root_size_cells = prom_n_size_cells(root); + primary = list_empty(&hose_list); phb = alloc_phb_dynamic(dn, root_size_cells); if (!phb) return NULL; pci_process_bridge_OF_ranges(phb, dn); - pci_setup_phb_io_dynamic(phb); + pci_setup_phb_io_dynamic(phb, primary); of_node_put(root); pci_devs_phb_init_dynamic(phb); diff -urN linux-2.5/arch/ppc64/kernel/pci.c test/arch/ppc64/kernel/pci.c --- linux-2.5/arch/ppc64/kernel/pci.c 2005-03-07 08:21:53.000000000 +1100 +++ test/arch/ppc64/kernel/pci.c 2005-03-07 21:04:02.000000000 +1100 @@ -619,7 +619,8 @@ res->end += io_virt_offset; } -void __devinit pci_setup_phb_io_dynamic(struct pci_controller *hose) +void __devinit pci_setup_phb_io_dynamic(struct pci_controller *hose, + int primary) { unsigned long size = hose->pci_io_size; unsigned long io_virt_offset; @@ -631,6 +632,9 @@ hose->global_number, hose->io_base_phys, (unsigned long) hose->io_base_virt); + if (primary) + pci_io_base = (unsigned long)hose->io_base_virt; + io_virt_offset = (unsigned long)hose->io_base_virt - pci_io_base; res = &hose->io_resource; res->start += io_virt_offset; diff -urN linux-2.5/arch/ppc64/kernel/pci.h test/arch/ppc64/kernel/pci.h --- linux-2.5/arch/ppc64/kernel/pci.h 2005-01-12 18:20:48.000000000 +1100 +++ test/arch/ppc64/kernel/pci.h 2005-03-07 21:06:52.000000000 +1100 @@ -16,8 +16,7 @@ extern void pci_setup_pci_controller(struct pci_controller *hose); extern void pci_setup_phb_io(struct pci_controller *hose, int primary); - -extern void pci_setup_phb_io_dynamic(struct pci_controller *hose); +extern void pci_setup_phb_io_dynamic(struct pci_controller *hose, int primary); extern struct list_head hose_list; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |