Re: [PATCH V3 3/5] powerpc/mpc85xx: convert to unified PCI init
From: Kumar Gala <hidden>
Date: 2012-07-26 17:47:57
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. =20 Signed-off-by: Jia Hongtao <redacted> Signed-off-by: Li Yang <redacted> --- We now just apply this for mpc85xx_ds and qemu =20 arch/powerpc/kernel/iommu.c.rej | 22 ----------------- arch/powerpc/platforms/85xx/common.c | 9 +++++++ arch/powerpc/platforms/85xx/mpc85xx_ds.c | 38 =
+++++++----------------------
quoted hunk ↗ jump to hunk
arch/powerpc/platforms/85xx/qemu_e500.c | 5 +++- 4 files changed, 22 insertions(+), 52 deletions(-) delete mode 100644 arch/powerpc/kernel/iommu.c.rej =20diff --git a/arch/powerpc/kernel/iommu.c.rej =
b/arch/powerpc/kernel/iommu.c.rej
quoted hunk ↗ jump to hunk
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
quoted hunk ↗ jump to hunk
-@@ -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; - } -=20 -+ if (should_fail_iommu(dev)) -+ return DMA_ERROR_CODE; -+ - if (handle && *handle) - start =3D *handle; - elsediff --git a/arch/powerpc/platforms/85xx/common.c =
b/arch/powerpc/platforms/85xx/common.c
quoted hunk ↗ jump to hunk
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[] =3D { { .compatible =3D "fsl,mpc8548-guts", },
/* Probably unnecessary? */
{ .compatible =3D "gpio-leds", },
+ /* For all PCI controllers */
+ { .compatible =3D "fsl,mpc8540-pci", },
+ { .compatible =3D "fsl,mpc8548-pcie", },
+ { .compatible =3D "fsl,p1022-pcie", },
+ { .compatible =3D "fsl,p1010-pcie", },
+ { .compatible =3D "fsl,p1023-pcie", },
+ { .compatible =3D "fsl,p4080-pcie", },
Add:
{ .compatible =3D "fsl,qoriq-pcie-v2.4", },
+ { .compatible =3D "fsl,qoriq-pcie-v2.3", },
+ { .compatible =3D "fsl,qoriq-pcie-v2.2", }, {},
};- k=