Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e44fb18 authored by Horia Geantă's avatar Horia Geantă Committed by Herbert Xu
Browse files

asm-generic/io.h: add io{read,write}64 accessors 



This will allow device drivers to consistently use io{read,write}XX
also for 64-bit accesses.

Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7a1aedba

include/asm-generic/io.h

+63 −0
Original line number Diff line number Diff line
@@ -585,6 +585,16 @@ static inline u32 ioread32(const volatile void __iomem *addr) 
}

#endif



#ifdef CONFIG_64BIT

#ifndef ioread64

#define ioread64 ioread64

static inline u64 ioread64(const volatile void __iomem *addr)

{

	return readq(addr);

}

#endif

#endif /* CONFIG_64BIT */



#ifndef iowrite8

#define iowrite8 iowrite8

static inline void iowrite8(u8 value, volatile void __iomem *addr)
@@ -609,6 +619,16 @@ static inline void iowrite32(u32 value, volatile void __iomem *addr) 
}

#endif



#ifdef CONFIG_64BIT

#ifndef iowrite64

#define iowrite64 iowrite64

static inline void iowrite64(u64 value, volatile void __iomem *addr)

{

	writeq(value, addr);

}

#endif

#endif /* CONFIG_64BIT */



#ifndef ioread16be

#define ioread16be ioread16be

static inline u16 ioread16be(const volatile void __iomem *addr)
@@ -625,6 +645,16 @@ static inline u32 ioread32be(const volatile void __iomem *addr) 
}

#endif



#ifdef CONFIG_64BIT

#ifndef ioread64be

#define ioread64be ioread64be

static inline u64 ioread64be(const volatile void __iomem *addr)

{

	return swab64(readq(addr));

}

#endif

#endif /* CONFIG_64BIT */



#ifndef iowrite16be

#define iowrite16be iowrite16be

static inline void iowrite16be(u16 value, void volatile __iomem *addr)
@@ -641,6 +671,16 @@ static inline void iowrite32be(u32 value, volatile void __iomem *addr) 
}

#endif



#ifdef CONFIG_64BIT

#ifndef iowrite64be

#define iowrite64be iowrite64be

static inline void iowrite64be(u64 value, volatile void __iomem *addr)

{

	writeq(swab64(value), addr);

}

#endif

#endif /* CONFIG_64BIT */



#ifndef ioread8_rep

#define ioread8_rep ioread8_rep

static inline void ioread8_rep(const volatile void __iomem *addr, void *buffer,
@@ -668,6 +708,17 @@ static inline void ioread32_rep(const volatile void __iomem *addr, 
}

#endif



#ifdef CONFIG_64BIT

#ifndef ioread64_rep

#define ioread64_rep ioread64_rep

static inline void ioread64_rep(const volatile void __iomem *addr,

				void *buffer, unsigned int count)

{

	readsq(addr, buffer, count);

}

#endif

#endif /* CONFIG_64BIT */



#ifndef iowrite8_rep

#define iowrite8_rep iowrite8_rep

static inline void iowrite8_rep(volatile void __iomem *addr,
@@ -697,6 +748,18 @@ static inline void iowrite32_rep(volatile void __iomem *addr, 
	writesl(addr, buffer, count);

}

#endif



#ifdef CONFIG_64BIT

#ifndef iowrite64_rep

#define iowrite64_rep iowrite64_rep

static inline void iowrite64_rep(volatile void __iomem *addr,

				 const void *buffer,

				 unsigned int count)

{

	writesq(addr, buffer, count);

}

#endif

#endif /* CONFIG_64BIT */

#endif /* CONFIG_GENERIC_IOMAP */



#ifdef __KERNEL__

include/asm-generic/iomap.h

+8 −0
Original line number Diff line number Diff line
@@ -30,12 +30,20 @@ extern unsigned int ioread16(void __iomem *); 
extern unsigned int ioread16be(void __iomem *);

extern unsigned int ioread32(void __iomem *);

extern unsigned int ioread32be(void __iomem *);

#ifdef CONFIG_64BIT

extern u64 ioread64(void __iomem *);

extern u64 ioread64be(void __iomem *);

#endif



extern void iowrite8(u8, void __iomem *);

extern void iowrite16(u16, void __iomem *);

extern void iowrite16be(u16, void __iomem *);

extern void iowrite32(u32, void __iomem *);

extern void iowrite32be(u32, void __iomem *);

#ifdef CONFIG_64BIT

extern void iowrite64(u64, void __iomem *);

extern void iowrite64be(u64, void __iomem *);

#endif



/*

 * "string" versions of the above. Note that they