diff mbox

[4/6,v2] ARM: ux500: select L2X0 cache on ux500

Message ID 1331073072-17037-1-git-send-email-mathieu.poirier@linaro.org
State New
Headers show

Commit Message

Mathieu Poirier March 6, 2012, 10:31 p.m. UTC
From: Arnd Bergmann <arnd@arndb.de>

The cache controller needs to be enabled for the
cortex-a9 specific errata that are also selected
to work.

Also correcting config name for errata 753970.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
 arch/arm/mach-ux500/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Linus Walleij March 7, 2012, 9:14 a.m. UTC | #1
On Tue, Mar 6, 2012 at 11:31 PM,  <mathieu.poirier@linaro.org> wrote:

> From: Arnd Bergmann <arnd@arndb.de>
>
> The cache controller needs to be enabled for the
> cortex-a9 specific errata that are also selected
> to work.
>
> Also correcting config name for errata 753970.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> ---
>  arch/arm/mach-ux500/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
> index 50010b8..ed95db5 100644
> --- a/arch/arm/mach-ux500/Kconfig
> +++ b/arch/arm/mach-ux500/Kconfig
> @@ -5,7 +5,7 @@ config UX500_SOC_COMMON
>        default y
>        select ARM_GIC
>        select HAS_MTU
> -       select ARM_ERRATA_753970
> +       select PL310_ERRATA_753970 if CACHE_L2X0
>        select ARM_ERRATA_754322
>        select ARM_ERRATA_764369

Hey wait, that renaming fixes a regression introduced in commit
fa0ce4035d4897b0642132866d896a906429f45e
"ARM: 7162/1: errata: tidy up Kconfig options for PL310 errata workarounds"

Please:

(1) Fix this also in arch/arm/mach-vexpress/Kconfig where we
  have the same problem.

(2) Get Will Deacon's ACK

(3) Put it into Russell's patch tracker for immediate fixes.

Yours,
Linus Walleij
Will Deacon March 7, 2012, 9:51 a.m. UTC | #2
Hey Linus,

On Wed, Mar 07, 2012 at 09:14:51AM +0000, Linus Walleij wrote:
> On Tue, Mar 6, 2012 at 11:31 PM,  <mathieu.poirier@linaro.org> wrote:
> 
> > From: Arnd Bergmann <arnd@arndb.de>
> >
> > The cache controller needs to be enabled for the
> > cortex-a9 specific errata that are also selected
> > to work.
> >
> > Also correcting config name for errata 753970.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> > ---
> >  arch/arm/mach-ux500/Kconfig |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
> > index 50010b8..ed95db5 100644
> > --- a/arch/arm/mach-ux500/Kconfig
> > +++ b/arch/arm/mach-ux500/Kconfig
> > @@ -5,7 +5,7 @@ config UX500_SOC_COMMON
> >        default y
> >        select ARM_GIC
> >        select HAS_MTU
> > -       select ARM_ERRATA_753970
> > +       select PL310_ERRATA_753970 if CACHE_L2X0
> >        select ARM_ERRATA_754322
> >        select ARM_ERRATA_764369
> 
> Hey wait, that renaming fixes a regression introduced in commit
> fa0ce4035d4897b0642132866d896a906429f45e
> "ARM: 7162/1: errata: tidy up Kconfig options for PL310 errata workarounds"
> 
> Please:
> 
> (1) Fix this also in arch/arm/mach-vexpress/Kconfig where we
>   have the same problem.
> 
> (2) Get Will Deacon's ACK
> 
> (3) Put it into Russell's patch tracker for immediate fixes.

I beat you to it :) Check out 43a6955f ("ARM: 7346/1: errata: fix PL310
erratum #753970 workaround selection") in rmk/fixes.

Cheers,

Will
diff mbox

Patch

diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 50010b8..ed95db5 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -5,7 +5,7 @@  config UX500_SOC_COMMON
 	default y
 	select ARM_GIC
 	select HAS_MTU
-	select ARM_ERRATA_753970
+	select PL310_ERRATA_753970 if CACHE_L2X0
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_764369