ARM: check stmfd instruction using right shift
diff mbox series

Message ID 20190722071419.22535-1-zhang.lyra@gmail.com
State New
Headers show
Series
  • ARM: check stmfd instruction using right shift
Related show

Commit Message

Chunyan Zhang July 22, 2019, 7:14 a.m. UTC
From: Lvqiang Huang <Lvqiang.Huang@unisoc.com>

In the commit ef41b5c92498 ("ARM: make kernel oops easier to read"),
-               .word   0xe92d0000 >> 10        @ stmfd sp!, {}
+               .word   0xe92d0000 >> 11        @ stmfd sp!, {}
then the shift need to change to 11.

Fixes: ef41b5c92498 ("ARM: make kernel oops easier to read")
Signed-off-by: Lvqiang Huang <Lvqiang.Huang@unisoc.com>
Signed-off-by: Chunyan Zhang <zhang.lyra@gmail.com>
---
 arch/arm/lib/backtrace.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Chunyan Zhang July 30, 2019, 7:18 a.m. UTC | #1
Gentle ping

probably this patch was missed or entered into spam?

On Mon, 22 Jul 2019 at 15:14, Chunyan Zhang <zhang.lyra@gmail.com> wrote:
>
> From: Lvqiang Huang <Lvqiang.Huang@unisoc.com>
>
> In the commit ef41b5c92498 ("ARM: make kernel oops easier to read"),
> -               .word   0xe92d0000 >> 10        @ stmfd sp!, {}
> +               .word   0xe92d0000 >> 11        @ stmfd sp!, {}
> then the shift need to change to 11.
>
> Fixes: ef41b5c92498 ("ARM: make kernel oops easier to read")
> Signed-off-by: Lvqiang Huang <Lvqiang.Huang@unisoc.com>
> Signed-off-by: Chunyan Zhang <zhang.lyra@gmail.com>
> ---
>  arch/arm/lib/backtrace.S |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S
> index 7d7952e..926851b 100644
> --- a/arch/arm/lib/backtrace.S
> +++ b/arch/arm/lib/backtrace.S
> @@ -70,7 +70,7 @@ for_each_frame:       tst     frame, mask             @ Check for address exceptions
>
>  1003:          ldr     r2, [sv_pc, #-4]        @ if stmfd sp!, {args} exists,
>                 ldr     r3, .Ldsi+4             @ adjust saved 'pc' back one
> -               teq     r3, r2, lsr #10         @ instruction
> +               teq     r3, r2, lsr #11         @ instruction
>                 subne   r0, sv_pc, #4           @ allow for mov
>                 subeq   r0, sv_pc, #8           @ allow for mov + stmia
>
> --
> 1.7.9.5
>
Russell King - ARM Linux admin July 30, 2019, 11:02 a.m. UTC | #2
On Tue, Jul 30, 2019 at 03:18:31PM +0800, Chunyan Zhang wrote:
> Gentle ping
> 
> probably this patch was missed or entered into spam?

Please submit it to the patch system, thanks.

> 
> On Mon, 22 Jul 2019 at 15:14, Chunyan Zhang <zhang.lyra@gmail.com> wrote:
> >
> > From: Lvqiang Huang <Lvqiang.Huang@unisoc.com>
> >
> > In the commit ef41b5c92498 ("ARM: make kernel oops easier to read"),
> > -               .word   0xe92d0000 >> 10        @ stmfd sp!, {}
> > +               .word   0xe92d0000 >> 11        @ stmfd sp!, {}
> > then the shift need to change to 11.
> >
> > Fixes: ef41b5c92498 ("ARM: make kernel oops easier to read")
> > Signed-off-by: Lvqiang Huang <Lvqiang.Huang@unisoc.com>
> > Signed-off-by: Chunyan Zhang <zhang.lyra@gmail.com>
> > ---
> >  arch/arm/lib/backtrace.S |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S
> > index 7d7952e..926851b 100644
> > --- a/arch/arm/lib/backtrace.S
> > +++ b/arch/arm/lib/backtrace.S
> > @@ -70,7 +70,7 @@ for_each_frame:       tst     frame, mask             @ Check for address exceptions
> >
> >  1003:          ldr     r2, [sv_pc, #-4]        @ if stmfd sp!, {args} exists,
> >                 ldr     r3, .Ldsi+4             @ adjust saved 'pc' back one
> > -               teq     r3, r2, lsr #10         @ instruction
> > +               teq     r3, r2, lsr #11         @ instruction
> >                 subne   r0, sv_pc, #4           @ allow for mov
> >                 subeq   r0, sv_pc, #8           @ allow for mov + stmia
> >
> > --
> > 1.7.9.5
> >
>
Chunyan Zhang July 31, 2019, 3:30 a.m. UTC | #3
On Tue, 30 Jul 2019 at 19:02, Russell King - ARM Linux admin
<linux@armlinux.org.uk> wrote:
>
> On Tue, Jul 30, 2019 at 03:18:31PM +0800, Chunyan Zhang wrote:
> > Gentle ping
> >
> > probably this patch was missed or entered into spam?
>
> Please submit it to the patch system, thanks.

Ok, thanks.

>
> >
> > On Mon, 22 Jul 2019 at 15:14, Chunyan Zhang <zhang.lyra@gmail.com> wrote:
> > >
> > > From: Lvqiang Huang <Lvqiang.Huang@unisoc.com>
> > >
> > > In the commit ef41b5c92498 ("ARM: make kernel oops easier to read"),
> > > -               .word   0xe92d0000 >> 10        @ stmfd sp!, {}
> > > +               .word   0xe92d0000 >> 11        @ stmfd sp!, {}
> > > then the shift need to change to 11.
> > >
> > > Fixes: ef41b5c92498 ("ARM: make kernel oops easier to read")
> > > Signed-off-by: Lvqiang Huang <Lvqiang.Huang@unisoc.com>
> > > Signed-off-by: Chunyan Zhang <zhang.lyra@gmail.com>
> > > ---
> > >  arch/arm/lib/backtrace.S |    2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S
> > > index 7d7952e..926851b 100644
> > > --- a/arch/arm/lib/backtrace.S
> > > +++ b/arch/arm/lib/backtrace.S
> > > @@ -70,7 +70,7 @@ for_each_frame:       tst     frame, mask             @ Check for address exceptions
> > >
> > >  1003:          ldr     r2, [sv_pc, #-4]        @ if stmfd sp!, {args} exists,
> > >                 ldr     r3, .Ldsi+4             @ adjust saved 'pc' back one
> > > -               teq     r3, r2, lsr #10         @ instruction
> > > +               teq     r3, r2, lsr #11         @ instruction
> > >                 subne   r0, sv_pc, #4           @ allow for mov
> > >                 subeq   r0, sv_pc, #8           @ allow for mov + stmia
> > >
> > > --
> > > 1.7.9.5
> > >
> >
>
> --
> RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
> FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
> According to speedtest.net: 11.9Mbps down 500kbps up

Patch
diff mbox series

diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S
index 7d7952e..926851b 100644
--- a/arch/arm/lib/backtrace.S
+++ b/arch/arm/lib/backtrace.S
@@ -70,7 +70,7 @@  for_each_frame:	tst	frame, mask		@ Check for address exceptions
 
 1003:		ldr	r2, [sv_pc, #-4]	@ if stmfd sp!, {args} exists,
 		ldr	r3, .Ldsi+4		@ adjust saved 'pc' back one
-		teq	r3, r2, lsr #10		@ instruction
+		teq	r3, r2, lsr #11		@ instruction
 		subne	r0, sv_pc, #4		@ allow for mov
 		subeq	r0, sv_pc, #8		@ allow for mov + stmia