From: Paul Burton <paul.burton@imgtec.com>
Date: Mon, 26 Sep 2016 18:28:57 +0000 (+0100)
Subject: MIPS: Fix map_physmem for cached mappings
X-Git-Tag: v2017.01-rc1~154^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6fd596a1aa57bd431263f45b0c57ee8ae6b2403c;p=u-boot

MIPS: Fix map_physmem for cached mappings

map_physmem should return a pointer that can be used by the CPU to
access the given memory - on MIPS simply returning the physical address
as it does prior to this patch doesn't achieve that. Instead return a
pointer to the memory within (c)kseg0, which matches up consistently
with the (c)kseg1 pointer that uncached mappings return via ioremap.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
---

diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index 5b86386bc1..ee7a59290d 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -501,7 +501,7 @@ map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
 	if (flags == MAP_NOCACHE)
 		return ioremap(paddr, len);
 
-	return (void *)paddr;
+	return (void *)CKSEG0ADDR(paddr);
 }
 
 /*