Skip to content

Commit 5b06dcf

Browse files
brooniectmarinas
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent f171f9e commit 5b06dcf

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

arch/arm64/include/asm/sysreg.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,14 +1114,14 @@
11141114
#define DCZID_BS_SHIFT 0
11151115

11161116
#define ZCR_ELx_LEN_SHIFT 0
1117-
#define ZCR_ELx_LEN_SIZE 4
1117+
#define ZCR_ELx_LEN_WIDTH 4
11181118
#define ZCR_ELx_LEN_MASK 0xf
11191119

11201120
#define SMCR_ELx_FA64_SHIFT 31
11211121
#define SMCR_ELx_FA64_MASK (1 << SMCR_ELx_FA64_SHIFT)
11221122

11231123
#define SMCR_ELx_LEN_SHIFT 0
1124-
#define SMCR_ELx_LEN_SIZE 4
1124+
#define SMCR_ELx_LEN_WIDTH 4
11251125
#define SMCR_ELx_LEN_MASK 0xf
11261126

11271127
#define CPACR_EL1_FPEN_EL1EN (BIT(20)) /* enable EL1 access */

arch/arm64/kernel/cpufeature.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,13 +577,13 @@ static const struct arm64_ftr_bits ftr_id_dfr1[] = {
577577

578578
static const struct arm64_ftr_bits ftr_zcr[] = {
579579
ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE,
580-
ZCR_ELx_LEN_SHIFT, ZCR_ELx_LEN_SIZE, 0), /* LEN */
580+
ZCR_ELx_LEN_SHIFT, ZCR_ELx_LEN_WIDTH, 0), /* LEN */
581581
ARM64_FTR_END,
582582
};
583583

584584
static const struct arm64_ftr_bits ftr_smcr[] = {
585585
ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE,
586-
SMCR_ELx_LEN_SHIFT, SMCR_ELx_LEN_SIZE, 0), /* LEN */
586+
SMCR_ELx_LEN_SHIFT, SMCR_ELx_LEN_WIDTH, 0), /* LEN */
587587
ARM64_FTR_END,
588588
};
589589

0 commit comments

Comments
 (0)