Commit 546b7cde authored by Rob Herring's avatar Rob Herring Committed by Will Deacon
Browse files

arm64: Rename ARM64_WORKAROUND_2966298 



In preparation to apply ARM64_WORKAROUND_2966298 for multiple errata,
rename the kconfig and capability. No functional change.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20240110-arm-errata-a510-v1-1-d02bc51aeeee@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 3931261e

arch/arm64/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -1037,8 +1037,12 @@ config ARM64_ERRATUM_2645198 


	  If unsure, say Y.



config ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD

	bool



config ARM64_ERRATUM_2966298

	bool "Cortex-A520: 2966298: workaround for speculatively executed unprivileged load"

	select ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD

	default y

	help

	  This option adds the workaround for ARM Cortex-A520 erratum 2966298.

arch/arm64/kernel/cpu_errata.c

+2 −2
Original line number Diff line number Diff line
@@ -713,10 +713,10 @@ const struct arm64_cpu_capabilities arm64_errata[] = { 
		MIDR_FIXED(MIDR_CPU_VAR_REV(1,1), BIT(25)),

	},

#endif

#ifdef CONFIG_ARM64_ERRATUM_2966298

#ifdef CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD

	{

		.desc = "ARM erratum 2966298",

		.capability = ARM64_WORKAROUND_2966298,

		.capability = ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD,

		/* Cortex-A520 r0p0 - r0p1 */

		ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A520, 0, 0, 1),

	},

arch/arm64/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ alternative_else_nop_endif 
	ldp	x28, x29, [sp, #16 * 14]



	.if	\el == 0

alternative_if ARM64_WORKAROUND_2966298

alternative_if ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD

	tlbi	vale1, xzr

	dsb	nsh

alternative_else_nop_endif

arch/arm64/tools/cpucaps

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ WORKAROUND_2077057 
WORKAROUND_2457168

WORKAROUND_2645198

WORKAROUND_2658417

WORKAROUND_2966298

WORKAROUND_AMPERE_AC03_CPU_38

WORKAROUND_TRBE_OVERWRITE_FILL_MODE

WORKAROUND_TSB_FLUSH_FAILURE
@@ -100,3 +99,4 @@ WORKAROUND_NVIDIA_CARMEL_CNP 
WORKAROUND_QCOM_FALKOR_E1003

WORKAROUND_REPEAT_TLBI

WORKAROUND_SPECULATIVE_AT

WORKAROUND_SPECULATIVE_UNPRIV_LOAD