| Message ID | 1364316746-8702-2-git-send-email-thomas.petazzoni@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Tuesday 26 March 2013, Thomas Petazzoni wrote: > @@ -72,6 +73,10 @@ void __init armada_370_xp_init_early(void) > ARMADA_370_XP_MBUS_WINS_SIZE, > ARMADA_370_XP_SDRAM_WINS_BASE, > ARMADA_370_XP_SDRAM_WINS_SIZE); > + > +#ifdef CONFIG_CACHE_L2X0 > + l2x0_of_init(0, ~0UL); > +#endif I guess you should remove the #ifdef as well here, it's not needed. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Dear Arnd Bergmann, On Tue, 26 Mar 2013 16:53:48 +0000, Arnd Bergmann wrote: > On Tuesday 26 March 2013, Thomas Petazzoni wrote: > > @@ -72,6 +73,10 @@ void __init armada_370_xp_init_early(void) > > ARMADA_370_XP_MBUS_WINS_SIZE, > > ARMADA_370_XP_SDRAM_WINS_BASE, > > ARMADA_370_XP_SDRAM_WINS_SIZE); > > + > > +#ifdef CONFIG_CACHE_L2X0 > > + l2x0_of_init(0, ~0UL); > > +#endif > > I guess you should remove the #ifdef as well here, it's not needed. Right, will fix for the next version. Thanks, Thomas
On 03/26/2013 11:52 AM, Thomas Petazzoni wrote: > In preparation for moving the IRQ controller driver to > drivers/irqchip/, we don't want the IRQ controller driver to be > responsible for initializing the L2 cache. Instead, let's initialize > the L2 cache at the init_early() level, like mach-exynos/common.c is > doing. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > arch/arm/mach-mvebu/armada-370-xp.c | 5 +++++ > arch/arm/mach-mvebu/irq-armada-370-xp.c | 4 ---- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c > index 12d3655..d98a0ca 100644 > --- a/arch/arm/mach-mvebu/armada-370-xp.c > +++ b/arch/arm/mach-mvebu/armada-370-xp.c > @@ -20,6 +20,7 @@ > #include <linux/clk/mvebu.h> > #include <linux/dma-mapping.h> > #include <linux/mbus.h> > +#include <asm/hardware/cache-l2x0.h> > #include <asm/mach/arch.h> > #include <asm/mach/map.h> > #include <asm/mach/time.h> > @@ -72,6 +73,10 @@ void __init armada_370_xp_init_early(void) > ARMADA_370_XP_MBUS_WINS_SIZE, > ARMADA_370_XP_SDRAM_WINS_BASE, > ARMADA_370_XP_SDRAM_WINS_SIZE); > + > +#ifdef CONFIG_CACHE_L2X0 > + l2x0_of_init(0, ~0UL); > +#endif Have you actually tested this? I don't think the ioremap in here will work during init_early. Rob > } > > static void __init armada_370_xp_dt_init(void) > diff --git a/arch/arm/mach-mvebu/irq-armada-370-xp.c b/arch/arm/mach-mvebu/irq-armada-370-xp.c > index 6a9195e..f6699f3 100644 > --- a/arch/arm/mach-mvebu/irq-armada-370-xp.c > +++ b/arch/arm/mach-mvebu/irq-armada-370-xp.c > @@ -25,7 +25,6 @@ > #include <asm/mach/arch.h> > #include <asm/exception.h> > #include <asm/smp_plat.h> > -#include <asm/hardware/cache-l2x0.h> > > /* Interrupt Controller Registers Map */ > #define ARMADA_370_XP_INT_SET_MASK_OFFS (0x48) > @@ -292,7 +291,4 @@ static const struct of_device_id mpic_of_match[] __initconst = { > void __init armada_370_xp_init_irq(void) > { > of_irq_init(mpic_of_match); > -#ifdef CONFIG_CACHE_L2X0 > - l2x0_of_init(0, ~0UL); > -#endif > } > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c index 12d3655..d98a0ca 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.c +++ b/arch/arm/mach-mvebu/armada-370-xp.c @@ -20,6 +20,7 @@ #include <linux/clk/mvebu.h> #include <linux/dma-mapping.h> #include <linux/mbus.h> +#include <asm/hardware/cache-l2x0.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/mach/time.h> @@ -72,6 +73,10 @@ void __init armada_370_xp_init_early(void) ARMADA_370_XP_MBUS_WINS_SIZE, ARMADA_370_XP_SDRAM_WINS_BASE, ARMADA_370_XP_SDRAM_WINS_SIZE); + +#ifdef CONFIG_CACHE_L2X0 + l2x0_of_init(0, ~0UL); +#endif } static void __init armada_370_xp_dt_init(void) diff --git a/arch/arm/mach-mvebu/irq-armada-370-xp.c b/arch/arm/mach-mvebu/irq-armada-370-xp.c index 6a9195e..f6699f3 100644 --- a/arch/arm/mach-mvebu/irq-armada-370-xp.c +++ b/arch/arm/mach-mvebu/irq-armada-370-xp.c @@ -25,7 +25,6 @@ #include <asm/mach/arch.h> #include <asm/exception.h> #include <asm/smp_plat.h> -#include <asm/hardware/cache-l2x0.h> /* Interrupt Controller Registers Map */ #define ARMADA_370_XP_INT_SET_MASK_OFFS (0x48) @@ -292,7 +291,4 @@ static const struct of_device_id mpic_of_match[] __initconst = { void __init armada_370_xp_init_irq(void) { of_irq_init(mpic_of_match); -#ifdef CONFIG_CACHE_L2X0 - l2x0_of_init(0, ~0UL); -#endif }
In preparation for moving the IRQ controller driver to drivers/irqchip/, we don't want the IRQ controller driver to be responsible for initializing the L2 cache. Instead, let's initialize the L2 cache at the init_early() level, like mach-exynos/common.c is doing. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- arch/arm/mach-mvebu/armada-370-xp.c | 5 +++++ arch/arm/mach-mvebu/irq-armada-370-xp.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-)