X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=arch%2Fsh%2Fkernel%2Fio_generic.c;h=e1e1dbd195579e5cacc7a5437020a75bcc695757;hb=a1004d8e3d463012f231bab104325ecb15637f78;hp=a911b0149d1fc37161e4452e8a10981afb062eea;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;p=safe%2Fjmp%2Flinux-2.6 diff --git a/arch/sh/kernel/io_generic.c b/arch/sh/kernel/io_generic.c index a911b01..e1e1dbd 100644 --- a/arch/sh/kernel/io_generic.c +++ b/arch/sh/kernel/io_generic.c @@ -1,8 +1,8 @@ -/* $Id: io_generic.c,v 1.2 2003/05/04 19:29:53 lethal Exp $ - * - * linux/arch/sh/kernel/io_generic.c +/* + * arch/sh/kernel/io_generic.c * * Copyright (C) 2000 Niibe Yutaka + * Copyright (C) 2005 - 2007 Paul Mundt * * Generic I/O routine. These can be used where a machine specific version * is not required. @@ -10,64 +10,58 @@ * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. - * */ - -#include -#include #include +#include +#include -#if defined(CONFIG_CPU_SH3) +#ifdef CONFIG_CPU_SH3 +/* SH3 has a PCMCIA bug that needs a dummy read from area 6 for a + * workaround. */ /* I'm not sure SH7709 has this kind of bug */ -#define SH3_PCMCIA_BUG_WORKAROUND 1 -#define DUMMY_READ_AREA6 0xba000000 +#define dummy_read() __raw_readb(0xba000000) +#else +#define dummy_read() #endif -#define PORT2ADDR(x) (sh_mv.mv_isa_port2addr(x)) - -unsigned long generic_io_base; +unsigned long generic_io_base = 0; -static inline void delay(void) +u8 generic_inb(unsigned long port) { - ctrl_inw(0xa0000000); + return __raw_readb(__ioport_map(port, 1)); } -unsigned char generic_inb(unsigned long port) +u16 generic_inw(unsigned long port) { - return *(volatile unsigned char*)PORT2ADDR(port); + return __raw_readw(__ioport_map(port, 2)); } -unsigned short generic_inw(unsigned long port) +u32 generic_inl(unsigned long port) { - return *(volatile unsigned short*)PORT2ADDR(port); + return __raw_readl(__ioport_map(port, 4)); } -unsigned int generic_inl(unsigned long port) +u8 generic_inb_p(unsigned long port) { - return *(volatile unsigned long*)PORT2ADDR(port); -} - -unsigned char generic_inb_p(unsigned long port) -{ - unsigned long v = *(volatile unsigned char*)PORT2ADDR(port); + unsigned long v = generic_inb(port); - delay(); + ctrl_delay(); return v; } -unsigned short generic_inw_p(unsigned long port) +u16 generic_inw_p(unsigned long port) { - unsigned long v = *(volatile unsigned short*)PORT2ADDR(port); + unsigned long v = generic_inw(port); - delay(); + ctrl_delay(); return v; } -unsigned int generic_inl_p(unsigned long port) +u32 generic_inl_p(unsigned long port) { - unsigned long v = *(volatile unsigned long*)PORT2ADDR(port); + unsigned long v = generic_inl(port); - delay(); + ctrl_delay(); return v; } @@ -77,76 +71,55 @@ unsigned int generic_inl_p(unsigned long port) * convert the port address to real address once. */ -void generic_insb(unsigned long port, void *buffer, unsigned long count) +void generic_insb(unsigned long port, void *dst, unsigned long count) { - volatile unsigned char *port_addr; - unsigned char *buf=buffer; - - port_addr = (volatile unsigned char *)PORT2ADDR(port); - - while(count--) - *buf++ = *port_addr; + __raw_readsb(__ioport_map(port, 1), dst, count); + dummy_read(); } -void generic_insw(unsigned long port, void *buffer, unsigned long count) +void generic_insw(unsigned long port, void *dst, unsigned long count) { - volatile unsigned short *port_addr; - unsigned short *buf=buffer; - - port_addr = (volatile unsigned short *)PORT2ADDR(port); - - while(count--) - *buf++ = *port_addr; -#ifdef SH3_PCMCIA_BUG_WORKAROUND - ctrl_inb (DUMMY_READ_AREA6); -#endif + __raw_readsw(__ioport_map(port, 2), dst, count); + dummy_read(); } -void generic_insl(unsigned long port, void *buffer, unsigned long count) +void generic_insl(unsigned long port, void *dst, unsigned long count) { - volatile unsigned long *port_addr; - unsigned long *buf=buffer; - - port_addr = (volatile unsigned long *)PORT2ADDR(port); - - while(count--) - *buf++ = *port_addr; -#ifdef SH3_PCMCIA_BUG_WORKAROUND - ctrl_inb (DUMMY_READ_AREA6); -#endif + __raw_readsl(__ioport_map(port, 4), dst, count); + dummy_read(); } -void generic_outb(unsigned char b, unsigned long port) +void generic_outb(u8 b, unsigned long port) { - *(volatile unsigned char*)PORT2ADDR(port) = b; + __raw_writeb(b, __ioport_map(port, 1)); } -void generic_outw(unsigned short b, unsigned long port) +void generic_outw(u16 b, unsigned long port) { - *(volatile unsigned short*)PORT2ADDR(port) = b; + __raw_writew(b, __ioport_map(port, 2)); } -void generic_outl(unsigned int b, unsigned long port) +void generic_outl(u32 b, unsigned long port) { - *(volatile unsigned long*)PORT2ADDR(port) = b; + __raw_writel(b, __ioport_map(port, 4)); } -void generic_outb_p(unsigned char b, unsigned long port) +void generic_outb_p(u8 b, unsigned long port) { - *(volatile unsigned char*)PORT2ADDR(port) = b; - delay(); + generic_outb(b, port); + ctrl_delay(); } -void generic_outw_p(unsigned short b, unsigned long port) +void generic_outw_p(u16 b, unsigned long port) { - *(volatile unsigned short*)PORT2ADDR(port) = b; - delay(); + generic_outw(b, port); + ctrl_delay(); } -void generic_outl_p(unsigned int b, unsigned long port) +void generic_outl_p(u32 b, unsigned long port) { - *(volatile unsigned long*)PORT2ADDR(port) = b; - delay(); + generic_outl(b, port); + ctrl_delay(); } /* @@ -154,90 +127,34 @@ void generic_outl_p(unsigned int b, unsigned long port) * address. However as the port address doesn't change we only need to * convert the port address to real address once. */ - -void generic_outsb(unsigned long port, const void *buffer, unsigned long count) -{ - volatile unsigned char *port_addr; - const unsigned char *buf=buffer; - - port_addr = (volatile unsigned char *)PORT2ADDR(port); - - while(count--) - *port_addr = *buf++; -} - -void generic_outsw(unsigned long port, const void *buffer, unsigned long count) -{ - volatile unsigned short *port_addr; - const unsigned short *buf=buffer; - - port_addr = (volatile unsigned short *)PORT2ADDR(port); - - while(count--) - *port_addr = *buf++; - -#ifdef SH3_PCMCIA_BUG_WORKAROUND - ctrl_inb (DUMMY_READ_AREA6); -#endif -} - -void generic_outsl(unsigned long port, const void *buffer, unsigned long count) -{ - volatile unsigned long *port_addr; - const unsigned long *buf=buffer; - - port_addr = (volatile unsigned long *)PORT2ADDR(port); - - while(count--) - *port_addr = *buf++; - -#ifdef SH3_PCMCIA_BUG_WORKAROUND - ctrl_inb (DUMMY_READ_AREA6); -#endif -} - -unsigned char generic_readb(unsigned long addr) +void generic_outsb(unsigned long port, const void *src, unsigned long count) { - return *(volatile unsigned char*)addr; + __raw_writesb(__ioport_map(port, 1), src, count); + dummy_read(); } -unsigned short generic_readw(unsigned long addr) +void generic_outsw(unsigned long port, const void *src, unsigned long count) { - return *(volatile unsigned short*)addr; + __raw_writesw(__ioport_map(port, 2), src, count); + dummy_read(); } -unsigned int generic_readl(unsigned long addr) +void generic_outsl(unsigned long port, const void *src, unsigned long count) { - return *(volatile unsigned long*)addr; + __raw_writesl(__ioport_map(port, 4), src, count); + dummy_read(); } -void generic_writeb(unsigned char b, unsigned long addr) +void __iomem *generic_ioport_map(unsigned long addr, unsigned int size) { - *(volatile unsigned char*)addr = b; -} - -void generic_writew(unsigned short b, unsigned long addr) -{ - *(volatile unsigned short*)addr = b; -} - -void generic_writel(unsigned int b, unsigned long addr) -{ - *(volatile unsigned long*)addr = b; -} - -void * generic_ioremap(unsigned long offset, unsigned long size) -{ - return (void *) P2SEGADDR(offset); -} -EXPORT_SYMBOL(generic_ioremap); +#ifdef P1SEG + if (PXSEG(addr) >= P1SEG) + return (void __iomem *)addr; +#endif -void generic_iounmap(void *addr) -{ + return (void __iomem *)(addr + generic_io_base); } -EXPORT_SYMBOL(generic_iounmap); -unsigned long generic_isa_port2addr(unsigned long offset) +void generic_ioport_unmap(void __iomem *addr) { - return offset + generic_io_base; }