From: Richard Henderson <richard.henderson@linaro.org>
Date: Tue, 7 Nov 2023 21:30:27 +0000 (-0800)
Subject: target/hppa: Use PRIV_P_TO_MMU_IDX in helper_probe
X-Git-Tag: v8.2.0-rc0~5^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=576fc9376d7f220a21807bd7759d297acb4b6072;p=thirdparty%2Fqemu.git

target/hppa: Use PRIV_P_TO_MMU_IDX in helper_probe

Direct privilege level to mmu_idx mapping has been
false for some time.  Provide the correct value to
hppa_get_physical_address.

Fixes: fa824d99f9b ("target/hppa: Switch to use MMU indices 11-15")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c
index a0e31c0c256..7f607c3afd6 100644
--- a/target/hppa/op_helper.c
+++ b/target/hppa/op_helper.c
@@ -338,7 +338,7 @@ target_ulong HELPER(probe)(CPUHPPAState *env, target_ulong addr,
 #ifdef CONFIG_USER_ONLY
     return page_check_range(addr, 1, want);
 #else
-    int prot, excp;
+    int prot, excp, mmu_idx;
     hwaddr phys;
 
     trace_hppa_tlb_probe(addr, level, want);
@@ -347,7 +347,8 @@ target_ulong HELPER(probe)(CPUHPPAState *env, target_ulong addr,
         return 0;
     }
 
-    excp = hppa_get_physical_address(env, addr, level, 0, &phys,
+    mmu_idx = PRIV_P_TO_MMU_IDX(level, env->psw & PSW_P);
+    excp = hppa_get_physical_address(env, addr, mmu_idx, 0, &phys,
                                      &prot, NULL);
     if (excp >= 0) {
         if (env->psw & PSW_Q) {