arm64: cpu_errata: Remove ARM64_MISMATCHED_CACHE_LINE_SIZE
PATCH 1/1 arm64: cpu_errata: Remove ARM64_MISMATCHED_CACHE_LINE_SIZE
There's no need to treat mismatched cache-line sizes reported by CTR_EL0 differently to any other mismatched fields that we treat as "STRICT" in the cpufeature code. In both cases we need to trap and emulate EL0 accesses to the register, so drop ARM64_MISMATCHED_CACHE_LINE_SIZE and rely on ARM64_MISMATCHED_CACHE_TYPE instead.
--- arch/arm64/include/asm/assembler.h | 7 +++---- arch/arm64/include/asm/cpucaps.h | 2 +- arch/arm64/kernel/cpu_errata.c | 15 ++------------- 3 files changed, 6 insertions(+), 18 deletions(-)
arch/arm64/include/asm/assembler.h +3 -4
@@ -286,12 +286,11 @@ alternative_endif ldr \rd, [\rn, #MM_CONTEXT_ID] .endm /* - * read_ctr - read CTR_EL0. If the system has mismatched - * cache line sizes, provide the system wide safe value - * from arm64_ftr_reg_ctrel0.sys_val + * read_ctr - read CTR_EL0. If the system has mismatched register fields, + * provide the system wide safe value from arm64_ftr_reg_ctrel0.sys_val */ .macro read_ctr, reg -alternative_if_not ARM64_MISMATCHED_CACHE_LINE_SIZE +alternative_if_not ARM64_MISMATCHED_CACHE_TYPE mrs \reg, ctr_el0 // read CTR nop alternative_else
arch/arm64/include/asm/cpucaps.h +1 -1
@@ -33,7 +33,7 @@#define ARM64_WORKAROUND_CAVIUM_27456 12#define ARM64_HAS_32BIT_EL0 13#define ARM64_HARDEN_EL2_VECTORS 14 -#define ARM64_MISMATCHED_CACHE_LINE_SIZE 15 +/* #define ARM64_YOUR_CAP_HERE 15 */ #define ARM64_HAS_NO_FPSIMD 16#define ARM64_WORKAROUND_REPEAT_TLBI 17#define ARM64_WORKAROUND_QCOM_FALKOR_E1003 18
arch/arm64/kernel/cpu_errata.c +2 -13
@@ -68,11 +68,7 @@ static bool has_mismatched_cache_type(const struct arm64_cpu_capabilities *entry, int scope) { -u64 mask =CTR_CACHE_MINLINE_MASK ; - -/* Skip matching the min line sizes for cache type check */ -if (entry->capability ==ARM64_MISMATCHED_CACHE_TYPE ) - mask ^= arm64_ftr_reg_ctrel0.strict_mask; +u64 mask = arm64_ftr_reg_ctrel0.strict_mask;;WARN_ON (scope !=SCOPE_LOCAL_CPU ||preemptible ()); return (read_cpuid_cachetype() & mask) !=
@@ -616,14 +612,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { },#endif { - .desc = "Mismatched cache line size", - .capability = ARM64_MISMATCHED_CACHE_LINE_SIZE, - .matches = has_mismatched_cache_type, - .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, - .cpu_enable = cpu_enable_trap_ctr_access, - }, - { - .desc = "Mismatched cache type", + .desc = "Mismatched cache type (CTR_EL0)", .capability = ARM64_MISMATCHED_CACHE_TYPE, .matches = has_mismatched_cache_type, .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
Signature · 1 line
2.1.4
PATCH 1/1 arm64: cpu_errata: Remove ARM64_MISMATCHED_CACHE_LINE_SIZE
Quoted 5 lines · Will Deacon
There's no need to treat mismatched cache-line sizes reported by
CTR_EL0differently to any other mismatched fields that we treat as "STRICT" in the cpufeature code. In both cases we need to trap and emulate EL0 accesses to the register, so dropARM64_MISMATCHED_CACHE_LINE_SIZEand rely onARM64_MISMATCHED_CACHE_TYPEinstead.
The only reason was to avoid trapping the kernel accesses of CTR_EL0 for cache line sizes if there were no differences. If we are ok with that, I am fine with the patch.
Cheers
Suzuki
PATCH 1/1 arm64: cpu_errata: Remove ARM64_MISMATCHED_CACHE_LINE_SIZE
Quoted 10 lines · Suzuki K Poulose
Quoted 5 lines · Will Deacon
There's no need to treat mismatched cache-line sizes reported by
CTR_EL0differently to any other mismatched fields that we treat as "STRICT" in the cpufeature code. In both cases we need to trap and emulate EL0 accesses to the register, so dropARM64_MISMATCHED_CACHE_LINE_SIZEand rely onARM64_MISMATCHED_CACHE_TYPEinstead.The only reason was to avoid trapping the kernel accesses of
CTR_EL0for cache line sizes if there were no differences. If we are ok with that, I am fine with the patch.
It's not a "trap" as such though, is it? We just load the safe val and return that. I think that makes more sense, because if somebody uses read_ctr to try and read something like IDC or DIC, they probably want a sanitised copy on a mismatch.
Will
PATCH 1/1 arm64: cpu_errata: Remove ARM64_MISMATCHED_CACHE_LINE_SIZE
Quoted 8 lines · Will Deacon
Quoted 7 lines · Suzuki K Poulose
Quoted 5 lines · Will Deacon
There's no need to treat mismatched cache-line sizes reported by
CTR_EL0differently to any other mismatched fields that we treat as "STRICT" in the cpufeature code. In both cases we need to trap and emulate EL0 accesses to the register, so dropARM64_MISMATCHED_CACHE_LINE_SIZEand rely onARM64_MISMATCHED_CACHE_TYPEinstead.
Quoted 5 lines
Quoted 3 lines
The only reason was to avoid trapping the kernel accesses of
CTR_EL0for cache line sizes if there were no differences. If we are ok with that, I am fine with the patch.It's not a "trap" as such though, is it? We just load the safe val and
Oh, yes, it is not a "trap" as such.
Quoted 3 lines
return that. I think that makes more sense, because if somebody uses
read_ctrto try and read something like IDC or DIC, they probably want a sanitised copy on a mismatch.
Yes, true. And there is a indeed a helper for fetching the raw values on the current PE.
FWIW,