[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 10/14] target/arm: Consider GP an attribute in get_phys_addr_l
From: |
Richard Henderson |
Subject: |
[PATCH v5 10/14] target/arm: Consider GP an attribute in get_phys_addr_lpae |
Date: |
Fri, 21 Oct 2022 08:35:44 +1000 |
Both GP and DBM are in the upper attribute block.
Extend the computation of attrs to include them,
then simplify the setting of guarded.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/ptw.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/target/arm/ptw.c b/target/arm/ptw.c
index 6820c2f4bc..cb2e9072ec 100644
--- a/target/arm/ptw.c
+++ b/target/arm/ptw.c
@@ -1077,7 +1077,6 @@ static bool get_phys_addr_lpae(CPUARMState *env,
S1Translate *ptw,
uint32_t el = regime_el(env, mmu_idx);
uint64_t descaddrmask;
bool aarch64 = arm_el_is_aa64(env, el);
- bool guarded = false;
uint64_t descriptor;
bool nstable;
@@ -1343,7 +1342,7 @@ static bool get_phys_addr_lpae(CPUARMState *env,
S1Translate *ptw,
descaddr &= ~(hwaddr)(page_size - 1);
descaddr |= (address & (page_size - 1));
/* Extract attributes from the descriptor */
- attrs = descriptor & (MAKE_64BIT_MASK(2, 10) | MAKE_64BIT_MASK(52, 12));
+ attrs = descriptor & (MAKE_64BIT_MASK(2, 10) | MAKE_64BIT_MASK(50, 14));
if (regime_is_stage2(mmu_idx)) {
/* Stage 2 table descriptors do not include any attribute fields */
@@ -1351,7 +1350,6 @@ static bool get_phys_addr_lpae(CPUARMState *env,
S1Translate *ptw,
}
/* Merge in attributes from table descriptors */
attrs |= nstable << 5; /* NS */
- guarded = extract64(descriptor, 50, 1); /* GP */
if (param.hpd) {
/* HPD disables all the table attributes except NSTable. */
goto skip_attrs;
@@ -1404,7 +1402,7 @@ static bool get_phys_addr_lpae(CPUARMState *env,
S1Translate *ptw,
/* When in aarch64 mode, and BTI is enabled, remember GP in the TLB. */
if (aarch64 && cpu_isar_feature(aa64_bti, cpu)) {
- result->f.guarded = guarded;
+ result->f.guarded = extract64(attrs, 50, 1); /* GP */
}
if (regime_is_stage2(mmu_idx)) {
--
2.34.1
- [PATCH v5 06/14] target/arm: Add ARMFault_UnsuppAtomicUpdate, (continued)
- [PATCH v5 06/14] target/arm: Add ARMFault_UnsuppAtomicUpdate, Richard Henderson, 2022/10/20
- [PATCH v5 05/14] target/arm: Move S1_ptw_translate outside arm_ld[lq]_ptw, Richard Henderson, 2022/10/20
- [PATCH v5 07/14] target/arm: Remove loop from get_phys_addr_lpae, Richard Henderson, 2022/10/20
- [PATCH v5 08/14] target/arm: Fix fault reporting in get_phys_addr_lpae, Richard Henderson, 2022/10/20
- [PATCH v5 09/14] target/arm: Don't shift attrs in get_phys_addr_lpae, Richard Henderson, 2022/10/20
- [PATCH v5 11/14] target/arm: Tidy merging of attributes from descriptor and table, Richard Henderson, 2022/10/20
- [PATCH v5 12/14] target/arm: Implement FEAT_HAFDBS, access flag portion, Richard Henderson, 2022/10/20
- [PATCH v5 13/14] target/arm: Implement FEAT_HAFDBS, dirty bit portion, Richard Henderson, 2022/10/20
- [PATCH v5 10/14] target/arm: Consider GP an attribute in get_phys_addr_lpae,
Richard Henderson <=
- [PATCH v5 14/14] target/arm: Use the max page size in a 2-stage ptw, Richard Henderson, 2022/10/20