[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/7] target/arm/sme: Reset ZA state in aarch64_set_svcr()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 5/7] target/arm/sme: Reset ZA state in aarch64_set_svcr() |
Date: |
Thu, 12 Jan 2023 11:24:34 +0100 |
From: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230112004322.161330-1-richard.henderson@linaro.org>
[PMD: Split patch in multiple tiny steps]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/arm/helper.c | 12 ++++++++++++
target/arm/sme_helper.c | 12 ------------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index b655dde27d..26c3bb4cdf 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -6740,6 +6740,18 @@ void aarch64_set_svcr(CPUARMState *env, uint64_t new,
uint64_t mask)
if (change & R_SVCR_SM_MASK) {
arm_reset_sve_state(env);
}
+
+ /*
+ * ResetSMEState.
+ *
+ * SetPSTATE_ZA zeros on enable and disable. We can zero this only
+ * on enable: while disabled, the storage is inaccessible and the
+ * value does not matter. We're not saving the storage in vmstate
+ * when disabled either.
+ */
+ if (change & new & R_SVCR_ZA_MASK) {
+ memset(env->zarray, 0, sizeof(env->zarray));
+ }
}
static void svcr_write(CPUARMState *env, const ARMCPRegInfo *ri,
diff --git a/target/arm/sme_helper.c b/target/arm/sme_helper.c
index f73bf4d285..e146c17ba1 100644
--- a/target/arm/sme_helper.c
+++ b/target/arm/sme_helper.c
@@ -44,18 +44,6 @@ void helper_set_pstate_za(CPUARMState *env, uint32_t i)
return;
}
aarch64_set_svcr(env, 0, R_SVCR_ZA_MASK);
-
- /*
- * ResetSMEState.
- *
- * SetPSTATE_ZA zeros on enable and disable. We can zero this only
- * on enable: while disabled, the storage is inaccessible and the
- * value does not matter. We're not saving the storage in vmstate
- * when disabled either.
- */
- if (i) {
- memset(env->zarray, 0, sizeof(env->zarray));
- }
arm_rebuild_hflags(env);
}
--
2.38.1
- [PATCH v2 0/7] target/arm: Introduce aarch64_set_svcr, Philippe Mathieu-Daudé, 2023/01/12
- [PATCH v2 1/7] target/arm/sme: Reorg SME access handling in handle_msr_i(), Philippe Mathieu-Daudé, 2023/01/12
- [PATCH v2 2/7] target/arm/sme: Rebuild hflags in set_pstate() helpers, Philippe Mathieu-Daudé, 2023/01/12
- [PATCH v2 3/7] target/arm/sme: Introduce aarch64_set_svcr(), Philippe Mathieu-Daudé, 2023/01/12
- [PATCH v2 4/7] target/arm/sme: Reset SVE state in aarch64_set_svcr(), Philippe Mathieu-Daudé, 2023/01/12
- [PATCH v2 5/7] target/arm/sme: Reset ZA state in aarch64_set_svcr(),
Philippe Mathieu-Daudé <=
- [PATCH v2 6/7] target/arm/sme: Rebuild hflags in aarch64_set_svcr(), Philippe Mathieu-Daudé, 2023/01/12
- [PATCH v2 7/7] target/arm/sme: Unify set_pstate() SM/ZA helpers as set_svcr(), Philippe Mathieu-Daudé, 2023/01/12
- Re: [PATCH v2 0/7] target/arm: Introduce aarch64_set_svcr, Fabiano Rosas, 2023/01/12
- Re: [PATCH v2 0/7] target/arm: Introduce aarch64_set_svcr, Peter Maydell, 2023/01/17