summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2022-05-10 18:12:00 +0200
committerCatalin Marinas <catalin.marinas@arm.com>2022-05-16 20:50:20 +0200
commite65fc01bf271cefa6269b7ab1badcf7cddae5d40 (patch)
tree976b682e1239e2e6d86e05a12c6479a89a982bbc /arch/arm64/kernel
parentarm64/sme: Drop SYS_ from SMIDR_EL1 defines (diff)
downloadlinux-e65fc01bf271cefa6269b7ab1badcf7cddae5d40.tar.xz
linux-e65fc01bf271cefa6269b7ab1badcf7cddae5d40.zip
arm64/sme: Standardise bitfield names for SVCR
The bitfield definitions for SVCR have a SYS_ added to the names of the constant which will be a problem for automatic generation. Remove the prefixes, no functional change. Signed-off-by: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/r/20220510161208.631259-5-broonie@kernel.org Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel')
-rw-r--r--arch/arm64/kernel/fpsimd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index a568735b7c2e..a5f6d6d9f372 100644
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -1918,7 +1918,7 @@ void __efi_fpsimd_begin(void)
svcr = read_sysreg_s(SYS_SVCR_EL0);
if (!system_supports_fa64())
- ffr = svcr & SYS_SVCR_EL0_SM_MASK;
+ ffr = svcr & SVCR_EL0_SM_MASK;
__this_cpu_write(efi_sm_state, ffr);
}
@@ -1929,7 +1929,7 @@ void __efi_fpsimd_begin(void)
if (system_supports_sme())
sysreg_clear_set_s(SYS_SVCR_EL0,
- SYS_SVCR_EL0_SM_MASK, 0);
+ SVCR_EL0_SM_MASK, 0);
} else {
fpsimd_save_state(this_cpu_ptr(&efi_fpsimd_state));
@@ -1964,7 +1964,7 @@ void __efi_fpsimd_end(void)
if (__this_cpu_read(efi_sm_state)) {
sysreg_clear_set_s(SYS_SVCR_EL0,
0,
- SYS_SVCR_EL0_SM_MASK);
+ SVCR_EL0_SM_MASK);
if (!system_supports_fa64())
ffr = efi_sm_state;
}