diff options
Diffstat (limited to 'arch/microblaze/include/asm/io.h')
| -rw-r--r-- | arch/microblaze/include/asm/io.h | 303 | 
1 files changed, 19 insertions, 284 deletions
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h index 2565cb94f32..433751b2a00 100644 --- a/arch/microblaze/include/asm/io.h +++ b/arch/microblaze/include/asm/io.h @@ -15,215 +15,38 @@  #include <asm/page.h>  #include <linux/types.h>  #include <linux/mm.h>          /* Get struct page {...} */ -#include <asm-generic/iomap.h>  #ifndef CONFIG_PCI  #define _IO_BASE	0  #define _ISA_MEM_BASE	0 -#define PCI_DRAM_OFFSET	0  #else  #define _IO_BASE	isa_io_base  #define _ISA_MEM_BASE	isa_mem_base -#define PCI_DRAM_OFFSET	pci_dram_offset -#endif +struct pci_dev; +extern void pci_iounmap(struct pci_dev *dev, void __iomem *); +#define pci_iounmap pci_iounmap  extern unsigned long isa_io_base; -extern unsigned long pci_io_base; -extern unsigned long pci_dram_offset; -  extern resource_size_t isa_mem_base; +#endif +#define PCI_IOBASE	((void __iomem *)_IO_BASE)  #define IO_SPACE_LIMIT (0xFFFFFFFF) -/* the following is needed to support PCI with some drivers */ - -#define mmiowb() - -static inline unsigned char __raw_readb(const volatile void __iomem *addr) -{ -	return *(volatile unsigned char __force *)addr; -} -static inline unsigned short __raw_readw(const volatile void __iomem *addr) -{ -	return *(volatile unsigned short __force *)addr; -} -static inline unsigned int __raw_readl(const volatile void __iomem *addr) -{ -	return *(volatile unsigned int __force *)addr; -} -static inline unsigned long __raw_readq(const volatile void __iomem *addr) -{ -	return *(volatile unsigned long __force *)addr; -} -static inline void __raw_writeb(unsigned char v, volatile void __iomem *addr) -{ -	*(volatile unsigned char __force *)addr = v; -} -static inline void __raw_writew(unsigned short v, volatile void __iomem *addr) -{ -	*(volatile unsigned short __force *)addr = v; -} -static inline void __raw_writel(unsigned int v, volatile void __iomem *addr) -{ -	*(volatile unsigned int __force *)addr = v; -} -static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr) -{ -	*(volatile unsigned long __force *)addr = v; -} - -/* - * read (readb, readw, readl, readq) and write (writeb, writew, - * writel, writeq) accessors are for PCI and thus little endian. - * Linux 2.4 for Microblaze had this wrong. - */ -static inline unsigned char readb(const volatile void __iomem *addr) -{ -	return *(volatile unsigned char __force *)addr; -} -static inline unsigned short readw(const volatile void __iomem *addr) -{ -	return le16_to_cpu(*(volatile unsigned short __force *)addr); -} -static inline unsigned int readl(const volatile void __iomem *addr) -{ -	return le32_to_cpu(*(volatile unsigned int __force *)addr); -} -static inline void writeb(unsigned char v, volatile void __iomem *addr) -{ -	*(volatile unsigned char __force *)addr = v; -} -static inline void writew(unsigned short v, volatile void __iomem *addr) -{ -	*(volatile unsigned short __force *)addr = cpu_to_le16(v); -} -static inline void writel(unsigned int v, volatile void __iomem *addr) -{ -	*(volatile unsigned int __force *)addr = cpu_to_le32(v); -} - -/* ioread and iowrite variants. thease are for now same as __raw_ - * variants of accessors. we might check for endianess in the feature - */ -#define ioread8(addr)		__raw_readb((u8 *)(addr)) -#define ioread16(addr)		__raw_readw((u16 *)(addr)) -#define ioread32(addr)		__raw_readl((u32 *)(addr)) -#define iowrite8(v, addr)	__raw_writeb((u8)(v), (u8 *)(addr)) -#define iowrite16(v, addr)	__raw_writew((u16)(v), (u16 *)(addr)) -#define iowrite32(v, addr)	__raw_writel((u32)(v), (u32 *)(addr)) - -#define ioread16be(addr)	__raw_readw((u16 *)(addr)) -#define ioread32be(addr)	__raw_readl((u32 *)(addr)) -#define iowrite16be(v, addr)	__raw_writew((u16)(v), (u16 *)(addr)) -#define iowrite32be(v, addr)	__raw_writel((u32)(v), (u32 *)(addr)) - -/* These are the definitions for the x86 IO instructions - * inb/inw/inl/outb/outw/outl, the "string" versions - * insb/insw/insl/outsb/outsw/outsl, and the "pausing" versions - * inb_p/inw_p/... - * The macros don't do byte-swapping. - */ -#define inb(port)		readb((u8 *)((unsigned long)(port))) -#define outb(val, port)		writeb((val), (u8 *)((unsigned long)(port))) -#define inw(port)		readw((u16 *)((unsigned long)(port))) -#define outw(val, port)		writew((val), (u16 *)((unsigned long)(port))) -#define inl(port)		readl((u32 *)((unsigned long)(port))) -#define outl(val, port)		writel((val), (u32 *)((unsigned long)(port))) - -#define inb_p(port)		inb((port)) -#define outb_p(val, port)	outb((val), (port)) -#define inw_p(port)		inw((port)) -#define outw_p(val, port)	outw((val), (port)) -#define inl_p(port)		inl((port)) -#define outl_p(val, port)	outl((val), (port)) - -#define memset_io(a, b, c)	memset((void *)(a), (b), (c)) -#define memcpy_fromio(a, b, c)	memcpy((a), (void *)(b), (c)) -#define memcpy_toio(a, b, c)	memcpy((void *)(a), (b), (c)) -  #ifdef CONFIG_MMU - -#define phys_to_virt(addr)	((void *)__phys_to_virt(addr)) -#define virt_to_phys(addr)	((unsigned long)__virt_to_phys(addr)) -#define virt_to_bus(addr)	((unsigned long)__virt_to_phys(addr)) -  #define page_to_bus(page)	(page_to_phys(page)) -#define bus_to_virt(addr)	(phys_to_virt(addr))  extern void iounmap(void __iomem *addr); -/*extern void *__ioremap(phys_addr_t address, unsigned long size, -		unsigned long flags);*/ -extern void __iomem *ioremap(phys_addr_t address, unsigned long size); -#define ioremap_writethrough(addr, size) ioremap((addr), (size)) -#define ioremap_nocache(addr, size)      ioremap((addr), (size)) -#define ioremap_fullcache(addr, size)    ioremap((addr), (size)) - -#else /* CONFIG_MMU */ - -/** - *	virt_to_phys - map virtual addresses to physical - *	@address: address to remap - * - *	The returned physical address is the physical (CPU) mapping for - *	the memory address given. It is only valid to use this function on - *	addresses directly mapped or allocated via kmalloc. - * - *	This function does not give bus mappings for DMA transfers. In - *	almost all conceivable cases a device driver should not be using - *	this function - */ -static inline unsigned long __iomem virt_to_phys(volatile void *address) -{ -	return __pa((unsigned long)address); -} - -#define virt_to_bus virt_to_phys - -/** - *	phys_to_virt - map physical address to virtual - *	@address: address to remap - * - *	The returned virtual address is a current CPU mapping for - *	the memory address given. It is only valid to use this function on - *	addresses that have a kernel mapping - * - *	This function does not handle bus mappings for DMA transfers. In - *	almost all conceivable cases a device driver should not be using - *	this function - */ -static inline void *phys_to_virt(unsigned long address) -{ -	return (void *)__va(address); -} - -#define bus_to_virt(a) phys_to_virt(a) -static inline void __iomem *__ioremap(phys_addr_t address, unsigned long size, -			unsigned long flags) -{ -	return (void *)address; -} - -#define ioremap(physaddr, size)	((void __iomem *)(unsigned long)(physaddr)) -#define iounmap(addr)		((void)0) -#define ioremap_nocache(physaddr, size)	ioremap(physaddr, size) +extern void __iomem *ioremap(phys_addr_t address, unsigned long size); +#define ioremap_writethrough(addr, size)	ioremap((addr), (size)) +#define ioremap_nocache(addr, size)		ioremap((addr), (size)) +#define ioremap_fullcache(addr, size)		ioremap((addr), (size)) +#define ioremap_wc(addr, size)			ioremap((addr), (size))  #endif /* CONFIG_MMU */ -/* - * Convert a physical pointer to a virtual kernel pointer for /dev/mem - * access - */ -#define xlate_dev_mem_ptr(p)	__va(p) - -/* - * Convert a virtual cached pointer to an uncached pointer - */ -#define xlate_dev_kmem_ptr(p)	p - -/* - * Big Endian - */ +/* Big Endian */  #define out_be32(a, v) __raw_writel((v), (void __iomem __force *)(a))  #define out_be16(a, v) __raw_writew((v), (a)) @@ -233,10 +56,7 @@ static inline void __iomem *__ioremap(phys_addr_t address, unsigned long size,  #define writel_be(v, a)	out_be32((__force unsigned *)a, v)  #define readl_be(a)	in_be32((__force unsigned *)a) -/* - * Little endian - */ - +/* Little endian */  #define out_le32(a, v) __raw_writel(__cpu_to_le32(v), (a))  #define out_le16(a, v) __raw_writew(__cpu_to_le16(v), (a)) @@ -247,99 +67,14 @@ static inline void __iomem *__ioremap(phys_addr_t address, unsigned long size,  #define out_8(a, v) __raw_writeb((v), (a))  #define in_8(a) __raw_readb(a) -#define mmiowb() - -#define ioport_map(port, nr)	((void __iomem *)(port)) -#define ioport_unmap(addr) - -/* from asm-generic/io.h */ -#ifndef insb -static inline void insb(unsigned long addr, void *buffer, int count) -{ -	if (count) { -		u8 *buf = buffer; -		do { -			u8 x = inb(addr); -			*buf++ = x; -		} while (--count); -	} -} -#endif - -#ifndef insw -static inline void insw(unsigned long addr, void *buffer, int count) -{ -	if (count) { -		u16 *buf = buffer; -		do { -			u16 x = inw(addr); -			*buf++ = x; -		} while (--count); -	} -} -#endif - -#ifndef insl -static inline void insl(unsigned long addr, void *buffer, int count) -{ -	if (count) { -		u32 *buf = buffer; -		do { -			u32 x = inl(addr); -			*buf++ = x; -		} while (--count); -	} -} -#endif - -#ifndef outsb -static inline void outsb(unsigned long addr, const void *buffer, int count) -{ -	if (count) { -		const u8 *buf = buffer; -		do { -			outb(*buf++, addr); -		} while (--count); -	} -} -#endif - -#ifndef outsw -static inline void outsw(unsigned long addr, const void *buffer, int count) -{ -	if (count) { -		const u16 *buf = buffer; -		do { -			outw(*buf++, addr); -		} while (--count); -	} -} -#endif - -#ifndef outsl -static inline void outsl(unsigned long addr, const void *buffer, int count) -{ -	if (count) { -		const u32 *buf = buffer; -		do { -			outl(*buf++, addr); -		} while (--count); -	} -} -#endif +#include <asm-generic/io.h> -#define ioread8_rep(p, dst, count) \ -	insb((unsigned long) (p), (dst), (count)) -#define ioread16_rep(p, dst, count) \ -	insw((unsigned long) (p), (dst), (count)) -#define ioread32_rep(p, dst, count) \ -	insl((unsigned long) (p), (dst), (count)) +#define readb_relaxed	readb +#define readw_relaxed	readw +#define readl_relaxed	readl -#define iowrite8_rep(p, src, count) \ -	outsb((unsigned long) (p), (src), (count)) -#define iowrite16_rep(p, src, count) \ -	outsw((unsigned long) (p), (src), (count)) -#define iowrite32_rep(p, src, count) \ -	outsl((unsigned long) (p), (src), (count)) +#define writeb_relaxed	writeb +#define writew_relaxed	writew +#define writel_relaxed	writel  #endif /* _ASM_MICROBLAZE_IO_H */  | 
