[3.16.y-ckt stable] Patch "ARM: mvebu: make the coherency_ll.S functions work with no coherency fabric" has been added to staging queue

[Luis Henriques]

On Mon, Jan 12, 2015 at 04:27:59PM +0100, Thomas Petazzoni wrote:
> Dear Luis Henriques,
> 
> On Mon, 12 Jan 2015 15:25:37 +0000, Luis Henriques wrote:
> > On Wed, Jan 07, 2015 at 10:29:02AM +0000, Luis Henriques wrote:
> > > This is a note to let you know that I have just added a patch titled
> > > 
> > >     ARM: mvebu: make the coherency_ll.S functions work with no coherency fabric
> > > 
> > > to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree 
> > > which can be found at:
> > > 
> > >  http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.16.y-queue
> > > 
> > > This patch is scheduled to be released in version 3.16.7-ckt4.
> > > 
> > > If you, or anyone else, feels it should not be added to this tree, please 
> > > reply to this email.
> > >
> > 
> > Actually, this patch is breaking the builds of 3.16 kernel using
> > configs mvebu_v7_defconfig and multi_v7_defconfig:
> > 
> > arch/arm/mach-mvebu/coherency_ll.S: Assembler messages:
> > arch/arm/mach-mvebu/coherency_ll.S:98: Error: bad instruction `reteq r0'
> > arch/arm/mach-mvebu/coherency_ll.S:123: Error: bad instruction `reteq r0'
> > arch/arm/mach-mvebu/coherency_ll.S:150: Error: bad instruction `reteq r0'
> > 
> > Mainline builds fine, so I assume I'm missing some other patch, but I
> > couldn't find out which one.  Any ideas, or shall I just drop this
> > from the queue?
> 
> I guess:
> 
> commit 6ebbf2ce437b33022d30badd49dc94d33ecfa498
> Author: Russell King <rmk+kernel at arm.linux.org.uk>
> Date:   Mon Jun 30 16:29:12 2014 +0100
> 
>     ARM: convert all "mov.* pc, reg" to "bx reg" for ARMv6+
> 
> is the commit that introduced reteq. But instead of adding this one to
> stable, maybe I should provide a different patch for stable that
> doesn't use reteq.
>

Hmm... yeah, this commit doesn't seem to qualify for stable kernels.
I believe Greg applied 30cdef971073 ("ARM: mvebu: make the
coherency_ll.S functions work with no coherency fabric") to stable
kernels 3.17 and 3.18, which already include this commit you're
suggesting.

For now I'll drop this patch from the 3.16 queue; if you believe it is
important to have this fix in kernels < 3.17, please send the backport
without the reteq to the stable mailing-list.

And thanks for your quick reply!

Cheers,
--
Luís

> Thomas
> -- 
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com