From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 30 Jan 2025 18:22:59 +0000 (+0000)
Subject: target/arm: Report correct syndrome for UNDEFINED LOR sysregs when NS=0
X-Git-Tag: v7.2.17~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83e270868b6ee1816aa4fda17fd1cb7b638acc7b;p=thirdparty%2Fqemu.git

target/arm: Report correct syndrome for UNDEFINED LOR sysregs when NS=0

The pseudocode for the accessors for the LOR sysregs says they
are UNDEFINED if SCR_EL3.NS is 0. We were reporting the wrong
syndrome value here; use CP_ACCESS_TRAP_UNCATEGORIZED.

Cc: qemu-stable@nongnu.org
Fixes: 2d7137c10faf ("target/arm: Implement the ARMv8.1-LOR extension")
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20250130182309.717346-5-peter.maydell@linaro.org
(cherry picked from commit 707d478ed8f2da6f2327e5af780890c1fd9c371a)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

diff --git a/target/arm/helper.c b/target/arm/helper.c
index f33fc5c4a6..24585d528b 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -6650,8 +6650,8 @@ static CPAccessResult access_lor_other(CPUARMState *env,
                                        const ARMCPRegInfo *ri, bool isread)
 {
     if (arm_is_secure_below_el3(env)) {
-        /* Access denied in secure mode.  */
-        return CP_ACCESS_TRAP;
+        /* UNDEF if SCR_EL3.NS == 0 */
+        return CP_ACCESS_TRAP_UNCATEGORIZED;
     }
     return access_lor_ns(env, ri, isread);
 }