Skip to contentSkip to conversation

alpha: fix ioread64be()/iowrite64be() helpers

PATCH In review Arnd Bergmann 4 participants 4 messages Jul 30, 2024 – Aug 1, 2024 Alpha port

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 alpha: fix ioread64be()/iowrite64be() helpers

From: Arnd Bergmann <[email protected]>

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>")

---
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(-)
arch/alpha/include/asm/io.h +3 -2
index 2bb8cbeedf91..52212e47e917 100644
@@ -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
Signature · 1 line
2.39.2
Tested-by on v1 1/1
#1 lore raw
Quoted 12 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

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.

Quoted 7 lines

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>")
Quoted 12 lines

---
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(-)
arch/alpha/include/asm/io.h +0 -0
index 2bb8cbeedf91..52212e47e917 100644

arch/alpha/include/asm/io.h extern inline void writeq(u64 b, volatile void __iomem *addr) · line 542

Quoted 9 lines
arch/alpha/include/asm/io.h +3 -0
@@ -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

#2 lore raw
Quoted 15 lines · Guenter Roeck
Quoted 14 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

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.

Quoted 7 lines
Quoted 5 lines
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>")

Thanks!

Quoted 6 lines

arch/alpha/include/asm/io.h extern inline void writeq(u64 b, volatile void __iomem *addr) · line 541

Quoted 6 lines
arch/alpha/include/asm/io.h +3 -0
+#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

Reviewed-by on v1 1/1
#3 lore raw
In reply to Arnd Bergmann
Quoted 12 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

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.

Quoted 7 lines

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>")

So *that* was the problem, I was scratching my head over this one.

Yours,
Linus Walleij