 c24bf9b4cc
			
		
	
	
	c24bf9b4cc
	
	
	
		
			
			The inb/outb macros for CRIS are broken from a number of points of view, missing () around parameters and they have an unprotected if statement in them. This was breaking the compile of IPMI on CRIS and thus I was being annoyed by build regressions, so I fixed them. Plus I don't think they would have worked at all, since the data values were missing "&" and the outsl had a "3" instead of a "4" for the size. From what I can tell, this stuff is not used at all, so this can't be any more broken than it was before, anyway. Signed-off-by: Corey Minyard <cminyard@mvista.com> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Mikael Starvik <starvik@axis.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
		
			
				
	
	
		
			181 lines
		
	
	
	
		
			5.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			181 lines
		
	
	
	
		
			5.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef _ASM_CRIS_IO_H
 | |
| #define _ASM_CRIS_IO_H
 | |
| 
 | |
| #include <asm/page.h>   /* for __va, __pa */
 | |
| #include <arch/io.h>
 | |
| #include <linux/kernel.h>
 | |
| 
 | |
| struct cris_io_operations
 | |
| {
 | |
| 	u32 (*read_mem)(void *addr, int size);
 | |
| 	void (*write_mem)(u32 val, int size, void *addr);
 | |
| 	u32 (*read_io)(u32 port, void *addr, int size, int count);
 | |
| 	void (*write_io)(u32 port, void *addr, int size, int count);
 | |
| };
 | |
| 
 | |
| #ifdef CONFIG_PCI
 | |
| extern struct cris_io_operations *cris_iops;
 | |
| #else
 | |
| #define cris_iops ((struct cris_io_operations*)NULL)
 | |
| #endif
 | |
| 
 | |
| /*
 | |
|  * Change virtual addresses to physical addresses and vv.
 | |
|  */
 | |
| 
 | |
| static inline unsigned long virt_to_phys(volatile void * address)
 | |
| {
 | |
| 	return __pa(address);
 | |
| }
 | |
| 
 | |
| static inline void * phys_to_virt(unsigned long address)
 | |
| {
 | |
| 	return __va(address);
 | |
| }
 | |
| 
 | |
| extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
 | |
| extern void __iomem * __ioremap_prot(unsigned long phys_addr, unsigned long size, pgprot_t prot);
 | |
| 
 | |
| static inline void __iomem * ioremap (unsigned long offset, unsigned long size)
 | |
| {
 | |
| 	return __ioremap(offset, size, 0);
 | |
| }
 | |
| 
 | |
| extern void iounmap(volatile void * __iomem addr);
 | |
| 
 | |
| extern void __iomem * ioremap_nocache(unsigned long offset, unsigned long size);
 | |
| 
 | |
| /*
 | |
|  * IO bus memory addresses are also 1:1 with the physical address
 | |
|  */
 | |
| #define virt_to_bus virt_to_phys
 | |
| #define bus_to_virt phys_to_virt
 | |
| 
 | |
| /*
 | |
|  * readX/writeX() are used to access memory mapped devices. On some
 | |
|  * architectures the memory mapped IO stuff needs to be accessed
 | |
|  * differently. On the CRIS architecture, we just read/write the
 | |
|  * memory location directly.
 | |
|  */
 | |
| #ifdef CONFIG_PCI
 | |
| #define PCI_SPACE(x) ((((unsigned)(x)) & 0x10000000) == 0x10000000)
 | |
| #else
 | |
| #define PCI_SPACE(x) 0
 | |
| #endif
 | |
| static inline unsigned char readb(const volatile void __iomem *addr)
 | |
| {
 | |
| 	if (PCI_SPACE(addr) && cris_iops)
 | |
| 		return cris_iops->read_mem((void*)addr, 1);
 | |
| 	else
 | |
| 		return *(volatile unsigned char __force *) addr;
 | |
| }
 | |
| static inline unsigned short readw(const volatile void __iomem *addr)
 | |
| {
 | |
| 	if (PCI_SPACE(addr) && cris_iops)
 | |
| 		return cris_iops->read_mem((void*)addr, 2);
 | |
| 	else
 | |
| 		return *(volatile unsigned short __force *) addr;
 | |
| }
 | |
| static inline unsigned int readl(const volatile void __iomem *addr)
 | |
| {
 | |
| 	if (PCI_SPACE(addr) && cris_iops)
 | |
| 		return cris_iops->read_mem((void*)addr, 4);
 | |
| 	else
 | |
| 		return *(volatile unsigned int __force *) addr;
 | |
| }
 | |
| #define readb_relaxed(addr) readb(addr)
 | |
| #define readw_relaxed(addr) readw(addr)
 | |
| #define readl_relaxed(addr) readl(addr)
 | |
| #define __raw_readb readb
 | |
| #define __raw_readw readw
 | |
| #define __raw_readl readl
 | |
| 
 | |
| static inline void writeb(unsigned char b, volatile void __iomem *addr)
 | |
| {
 | |
| 	if (PCI_SPACE(addr) && cris_iops)
 | |
| 		cris_iops->write_mem(b, 1, (void*)addr);
 | |
| 	else
 | |
| 		*(volatile unsigned char __force *) addr = b;
 | |
| }
 | |
| static inline void writew(unsigned short b, volatile void __iomem *addr)
 | |
| {
 | |
| 	if (PCI_SPACE(addr) && cris_iops)
 | |
| 		cris_iops->write_mem(b, 2, (void*)addr);
 | |
| 	else
 | |
| 		*(volatile unsigned short __force *) addr = b;
 | |
| }
 | |
| static inline void writel(unsigned int b, volatile void __iomem *addr)
 | |
| {
 | |
| 	if (PCI_SPACE(addr) && cris_iops)
 | |
| 		cris_iops->write_mem(b, 4, (void*)addr);
 | |
| 	else
 | |
| 		*(volatile unsigned int __force *) addr = b;
 | |
| }
 | |
| #define __raw_writeb writeb
 | |
| #define __raw_writew writew
 | |
| #define __raw_writel writel
 | |
| 
 | |
| #define mmiowb()
 | |
| 
 | |
| #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))
 | |
| 
 | |
| 
 | |
| /* I/O port access. Normally there is no I/O space on CRIS but when
 | |
|  * Cardbus/PCI is enabled the request is passed through the bridge.
 | |
|  */
 | |
| 
 | |
| #define IO_SPACE_LIMIT 0xffff
 | |
| #define inb(port) (cris_iops ? cris_iops->read_io(port,NULL,1,1) : 0)
 | |
| #define inw(port) (cris_iops ? cris_iops->read_io(port,NULL,2,1) : 0)
 | |
| #define inl(port) (cris_iops ? cris_iops->read_io(port,NULL,4,1) : 0)
 | |
| #define insb(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,1,count) : 0)
 | |
| #define insw(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,2,count) : 0)
 | |
| #define insl(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,4,count) : 0)
 | |
| static inline void outb(unsigned char data, unsigned int port)
 | |
| {
 | |
| 	if (cris_iops)
 | |
| 		cris_iops->write_io(port, (void *) &data, 1, 1);
 | |
| }
 | |
| static inline void outw(unsigned short data, unsigned int port)
 | |
| {
 | |
| 	if (cris_iops)
 | |
| 		cris_iops->write_io(port, (void *) &data, 2, 1);
 | |
| }
 | |
| static inline void outl(unsigned int data, unsigned int port)
 | |
| {
 | |
| 	if (cris_iops)
 | |
| 		cris_iops->write_io(port, (void *) &data, 4, 1);
 | |
| }
 | |
| static inline void outsb(unsigned int port, const void *addr,
 | |
| 			 unsigned long count)
 | |
| {
 | |
| 	if (cris_iops)
 | |
| 		cris_iops->write_io(port, (void *)addr, 1, count);
 | |
| }
 | |
| static inline void outsw(unsigned int port, const void *addr,
 | |
| 			 unsigned long count)
 | |
| {
 | |
| 	if (cris_iops)
 | |
| 		cris_iops->write_io(port, (void *)addr, 2, count);
 | |
| }
 | |
| static inline void outsl(unsigned int port, const void *addr,
 | |
| 			 unsigned long count)
 | |
| {
 | |
| 	if (cris_iops)
 | |
| 		cris_iops->write_io(port, (void *)addr, 4, count);
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * 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
 | |
| 
 | |
| #endif
 |