| Message ID | 1343305827-26734-3-git-send-email-B38951@freescale.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Kumar Gala |
| Headers | show |
On Jul 26, 2012, at 7:30 AM, Jia Hongtao wrote: > PCI initialization is now done by PCI controller driver. In board_setup_arch > stage we don't need PCI init any more but swiotlb should be determined at this > stage. > > Signed-off-by: Jia Hongtao <B38951@freescale.com> > Signed-off-by: Li Yang <leoli@freescale.com> > --- > We now just apply this for mpc85xx_ds and qemu > > arch/powerpc/kernel/iommu.c.rej | 22 ----------------- > arch/powerpc/platforms/85xx/common.c | 9 +++++++ > arch/powerpc/platforms/85xx/mpc85xx_ds.c | 38 +++++++---------------------- > arch/powerpc/platforms/85xx/qemu_e500.c | 5 +++- > 4 files changed, 22 insertions(+), 52 deletions(-) > delete mode 100644 arch/powerpc/kernel/iommu.c.rej removal of iommu.c.rej is handled by: commit 668fcb6972177489bdc01a66d697c3b494aa8a24 Author: Benjamin Herrenschmidt <benh@kernel.crashing.org> Date: Mon Jul 23 09:38:53 2012 +1000 Remove stale .rej file - k
On Jul 26, 2012, at 7:30 AM, Jia Hongtao wrote: > PCI initialization is now done by PCI controller driver. In board_setup_arch > stage we don't need PCI init any more but swiotlb should be determined at this > stage. > > Signed-off-by: Jia Hongtao <B38951@freescale.com> > Signed-off-by: Li Yang <leoli@freescale.com> > --- > We now just apply this for mpc85xx_ds and qemu > > arch/powerpc/kernel/iommu.c.rej | 22 ----------------- > arch/powerpc/platforms/85xx/common.c | 9 +++++++ > arch/powerpc/platforms/85xx/mpc85xx_ds.c | 38 +++++++---------------------- > arch/powerpc/platforms/85xx/qemu_e500.c | 5 +++- > 4 files changed, 22 insertions(+), 52 deletions(-) > delete mode 100644 arch/powerpc/kernel/iommu.c.rej > > diff --git a/arch/powerpc/kernel/iommu.c.rej b/arch/powerpc/kernel/iommu.c.rej > deleted file mode 100644 > index 9d10d34..0000000 > --- a/arch/powerpc/kernel/iommu.c.rej > +++ /dev/null > @@ -1,22 +0,0 @@ > ---- arch/powerpc/kernel/iommu.c 2012-06-08 09:01:02.785709100 +1000 > -+++ arch/powerpc/kernel/iommu.c 2012-06-08 09:01:07.489784856 +1000 > -@@ -33,7 +33,9 @@ > - #include <linux/bitmap.h> > - #include <linux/iommu-helper.h> > - #include <linux/crash_dump.h> > -+#include <linux/fault-inject.h> > - #include <asm/io.h> > -+#include <asm/vio.h> > - #include <asm/prom.h> > - #include <asm/iommu.h> > - #include <asm/pci-bridge.h> > -@@ -171,6 +261,9 @@ > - return DMA_ERROR_CODE; > - } > - > -+ if (should_fail_iommu(dev)) > -+ return DMA_ERROR_CODE; > -+ > - if (handle && *handle) > - start = *handle; > - else > diff --git a/arch/powerpc/platforms/85xx/common.c b/arch/powerpc/platforms/85xx/common.c > index 67dac22..303fedb 100644 > --- a/arch/powerpc/platforms/85xx/common.c > +++ b/arch/powerpc/platforms/85xx/common.c > @@ -27,6 +27,15 @@ static struct of_device_id __initdata mpc85xx_common_ids[] = { > { .compatible = "fsl,mpc8548-guts", }, > /* Probably unnecessary? */ > { .compatible = "gpio-leds", }, > + /* For all PCI controllers */ > + { .compatible = "fsl,mpc8540-pci", }, > + { .compatible = "fsl,mpc8548-pcie", }, > + { .compatible = "fsl,p1022-pcie", }, > + { .compatible = "fsl,p1010-pcie", }, > + { .compatible = "fsl,p1023-pcie", }, > + { .compatible = "fsl,p4080-pcie", }, Add: { .compatible = "fsl,qoriq-pcie-v2.4", }, > + { .compatible = "fsl,qoriq-pcie-v2.3", }, > + { .compatible = "fsl,qoriq-pcie-v2.2", }, > {}, > }; - k
diff --git a/arch/powerpc/kernel/iommu.c.rej b/arch/powerpc/kernel/iommu.c.rej deleted file mode 100644 index 9d10d34..0000000 --- a/arch/powerpc/kernel/iommu.c.rej +++ /dev/null @@ -1,22 +0,0 @@ ---- arch/powerpc/kernel/iommu.c 2012-06-08 09:01:02.785709100 +1000 -+++ arch/powerpc/kernel/iommu.c 2012-06-08 09:01:07.489784856 +1000 -@@ -33,7 +33,9 @@ - #include <linux/bitmap.h> - #include <linux/iommu-helper.h> - #include <linux/crash_dump.h> -+#include <linux/fault-inject.h> - #include <asm/io.h> -+#include <asm/vio.h> - #include <asm/prom.h> - #include <asm/iommu.h> - #include <asm/pci-bridge.h> -@@ -171,6 +261,9 @@ - return DMA_ERROR_CODE; - } - -+ if (should_fail_iommu(dev)) -+ return DMA_ERROR_CODE; -+ - if (handle && *handle) - start = *handle; - else diff --git a/arch/powerpc/platforms/85xx/common.c b/arch/powerpc/platforms/85xx/common.c index 67dac22..303fedb 100644 --- a/arch/powerpc/platforms/85xx/common.c +++ b/arch/powerpc/platforms/85xx/common.c @@ -27,6 +27,15 @@ static struct of_device_id __initdata mpc85xx_common_ids[] = { { .compatible = "fsl,mpc8548-guts", }, /* Probably unnecessary? */ { .compatible = "gpio-leds", }, + /* For all PCI controllers */ + { .compatible = "fsl,mpc8540-pci", }, + { .compatible = "fsl,mpc8548-pcie", }, + { .compatible = "fsl,p1022-pcie", }, + { .compatible = "fsl,p1010-pcie", }, + { .compatible = "fsl,p1023-pcie", }, + { .compatible = "fsl,p4080-pcie", }, + { .compatible = "fsl,qoriq-pcie-v2.3", }, + { .compatible = "fsl,qoriq-pcie-v2.2", }, {}, }; diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c index 6d3265f..4e64414 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c @@ -117,40 +117,16 @@ void __init mpc85xx_ds_pic_init(void) extern int uli_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn); -static struct device_node *pci_with_uli; - static int mpc85xx_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn) { - if (hose->dn == pci_with_uli) + if (hose->is_primary) return uli_exclude_device(hose, bus, devfn); return PCIBIOS_SUCCESSFUL; } #endif /* CONFIG_PCI */ -static void __init mpc85xx_ds_pci_init(void) -{ -#ifdef CONFIG_PCI - struct device_node *node; - - fsl_pci_init(); - - /* See if we have a ULI under the primary */ - - node = of_find_node_by_name(NULL, "uli1575"); - while ((pci_with_uli = of_get_parent(node))) { - of_node_put(node); - node = pci_with_uli; - - if (pci_with_uli == fsl_pci_primary) { - ppc_md.pci_exclude_device = mpc85xx_exclude_device; - break; - } - } -#endif -} - /* * Setup the architecture */ @@ -159,7 +135,11 @@ static void __init mpc85xx_ds_setup_arch(void) if (ppc_md.progress) ppc_md.progress("mpc85xx_ds_setup_arch()", 0); - mpc85xx_ds_pci_init(); +#ifdef CONFIG_PCI + pci_determine_swiotlb(); + ppc_md.pci_exclude_device = mpc85xx_exclude_device; +#endif + mpc85xx_smp_init(); printk("MPC85xx DS board from Freescale Semiconductor\n"); @@ -175,9 +155,9 @@ static int __init mpc8544_ds_probe(void) return !!of_flat_dt_is_compatible(root, "MPC8544DS"); } -machine_device_initcall(mpc8544_ds, mpc85xx_common_publish_devices); -machine_device_initcall(mpc8572_ds, mpc85xx_common_publish_devices); -machine_device_initcall(p2020_ds, mpc85xx_common_publish_devices); +machine_arch_initcall(mpc8544_ds, mpc85xx_common_publish_devices); +machine_arch_initcall(mpc8572_ds, mpc85xx_common_publish_devices); +machine_arch_initcall(p2020_ds, mpc85xx_common_publish_devices); machine_arch_initcall(mpc8544_ds, swiotlb_setup_bus_notifier); machine_arch_initcall(mpc8572_ds, swiotlb_setup_bus_notifier); diff --git a/arch/powerpc/platforms/85xx/qemu_e500.c b/arch/powerpc/platforms/85xx/qemu_e500.c index 95a2e53..c490b12 100644 --- a/arch/powerpc/platforms/85xx/qemu_e500.c +++ b/arch/powerpc/platforms/85xx/qemu_e500.c @@ -41,7 +41,10 @@ static void __init qemu_e500_setup_arch(void) { ppc_md.progress("qemu_e500_setup_arch()", 0); - fsl_pci_init(); +#ifdef CONFIG_PCI + pci_determine_swiotlb(); +#endif + mpc85xx_smp_init(); }