[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 11/18] target/arm: Extend arm_fi_to_lfsc to level -1
From: |
Richard Henderson |
Subject: |
[PATCH v4 11/18] target/arm: Extend arm_fi_to_lfsc to level -1 |
Date: |
Tue, 1 Mar 2022 11:59:51 -1000 |
With FEAT_LPA2, rather than introducing translation level 4,
we introduce level -1, below the current level 0. Extend
arm_fi_to_lfsc to handle these faults.
Assert that this new translation level does not leak into
fault types for which it is not defined, which allows some
masking of fi->level to be removed.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/internals.h | 35 +++++++++++++++++++++++++++++------
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/target/arm/internals.h b/target/arm/internals.h
index 3d3d41ba2b..00af41d792 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -462,28 +462,51 @@ static inline uint32_t arm_fi_to_lfsc(ARMMMUFaultInfo *fi)
case ARMFault_None:
return 0;
case ARMFault_AddressSize:
- fsc = fi->level & 3;
+ assert(fi->level >= -1 && fi->level <= 3);
+ if (fi->level < 0) {
+ fsc = 0b101001;
+ } else {
+ fsc = fi->level;
+ }
break;
case ARMFault_AccessFlag:
- fsc = (fi->level & 3) | (0x2 << 2);
+ assert(fi->level >= 0 && fi->level <= 3);
+ fsc = 0b001000 | fi->level;
break;
case ARMFault_Permission:
- fsc = (fi->level & 3) | (0x3 << 2);
+ assert(fi->level >= 0 && fi->level <= 3);
+ fsc = 0b001100 | fi->level;
break;
case ARMFault_Translation:
- fsc = (fi->level & 3) | (0x1 << 2);
+ assert(fi->level >= -1 && fi->level <= 3);
+ if (fi->level < 0) {
+ fsc = 0b101011;
+ } else {
+ fsc = 0b000100 | fi->level;
+ }
break;
case ARMFault_SyncExternal:
fsc = 0x10 | (fi->ea << 12);
break;
case ARMFault_SyncExternalOnWalk:
- fsc = (fi->level & 3) | (0x5 << 2) | (fi->ea << 12);
+ assert(fi->level >= -1 && fi->level <= 3);
+ if (fi->level < 0) {
+ fsc = 0b010011;
+ } else {
+ fsc = 0b010100 | fi->level;
+ }
+ fsc |= fi->ea << 12;
break;
case ARMFault_SyncParity:
fsc = 0x18;
break;
case ARMFault_SyncParityOnWalk:
- fsc = (fi->level & 3) | (0x7 << 2);
+ assert(fi->level >= -1 && fi->level <= 3);
+ if (fi->level < 0) {
+ fsc = 0b011011;
+ } else {
+ fsc = 0b011100 | fi->level;
+ }
break;
case ARMFault_AsyncParity:
fsc = 0x19;
--
2.25.1
- [PATCH v4 02/18] target/arm: Set TCR_EL1.TSZ for user-only, (continued)
- [PATCH v4 02/18] target/arm: Set TCR_EL1.TSZ for user-only, Richard Henderson, 2022/03/01
- [PATCH v4 01/18] hw/registerfields: Add FIELD_SEX<N> and FIELD_SDP<N>, Richard Henderson, 2022/03/01
- [PATCH v4 03/18] target/arm: Fault on invalid TCR_ELx.TxSZ, Richard Henderson, 2022/03/01
- [PATCH v4 05/18] target/arm: Pass outputsize down to check_s2_mmu_setup, Richard Henderson, 2022/03/01
- [PATCH v4 06/18] target/arm: Use MAKE_64BIT_MASK to compute indexmask, Richard Henderson, 2022/03/01
- [PATCH v4 08/18] target/arm: Prepare DBGBVR and DBGWVR for FEAT_LVA, Richard Henderson, 2022/03/01
- [PATCH v4 10/18] target/arm: Implement FEAT_LPA, Richard Henderson, 2022/03/01
- [PATCH v4 07/18] target/arm: Honor TCR_ELx.{I}PS, Richard Henderson, 2022/03/01
- [PATCH v4 09/18] target/arm: Implement FEAT_LVA, Richard Henderson, 2022/03/01
- [PATCH v4 12/18] target/arm: Introduce tlbi_aa64_get_range, Richard Henderson, 2022/03/01
- [PATCH v4 11/18] target/arm: Extend arm_fi_to_lfsc to level -1,
Richard Henderson <=
- [PATCH v4 14/18] target/arm: Validate tlbi TG matches translation granule in use, Richard Henderson, 2022/03/01
- [PATCH v4 13/18] target/arm: Fix TLBIRange.base for 16k and 64k pages, Richard Henderson, 2022/03/01
- [PATCH v4 17/18] target/arm: Provide cpu property for controling FEAT_LPA2, Richard Henderson, 2022/03/01
- [PATCH v4 15/18] target/arm: Advertise all page sizes for -cpu max, Richard Henderson, 2022/03/01
- [PATCH v4 16/18] target/arm: Implement FEAT_LPA2, Richard Henderson, 2022/03/01
- [PATCH v4 18/18] hw/arm/virt: Disable LPA2 for -machine virt-6.2, Richard Henderson, 2022/03/01