diff mbox

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

Message ID 1330199334-5133-4-git-send-email-mathieu.poirier@linaro.org
State New
Headers show

Commit Message

Mathieu Poirier Feb. 25, 2012, 7:48 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.

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

Comments

Linus Walleij Feb. 29, 2012, 3:47 p.m. UTC | #1
On Sat, Feb 25, 2012 at 8:48 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.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> ---
>  arch/arm/mach-ux500/Kconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
> index 50010b8..7ee7013 100644
> --- a/arch/arm/mach-ux500/Kconfig
> +++ b/arch/arm/mach-ux500/Kconfig
> @@ -8,6 +8,7 @@ config UX500_SOC_COMMON
>        select ARM_ERRATA_753970
>        select ARM_ERRATA_754322
>        select ARM_ERRATA_764369
> +       select CACHE_L2X0

I don't quite get this one.

arch/arm/Kconfig already selects this for the arch:

config ARCH_U8500
        bool "ST-Ericsson U8500 Series"
        depends on MMU
        select CPU_V7
        select ARM_AMBA
        select GENERIC_CLOCKEVENTS
        select CLKDEV_LOOKUP
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_HAS_CPUFREQ
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
        help
          Support for ST-Ericsson's Ux500 architecture

If the idea is to move all of this down to the mach-ux500
folder you could do a patch that also deletes if from the
"big" Kconfig, but then I guess you should also move all the
rest of the stuff?

Yours,
Linus Walleij
Arnd Bergmann Feb. 29, 2012, 3:55 p.m. UTC | #2
On Wednesday 29 February 2012, Linus Walleij wrote:
> > diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
> > index 50010b8..7ee7013 100644
> > --- a/arch/arm/mach-ux500/Kconfig
> > +++ b/arch/arm/mach-ux500/Kconfig
> > @@ -8,6 +8,7 @@ config UX500_SOC_COMMON
> >        select ARM_ERRATA_753970
> >        select ARM_ERRATA_754322
> >        select ARM_ERRATA_764369
> > +       select CACHE_L2X0
> 
> I don't quite get this one.
> 
> arch/arm/Kconfig already selects this for the arch:
> 
> config ARCH_U8500
>         bool "ST-Ericsson U8500 Series"
>         depends on MMU
>         select CPU_V7
>         select ARM_AMBA
>         select GENERIC_CLOCKEVENTS
>         select CLKDEV_LOOKUP
>         select ARCH_REQUIRE_GPIOLIB
>         select ARCH_HAS_CPUFREQ
>         select HAVE_SMP
>         select MIGHT_HAVE_CACHE_L2X0
>         help
>           Support for ST-Ericsson's Ux500 architecture
> 
> If the idea is to move all of this down to the mach-ux500
> folder you could do a patch that also deletes if from the
> "big" Kconfig, but then I guess you should also move all the
> rest of the stuff?

It's just a warning from the Kconfig:

ARM_ERRATA_753970 depends on CACHE_PL310, so if you select
ARM_ERRATA_753970 but not CACHE_L2X0, you get a warning
about unfulfilled dependencies when you disabled CACHE_L2X0
(which disables CACHE_PL310 in turn).

	Arnd
diff mbox

Patch

diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 50010b8..7ee7013 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -8,6 +8,7 @@  config UX500_SOC_COMMON
 	select ARM_ERRATA_753970
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_764369
+	select CACHE_L2X0
 
 config UX500_SOC_DB5500
 	bool