From: Benjamin Herrenschmidt Date: Fri, 21 Dec 2007 04:39:37 +0000 (+1100) Subject: [POWERPC] pci32: 4xx embedded platforms want to reassign all PCI resources X-Git-Tag: v2.6.25-rc1~1131^2~177 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=25c24f3dc7f01491ea0d92a1de2bb84094b27e21;p=linux-2.6-omap-h63xx.git [POWERPC] pci32: 4xx embedded platforms want to reassign all PCI resources This makes 4xx embedded platforms re-assign all PCI resources as we pretty much never care about what the various firmwares have done on these, it's generally not compatible with the way the kernel will map the bridges. We still need to also enable bus renumbering on some of them, but I will do that from a separate patch after I've fixed 4xx PCIe to handle all bus numbers. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Josh Boyer --- diff --git a/arch/powerpc/platforms/40x/ep405.c b/arch/powerpc/platforms/40x/ep405.c index ba84a41e63e..759d937cdb6 100644 --- a/arch/powerpc/platforms/40x/ep405.c +++ b/arch/powerpc/platforms/40x/ep405.c @@ -101,6 +101,8 @@ static void __init ep405_setup_arch(void) { /* Find & init the BCSR CPLD */ ep405_init_bcsr(); + + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; } static int __init ep405_probe(void) diff --git a/arch/powerpc/platforms/40x/kilauea.c b/arch/powerpc/platforms/40x/kilauea.c index 1bffdbdd21b..4470940065b 100644 --- a/arch/powerpc/platforms/40x/kilauea.c +++ b/arch/powerpc/platforms/40x/kilauea.c @@ -19,6 +19,7 @@ #include #include #include +#include static struct of_device_id kilauea_of_bus[] = { { .compatible = "ibm,plb4", }, @@ -45,6 +46,8 @@ static int __init kilauea_probe(void) if (!of_flat_dt_is_compatible(root, "amcc,kilauea")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; } diff --git a/arch/powerpc/platforms/40x/walnut.c b/arch/powerpc/platforms/40x/walnut.c index ff6db243179..aea97017a7d 100644 --- a/arch/powerpc/platforms/40x/walnut.c +++ b/arch/powerpc/platforms/40x/walnut.c @@ -24,6 +24,7 @@ #include #include #include +#include static struct of_device_id walnut_of_bus[] = { { .compatible = "ibm,plb3", }, @@ -51,6 +52,8 @@ static int __init walnut_probe(void) if (!of_flat_dt_is_compatible(root, "ibm,walnut")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; } diff --git a/arch/powerpc/platforms/44x/bamboo.c b/arch/powerpc/platforms/44x/bamboo.c index be23f112184..553c9f18aa7 100644 --- a/arch/powerpc/platforms/44x/bamboo.c +++ b/arch/powerpc/platforms/44x/bamboo.c @@ -21,6 +21,8 @@ #include #include #include +#include + #include "44x.h" static struct of_device_id bamboo_of_bus[] = { @@ -48,6 +50,8 @@ static int __init bamboo_probe(void) if (!of_flat_dt_is_compatible(root, "amcc,bamboo")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; } diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c index 6cd3476767c..262f300cc10 100644 --- a/arch/powerpc/platforms/44x/ebony.c +++ b/arch/powerpc/platforms/44x/ebony.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "44x.h" @@ -55,6 +56,8 @@ static int __init ebony_probe(void) if (!of_flat_dt_is_compatible(root, "ibm,ebony")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; } diff --git a/arch/powerpc/platforms/44x/katmai.c b/arch/powerpc/platforms/44x/katmai.c index fd737d10f6e..158ca0558a0 100644 --- a/arch/powerpc/platforms/44x/katmai.c +++ b/arch/powerpc/platforms/44x/katmai.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "44x.h" @@ -49,6 +50,8 @@ static int __init katmai_probe(void) if (!of_flat_dt_is_compatible(root, "amcc,katmai")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; } diff --git a/arch/powerpc/platforms/44x/sequoia.c b/arch/powerpc/platforms/44x/sequoia.c index 21a9dd14f29..5185b5cb48c 100644 --- a/arch/powerpc/platforms/44x/sequoia.c +++ b/arch/powerpc/platforms/44x/sequoia.c @@ -21,7 +21,8 @@ #include #include #include -#include "44x.h" +#include + static struct of_device_id sequoia_of_bus[] = { { .compatible = "ibm,plb4", }, @@ -48,6 +49,8 @@ static int __init sequoia_probe(void) if (!of_flat_dt_is_compatible(root, "amcc,sequoia")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; } diff --git a/arch/powerpc/platforms/44x/taishan.c b/arch/powerpc/platforms/44x/taishan.c index e3b7c702333..ca71666bde2 100644 --- a/arch/powerpc/platforms/44x/taishan.c +++ b/arch/powerpc/platforms/44x/taishan.c @@ -60,6 +60,8 @@ static int __init taishan_probe(void) if (!of_flat_dt_is_compatible(root, "amcc,taishan")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; }