From: Sebastian Reichel <sre@kernel.org>
To: Tony Lindgren <tony@atomide.com>,
Russell King <rmk+kernel@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org, Sebastian Reichel <sre@kernel.org>
Subject: [PATCH 3/3] ARM: errata 430973: move !ARCH_MULTIPLATFORM to Kconfig
Date: Thu, 23 Jul 2015 02:48:03 +0200 [thread overview]
Message-ID: <1437612483-30160-4-git-send-email-sre@kernel.org> (raw)
In-Reply-To: <1437612483-30160-1-git-send-email-sre@kernel.org>
Having the !ARCH_MULTIPLATFORM dependency in the Kconfig file results
in one option less to think about when configuring the kernel.
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
arch/arm/Kconfig | 1 +
arch/arm/mm/proc-v7.S | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0e4929b..f0e2d92 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1066,6 +1066,7 @@ config ARM_ERRATA_411920
config ARM_ERRATA_430973
bool "ARM errata: Stale prediction on replaced interworking branch"
depends on CPU_V7
+ depends on !ARCH_MULTIPLATFORM
help
This option enables the workaround for the 430973 Cortex-A8
r1p* erratum. If a code sequence containing an ARM/Thumb
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 0716bbe..494e844 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -294,7 +294,7 @@ __v7_ca17mp_setup:
* r9: MIDR
*/
__ca8_errata:
-#if defined(CONFIG_ARM_ERRATA_430973) && !defined(CONFIG_ARCH_MULTIPLATFORM)
+#ifdef CONFIG_ARM_ERRATA_430973
teq r3, #0x00100000 @ only present in r1p*
mrceq p15, 0, r0, c1, c0, 1 @ read aux control register
orreq r0, r0, #(1 << 6) @ set IBE to 1
--
2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: sre@kernel.org (Sebastian Reichel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] ARM: errata 430973: move !ARCH_MULTIPLATFORM to Kconfig
Date: Thu, 23 Jul 2015 02:48:03 +0200 [thread overview]
Message-ID: <1437612483-30160-4-git-send-email-sre@kernel.org> (raw)
In-Reply-To: <1437612483-30160-1-git-send-email-sre@kernel.org>
Having the !ARCH_MULTIPLATFORM dependency in the Kconfig file results
in one option less to think about when configuring the kernel.
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
arch/arm/Kconfig | 1 +
arch/arm/mm/proc-v7.S | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0e4929b..f0e2d92 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1066,6 +1066,7 @@ config ARM_ERRATA_411920
config ARM_ERRATA_430973
bool "ARM errata: Stale prediction on replaced interworking branch"
depends on CPU_V7
+ depends on !ARCH_MULTIPLATFORM
help
This option enables the workaround for the 430973 Cortex-A8
r1p* erratum. If a code sequence containing an ARM/Thumb
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 0716bbe..494e844 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -294,7 +294,7 @@ __v7_ca17mp_setup:
* r9: MIDR
*/
__ca8_errata:
-#if defined(CONFIG_ARM_ERRATA_430973) && !defined(CONFIG_ARCH_MULTIPLATFORM)
+#ifdef CONFIG_ARM_ERRATA_430973
teq r3, #0x00100000 @ only present in r1p*
mrceq p15, 0, r0, c1, c0, 1 @ read aux control register
orreq r0, r0, #(1 << 6) @ set IBE to 1
--
2.1.4
next prev parent reply other threads:[~2015-07-23 0:48 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-23 0:48 [PATCH 0/3] Another Errata 430973 Update Sebastian Reichel
2015-07-23 0:48 ` Sebastian Reichel
2015-07-23 0:48 ` [PATCH 1/3] ARM: OMAP2+: N900: always enable IBE bit Sebastian Reichel
2015-07-23 0:48 ` Sebastian Reichel
2015-07-23 7:28 ` Tony Lindgren
2015-07-23 7:28 ` Tony Lindgren
2015-10-05 13:53 ` Pavel Machek
2015-10-05 13:53 ` Pavel Machek
2015-07-23 0:48 ` [PATCH 2/3] ARM: update errata 430973 documentation Sebastian Reichel
2015-07-23 0:48 ` Sebastian Reichel
2015-07-23 0:48 ` Sebastian Reichel [this message]
2015-07-23 0:48 ` [PATCH 3/3] ARM: errata 430973: move !ARCH_MULTIPLATFORM to Kconfig Sebastian Reichel
2015-07-23 12:35 ` Russell King - ARM Linux
2015-07-23 12:35 ` Russell King - ARM Linux
2015-07-24 0:16 ` Sebastian Reichel
2015-07-24 0:16 ` Sebastian Reichel
2015-07-26 22:51 ` Russell King - ARM Linux
2015-07-26 22:51 ` Russell King - ARM Linux
2015-07-27 1:14 ` Sebastian Reichel
2015-07-27 1:14 ` Sebastian Reichel
2015-07-27 9:59 ` Ben Dooks
2015-07-27 9:59 ` Ben Dooks
2015-07-27 10:43 ` Russell King - ARM Linux
2015-07-27 10:43 ` Russell King - ARM Linux
2015-07-27 17:36 ` Sebastian Reichel
2015-07-27 17:36 ` Sebastian Reichel
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=1437612483-30160-4-git-send-email-sre@kernel.org \
--to=sre@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=tony@atomide.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.