diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-03-16 16:23:55 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2017-03-22 15:42:17 +0100 |
| commit | 61012985eb132a2fa5e4a3eddbc33528334fa377 (patch) | |
| tree | 7a059b5eb48068a5df54a6003c414140f795964a | |
| parent | f9808079aa7626d71215a71661dbed5c4ff101d2 (diff) | |
iommu/vt-d: Use lo_hi_readq() / lo_hi_writeq()
There is already helper functions to do 64-bit I/O on 32-bit machines or
buses, thus we don't need to reinvent the wheel.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
| -rw-r--r-- | include/linux/intel-iommu.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index c573a52ae440..485a5b48f038 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -30,6 +30,8 @@ #include <linux/mmu_notifier.h> #include <linux/list.h> #include <linux/iommu.h> +#include <linux/io-64-nonatomic-lo-hi.h> + #include <asm/cacheflush.h> #include <asm/iommu.h> @@ -72,24 +74,8 @@ #define OFFSET_STRIDE (9) -#ifdef CONFIG_64BIT #define dmar_readq(a) readq(a) #define dmar_writeq(a,v) writeq(v,a) -#else -static inline u64 dmar_readq(void __iomem *addr) -{ - u32 lo, hi; - lo = readl(addr); - hi = readl(addr + 4); - return (((u64) hi) << 32) + lo; -} - -static inline void dmar_writeq(void __iomem *addr, u64 val) -{ - writel((u32)val, addr); - writel((u32)(val >> 32), addr + 4); -} -#endif #define DMAR_VER_MAJOR(v) (((v) & 0xf0) >> 4) #define DMAR_VER_MINOR(v) ((v) & 0x0f) |