Support for non-generic iomap: ARM compatibility

Some architectures such as ARM don't use asm-generic/iomap.h and instead define their own implementation for ioread32 and iowrite32. This can be checked using the CONFIG_GENERIC_IOMAP preprocessor. The signature used inside asm-generic/io.h uses volatile for the address parameter. Thus it is necessary to accomodate this change. Moreover, ARM uses macros to define ioread32be and iowrite32be, so it is necessary to define a function on top of the macro to allow for assignation. Note: other architectures may not use macros, or use macros for ioread32 and iowrite32, in which case this patch may not work and has to be adapted. Signed-off-by: Gwenhael GOAVEC <gwenhael.goavec@femto-st.fr> Signed-off-by: Mathis MARION <mathis.marion@grenoble-inp.org>

Support for non-generic iomap: ARM compatibility
Some architectures such as ARM don't use asm-generic/iomap.h and instead define their own implementation for ioread32 and iowrite32. This can be checked using the CONFIG_GENERIC_IOMAP preprocessor. The signature used inside asm-generic/io.h uses volatile for the address parameter. Thus it is necessary to accomodate this change. Moreover, ARM uses macros to define ioread32be and iowrite32be, so it is necessary to define a function on top of the macro to allow for assignation. Note: other architectures may not use macros, or use macros for ioread32 and iowrite32, in which case this patch may not work and has to be adapted. Signed-off-by: Gwenhael GOAVEC <gwenhael.goavec@femto-st.fr> Signed-off-by: Mathis MARION <mathis.marion@grenoble-inp.org>
a61fca3e · Mathis MARION · Federico Vaga · 7f4ea5bd · a61fca3e
Commit a61fca3e authored Jul 22, 2021 by Mathis MARION Committed by Federico Vaga Apr 05, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 0 deletions

fmc-adc-100m14b4cha-private.h software/kernel/fmc-adc-100m14b4cha-private.h +17 -0

No files found.
--- a/software/kernel/fmc-adc-100m14b4cha-private.h
+++ b/software/kernel/fmc-adc-100m14b4cha-private.h
@@ -78,13 +78,30 @@ enum fa_bus_resource {
 	ADC_CARR_VME_ADDR,
 };

+#ifndef CONFIG_GENERIC_IOMAP
+static inline u32 (ioread32be)(const volatile void __iomem *addr)
+{
+	return ioread32be(addr);
+}
+
+static inline void (iowrite32be)(u32 value, volatile void __iomem *addr)
+{
+	iowrite32be(value, addr);
+}
+#endif
+
 struct fa_memory_ops {
+#ifdef CONFIG_GENERIC_IOMAP
 #if KERNEL_VERSION(5, 8, 0) <= LINUX_VERSION_CODE
 	u32 (*read)(const void *addr);
 #else
 	u32 (*read)(void *addr);
 #endif
 	void (*write)(u32 value, void *addr);
+#else
+	u32 (*read)(const volatile void *addr);
+	void (*write)(u32 value, volatile void *addr);
+#endif
 };

 /*