| Message ID | cb4f991947caa10acc7439735dae7b246245f8e5.1523041697.git.ivan.gorinov@intel.com |
|---|---|
| State | Superseded |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | timer: Add High Precision Event Timers (HPET) support | expand |
On Fri, 2018-04-06 at 12:17 -0700, Ivan Gorinov wrote: > Add readq() and writeq() definitions for x86. > > Please note: in 32-bit code readq/writeq will generate two 32-bit > memory access instructions instead of one atomic 64-bit operation. > > -#define readb(addr) (*(volatile unsigned char *) (addr)) > -#define readw(addr) (*(volatile unsigned short *) (addr)) > -#define readl(addr) (*(volatile unsigned int *) (addr)) > +#define readb(addr) (*(volatile u8 *) (addr)) > +#define readw(addr) (*(volatile u16 *) (addr)) > +#define readl(addr) (*(volatile u32 *) (addr)) > -#define writeb(b,addr) (*(volatile unsigned char *) (addr) = (b)) > -#define writew(b,addr) (*(volatile unsigned short *) (addr) = (b)) > -#define writel(b,addr) (*(volatile unsigned int *) (addr) = (b)) > +#define writeb(b, addr) (*(volatile u8 *) (addr) = (b)) > +#define writew(b, addr) (*(volatile u16 *) (addr) = (b)) > +#define writel(b, addr) (*(volatile u32 *) (addr) = (b)) What's wrong with the existing types? Even in ARM case they are using unsigned long long for 64-bit variant.
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index 263dd8f..c7f6fcb 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -58,19 +58,23 @@ * memory location directly. */ -#define readb(addr) (*(volatile unsigned char *) (addr)) -#define readw(addr) (*(volatile unsigned short *) (addr)) -#define readl(addr) (*(volatile unsigned int *) (addr)) +#define readb(addr) (*(volatile u8 *) (addr)) +#define readw(addr) (*(volatile u16 *) (addr)) +#define readl(addr) (*(volatile u32 *) (addr)) +#define readq(addr) (*(volatile u64 *) (addr)) #define __raw_readb readb #define __raw_readw readw #define __raw_readl readl +#define __raw_readq readq -#define writeb(b,addr) (*(volatile unsigned char *) (addr) = (b)) -#define writew(b,addr) (*(volatile unsigned short *) (addr) = (b)) -#define writel(b,addr) (*(volatile unsigned int *) (addr) = (b)) +#define writeb(b, addr) (*(volatile u8 *) (addr) = (b)) +#define writew(b, addr) (*(volatile u16 *) (addr) = (b)) +#define writel(b, addr) (*(volatile u32 *) (addr) = (b)) +#define writeq(b, addr) (*(volatile u64 *) (addr) = (b)) #define __raw_writeb writeb #define __raw_writew writew #define __raw_writel writel +#define __raw_writeq writeq #define memset_io(a,b,c) memset((a),(b),(c)) #define memcpy_fromio(a,b,c) memcpy((a),(b),(c))
Add readq() and writeq() definitions for x86. Please note: in 32-bit code readq/writeq will generate two 32-bit memory access instructions instead of one atomic 64-bit operation. Signed-off-by: Ivan Gorinov <ivan.gorinov@intel.com> --- arch/x86/include/asm/io.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)