Merge branch 'kbuild/rc-fixes' into kbuild/kconfig

We need to revert the temporary hack in 71ebc01, hence the merge.

1 files changed, 10 insertions, 7 deletions

diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
index be531ec1f206..d22b5a2d64f4 100644
--- a/arch/mips/cavium-octeon/dma-octeon.c
+++ b/arch/mips/cavium-octeon/dma-octeon.c
@@ -99,13 +99,16 @@ dma_addr_t octeon_map_dma_mem(struct device *dev, void *ptr, size_t size)
                         panic("dma_map_single: "
                               "Attempt to map illegal memory address 0x%llx\n",
                               physical);
-                else if ((physical + size >=
-                          (4ull<<30) - (OCTEON_PCI_BAR1_HOLE_SIZE<<20))
-                         && physical < (4ull<<30))
-                        pr_warning("dma_map_single: Warning: "
-                                   "Mapping memory address that might "
-                                   "conflict with devices 0x%llx-0x%llx\n",
-                                   physical, physical+size-1);
+                else if (physical >= CVMX_PCIE_BAR1_PHYS_BASE &&
+                         physical + size < (CVMX_PCIE_BAR1_PHYS_BASE + CVMX_PCIE_BAR1_PHYS_SIZE)) {
+                        result = physical - CVMX_PCIE_BAR1_PHYS_BASE + CVMX_PCIE_BAR1_RC_BASE;
+
+                        if (((result+size-1) & dma_mask) != result+size-1)
+                                panic("dma_map_single: Attempt to map address 0x%llx-0x%llx, which can't be accessed according to the dma mask 0x%llx\n",
+                                      physical, physical+size-1, dma_mask);
+                        goto done;
+                }
+
                 /* The 2nd 256MB is mapped at 256<<20 instead of 0x410000000 */
                 if ((physical >= 0x410000000ull) && physical < 0x420000000ull)
                         result = physical - 0x400000000ull;