| Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame] | 1 | target/arm: mark SP_EL1 with ARM_CP_EL3_NO_EL2_KEEP |
| 2 | |
| 3 | SP_EL1 must be kept when EL3 is present but EL2 is not. Therefore mark |
| 4 | it with ARM_CP_EL3_NO_EL2_KEEP. |
| 5 | |
| 6 | Fixes: 696ba3771894 ("target/arm: Handle cpreg registration for missing EL") |
| 7 | Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> |
| 8 | |
| 9 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2022-09/msg04515.html] |
| 10 | |
| 11 | --- |
| 12 | target/arm/helper.c | 2 +- |
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 | |
| 15 | Index: qemu-7.1.0/target/arm/helper.c |
| 16 | =================================================================== |
| 17 | --- qemu-7.1.0.orig/target/arm/helper.c |
| 18 | +++ qemu-7.1.0/target/arm/helper.c |
| 19 | @@ -4971,7 +4971,7 @@ static const ARMCPRegInfo v8_cp_reginfo[ |
| 20 | .fieldoffset = offsetof(CPUARMState, sp_el[0]) }, |
| 21 | { .name = "SP_EL1", .state = ARM_CP_STATE_AA64, |
| 22 | .opc0 = 3, .opc1 = 4, .crn = 4, .crm = 1, .opc2 = 0, |
| 23 | - .access = PL2_RW, .type = ARM_CP_ALIAS, |
| 24 | + .access = PL2_RW, .type = ARM_CP_ALIAS | ARM_CP_EL3_NO_EL2_KEEP, |
| 25 | .fieldoffset = offsetof(CPUARMState, sp_el[1]) }, |
| 26 | { .name = "SPSel", .state = ARM_CP_STATE_AA64, |
| 27 | .opc0 = 3, .opc1 = 0, .crn = 4, .crm = 2, .opc2 = 0, |