> -----Original Message----- > From: linux-omap-owner@xxxxxxxxxxxxxxx [mailto:linux-omap- > owner@xxxxxxxxxxxxxxx] On Behalf Of Tony Lindgren > Sent: Thursday, September 02, 2010 9:50 PM > To: Russell King - ARM Linux > Cc: linux-omap@xxxxxxxxxxxxxxx; linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; > Bryan Wu; Will Deacon > Subject: [PATCH 2/6] ARM: Use SMP and UP macros for cacheflush > > From 16c866489613ef8ea9d28ecf861f5a7ff4d60377 Mon Sep 17 00:00:00 2001 > From: Tony Lindgren <tony@xxxxxxxxxxx> > Date: Thu, 2 Sep 2010 08:20:02 -0700 > Subject: [PATCH 2/6] ARM: Use SMP and UP macros for cacheflush > > Use SMP and UP macros for cacheflush. Note that __flush_icache_all > currently won't work properly on ARMv7 SMP if support for ARMv6 is > compiled in. > > Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx> > --- > arch/arm/include/asm/cacheflush.h | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/include/asm/cacheflush.h > b/arch/arm/include/asm/cacheflush.h > index 4656a24..09a893e 100644 > --- a/arch/arm/include/asm/cacheflush.h > +++ b/arch/arm/include/asm/cacheflush.h > @@ -16,6 +16,7 @@ > #include <asm/shmparam.h> > #include <asm/cachetype.h> > #include <asm/outercache.h> > +#include <asm/smp_plat.h> > > #define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT) > > @@ -372,8 +373,10 @@ static inline void __flush_icache_all(void) > extern void v6_icache_inval_all(void); > v6_icache_inval_all(); > #elif defined(CONFIG_SMP) && __LINUX_ARM_ARCH__ >= 7 > - asm("mcr p15, 0, %0, c7, c1, 0 @ invalidate I-cache inner > shareable\n" > - : > + asm( \ > + SMP(mcr p15, 0, %0, c7, c1, 0 @ inv I-cache inner shareable) > \ > + UP(mcr p15, 0, %0, c7, c5, 0 @ invalidate I-cache) \ > + : \ > : "r" (0)); > #else > asm("mcr p15, 0, %0, c7, c5, 0 @ invalidate I-cache\n" Since UP/SMP both cases are handled, the above patch can be something like this now... diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h index 9792a71..ebdff42 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -16,6 +16,7 @@ #include <asm/shmparam.h> #include <asm/cachetype.h> #include <asm/outercache.h> +#include <asm/smp_plat.h> #define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT) @@ -394,13 +395,11 @@ static inline void __flush_icache_all(void) #ifdef CONFIG_ARM_ERRATA_411920 extern void v6_icache_inval_all(void); v6_icache_inval_all(); -#elif defined(CONFIG_SMP) && __LINUX_ARM_ARCH__ >= 7 - asm("mcr p15, 0, %0, c7, c1, 0 @ invalidate I-cache inner shareable\n" - : - : "r" (0)); #else - asm("mcr p15, 0, %0, c7, c5, 0 @ invalidate I-cache\n" - : + asm( \ + SMP(mcr p15, 0, %0, c7, c1, 0 @ inv I-cache inner shareable) \ + UP(mcr p15, 0, %0, c7, c5, 0 @ invalidate I-cache) \ + : \ : "r" (0)); #endif } -- 1.6.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
