1 files changed, 21 insertions, 2 deletions

diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
index ea4febaa4bb1..b6bb92c16a47 100644
--- a/arch/mips/cavium-octeon/dma-octeon.c
+++ b/arch/mips/cavium-octeon/dma-octeon.c
@@ -61,6 +61,16 @@ static phys_addr_t octeon_gen1_dma_to_phys(struct device *dev, dma_addr_t daddr)
         return daddr;
 }
 
+static dma_addr_t octeon_gen2_phys_to_dma(struct device *dev, phys_addr_t paddr)
+{
+        return octeon_hole_phys_to_dma(paddr);
+}
+
+static phys_addr_t octeon_gen2_dma_to_phys(struct device *dev, dma_addr_t daddr)
+{
+        return octeon_hole_dma_to_phys(daddr);
+}
+
 static dma_addr_t octeon_big_phys_to_dma(struct device *dev, phys_addr_t paddr)
 {
         if (paddr >= 0x410000000ull && paddr < 0x420000000ull)
@@ -262,11 +272,11 @@ void __init plat_swiotlb_setup(void)
 
         for (i = 0 ; i < boot_mem_map.nr_map; i++) {
                 struct boot_mem_map_entry *e = &boot_mem_map.map[i];
-                if (e->type != BOOT_MEM_RAM)
+                if (e->type != BOOT_MEM_RAM && e->type != BOOT_MEM_INIT_RAM)
                         continue;
 
                 /* These addresses map low for PCI. */
-                if (e->addr > 0x410000000ull)
+                if (e->addr > 0x410000000ull && !OCTEON_IS_MODEL(OCTEON_CN6XXX))
                         continue;
 
                 addr_size += e->size;
@@ -296,6 +306,11 @@ void __init plat_swiotlb_setup(void)
                 swiotlbsize = 64 * (1<<20);
         }
 #endif
+#ifdef CONFIG_USB_OCTEON_OHCI
+        /* OCTEON II ohci is only 32-bit. */
+        if (OCTEON_IS_MODEL(OCTEON_CN6XXX) && max_addr >= 0x100000000ul)
+                swiotlbsize = 64 * (1<<20);
+#endif
         swiotlb_nslabs = swiotlbsize >> IO_TLB_SHIFT;
         swiotlb_nslabs = ALIGN(swiotlb_nslabs, IO_TLB_SEGSIZE);
         swiotlbsize = swiotlb_nslabs << IO_TLB_SHIFT;
@@ -330,6 +345,10 @@ struct dma_map_ops *octeon_pci_dma_map_ops;
 void __init octeon_pci_dma_init(void)
 {
         switch (octeon_dma_bar_type) {
+        case OCTEON_DMA_BAR_TYPE_PCIE2:
+                _octeon_pci_dma_map_ops.phys_to_dma = octeon_gen2_phys_to_dma;
+                _octeon_pci_dma_map_ops.dma_to_phys = octeon_gen2_dma_to_phys;
+                break;
         case OCTEON_DMA_BAR_TYPE_PCIE:
                 _octeon_pci_dma_map_ops.phys_to_dma = octeon_gen1_phys_to_dma;
                 _octeon_pci_dma_map_ops.dma_to_phys = octeon_gen1_dma_to_phys;