From: Will Deacon <will.deacon@arm.com>
Date: Fri, 22 Feb 2019 18:04:54 +0000 (+0000)
Subject: arm64: io: Hook up __io_par() for inX() ordering
X-Git-Tag: v5.4-rc1~1447^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c97a9cc35a7a73a7580a8e2632419ff3c0b0fe5;p=platform%2Fkernel%2Flinux-rpi.git

arm64: io: Hook up __io_par() for inX() ordering

Ensure that inX() provides the same ordering guarantees as readX()
by hooking up __io_par() so that it maps directly to __iormb().

Reported-by: Andrew Murray <andrew.murray@arm.com>
Reviewed-by: Palmer Dabbelt <palmer@sifive.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h
index ee723835c1f4..8bb7210ac286 100644
--- a/arch/arm64/include/asm/io.h
+++ b/arch/arm64/include/asm/io.h
@@ -121,6 +121,7 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)
 		     : "memory");					\
 })
 
+#define __io_par(v)		__iormb(v)
 #define __iowmb()		wmb()
 
 #define mmiowb()		do { } while (0)