Commit 53d2d84a authored by Mark Brown's avatar Mark Brown Committed by Will Deacon

arm64/cache: Fix cache_type_cwg() for register generation

Ard noticed that since we converted CTR_EL0 to automatic generation we have
been seeing errors on some systems handling the value of cache_type_cwg()
such as

   CPU features: No Cache Writeback Granule information, assuming 128

This is because the manual definition of CTR_EL0_CWG_MASK was done without
a shift while our convention is to define the mask after shifting. This
means that the user in cache_type_cwg() was broken as it was written for
the manually written shift then mask. Fix this by converting to use
SYS_FIELD_GET().

The only other field where the _MASK for this register is used is IminLine
which is at offset 0 so unaffected.

Fixes: 9a3634d0 ("arm64/sysreg: Convert CTR_EL0 to automatic generation")
Reported-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220818213613.733091-4-broonie@kernel.orgSigned-off-by: default avatarWill Deacon <will@kernel.org>
parent a10edea4
...@@ -71,7 +71,7 @@ static __always_inline int icache_is_vpipt(void) ...@@ -71,7 +71,7 @@ static __always_inline int icache_is_vpipt(void)
static inline u32 cache_type_cwg(void) static inline u32 cache_type_cwg(void)
{ {
return (read_cpuid_cachetype() >> CTR_EL0_CWG_SHIFT) & CTR_EL0_CWG_MASK; return SYS_FIELD_GET(CTR_EL0, CWG, read_cpuid_cachetype());
} }
#define __read_mostly __section(".data..read_mostly") #define __read_mostly __section(".data..read_mostly")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment