Skip to content

Commit d65bf6e

Browse files
author
Marc Zyngier
committed
KVM: arm64: Remove all traces of FEAT_TME
FEAT_TME has been dropped from the architecture. Retrospectively. I'm sure someone is crying somewhere, but most of us won't. Clean-up time. Reviewed-by: Fuad Tabba <tabba@google.com> Tested-by: Fuad Tabba <tabba@google.com> Link: https://patch.msgid.link/20260202184329.2724080-18-maz@kernel.org Signed-off-by: Marc Zyngier <maz@kernel.org>
1 parent d784cfe commit d65bf6e

5 files changed

Lines changed: 3 additions & 23 deletions

File tree

arch/arm64/kvm/config.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ struct reg_feat_map_desc {
187187
#define FEAT_RME ID_AA64PFR0_EL1, RME, IMP
188188
#define FEAT_MPAM ID_AA64PFR0_EL1, MPAM, 1
189189
#define FEAT_S2FWB ID_AA64MMFR2_EL1, FWB, IMP
190-
#define FEAT_TME ID_AA64ISAR0_EL1, TME, IMP
191190
#define FEAT_TWED ID_AA64MMFR1_EL1, TWED, IMP
192191
#define FEAT_E2H0 ID_AA64MMFR4_EL1, E2H0, IMP
193192
#define FEAT_SRMASK ID_AA64MMFR4_EL1, SRMASK, IMP
@@ -991,7 +990,6 @@ static const struct reg_bits_to_feat_map hcr_feat_map[] = {
991990
NEEDS_FEAT(HCR_EL2_FIEN, feat_rasv1p1),
992991
NEEDS_FEAT(HCR_EL2_GPF, FEAT_RME),
993992
NEEDS_FEAT(HCR_EL2_FWB, FEAT_S2FWB),
994-
NEEDS_FEAT(HCR_EL2_TME, FEAT_TME),
995993
NEEDS_FEAT(HCR_EL2_TWEDEL |
996994
HCR_EL2_TWEDEn,
997995
FEAT_TWED),
@@ -1102,11 +1100,6 @@ static const struct reg_bits_to_feat_map sctlr_el1_feat_map[] = {
11021100
NEEDS_FEAT(SCTLR_EL1_EnRCTX, FEAT_SPECRES),
11031101
NEEDS_FEAT(SCTLR_EL1_DSSBS, FEAT_SSBS),
11041102
NEEDS_FEAT(SCTLR_EL1_TIDCP, FEAT_TIDCP1),
1105-
NEEDS_FEAT(SCTLR_EL1_TME0 |
1106-
SCTLR_EL1_TME |
1107-
SCTLR_EL1_TMT0 |
1108-
SCTLR_EL1_TMT,
1109-
FEAT_TME),
11101103
NEEDS_FEAT(SCTLR_EL1_TWEDEL |
11111104
SCTLR_EL1_TWEDEn,
11121105
FEAT_TWED),

arch/arm64/kvm/nested.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,11 +1505,6 @@ u64 limit_nv_id_reg(struct kvm *kvm, u32 reg, u64 val)
15051505
u64 orig_val = val;
15061506

15071507
switch (reg) {
1508-
case SYS_ID_AA64ISAR0_EL1:
1509-
/* Support everything but TME */
1510-
val &= ~ID_AA64ISAR0_EL1_TME;
1511-
break;
1512-
15131508
case SYS_ID_AA64ISAR1_EL1:
15141509
/* Support everything but LS64 and Spec Invalidation */
15151510
val &= ~(ID_AA64ISAR1_EL1_LS64 |

arch/arm64/tools/sysreg

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1856,10 +1856,7 @@ UnsignedEnum 31:28 RDM
18561856
0b0000 NI
18571857
0b0001 IMP
18581858
EndEnum
1859-
UnsignedEnum 27:24 TME
1860-
0b0000 NI
1861-
0b0001 IMP
1862-
EndEnum
1859+
Res0 27:24
18631860
UnsignedEnum 23:20 ATOMIC
18641861
0b0000 NI
18651862
0b0010 IMP
@@ -2432,10 +2429,7 @@ Field 57 EPAN
24322429
Field 56 EnALS
24332430
Field 55 EnAS0
24342431
Field 54 EnASR
2435-
Field 53 TME
2436-
Field 52 TME0
2437-
Field 51 TMT
2438-
Field 50 TMT0
2432+
Res0 53:50
24392433
Field 49:46 TWEDEL
24402434
Field 45 TWEDEn
24412435
Field 44 DSSBS
@@ -3840,7 +3834,7 @@ Field 43 NV1
38403834
Field 42 NV
38413835
Field 41 API
38423836
Field 40 APK
3843-
Field 39 TME
3837+
Res0 39
38443838
Field 38 MIOCNCE
38453839
Field 37 TEA
38463840
Field 36 TERR

tools/perf/Documentation/perf-arm-spe.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ and inv_event_filter are:
176176
bit 10 - Remote access (FEAT_SPEv1p4)
177177
bit 11 - Misaligned access (FEAT_SPEv1p1)
178178
bit 12-15 - IMPLEMENTATION DEFINED events (when implemented)
179-
bit 16 - Transaction (FEAT_TME)
180179
bit 17 - Partial or empty SME or SVE predicate (FEAT_SPEv1p1)
181180
bit 18 - Empty SME or SVE predicate (FEAT_SPEv1p1)
182181
bit 19 - L2D access (FEAT_SPEv1p4)

tools/testing/selftests/kvm/arm64/set_id_regs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ static const struct reg_ftr_bits ftr_id_aa64isar0_el1[] = {
9191
REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64ISAR0_EL1, SM3, 0),
9292
REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64ISAR0_EL1, SHA3, 0),
9393
REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64ISAR0_EL1, RDM, 0),
94-
REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64ISAR0_EL1, TME, 0),
9594
REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64ISAR0_EL1, ATOMIC, 0),
9695
REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64ISAR0_EL1, CRC32, 0),
9796
REG_FTR_BITS(FTR_LOWER_SAFE, ID_AA64ISAR0_EL1, SHA2, 0),

0 commit comments

Comments
 (0)