[v6,02/15] MIPS: Fix set_uncached_handler for ebase in XKPHYS

Commit Message

Gregory CLEMENT Jan. 18, 2024, 3:52 p.m. UTC

From: Jiaxun Yang <[e-mail]>

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 <[e-mail]>
Signed-off-by: Vladimir Kondratiev <[e-mail]>
Co-developed-by: Gregory CLEMENT <[e-mail]>
Signed-off-by: Jiaxun Yang <[e-mail]>
Signed-off-by: Gregory CLEMENT <[e-mail]>
---
 arch/mips/kernel/traps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 0e3f2f2fa732b..355d0f0709de8 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -2295,7 +2295,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);