]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: asm: io.h: define readX_relaxed and writeX_relaxed
authorPhilippe Reynes <philippe.reynes@softathome.com>
Fri, 15 Mar 2019 14:14:33 +0000 (15:14 +0100)
committerTom Rini <trini@konsulko.com>
Mon, 22 Apr 2019 15:55:58 +0000 (11:55 -0400)
This patch port the function readX_relaxed and
writeX_relaxed from kernel 4.18.

Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
arch/arm/include/asm/io.h

index 12bc7fbe06e83cd4ab442c81bd55d5368082eece..e6d27b69f936043a880826648d59f46bf36274b4 100644 (file)
@@ -122,6 +122,27 @@ static inline void __raw_readsl(unsigned long addr, void *data, int longlen)
 #define readl(c)       ({ u32 __v = __arch_getl(c); __iormb(); __v; })
 #define readq(c)       ({ u64 __v = __arch_getq(c); __iormb(); __v; })
 
+/*
+ * Relaxed I/O memory access primitives. These follow the Device memory
+ * ordering rules but do not guarantee any ordering relative to Normal memory
+ * accesses.
+ */
+#define readb_relaxed(c)       ({ u8  __r = __raw_readb(c); __r; })
+#define readw_relaxed(c)       ({ u16 __r = le16_to_cpu((__force __le16) \
+                                               __raw_readw(c)); __r; })
+#define readl_relaxed(c)       ({ u32 __r = le32_to_cpu((__force __le32) \
+                                               __raw_readl(c)); __r; })
+#define readq_relaxed(c)       ({ u64 __r = le64_to_cpu((__force __le64) \
+                                               __raw_readq(c)); __r; })
+
+#define writeb_relaxed(v, c)   ((void)__raw_writeb((v), (c)))
+#define writew_relaxed(v, c)   ((void)__raw_writew((__force u16) \
+                                                   cpu_to_le16(v), (c)))
+#define writel_relaxed(v, c)   ((void)__raw_writel((__force u32) \
+                                                   cpu_to_le32(v), (c)))
+#define writeq_relaxed(v, c)   ((void)__raw_writeq((__force u64) \
+                                                   cpu_to_le64(v), (c)))
+
 /*
  * The compiler seems to be incapable of optimising constants
  * properly.  Spell it out to the compiler in some cases.