[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/14] target/arm: Report correct syndrome for UNDEFINED AT ops w
From: |
Peter Maydell |
Subject: |
[PATCH 02/14] target/arm: Report correct syndrome for UNDEFINED AT ops with wrong NSE, NS |
Date: |
Thu, 30 Jan 2025 18:22:57 +0000 |
R_NYXTL says that these AT insns should be UNDEFINED if they
would operate on an EL lower than EL3 and SCR_EL3.{NSE,NS} is
set to the Reserved {1, 0}. We were incorrectly reporting
them with the wrong syndrome; use CP_ACCESS_TRAP_UNCATEGORIZED
so they are reported as UNDEFINED.
Cc: qemu-stable@nongnu.org
Fixes: 1acd00ef1410 ("target/arm/helper: Check SCR_EL3.{NSE, NS} encoding for
AT instructions")
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index c5245a20aaf..7ddeed0283f 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -3601,7 +3601,7 @@ static CPAccessResult at_e012_access(CPUARMState *env,
const ARMCPRegInfo *ri,
* scr_write() ensures that the NSE bit is not set otherwise.
*/
if ((env->cp15.scr_el3 & (SCR_NSE | SCR_NS)) == SCR_NSE) {
- return CP_ACCESS_TRAP;
+ return CP_ACCESS_TRAP_UNCATEGORIZED;
}
return CP_ACCESS_OK;
}
--
2.34.1
- [PATCH 00/14] target/arm: Clean up some corner cases of sysreg traps, Peter Maydell, 2025/01/30
- [PATCH 02/14] target/arm: Report correct syndrome for UNDEFINED AT ops with wrong NSE, NS,
Peter Maydell <=
- [PATCH 01/14] target/arm: Report correct syndrome for UNDEFINED CNTPS_*_EL1 from EL2 and NS EL1, Peter Maydell, 2025/01/30
- [PATCH 03/14] target/arm: Report correct syndrome for UNDEFINED S1E2 AT ops at EL3, Peter Maydell, 2025/01/30
- [PATCH 04/14] target/arm: Report correct syndrome for UNDEFINED LOR sysregs when NS=0, Peter Maydell, 2025/01/30
- [PATCH 08/14] hw/intc/arm_gicv3_cpuif(): Remove redundant tests of is_a64(), Peter Maydell, 2025/01/30
- [PATCH 14/14] target/arm: Correct errors in WFI/WFE trapping, Peter Maydell, 2025/01/30
- [PATCH 10/14] target/arm: Use CP_ACCESS_TRAP_EL1 for traps that are always to EL1, Peter Maydell, 2025/01/30
- [PATCH 11/14] target/arm: Use TRAP_UNCATEGORIZED for XScale CPAR traps, Peter Maydell, 2025/01/30
- [PATCH 05/14] target/arm: Make CP_ACCESS_TRAPs to AArch32 EL3 be Monitor traps, Peter Maydell, 2025/01/30
- [PATCH 09/14] target/arm: Support CP_ACCESS_TRAP_EL1 as a CPAccessResult, Peter Maydell, 2025/01/30
- [PATCH 12/14] target/arm: Remove CP_ACCESS_TRAP handling, Peter Maydell, 2025/01/30