MIPS: Fix set_uncached_handler for ebase in XKPHYS

ebase might reside in XKPHYS if memblock is unable to allocate memory
within the KSEG0 physical range.

To map EBASE into uncached space, we convert it back to its physical
address and utilize the new CKSEG1ADDR_OR_64BIT helper for mapping.

Co-developed-by: Vladimir Kondratiev <vladimir.kondratiev@intel.com>
Signed-off-by: Vladimir Kondratiev <vladimir.kondratiev@intel.com>
Co-developed-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 2d95e9971a2df4ded65fe7b548b964fcb30927f9..a0085445f4402fb0afab60fd3a9c7b5445c8aa8e 100644 (file)
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -2299,7 +2299,7 @@ static const char panic_null_cerr[] =
 void set_uncached_handler(unsigned long offset, void *addr,
        unsigned long size)
 {
-       unsigned long uncached_ebase = CKSEG1ADDR(ebase);
+       unsigned long uncached_ebase = CKSEG1ADDR_OR_64BIT(__pa(ebase));
 
        if (!addr)
                panic(panic_null_cerr);