arm64/fp: Rename SVE and SME LEN field name to _WIDTH

The SVE and SVE length configuration field LEN have constants specifying
their width called _SIZE rather than the more normal _WIDTH, in preparation
for automatic generation rename to _WIDTH. No functional change.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220510161208.631259-3-broonie@kernel.org
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index 4d78b6a..b83808e 100644 (file)
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -1114,14 +1114,14 @@
 #define DCZID_BS_SHIFT                 0
 
 #define ZCR_ELx_LEN_SHIFT      0
-#define ZCR_ELx_LEN_SIZE       4
+#define ZCR_ELx_LEN_WIDTH      4
 #define ZCR_ELx_LEN_MASK       0xf
 
 #define SMCR_ELx_FA64_SHIFT    31
 #define SMCR_ELx_FA64_MASK     (1 << SMCR_ELx_FA64_SHIFT)
 
 #define SMCR_ELx_LEN_SHIFT     0
-#define SMCR_ELx_LEN_SIZE      4
+#define SMCR_ELx_LEN_WIDTH     4
 #define SMCR_ELx_LEN_MASK      0xf
 
 #define CPACR_EL1_FPEN_EL1EN   (BIT(20)) /* enable EL1 access */

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 0868936..665ad38 100644 (file)
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -577,13 +577,13 @@ static const struct arm64_ftr_bits ftr_id_dfr1[] = {
 
 static const struct arm64_ftr_bits ftr_zcr[] = {
        ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE,
-               ZCR_ELx_LEN_SHIFT, ZCR_ELx_LEN_SIZE, 0),        /* LEN */
+               ZCR_ELx_LEN_SHIFT, ZCR_ELx_LEN_WIDTH, 0),       /* LEN */
        ARM64_FTR_END,
 };
 
 static const struct arm64_ftr_bits ftr_smcr[] = {
        ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE,
-               SMCR_ELx_LEN_SHIFT, SMCR_ELx_LEN_SIZE, 0),      /* LEN */
+               SMCR_ELx_LEN_SHIFT, SMCR_ELx_LEN_WIDTH, 0),     /* LEN */
        ARM64_FTR_END,
 };