[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 43/45] target/arm: Only set ZEN in reset if SVE present
From: |
Peter Maydell |
Subject: |
[PULL 43/45] target/arm: Only set ZEN in reset if SVE present |
Date: |
Mon, 11 Jul 2022 14:57:48 +0100 |
From: Richard Henderson <richard.henderson@linaro.org>
There's no reason to set CPACR_EL1.ZEN if SVE disabled.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220708151540.18136-44-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/cpu.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 9c58be8b146..9b544438432 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -204,11 +204,10 @@ static void arm_cpu_reset(DeviceState *dev)
/* and to the FP/Neon instructions */
env->cp15.cpacr_el1 = FIELD_DP64(env->cp15.cpacr_el1,
CPACR_EL1, FPEN, 3);
- /* and to the SVE instructions */
- env->cp15.cpacr_el1 = FIELD_DP64(env->cp15.cpacr_el1,
- CPACR_EL1, ZEN, 3);
- /* with reasonable vector length */
+ /* and to the SVE instructions, with default vector length */
if (cpu_isar_feature(aa64_sve, cpu)) {
+ env->cp15.cpacr_el1 = FIELD_DP64(env->cp15.cpacr_el1,
+ CPACR_EL1, ZEN, 3);
env->vfp.zcr_el[1] = cpu->sve_default_vq - 1;
}
/*
--
2.25.1
- [PULL 44/45] target/arm: Enable SME for user-only, (continued)
- [PULL 44/45] target/arm: Enable SME for user-only, Peter Maydell, 2022/07/11
- [PULL 28/45] target/arm: Implement PSEL, Peter Maydell, 2022/07/11
- [PULL 20/45] target/arm: Implement SME LD1, ST1, Peter Maydell, 2022/07/11
- [PULL 32/45] target/arm: Enable SME for -cpu max, Peter Maydell, 2022/07/11
- [PULL 38/45] linux-user/aarch64: Verify extra record lock succeeded, Peter Maydell, 2022/07/11
- [PULL 40/45] linux-user/aarch64: Implement SME signal handling, Peter Maydell, 2022/07/11
- [PULL 41/45] linux-user: Rename sve prctls, Peter Maydell, 2022/07/11
- [PULL 42/45] linux-user/aarch64: Implement PR_SME_GET_VL, PR_SME_SET_VL, Peter Maydell, 2022/07/11
- [PULL 43/45] target/arm: Only set ZEN in reset if SVE present,
Peter Maydell <=
- [PULL 45/45] linux-user/aarch64: Add SME related hwcap entries, Peter Maydell, 2022/07/11
- [PULL 08/45] target/arm: Mark FTSMUL, FTMAD, FADDA as non-streaming, Peter Maydell, 2022/07/11
- Re: [PULL 00/45] target-arm queue, Richard Henderson, 2022/07/11