lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] Remove some iSeries platform checks from the PCI code

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:03:23 +11:00
committed by Paul Mackerras
parent c96bede657
commit 9ccc4fd260
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
arch/powerpc/kernel/pci_64.c
View File

@@ -31,7 +31,6 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/ppc-pci.h> #include <asm/ppc-pci.h>
#include <asm/firmware.h>
#ifdef DEBUG #ifdef DEBUG
#include <asm/udbg.h> #include <asm/udbg.h>
@@ -197,9 +196,6 @@ static void __init pcibios_claim_of_setup(void)
{ {
struct pci_bus *b; struct pci_bus *b;
if (firmware_has_feature(FW_FEATURE_ISERIES))
return;
list_for_each_entry(b, &pci_root_buses, node) list_for_each_entry(b, &pci_root_buses, node)
pcibios_claim_one_bus(b); pcibios_claim_one_bus(b);
} }
@@ -477,8 +473,7 @@ void __devinit scan_phb(struct pci_controller *hose)
bus->secondary = hose->first_busno; bus->secondary = hose->first_busno;
hose->bus = bus; hose->bus = bus;
if (!firmware_has_feature(FW_FEATURE_ISERIES)) pcibios_map_io_space(bus);
pcibios_map_io_space(bus);
bus->resource[0] = res = &hose->io_resource; bus->resource[0] = res = &hose->io_resource;
if (res->flags && request_resource(&ioport_resource, res)) { if (res->flags && request_resource(&ioport_resource, res)) {
@@ -527,15 +522,13 @@ static int __init pcibios_init(void)
pci_bus_add_devices(hose->bus); pci_bus_add_devices(hose->bus);
} }
if (!firmware_has_feature(FW_FEATURE_ISERIES)) { if (pci_probe_only)
if (pci_probe_only) pcibios_claim_of_setup();
pcibios_claim_of_setup(); else
else /* FIXME: `else' will be removed when
/* FIXME: `else' will be removed when pci_assign_unassigned_resources() is able to work
pci_assign_unassigned_resources() is able to work correctly with [partially] allocated PCI tree. */
correctly with [partially] allocated PCI tree. */ pci_assign_unassigned_resources();
pci_assign_unassigned_resources();
}
/* Call machine dependent final fixup */ /* Call machine dependent final fixup */
if (ppc_md.pcibios_fixup) if (ppc_md.pcibios_fixup)

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

@@ -646,6 +646,8 @@ void __init iSeries_pcibios_init(void)
/* Install IO hooks */ /* Install IO hooks */
ppc_pci_io = iseries_pci_io; ppc_pci_io = iseries_pci_io;
pci_probe_only = 1;
/* iSeries has no IO space in the common sense, it needs to set /* iSeries has no IO space in the common sense, it needs to set
* the IO base to 0 * the IO base to 0
*/ */