Commit 9216efaf authored by Thierry Reding's avatar Thierry Reding
Browse files

asm-generic/io.h: Reconcile I/O accessor overrides 



Overriding I/O accessors and helpers is currently very inconsistent.
This commit introduces a homogeneous way to override functions by
checking for the existence of a macro with the same of the function.
Architectures can provide their own implementations and communicate this
to the generic header by defining the appropriate macro. Doing this will
also help prevent the implementations from being subsequently
overridden.

While at it, also turn a lot of macros into static inline functions for
better type checking and to provide a canonical signature for overriding
architectures to copy. Also reorder functions by logical groups.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 4707a341

include/asm-generic/io.h

+350 −95
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define __ASM_GENERIC_IO_H



#include <asm/page.h> /* I/O is all done through memory accesses */

#include <linux/string.h> /* for memset() and memcpy() */

#include <linux/types.h>



#ifdef CONFIG_GENERIC_IOMAP
@@ -24,14 +25,16 @@ 
#define mmiowb() do {} while (0)

#endif



/*****************************************************************************/

/*

 * readX/writeX() are used to access memory mapped devices. On some

 * architectures the memory mapped IO stuff needs to be accessed

 * differently. On the simple architectures, we just read/write the

 * memory location directly.

 * __raw_{read,write}{b,w,l,q}() access memory in native endianness.

 *

 * On some architectures memory mapped IO needs to be accessed differently.

 * On the simple architectures, we just read/write the memory location

 * directly.

 */



#ifndef __raw_readb

#define __raw_readb __raw_readb

static inline u8 __raw_readb(const volatile void __iomem *addr)

{

	return *(const volatile u8 __force *)addr;
@@ -39,6 +42,7 @@ static inline u8 __raw_readb(const volatile void __iomem *addr) 
#endif



#ifndef __raw_readw

#define __raw_readw __raw_readw

static inline u16 __raw_readw(const volatile void __iomem *addr)

{

	return *(const volatile u16 __force *)addr;
@@ -46,120 +50,129 @@ static inline u16 __raw_readw(const volatile void __iomem *addr) 
#endif



#ifndef __raw_readl

#define __raw_readl __raw_readl

static inline u32 __raw_readl(const volatile void __iomem *addr)

{

	return *(const volatile u32 __force *)addr;

}

#endif



#define readb __raw_readb



#define readw readw

static inline u16 readw(const volatile void __iomem *addr)

{

	return __le16_to_cpu(__raw_readw(addr));

}



#define readl readl

static inline u32 readl(const volatile void __iomem *addr)

#ifdef CONFIG_64BIT

#ifndef __raw_readq

#define __raw_readq __raw_readq

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

{

	return __le32_to_cpu(__raw_readl(addr));

	return *(const volatile u64 __force *)addr;

}

#endif

#endif /* CONFIG_64BIT */



#ifndef __raw_writeb

static inline void __raw_writeb(u8 b, volatile void __iomem *addr)

#define __raw_writeb __raw_writeb

static inline void __raw_writeb(u8 value, volatile void __iomem *addr)

{

	*(volatile u8 __force *) addr = b;

	*(volatile u8 __force *)addr = value;

}

#endif



#ifndef __raw_writew

static inline void __raw_writew(u16 b, volatile void __iomem *addr)

#define __raw_writew __raw_writew

static inline void __raw_writew(u16 value, volatile void __iomem *addr)

{

	*(volatile u16 __force *) addr = b;

	*(volatile u16 __force *)addr = value;

}

#endif



#ifndef __raw_writel

static inline void __raw_writel(u32 b, volatile void __iomem *addr)

#define __raw_writel __raw_writel

static inline void __raw_writel(u32 value, volatile void __iomem *addr)

{

	*(volatile u32 __force *) addr = b;

	*(volatile u32 __force *)addr = value;

}

#endif



#define writeb __raw_writeb

#define writew(b,addr) __raw_writew(__cpu_to_le16(b),addr)

#define writel(b,addr) __raw_writel(__cpu_to_le32(b),addr)



#ifdef CONFIG_64BIT

#ifndef __raw_readq

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

#ifndef __raw_writeq

#define __raw_writeq __raw_writeq

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

{

	return *(const volatile u64 __force *) addr;

	*(volatile u64 __force *)addr = value;

}

#endif

#endif /* CONFIG_64BIT */



#define readq readq

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

{

	return __le64_to_cpu(__raw_readq(addr));

}

/*

 * {read,write}{b,w,l,q}() access little endian memory and return result in

 * native endianness.

 */



#ifndef __raw_writeq

static inline void __raw_writeq(u64 b, volatile void __iomem *addr)

#ifndef readb

#define readb readb

static inline u8 readb(const volatile void __iomem *addr)

{

	*(volatile u64 __force *) addr = b;

	return __raw_readb(addr);

}

#endif



#define writeq(b, addr) __raw_writeq(__cpu_to_le64(b), addr)

#endif /* CONFIG_64BIT */



#ifndef PCI_IOBASE

#define PCI_IOBASE ((void __iomem *) 0)

#ifndef readw

#define readw readw

static inline u16 readw(const volatile void __iomem *addr)

{

	return __le16_to_cpu(__raw_readw(addr));

}

#endif



/*****************************************************************************/

/*

 * traditional input/output functions

 */



static inline u8 inb(unsigned long addr)

#ifndef readl

#define readl readl

static inline u32 readl(const volatile void __iomem *addr)

{

	return readb(addr + PCI_IOBASE);

	return __le32_to_cpu(__raw_readl(addr));

}

#endif



static inline u16 inw(unsigned long addr)

#ifdef CONFIG_64BIT

#ifndef readq

#define readq readq

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

{

	return readw(addr + PCI_IOBASE);

	return __le64_to_cpu(__raw_readq(addr));

}

#endif

#endif /* CONFIG_64BIT */



static inline u32 inl(unsigned long addr)

#ifndef writeb

#define writeb writeb

static inline void writeb(u8 value, volatile void __iomem *addr)

{

	return readl(addr + PCI_IOBASE);

	__raw_writeb(value, addr);

}

#endif



static inline void outb(u8 b, unsigned long addr)

#ifndef writew

#define writew writew

static inline void writew(u16 value, volatile void __iomem *addr)

{

	writeb(b, addr + PCI_IOBASE);

	__raw_writew(cpu_to_le16(value), addr);

}

#endif



static inline void outw(u16 b, unsigned long addr)

#ifndef writel

#define writel writel

static inline void writel(u32 value, volatile void __iomem *addr)

{

	writew(b, addr + PCI_IOBASE);

	__raw_writel(__cpu_to_le32(value), addr);

}

#endif



static inline void outl(u32 b, unsigned long addr)

#ifdef CONFIG_64BIT

#ifndef writeq

#define writeq writeq

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

{

	writel(b, addr + PCI_IOBASE);

	__raw_writeq(__cpu_to_le64(value), addr);

}



#define inb_p(addr)	inb(addr)

#define inw_p(addr)	inw(addr)

#define inl_p(addr)	inl(addr)

#define outb_p(x, addr)	outb((x), (addr))

#define outw_p(x, addr)	outw((x), (addr))

#define outl_p(x, addr)	outl((x), (addr))

#endif

#endif /* CONFIG_64BIT */



#ifndef insb

static inline void insb(unsigned long addr, void *buffer, int count)
@@ -237,18 +250,6 @@ static inline void outsl(unsigned long addr, const void *buffer, int count) 
#endif



#ifndef CONFIG_GENERIC_IOMAP

#define ioread8(addr)		readb(addr)

#define ioread16(addr)		readw(addr)

#define ioread16be(addr)	__be16_to_cpu(__raw_readw(addr))

#define ioread32(addr)		readl(addr)

#define ioread32be(addr)	__be32_to_cpu(__raw_readl(addr))



#define iowrite8(v, addr)	writeb((v), (addr))

#define iowrite16(v, addr)	writew((v), (addr))

#define iowrite16be(v, addr)	__raw_writew(__cpu_to_be16(v), addr)

#define iowrite32(v, addr)	writel((v), (addr))

#define iowrite32be(v, addr)	__raw_writel(__cpu_to_be32(v), addr)



#define ioread8_rep(p, dst, count) \

	insb((unsigned long) (p), (dst), (count))

#define ioread16_rep(p, dst, count) \
@@ -264,10 +265,198 @@ static inline void outsl(unsigned long addr, const void *buffer, int count) 
	outsl((unsigned long) (p), (src), (count))

#endif /* CONFIG_GENERIC_IOMAP */



#ifndef PCI_IOBASE

#define PCI_IOBASE ((void __iomem *)0)

#endif



#ifndef IO_SPACE_LIMIT

#define IO_SPACE_LIMIT 0xffff

#endif



/*

 * {in,out}{b,w,l}() access little endian I/O. {in,out}{b,w,l}_p() can be

 * implemented on hardware that needs an additional delay for I/O accesses to

 * take effect.

 */



#ifndef inb

#define inb inb

static inline u8 inb(unsigned long addr)

{

	return readb(PCI_IOBASE + addr);

}

#endif



#ifndef inw

#define inw inw

static inline u16 inw(unsigned long addr)

{

	return readw(PCI_IOBASE + addr);

}

#endif



#ifndef inl

#define inl inl

static inline u32 inl(unsigned long addr)

{

	return readl(PCI_IOBASE + addr);

}

#endif



#ifndef outb

#define outb outb

static inline void outb(u8 value, unsigned long addr)

{

	writeb(value, PCI_IOBASE + addr);

}

#endif



#ifndef outw

#define outw outw

static inline void outw(u16 value, unsigned long addr)

{

	writew(value, PCI_IOBASE + addr);

}

#endif



#ifndef outl

#define outl outl

static inline void outl(u32 value, unsigned long addr)

{

	writel(value, PCI_IOBASE + addr);

}

#endif



#ifndef inb_p

#define inb_p inb_p

static inline u8 inb_p(unsigned long addr)

{

	return inb(addr);

}

#endif



#ifndef inw_p

#define inw_p inw_p

static inline u16 inw_p(unsigned long addr)

{

	return inw(addr);

}

#endif



#ifndef inl_p

#define inl_p inl_p

static inline u32 inl_p(unsigned long addr)

{

	return inl(addr);

}

#endif



#ifndef outb_p

#define outb_p outb_p

static inline void outb_p(u8 value, unsigned long addr)

{

	outb(value, addr);

}

#endif



#ifndef outw_p

#define outw_p outw_p

static inline void outw_p(u16 value, unsigned long addr)

{

	outw(value, addr);

}

#endif



#ifndef outl_p

#define outl_p outl_p

static inline void outl_p(u32 value, unsigned long addr)

{

	outl(value, addr);

}

#endif



#ifndef CONFIG_GENERIC_IOMAP

#ifndef ioread8

#define ioread8 ioread8

static inline u8 ioread8(const volatile void __iomem *addr)

{

	return readb(addr);

}

#endif



#ifndef ioread16

#define ioread16 ioread16

static inline u16 ioread16(const volatile void __iomem *addr)

{

	return readw(addr);

}

#endif



#ifndef ioread32

#define ioread32 ioread32

static inline u32 ioread32(const volatile void __iomem *addr)

{

	return readl(addr);

}

#endif



#ifndef iowrite8

#define iowrite8 iowrite8

static inline void iowrite8(u8 value, volatile void __iomem *addr)

{

	writeb(value, addr);

}

#endif



#ifndef iowrite16

#define iowrite16 iowrite16

static inline void iowrite16(u16 value, volatile void __iomem *addr)

{

	writew(value, addr);

}

#endif



#ifndef iowrite32

#define iowrite32 iowrite32

static inline void iowrite32(u32 value, volatile void __iomem *addr)

{

	writel(value, addr);

}

#endif



#ifndef ioread16be

#define ioread16be ioread16be

static inline u16 ioread16be(const volatile void __iomem *addr)

{

	return __be16_to_cpu(__raw_readw(addr));

}

#endif



#ifndef ioread32be

#define ioread32be ioread32be

static inline u32 ioread32be(const volatile void __iomem *addr)

{

	return __be32_to_cpu(__raw_readl(addr));

}

#endif



#ifndef iowrite16be

#define iowrite16be iowrite16be

static inline void iowrite16be(u16 value, void volatile __iomem *addr)

{

	__raw_writew(__cpu_to_be16(value), addr);

}

#endif



#ifndef iowrite32be

#define iowrite32be iowrite32be

static inline void iowrite32be(u32 value, volatile void __iomem *addr)

{

	__raw_writel(__cpu_to_be32(value), addr);

}

#endif

#endif /* CONFIG_GENERIC_IOMAP */



#ifdef __KERNEL__



#include <linux/vmalloc.h>
@@ -278,6 +467,7 @@ struct pci_dev; 
extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);



#ifndef pci_iounmap

#define pci_iounmap pci_iounmap

static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)

{

}
@@ -289,11 +479,15 @@ static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p) 
 * These are pretty trivial

 */

#ifndef virt_to_phys

#define virt_to_phys virt_to_phys

static inline unsigned long virt_to_phys(volatile void *address)

{

	return __pa((unsigned long)address);

}

#endif



#ifndef phys_to_virt

#define phys_to_virt phys_to_virt

static inline void *phys_to_virt(unsigned long address)

{

	return __va(address);
@@ -306,37 +500,65 @@ static inline void *phys_to_virt(unsigned long address) 
 * This implementation is for the no-MMU case only... if you have an MMU

 * you'll need to provide your own definitions.

 */



#ifndef CONFIG_MMU

static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size)

#ifndef ioremap

#define ioremap ioremap

static inline void __iomem *ioremap(phys_addr_t offset, size_t size)

{

	return (void __iomem *)(unsigned long)offset;

}

#endif



#define __ioremap(offset, size, flags)	ioremap(offset, size)

#ifndef __ioremap

#define __ioremap __ioremap

static inline void __iomem *__ioremap(phys_addr_t offset, size_t size,

				      unsigned long flags)

{

	return ioremap(offset, size);

}

#endif



#ifndef ioremap_nocache

#define ioremap_nocache ioremap

#define ioremap_nocache ioremap_nocache

static inline void __iomem *ioremap_nocache(phys_addr_t offset, size_t size)

{

	return ioremap(offset, size);

}

#endif



#ifndef ioremap_wc

#define ioremap_wc ioremap_nocache

#define ioremap_wc ioremap_wc

static inline void __iomem *ioremap_wc(phys_addr_t offset, size_t size)

{

	return ioremap_nocache(offset, size);

}

#endif



#ifndef iounmap

#define iounmap iounmap

static inline void iounmap(void __iomem *addr)

{

}

#endif

#endif /* CONFIG_MMU */



#ifdef CONFIG_HAS_IOPORT_MAP

#ifndef CONFIG_GENERIC_IOMAP

#ifndef ioport_map

#define ioport_map ioport_map

static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)

{

	return PCI_IOBASE + (port & IO_SPACE_LIMIT);

}

#endif



#ifndef ioport_unmap

#define ioport_unmap ioport_unmap

static inline void ioport_unmap(void __iomem *p)

{

}

#endif

#else /* CONFIG_GENERIC_IOMAP */

extern void __iomem *ioport_map(unsigned long port, unsigned int nr);

extern void ioport_unmap(void __iomem *p);
@@ -344,17 +566,33 @@ extern void ioport_unmap(void __iomem *p); 
#endif /* CONFIG_HAS_IOPORT_MAP */



#ifndef xlate_dev_kmem_ptr

#define xlate_dev_kmem_ptr(p)	p

#define xlate_dev_kmem_ptr xlate_dev_kmem_ptr

static inline void *xlate_dev_kmem_ptr(void *addr)

{

	return addr;

}

#endif



#ifndef xlate_dev_mem_ptr

#define xlate_dev_mem_ptr(p)	__va(p)

#define xlate_dev_mem_ptr xlate_dev_mem_ptr

static inline void *xlate_dev_mem_ptr(phys_addr_t addr)

{

	return __va(addr);

}

#endif



#ifndef unxlate_dev_mem_ptr

#define unxlate_dev_mem_ptr unxlate_dev_mem_ptr

static inline void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)

{

}

#endif



#ifdef CONFIG_VIRT_TO_BUS

#ifndef virt_to_bus

static inline unsigned long virt_to_bus(volatile void *address)

static inline unsigned long virt_to_bus(void *address)

{

	return ((unsigned long) address);

	return (unsigned long)address;

}



static inline void *bus_to_virt(unsigned long address)
@@ -365,14 +603,31 @@ static inline void *bus_to_virt(unsigned long address) 
#endif



#ifndef memset_io

#define memset_io(a, b, c)	memset(__io_virt(a), (b), (c))

#define memset_io memset_io

static inline void memset_io(volatile void __iomem *addr, int value,

			     size_t size)

{

	memset(__io_virt(addr), value, size);

}

#endif



#ifndef memcpy_fromio

#define memcpy_fromio(a, b, c)	memcpy((a), __io_virt(b), (c))

#define memcpy_fromio memcpy_fromio

static inline void memcpy_fromio(void *buffer,

				 const volatile void __iomem *addr,

				 size_t size)

{

	memcpy(buffer, __io_virt(addr), size);

}

#endif



#ifndef memcpy_toio

#define memcpy_toio(a, b, c)	memcpy(__io_virt(a), (b), (c))

#define memcpy_toio memcpy_toio

static inline void memcpy_toio(volatile void __iomem *addr, const void *buffer,

			       size_t size)

{

	memcpy(__io_virt(addr), buffer, size);

}

#endif



#endif /* __KERNEL__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE