alpha: fix ioread64be()/iowrite64be() helpers

[PATCH] alpha: fix ioread64be()/iowrite64be() helpers

Posted by Arnd Bergmann 1 year, 4 months ago

From: Arnd Bergmann <arnd@arndb.de>

Compile-testing the crypto/caam driver on alpha showed a pre-existing
problem on alpha with iowrite64be() missing:

ERROR: modpost: "iowrite64be" [drivers/crypto/caam/caam_jr.ko] undefined!

The prototypes were added a while ago when we started using asm-generic/io.h,
but the implementation was still missing. At some point the ioread64/iowrite64
helpers were added, but the big-endian versions are still missing, and
the generic version (using readq/writeq) is would not work here.

Change it to wrap ioread64()/iowrite64() instead.

Fixes: beba3771d9e0 ("crypto: caam: Make CRYPTO_DEV_FSL_CAAM dependent of COMPILE_TEST")
Fixes: e19d4ebc536d ("alpha: add full ioread64/iowrite64 implementation")
Fixes: 7e772dad9913 ("alpha: Use generic <asm-generic/io.h>")
Closes: https://lore.kernel.org/all/CAHk-=wgEyzSxTs467NDOVfBSzWvUS6ztcwhiy=M3xog==KBmTw@mail.gmail.com/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
I've queued this in the asm-generic tree now, will send a pull request
in the next few days to fix alpha allmodconfig.

 arch/alpha/include/asm/io.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h
index 2bb8cbeedf91..52212e47e917 100644
--- a/arch/alpha/include/asm/io.h
+++ b/arch/alpha/include/asm/io.h
@@ -534,8 +534,11 @@ extern inline void writeq(u64 b, volatile void __iomem *addr)
 
 #define ioread16be(p) swab16(ioread16(p))
 #define ioread32be(p) swab32(ioread32(p))
+#define ioread64be(p) swab64(ioread64(p))
 #define iowrite16be(v,p) iowrite16(swab16(v), (p))
 #define iowrite32be(v,p) iowrite32(swab32(v), (p))
+#define iowrite64be(v,p) iowrite64(swab64(v), (p))
+
 
 #define inb_p		inb
 #define inw_p		inw
@@ -634,8 +637,6 @@ extern void outsl (unsigned long port, const void *src, unsigned long count);
  */
 #define ioread64 ioread64
 #define iowrite64 iowrite64
-#define ioread64be ioread64be
-#define iowrite64be iowrite64be
 #define ioread8_rep ioread8_rep
 #define ioread16_rep ioread16_rep
 #define ioread32_rep ioread32_rep
-- 
2.39.2

Re: [PATCH] alpha: fix ioread64be()/iowrite64be() helpers

Posted by Linus Walleij 1 year, 4 months ago

On Tue, Jul 30, 2024 at 5:27 PM Arnd Bergmann <arnd@kernel.org> wrote:

> From: Arnd Bergmann <arnd@arndb.de>
>
> Compile-testing the crypto/caam driver on alpha showed a pre-existing
> problem on alpha with iowrite64be() missing:
>
> ERROR: modpost: "iowrite64be" [drivers/crypto/caam/caam_jr.ko] undefined!
>
> The prototypes were added a while ago when we started using asm-generic/io.h,
> but the implementation was still missing. At some point the ioread64/iowrite64
> helpers were added, but the big-endian versions are still missing, and
> the generic version (using readq/writeq) is would not work here.
>
> Change it to wrap ioread64()/iowrite64() instead.
>
> Fixes: beba3771d9e0 ("crypto: caam: Make CRYPTO_DEV_FSL_CAAM dependent of COMPILE_TEST")
> Fixes: e19d4ebc536d ("alpha: add full ioread64/iowrite64 implementation")
> Fixes: 7e772dad9913 ("alpha: Use generic <asm-generic/io.h>")
> Closes: https://lore.kernel.org/all/CAHk-=wgEyzSxTs467NDOVfBSzWvUS6ztcwhiy=M3xog==KBmTw@mail.gmail.com/
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

So *that* was the problem, I was scratching my head over this one.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH] alpha: fix ioread64be()/iowrite64be() helpers

Posted by Guenter Roeck 1 year, 4 months ago

On Tue, Jul 30, 2024 at 05:27:25PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> Compile-testing the crypto/caam driver on alpha showed a pre-existing
> problem on alpha with iowrite64be() missing:
> 
> ERROR: modpost: "iowrite64be" [drivers/crypto/caam/caam_jr.ko] undefined!
> 
> The prototypes were added a while ago when we started using asm-generic/io.h,
> but the implementation was still missing. At some point the ioread64/iowrite64
> helpers were added, but the big-endian versions are still missing, and
> the generic version (using readq/writeq) is would not work here.
> 
> Change it to wrap ioread64()/iowrite64() instead.
> 
> Fixes: beba3771d9e0 ("crypto: caam: Make CRYPTO_DEV_FSL_CAAM dependent of COMPILE_TEST")
> Fixes: e19d4ebc536d ("alpha: add full ioread64/iowrite64 implementation")
> Fixes: 7e772dad9913 ("alpha: Use generic <asm-generic/io.h>")
> Closes: https://lore.kernel.org/all/CAHk-=wgEyzSxTs467NDOVfBSzWvUS6ztcwhiy=M3xog==KBmTw@mail.gmail.com/
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Tested-by: Guenter Roeck <linux@roeck-us.net>

> ---
> I've queued this in the asm-generic tree now, will send a pull request
> in the next few days to fix alpha allmodconfig.
> 
>  arch/alpha/include/asm/io.h | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h
> index 2bb8cbeedf91..52212e47e917 100644
> --- a/arch/alpha/include/asm/io.h
> +++ b/arch/alpha/include/asm/io.h
> @@ -534,8 +534,11 @@ extern inline void writeq(u64 b, volatile void __iomem *addr)
>  
>  #define ioread16be(p) swab16(ioread16(p))
>  #define ioread32be(p) swab32(ioread32(p))
> +#define ioread64be(p) swab64(ioread64(p))
>  #define iowrite16be(v,p) iowrite16(swab16(v), (p))
>  #define iowrite32be(v,p) iowrite32(swab32(v), (p))
> +#define iowrite64be(v,p) iowrite64(swab64(v), (p))
> +
>  

FWIW: Unnecessary extra blank line

Thanks,
Guenter

Re: [PATCH] alpha: fix ioread64be()/iowrite64be() helpers

Posted by Arnd Bergmann 1 year, 4 months ago

On Wed, Jul 31, 2024, at 17:47, Guenter Roeck wrote:
> On Tue, Jul 30, 2024 at 05:27:25PM +0200, Arnd Bergmann wrote:
>> From: Arnd Bergmann <arnd@arndb.de>
>> 
>> Compile-testing the crypto/caam driver on alpha showed a pre-existing
>> problem on alpha with iowrite64be() missing:
>> 
>> ERROR: modpost: "iowrite64be" [drivers/crypto/caam/caam_jr.ko] undefined!
>> 
>> The prototypes were added a while ago when we started using asm-generic/io.h,
>> but the implementation was still missing. At some point the ioread64/iowrite64
>> helpers were added, but the big-endian versions are still missing, and
>> the generic version (using readq/writeq) is would not work here.
>> 
>> Change it to wrap ioread64()/iowrite64() instead.
>> 
>> Fixes: beba3771d9e0 ("crypto: caam: Make CRYPTO_DEV_FSL_CAAM dependent of COMPILE_TEST")
>> Fixes: e19d4ebc536d ("alpha: add full ioread64/iowrite64 implementation")
>> Fixes: 7e772dad9913 ("alpha: Use generic <asm-generic/io.h>")
>> Closes: https://lore.kernel.org/all/CAHk-=wgEyzSxTs467NDOVfBSzWvUS6ztcwhiy=M3xog==KBmTw@mail.gmail.com/
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Tested-by: Guenter Roeck <linux@roeck-us.net>

Thanks!

>> +#define ioread64be(p) swab64(ioread64(p))
>>  #define iowrite16be(v,p) iowrite16(swab16(v), (p))
>>  #define iowrite32be(v,p) iowrite32(swab32(v), (p))
>> +#define iowrite64be(v,p) iowrite64(swab64(v), (p))
>> +
>>  

Fixed

      Arnd