* [PATCH] arm: Fix bad memcpy.S str8w macro argument count
@ 2021-11-10 14:04 Pierre-Clément Tosi
2021-11-10 14:14 ` Tom Rini
2021-11-16 19:26 ` Tom Rini
0 siblings, 2 replies; 5+ messages in thread
From: Pierre-Clément Tosi @ 2021-11-10 14:04 UTC (permalink / raw)
To: u-boot; +Cc: Tom Rini, Pierre-Clément Tosi, Matthias Weisser
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 )
--
2.34.0.rc0.344.g81b53c2807-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] arm: Fix bad memcpy.S str8w macro argument count
2021-11-10 14:04 [PATCH] arm: Fix bad memcpy.S str8w macro argument count Pierre-Clément Tosi
@ 2021-11-10 14:14 ` Tom Rini
2021-11-10 14:51 ` Pierre-Clément Tosi
2021-11-16 19:26 ` Tom Rini
1 sibling, 1 reply; 5+ messages in thread
From: Tom Rini @ 2021-11-10 14:14 UTC (permalink / raw)
To: Pierre-Clément Tosi; +Cc: u-boot, Matthias Weisser
[-- Attachment #1: Type: text/plain, Size: 1411 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] arm: Fix bad memcpy.S str8w macro argument count
2021-11-10 14:14 ` Tom Rini
@ 2021-11-10 14:51 ` Pierre-Clément Tosi
2021-11-10 14:58 ` Tom Rini
0 siblings, 1 reply; 5+ messages in thread
From: Pierre-Clément Tosi @ 2021-11-10 14:51 UTC (permalink / raw)
To: Tom Rini; +Cc: u-boot, Matthias Weisser
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] arm: Fix bad memcpy.S str8w macro argument count
2021-11-10 14:51 ` Pierre-Clément Tosi
@ 2021-11-10 14:58 ` Tom Rini
0 siblings, 0 replies; 5+ messages in thread
From: Tom Rini @ 2021-11-10 14:58 UTC (permalink / raw)
To: Pierre-Clément Tosi; +Cc: u-boot, Matthias Weisser
[-- Attachment #1: Type: text/plain, Size: 2253 bytes --]
On Wed, Nov 10, 2021 at 03:51:38PM +0100, Pierre-Clément Tosi wrote:
> 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.
Any chance you have time / interest in a resync? Otherwise, I'll take
your patch soon. Thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] arm: Fix bad memcpy.S str8w macro argument count
2021-11-10 14:04 [PATCH] arm: Fix bad memcpy.S str8w macro argument count Pierre-Clément Tosi
2021-11-10 14:14 ` Tom Rini
@ 2021-11-16 19:26 ` Tom Rini
1 sibling, 0 replies; 5+ messages in thread
From: Tom Rini @ 2021-11-16 19:26 UTC (permalink / raw)
To: Pierre-Clément Tosi; +Cc: u-boot, Matthias Weisser
[-- Attachment #1: Type: text/plain, Size: 709 bytes --]
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>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-11-16 19:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-10 14:04 [PATCH] arm: Fix bad memcpy.S str8w macro argument count Pierre-Clément Tosi
2021-11-10 14:14 ` Tom Rini
2021-11-10 14:51 ` Pierre-Clément Tosi
2021-11-10 14:58 ` Tom Rini
2021-11-16 19:26 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.