[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/8] target/arm: Replicate TBI/TBID bits for single range regimes
From: |
Richard Henderson |
Subject: |
[PATCH 1/8] target/arm: Replicate TBI/TBID bits for single range regimes |
Date: |
Mon, 24 Feb 2020 19:12:11 -0800 |
Replicate the single TBI bit from TCR_EL2 and TCR_EL3 so that
we can unconditionally use pointer bit 55 to index into our
composite TBI1:TBI0 field.
Signed-off-by: Richard Henderson <address@hidden>
---
target/arm/helper.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 79db169e04..c1dae83700 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -10297,7 +10297,8 @@ static int aa64_va_parameter_tbi(uint64_t tcr,
ARMMMUIdx mmu_idx)
} else if (mmu_idx == ARMMMUIdx_Stage2) {
return 0; /* VTCR_EL2 */
} else {
- return extract32(tcr, 20, 1);
+ /* Replicate the single TBI bit so we always have 2 bits. */
+ return extract32(tcr, 20, 1) * 3;
}
}
@@ -10308,7 +10309,8 @@ static int aa64_va_parameter_tbid(uint64_t tcr,
ARMMMUIdx mmu_idx)
} else if (mmu_idx == ARMMMUIdx_Stage2) {
return 0; /* VTCR_EL2 */
} else {
- return extract32(tcr, 29, 1);
+ /* Replicate the single TBID bit so we always have 2 bits. */
+ return extract32(tcr, 29, 1) * 3;
}
}
--
2.20.1
- [PATCH 0/8] target/arm: Misc cleanups surrounding TBI, Richard Henderson, 2020/02/24
- [PATCH 1/8] target/arm: Replicate TBI/TBID bits for single range regimes,
Richard Henderson <=
- [PATCH 2/8] target/arm: Optimize cpu_mmu_index, Richard Henderson, 2020/02/24
- [PATCH 3/8] target/arm: Apply TBI to ESR_ELx in helper_exception_return, Richard Henderson, 2020/02/24
- [PATCH 5/8] target/arm: Use DEF_HELPER_FLAGS for helper_dc_zva, Richard Henderson, 2020/02/24
- [PATCH 6/8] target/arm: Clean address for DC ZVA, Richard Henderson, 2020/02/24
- [PATCH 7/8] target/arm: Check addresses for disabled regimes, Richard Henderson, 2020/02/24
- [PATCH 8/8] target/arm: Disable clean_data_tbi for system mode, Richard Henderson, 2020/02/24
- [PATCH 4/8] target/arm: Move helper_dc_zva to helper-a64.c, Richard Henderson, 2020/02/24