Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 01:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[POWERPC] Don't special case pci_domain_nr() for iSeries

Browse Source 
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Stephen Rothwell 2007-12-07 02:04:33 +11:00 committed by Paul Mackerras
parent 9ccc4fd260
commit 6207e81695
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/powerpc/kernel/pci-common.c
View File

@ -115,15 +115,10 @@ int pcibios_vaddr_is_ioport(void __iomem *address)
*/ */
int pci_domain_nr(struct pci_bus *bus) int pci_domain_nr(struct pci_bus *bus)
{ {
if (firmware_has_feature(FW_FEATURE_ISERIES)) struct pci_controller *hose = pci_bus_to_host(bus);
return 0;
else {
struct pci_controller *hose = pci_bus_to_host(bus);
return hose->global_number; return hose->global_number;
}
} }
EXPORT_SYMBOL(pci_domain_nr); EXPORT_SYMBOL(pci_domain_nr);
#ifdef CONFIG_PPC_OF #ifdef CONFIG_PPC_OF

2
arch/powerpc/platforms/iseries/pci.c
View File

@ -673,6 +673,8 @@ void __init iSeries_pcibios_init(void)
phb = pcibios_alloc_controller(node); phb = pcibios_alloc_controller(node);
if (phb == NULL) if (phb == NULL)
continue; continue;
/* All legacy iSeries PHBs are in domain zero */
phb->global_number = 0;
phb->pci_mem_offset = bus; phb->pci_mem_offset = bus;
phb->first_busno = bus; phb->first_busno = bus;