[RFC] Fix omap3 booting with thumb2 compiled kernel
Dave.Martin at arm.com
Thu May 28 10:31:04 PDT 2015
On Thu, May 28, 2015 at 09:36:05AM -0700, Tony Lindgren wrote:
> * Dave Martin <Dave.Martin at arm.com> [150528 09:19]:
> > On Thu, May 28, 2015 at 07:21:25AM -0700, Tony Lindgren wrote:
> > > --- a/arch/arm/mach-omap2/sleep34xx.S
> > > +++ b/arch/arm/mach-omap2/sleep34xx.S
> > > @@ -203,23 +203,8 @@ save_context_wfi:
> > > */
> > > ldr r1, kernel_flush
> > > blx r1
> > > - /*
> > > - * The kernel doesn't interwork: v7_flush_dcache_all in particluar will
> > > - * always return in Thumb state when CONFIG_THUMB2_KERNEL is enabled.
> > > - * This sequence switches back to ARM. Note that .align may insert a
> > > - * nop: bx pc needs to be word-aligned in order to work.
> > > - */
> > > - THUMB( .thumb )
> > > - THUMB( .align )
> > > - THUMB( bx pc )
> > > - THUMB( nop )
> > > - .arm
> > > -
> > ^ This looks unrelated to the issue? This code is simply unnecessary
> > after Russell introduced the "ret" macro in commit 6ebbf2ce43. That
> > made v7_flush_dcache_all do a proper interworking return.
> > It should probably be in a separate commit, or at least mentioned
> > explicitly in the commit log.
> Thanks, I've updated the description with the commit info above.
> I'll keep the removal of the duplicate code in this patch, as it's
> all related to the mode switching and we don't want to do it twice.
> > > b omap3_do_wfi
> > > -
> > > -/*
> > > - * Local variables
> > > - */
> > ^ Likewise this is just tidyup, not bug fixing.
> Will keep that too, the local variables comments are now just too
> confusing while reading the code after adding the ENDPROC. And that
> too is just removal.
I have no objection to tidyups ;)
So long as the commit message is clear about which parts are bugfix and
which parts are tidyup, I'm fine with that.
More information about the linux-arm-kernel