Commit 0bbf47ea authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Miquel Raynal

ia64: use asm-generic/io.h

asm-generic/io.h provides a generic implementation of all I/O accessors,
which the architectures can override.

Since ia64 does not provide readsl/writesl etc, any driver using those
fails to build, and including asm-generic/io.h will provide the
missing interfaces, as well as any other future interfaces that get
added there. We need to #define a couple of symbols to themselves
in the ia64 to ensure that we use the ia64 specific version of those
rather than the generic one.

There should be no other effect than adding {read,write}s{b,w,l}()
as well as {in,out}s{b,w,l}_p(), which were also not provided
by ia64 but are provided by the generic header for historic reasons.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Tested-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 6a3cec64
...@@ -83,12 +83,14 @@ virt_to_phys (volatile void *address) ...@@ -83,12 +83,14 @@ virt_to_phys (volatile void *address)
{ {
return (unsigned long) address - PAGE_OFFSET; return (unsigned long) address - PAGE_OFFSET;
} }
#define virt_to_phys virt_to_phys
static inline void* static inline void*
phys_to_virt (unsigned long address) phys_to_virt (unsigned long address)
{ {
return (void *) (address + PAGE_OFFSET); return (void *) (address + PAGE_OFFSET);
} }
#define phys_to_virt phys_to_virt
#define ARCH_HAS_VALID_PHYS_ADDR_RANGE #define ARCH_HAS_VALID_PHYS_ADDR_RANGE
extern u64 kern_mem_attribute (unsigned long phys_addr, unsigned long size); extern u64 kern_mem_attribute (unsigned long phys_addr, unsigned long size);
...@@ -433,9 +435,11 @@ static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned lo ...@@ -433,9 +435,11 @@ static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned lo
{ {
return ioremap(phys_addr, size); return ioremap(phys_addr, size);
} }
#define ioremap ioremap
#define ioremap_nocache ioremap_nocache
#define ioremap_cache ioremap_cache #define ioremap_cache ioremap_cache
#define ioremap_uc ioremap_nocache #define ioremap_uc ioremap_nocache
#define iounmap iounmap
/* /*
* String version of IO memory access ops: * String version of IO memory access ops:
...@@ -444,6 +448,13 @@ extern void memcpy_fromio(void *dst, const volatile void __iomem *src, long n); ...@@ -444,6 +448,13 @@ extern void memcpy_fromio(void *dst, const volatile void __iomem *src, long n);
extern void memcpy_toio(volatile void __iomem *dst, const void *src, long n); extern void memcpy_toio(volatile void __iomem *dst, const void *src, long n);
extern void memset_io(volatile void __iomem *s, int c, long n); extern void memset_io(volatile void __iomem *s, int c, long n);
#define memcpy_fromio memcpy_fromio
#define memcpy_toio memcpy_toio
#define memset_io memset_io
#define xlate_dev_kmem_ptr xlate_dev_kmem_ptr
#define xlate_dev_mem_ptr xlate_dev_mem_ptr
#include <asm-generic/io.h>
# endif /* __KERNEL__ */ # endif /* __KERNEL__ */
#endif /* _ASM_IA64_IO_H */ #endif /* _ASM_IA64_IO_H */
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