4 files changed, 25 insertions, 7 deletions

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index f28acdcbd6c9..51f3ea40a285 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -54,8 +54,7 @@ config 440EPX
 
 config 440GP
         bool
-# Disabled until the new EMAC Driver is merged.
-#       select IBM_NEW_EMAC_ZMII
+        select IBM_NEW_EMAC_ZMII
 
 config 440GX
         bool
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index ac8032034fb8..e1e2f6a43019 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -10,6 +10,10 @@ config PPC_CELL_NATIVE
         select PPC_INDIRECT_IO
         select PPC_NATIVE
         select MPIC
+        select IBM_NEW_EMAC_EMAC4
+        select IBM_NEW_EMAC_RGMII
+        select IBM_NEW_EMAC_ZMII #test only
+        select IBM_NEW_EMAC_TAH  #test only
         default n
 
 config PPC_IBM_CELL_BLADE
diff --git a/arch/powerpc/platforms/pasemi/Kconfig b/arch/powerpc/platforms/pasemi/Kconfig
index 117d90aa5008..735e1536cbfc 100644
--- a/arch/powerpc/platforms/pasemi/Kconfig
+++ b/arch/powerpc/platforms/pasemi/Kconfig
@@ -19,6 +19,16 @@ config PPC_PASEMI_IOMMU
         help
           IOMMU support for PA6T-1682M
 
+config PPC_PASEMI_IOMMU_DMA_FORCE
+        bool "Force DMA engine to use IOMMU"
+        depends on PPC_PASEMI_IOMMU
+        help
+          This option forces the use of the IOMMU also for the
+          DMA engine. Otherwise the kernel will use it only when
+          running under a hypervisor.
+
+          If in doubt, say "N".
+
 config PPC_PASEMI_MDIO
         depends on PHYLIB
         tristate "MDIO support via GPIO"
diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c
index 6c42787fb382..9916a0f3e431 100644
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -25,6 +25,7 @@
 #include <asm/iommu.h>
 #include <asm/machdep.h>
 #include <asm/abs_addr.h>
+#include <asm/firmware.h>
 
 
 #define IOBMAP_PAGE_SHIFT       12
@@ -175,13 +176,17 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev)
 {
         pr_debug("pci_dma_dev_setup, dev %p (%s)\n", dev, pci_name(dev));
 
-        /* DMA device is untranslated, but all other PCI-e goes through
-         * the IOMMU
+#if !defined(CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE)
+        /* For non-LPAR environment, don't translate anything for the DMA
+         * engine. The exception to this is if the user has enabled
+         * CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE at build time.
          */
-        if (dev->vendor == 0x1959 && dev->device == 0xa007)
+        if (dev->vendor == 0x1959 && dev->device == 0xa007 &&
+            !firmware_has_feature(FW_FEATURE_LPAR))
                 dev->dev.archdata.dma_ops = &dma_direct_ops;
-        else
-                dev->dev.archdata.dma_data = &iommu_table_iobmap;
+#endif
+
+        dev->dev.archdata.dma_data = &iommu_table_iobmap;
 }
 
 static void pci_dma_bus_setup_null(struct pci_bus *b) { }