From: Douglas Anderson <dianders@chromium.org>
To: Russell King <linux@armlinux.org.uk>
Cc: mark.rutland@arm.com, Salva.Climent@arm.com,
linux-rockchip@lists.infradead.org, sonnyrao@chromium.org,
will.deacon@arm.com, bbatacha@arm.com, mka@chromium.org,
robin.murphy@arm.com, heiko@sntech.de,
Douglas Anderson <dianders@chromium.org>,
Arnd Bergmann <arnd@arndb.de>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
linux-kernel@vger.kernel.org, Paul Burton <paul.burton@mips.com>,
Palmer Dabbelt <palmer@sifive.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Marc Zyngier <marc.zyngier@arm.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
linux-arm-kernel@lists.infradead.org,
Tony Lindgren <tony@atomide.com>
Subject: [PATCH 2/2] ARM: errata: add support for A12/A17 errata CR711784
Date: Fri, 19 Apr 2019 15:18:03 -0700 [thread overview]
Message-ID: <20190419221803.99322-2-dianders@chromium.org> (raw)
In-Reply-To: <20190419221803.99322-1-dianders@chromium.org>
This adds a code for turning on chicken bit 11, which appears to avoid
a potential CPU deadlock that could occur. The exact set of
instruction needed to trigger this errata is not totaly known but we
have a high level of confidence that the problem is fixed by setting
chicken bit 11.
All details are in http://crbug.com/711784
This erratum has no known number and thus I have tagged it CR711784
(after the Chrome OS bug number). I have created separate A12 / A17
configs to match how the rest of the A12 / A17 errata is handled.
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---
arch/arm/Kconfig | 18 ++++++++++++++++++
arch/arm/mm/proc-v7.S | 10 ++++++++++
2 files changed, 28 insertions(+)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4376fe74f95e..34ec9039206b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1181,6 +1181,13 @@ config ARM_ERRATA_857271
hang. The workaround is expected to have a negligible performance
impact.
+config ARM_ERRATA_CR711784_A12
+ bool "ARM errata: A12: conditional instructions can lead to a CPU hang"
+ depends on CPU_V7
+ help
+ This option enables the workaround for a Cortex-A12 erratum without a
+ number. The problems are best described in https://crbug.com/711784
+
config ARM_ERRATA_852421
bool "ARM errata: A17: DMB ST might fail to create order between stores"
depends on CPU_V7
@@ -1212,6 +1219,17 @@ config ARM_ERRATA_857272
config option from the A12 erratum due to the way errata are checked
for and handled.
+config ARM_ERRATA_CR711784_A17
+ bool "ARM errata: A17: conditional instructions can lead to a CPU hang"
+ depends on CPU_V7
+ help
+ This option enables the workaround for a Cortex-A17 erratum without a
+ number. The problems are best described in https://crbug.com/711784
+ This erratum is not known to be fixed in any A17 revision.
+ This is identical to Cortex-A12 erratum CR711784. It is a separate
+ config option from the A12 erratum due to the way errata are checked
+ for and handled.
+
endmenu
source "arch/arm/common/Kconfig"
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index cd2accbab844..a5156ea734ee 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -396,6 +396,11 @@ __ca12_errata:
mrc p15, 0, r10, c15, c0, 1 @ read diagnostic register
orr r10, r10, #1 << 10 @ set bit #10
mcr p15, 0, r10, c15, c0, 1 @ write diagnostic register
+#endif
+#ifdef CONFIG_ARM_ERRATA_CR711784_A12
+ mrc p15, 0, r10, c15, c0, 1 @ read diagnostic register
+ orr r10, r10, #1 << 11 @ set bit #11
+ mcr p15, 0, r10, c15, c0, 1 @ write diagnostic register
#endif
b __errata_finish
@@ -416,6 +421,11 @@ __ca17_errata:
mrc p15, 0, r10, c15, c0, 1 @ read diagnostic register
orr r10, r10, #1 << 10 @ set bit #10
mcr p15, 0, r10, c15, c0, 1 @ write diagnostic register
+#endif
+#ifdef CONFIG_ARM_ERRATA_CR711784_A17
+ mrc p15, 0, r10, c15, c0, 1 @ read diagnostic register
+ orr r10, r10, #1 << 11 @ set bit #11
+ mcr p15, 0, r10, c15, c0, 1 @ write diagnostic register
#endif
b __errata_finish
--
2.21.0.593.g511ec345e18-goog
next prev parent reply other threads:[~2019-04-19 22:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-19 22:18 [PATCH 1/2] ARM: errata: Workaround errata A12 857271 / A17 857272 Douglas Anderson
2019-04-19 22:18 ` Douglas Anderson [this message]
2019-04-23 10:19 ` [PATCH 2/2] ARM: errata: add support for A12/A17 errata CR711784 Robin Murphy
2019-04-23 14:37 ` Doug Anderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190419221803.99322-2-dianders@chromium.org \
--to=dianders@chromium.org \
--cc=Salva.Climent@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=bbatacha@arm.com \
--cc=f.fainelli@gmail.com \
--cc=geert@linux-m68k.org \
--cc=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=mka@chromium.org \
--cc=palmer@sifive.com \
--cc=paul.burton@mips.com \
--cc=robin.murphy@arm.com \
--cc=sonnyrao@chromium.org \
--cc=tony@atomide.com \
--cc=will.deacon@arm.com \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).