[PATCHv2 05/19] arm64: kill change_cpacr()

[Mark Rutland]

Now that we have sysreg_clear_set(), we can use this instead of
change_cpacr().

Note that the order of the set and clear arguments differs between
change_cpacr() and sysreg_clear_set(), so these are flipped as part of
the conversion. Also, sve_user_enable() redundantly clears
CPACR_EL1_ZEN_EL0EN before setting it; this is removed for clarity.

Signed-off-by: Mark Rutland <mark.rutl...@arm.com>
Reviewed-by: Dave Martin <dave.mar...@arm.com>
Cc: Catalin Marinas <catalin.mari...@arm.com>
Cc: James Morse <james.mo...@arm.com>
Cc: Will Deacon <will.dea...@arm.com>
---
 arch/arm64/kernel/fpsimd.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index 3db8ed530e56..c135cff8f882 100644
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -171,23 +171,14 @@ static void *sve_pffr(struct task_struct *task)
                sve_ffr_offset(task->thread.sve_vl);
 }
 
-static void change_cpacr(u64 val, u64 mask)
-{
-       u64 cpacr = read_sysreg(CPACR_EL1);
-       u64 new = (cpacr & ~mask) | val;
-
-       if (new != cpacr)
-               write_sysreg(new, CPACR_EL1);
-}
-
 static void sve_user_disable(void)
 {
-       change_cpacr(0, CPACR_EL1_ZEN_EL0EN);
+       sysreg_clear_set(cpacr_el1, CPACR_EL1_ZEN_EL0EN, 0);
 }
 
 static void sve_user_enable(void)
 {
-       change_cpacr(CPACR_EL1_ZEN_EL0EN, CPACR_EL1_ZEN_EL0EN);
+       sysreg_clear_set(cpacr_el1, 0, CPACR_EL1_ZEN_EL0EN);
 }
 
 /*
-- 
2.11.0