Patchwork ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1

login
register
mail settings
Submitter Shawn Guo
Date Dec. 31, 2011, 1:50 a.m.
Message ID <1325296251-11144-1-git-send-email-shawn.guo@linaro.org>
Download mbox | patch
Permalink /patch/133711/
State New
Headers show

Comments

Shawn Guo - Dec. 31, 2011, 1:50 a.m.
The recent suspend testing on !SMP build discovers that the __CPUINIT
annotation for v7_invalidate_l1 should not be there, as the function
is called by resume path for not only SMP but also !SMP build.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/mach-imx/head-v7.S |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
Richard Zhao - Dec. 31, 2011, 3:31 a.m.
On Sat, Dec 31, 2011 at 09:50:51AM +0800, Shawn Guo wrote:
> The recent suspend testing on !SMP build discovers that the __CPUINIT
> annotation for v7_invalidate_l1 should not be there, as the function
> is called by resume path for not only SMP but also !SMP build.
> 
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
>  arch/arm/mach-imx/head-v7.S |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/head-v7.S b/arch/arm/mach-imx/head-v7.S
> index c844112..914f2a1 100644
> --- a/arch/arm/mach-imx/head-v7.S
> +++ b/arch/arm/mach-imx/head-v7.S
> @@ -16,7 +16,6 @@
>  #include <asm/hardware/cache-l2x0.h>
>  
>  	.section ".text.head", "ax"
why do we put it this specific section, rather not .text?

Thanks
Richard
> -	__CPUINIT
>  
>  /*
>   * The secondary kernel init calls v7_flush_dcache_all before it enables
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
Shawn Guo - Dec. 31, 2011, 5:31 a.m.
On Sat, Dec 31, 2011 at 11:31:08AM +0800, Richard Zhao wrote:
> On Sat, Dec 31, 2011 at 09:50:51AM +0800, Shawn Guo wrote:
> > The recent suspend testing on !SMP build discovers that the __CPUINIT
> > annotation for v7_invalidate_l1 should not be there, as the function
> > is called by resume path for not only SMP but also !SMP build.
> > 
> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> > ---
> >  arch/arm/mach-imx/head-v7.S |    1 -
> >  1 files changed, 0 insertions(+), 1 deletions(-)
> > 
> > diff --git a/arch/arm/mach-imx/head-v7.S b/arch/arm/mach-imx/head-v7.S
> > index c844112..914f2a1 100644
> > --- a/arch/arm/mach-imx/head-v7.S
> > +++ b/arch/arm/mach-imx/head-v7.S
> > @@ -16,7 +16,6 @@
> >  #include <asm/hardware/cache-l2x0.h>
> >  
> >  	.section ".text.head", "ax"
> why do we put it this specific section, rather not .text?
> 
This was cloned from arch/arm/mach-tegra/headsmp.S, I guess :)  But
do you see any problem with putting it in ".text.head"?
Richard Zhao - Dec. 31, 2011, 6:08 a.m.
On Sat, Dec 31, 2011 at 01:31:54PM +0800, Shawn Guo wrote:
> On Sat, Dec 31, 2011 at 11:31:08AM +0800, Richard Zhao wrote:
> > On Sat, Dec 31, 2011 at 09:50:51AM +0800, Shawn Guo wrote:
> > > The recent suspend testing on !SMP build discovers that the __CPUINIT
> > > annotation for v7_invalidate_l1 should not be there, as the function
> > > is called by resume path for not only SMP but also !SMP build.
> > > 
> > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> > > ---
> > >  arch/arm/mach-imx/head-v7.S |    1 -
> > >  1 files changed, 0 insertions(+), 1 deletions(-)
> > > 
> > > diff --git a/arch/arm/mach-imx/head-v7.S b/arch/arm/mach-imx/head-v7.S
> > > index c844112..914f2a1 100644
> > > --- a/arch/arm/mach-imx/head-v7.S
> > > +++ b/arch/arm/mach-imx/head-v7.S
> > > @@ -16,7 +16,6 @@
> > >  #include <asm/hardware/cache-l2x0.h>
> > >  
> > >  	.section ".text.head", "ax"
> > why do we put it this specific section, rather not .text?
> > 
> This was cloned from arch/arm/mach-tegra/headsmp.S, I guess :)  But
> do you see any problem with putting it in ".text.head"?
No, It just seems strange.

Regards,
Richard
> 
> -- 
> Regards,
> Shawn

Patch

diff --git a/arch/arm/mach-imx/head-v7.S b/arch/arm/mach-imx/head-v7.S
index c844112..914f2a1 100644
--- a/arch/arm/mach-imx/head-v7.S
+++ b/arch/arm/mach-imx/head-v7.S
@@ -16,7 +16,6 @@ 
 #include <asm/hardware/cache-l2x0.h>
 
 	.section ".text.head", "ax"
-	__CPUINIT
 
 /*
  * The secondary kernel init calls v7_flush_dcache_all before it enables