diff options
| author | Joerg Roedel <jroedel@suse.de> | 2016-05-09 12:03:37 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2016-05-09 12:03:37 +0200 |
| commit | 8801561ce029ef2bf6927c53b834d711830bc8be (patch) | |
| tree | f0c730e94e96a3a1f4ae102f311f3f0fd1ec8011 /include/linux/io-64-nonatomic-hi-lo.h | |
| parent | 44549e8f5eea4e0a41b487b63e616cb089922b99 (diff) | |
| parent | 3ca3712a42f9e632eb41da94ca4eab4f1fb06fcb (diff) | |
| download | talos-obmc-linux-8801561ce029ef2bf6927c53b834d711830bc8be.tar.gz talos-obmc-linux-8801561ce029ef2bf6927c53b834d711830bc8be.zip | |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'include/linux/io-64-nonatomic-hi-lo.h')
| -rw-r--r-- | include/linux/io-64-nonatomic-hi-lo.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/include/linux/io-64-nonatomic-hi-lo.h b/include/linux/io-64-nonatomic-hi-lo.h index 11d7e840d913..defcc4644ce3 100644 --- a/include/linux/io-64-nonatomic-hi-lo.h +++ b/include/linux/io-64-nonatomic-hi-lo.h @@ -21,6 +21,23 @@ static inline void hi_lo_writeq(__u64 val, volatile void __iomem *addr) writel(val, addr); } +static inline __u64 hi_lo_readq_relaxed(const volatile void __iomem *addr) +{ + const volatile u32 __iomem *p = addr; + u32 low, high; + + high = readl_relaxed(p + 1); + low = readl_relaxed(p); + + return low + ((u64)high << 32); +} + +static inline void hi_lo_writeq_relaxed(__u64 val, volatile void __iomem *addr) +{ + writel_relaxed(val >> 32, addr + 4); + writel_relaxed(val, addr); +} + #ifndef readq #define readq hi_lo_readq #endif @@ -29,4 +46,12 @@ static inline void hi_lo_writeq(__u64 val, volatile void __iomem *addr) #define writeq hi_lo_writeq #endif +#ifndef readq_relaxed +#define readq_relaxed hi_lo_readq_relaxed +#endif + +#ifndef writeq_relaxed +#define writeq_relaxed hi_lo_writeq_relaxed +#endif + #endif /* _LINUX_IO_64_NONATOMIC_HI_LO_H_ */ |
