Re: [PATCH] arm: Fix bad memcpy.S str8w macro argument count

["Pierre-Clément Tosi" <ptosi@google.com>]

On Wed, Nov 10, 2021 at 09:14:14AM -0500, Tom Rini wrote:
> On Wed, Nov 10, 2021 at 03:04:40PM +0100, Pierre-Clément Tosi wrote:
> 
> > Remove the extra (empty) argument passed to str8w, causing the following
> > error:
> > 
> >    <instantiation>:40:47: error: too many positional arguments
> >      str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=19f
> >                                                  ^
> >    u-boot/arch/arm/lib/memcpy.S:240:5: note: while in macro instantiation
> >    17: forward_copy_shift pull=16 push=16
> >        ^
> > 
> > Note: no functional change intended.
> > 
> > Fixes: d8834a1323af ("arm: Use optimized memcpy and memset from linux")
> > Signed-off-by: Pierre-Clément Tosi <ptosi@google.com>
> > ---
> >  arch/arm/lib/memcpy.S | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S
> > index f7fb77235c..eee7a219ce 100644
> > --- a/arch/arm/lib/memcpy.S
> > +++ b/arch/arm/lib/memcpy.S
> > @@ -210,7 +210,7 @@ ENTRY(memcpy)
> >  		orr	r9, r9, ip, lspush #\push
> >  		mov	ip, ip, lspull #\pull
> >  		orr	ip, ip, lr, lspush #\push
> > -		str8w	r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=19f
> > +		str8w	r0, r3, r4, r5, r6, r7, r8, r9, ip, abort=19f
> >  		bge	12b
> >  	PLD(	cmn	r2, #96			)
> >  	PLD(	bge	13b			)
> 
> Since this code is both taken from Linux, and likely in need of a
> re-sync with Linux, has this issue been addressed upstream?  Or no
> longer present?  Thanks.
> 
> -- 
> Tom

In a way, both; it is no longer present in memcpy.S because that file now uses
the shared implementation from copy_template.S but that particular line was
fixed in the same way (and funnily enough with a similar commit message) more
than 2 years ago in baf2df8e15be22b8bd24bdd6fd4575b6641bcfd1 ("ARM: 8827/1: fix
argument count to match macro definition").

Therefore, re-syncing would certainly solve the issue.

-- 
Pierre