Commit 8d370933 authored Jul 11, 2018 by Mark Rutland Committed by Will Deacon Jul 12, 2018

arm64: kill change_cpacr()



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.rutland@arm.com>
Reviewed-by: Dave Martin <dave.martin@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent 25be597a

arch/arm64/kernel/fpsimd.c

+2 −11

Original line number	Diff line number	Diff line
		@@ -159,23 +159,14 @@ static void sve_free(struct task_struct *task)
		__sve_free(task);
		}

		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);
		}

		/*