Commit 2c5643b1 authored by Hitoshi Mitake's avatar Hitoshi Mitake Committed by Ingo Molnar

x86: provide readq()/writeq() on 32-bit too

Impact: add new API for drivers

Add implementation of readq/writeq to x86_32, and add config value to
the x86 architecture to determine existence of readq/writeq.
Signed-off-by: default avatarHitoshi Mitake <h.mitake@gmail.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ed313489
...@@ -19,6 +19,8 @@ config X86_64 ...@@ -19,6 +19,8 @@ config X86_64
config X86 config X86
def_bool y def_bool y
select HAVE_AOUT if X86_32 select HAVE_AOUT if X86_32
select HAVE_READQ
select HAVE_WRITEQ
select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_UNSTABLE_SCHED_CLOCK
select HAVE_IDE select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define ARCH_HAS_IOREMAP_WC #define ARCH_HAS_IOREMAP_WC
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm-generic/int-ll64.h>
#define build_mmio_read(name, size, type, reg, barrier) \ #define build_mmio_read(name, size, type, reg, barrier) \
static inline type name(const volatile void __iomem *addr) \ static inline type name(const volatile void __iomem *addr) \
...@@ -57,6 +58,29 @@ build_mmio_write(__writeq, "q", unsigned long, "r", ) ...@@ -57,6 +58,29 @@ build_mmio_write(__writeq, "q", unsigned long, "r", )
/* Let people know we have them */ /* Let people know we have them */
#define readq readq #define readq readq
#define writeq writeq #define writeq writeq
#else /* CONFIG_X86_32 from here */
static inline __u64 readq(const volatile void __iomem *addr)
{
const volatile u32 __iomem *p = addr;
u32 l, h;
l = readl(p);
h = readl(p + 1);
return l + ((u64)h << 32);
}
static inline void writeq(__u64 val, volatile void __iomem *addr)
{
writel(val, addr);
writel(val >> 32, addr+4);
}
#define readq readq
#define writeq writeq
#endif #endif
extern int iommu_bio_merge; extern int iommu_bio_merge;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment