Commit efbc74ac authored by Will Deacon's avatar Will Deacon Committed by Russell King
Browse files

ARM: 7345/1: errata: update workaround for A9 erratum #743622 



Erratum #743622 affects all r2 variants of the Cortex-A9 processor, so
ensure that the workaround is applied regardless of the revision.

Cc: <stable@vger.kernel.org>
Reported-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 12021372

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1280,7 +1280,7 @@ config ARM_ERRATA_743622 
	depends on CPU_V7

	help

	  This option enables the workaround for the 743622 Cortex-A9

	  (r2p0..r2p2) erratum. Under very rare conditions, a faulty

	  (r2p*) erratum. Under very rare conditions, a faulty

	  optimisation in the Cortex-A9 Store Buffer may lead to data

	  corruption. This workaround sets a specific bit in the diagnostic

	  register of the Cortex-A9 which disables the Store Buffer

arch/arm/mm/proc-v7.S

+1 −3
Original line number Diff line number Diff line
@@ -230,9 +230,7 @@ __v7_setup: 
	mcreq	p15, 0, r10, c15, c0, 1		@ write diagnostic register

#endif

#ifdef CONFIG_ARM_ERRATA_743622

	teq	r6, #0x20			@ present in r2p0

	teqne	r6, #0x21			@ present in r2p1

	teqne	r6, #0x22			@ present in r2p2

	teq	r5, #0x00200000			@ only present in r2p*

	mrceq	p15, 0, r10, c15, c0, 1		@ read diagnostic register

	orreq	r10, r10, #1 << 6		@ set bit #6

	mcreq	p15, 0, r10, c15, c0, 1		@ write diagnostic register

CRA Git | Maintained and supported by SUSTech CRA and CCSE