diff options
Diffstat (limited to 'arch/sh/kernel/io.c')
| -rw-r--r-- | arch/sh/kernel/io.c | 165 |
1 files changed, 69 insertions, 96 deletions
diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c index 501fe03e371..5c51b794ba2 100644 --- a/arch/sh/kernel/io.c +++ b/arch/sh/kernel/io.c @@ -1,141 +1,114 @@ /* - * linux/arch/sh/kernel/io.c + * arch/sh/kernel/io.c - Machine independent I/O functions. * - * Copyright (C) 2000 Stuart Menefy + * Copyright (C) 2000 - 2009 Stuart Menefy * Copyright (C) 2005 Paul Mundt * - * Provide real functions which expand to whatever the header file defined. - * Also definitions of machine independent IO functions. - * * 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 <linux/module.h> +#include <linux/pci.h> #include <asm/machvec.h> #include <asm/io.h> /* * Copy data from IO memory space to "real" memory space. - * This needs to be optimized. - */ -void memcpy_fromio(void *to, volatile void __iomem *from, unsigned long count) -{ - char *p = to; - while (count) { - count--; - *p = readb((void __iomem *)from); - p++; - from++; - } -} -EXPORT_SYMBOL(memcpy_fromio); - -/* - * Copy data from "real" memory space to IO memory space. - * This needs to be optimized. - */ -void memcpy_toio(volatile void __iomem *to, const void *from, unsigned long count) -{ - const char *p = from; - while (count) { - count--; - writeb(*p, (void __iomem *)to); - p++; - to++; - } -} -EXPORT_SYMBOL(memcpy_toio); - -/* - * "memset" on IO memory space. - * This needs to be optimized. */ -void memset_io(volatile void __iomem *dst, int c, unsigned long count) +void memcpy_fromio(void *to, const volatile void __iomem *from, unsigned long count) { - while (count) { - count--; - writeb(c, (void __iomem *)dst); - dst++; - } -} -EXPORT_SYMBOL(memset_io); - -void __raw_readsl(unsigned long addr, void *datap, int len) -{ - u32 *data; - - for (data = datap; (len != 0) && (((u32)data & 0x1f) != 0); len--) - *data++ = ctrl_inl(addr); - - if (likely(len >= (0x20 >> 2))) { + /* + * Would it be worthwhile doing byte and long transfers first + * to try and get aligned? + */ +#ifdef CONFIG_CPU_SH4 + if ((count >= 0x20) && + (((u32)to & 0x1f) == 0) && (((u32)from & 0x3) == 0)) { int tmp2, tmp3, tmp4, tmp5, tmp6; __asm__ __volatile__( "1: \n\t" - "mov.l @%7, r0 \n\t" - "mov.l @%7, %2 \n\t" -#ifdef CONFIG_CPU_SH4 + "mov.l @%7+, r0 \n\t" + "mov.l @%7+, %2 \n\t" "movca.l r0, @%0 \n\t" -#else - "mov.l r0, @%0 \n\t" -#endif - "mov.l @%7, %3 \n\t" - "mov.l @%7, %4 \n\t" - "mov.l @%7, %5 \n\t" - "mov.l @%7, %6 \n\t" - "mov.l @%7, r7 \n\t" - "mov.l @%7, r0 \n\t" + "mov.l @%7+, %3 \n\t" + "mov.l @%7+, %4 \n\t" + "mov.l @%7+, %5 \n\t" + "mov.l @%7+, %6 \n\t" + "mov.l @%7+, r7 \n\t" + "mov.l @%7+, r0 \n\t" "mov.l %2, @(0x04,%0) \n\t" - "mov #0x20>>2, %2 \n\t" + "mov #0x20, %2 \n\t" "mov.l %3, @(0x08,%0) \n\t" "sub %2, %1 \n\t" "mov.l %4, @(0x0c,%0) \n\t" - "cmp/hi %1, %2 ! T if 32 > len \n\t" + "cmp/hi %1, %2 ! T if 32 > count \n\t" "mov.l %5, @(0x10,%0) \n\t" "mov.l %6, @(0x14,%0) \n\t" "mov.l r7, @(0x18,%0) \n\t" "mov.l r0, @(0x1c,%0) \n\t" "bf.s 1b \n\t" " add #0x20, %0 \n\t" - : "=&r" (data), "=&r" (len), + : "=&r" (to), "=&r" (count), "=&r" (tmp2), "=&r" (tmp3), "=&r" (tmp4), - "=&r" (tmp5), "=&r" (tmp6) - : "r"(addr), "0" (data), "1" (len) + "=&r" (tmp5), "=&r" (tmp6), "=&r" (from) + : "7"(from), "0" (to), "1" (count) : "r0", "r7", "t", "memory"); } +#endif + + if ((((u32)to | (u32)from) & 0x3) == 0) { + for (; count > 3; count -= 4) { + *(u32 *)to = *(volatile u32 *)from; + to += 4; + from += 4; + } + } + + for (; count > 0; count--) { + *(u8 *)to = *(volatile u8 *)from; + to++; + from++; + } - for (; len != 0; len--) - *data++ = ctrl_inl(addr); + mb(); } -EXPORT_SYMBOL(__raw_readsl); +EXPORT_SYMBOL(memcpy_fromio); -void __raw_writesl(unsigned long addr, const void *data, int len) +/* + * Copy data from "real" memory space to IO memory space. + */ +void memcpy_toio(volatile void __iomem *to, const void *from, unsigned long count) { - if (likely(len != 0)) { - int tmp1; + if ((((u32)to | (u32)from) & 0x3) == 0) { + for ( ; count > 3; count -= 4) { + *(volatile u32 *)to = *(u32 *)from; + to += 4; + from += 4; + } + } - __asm__ __volatile__ ( - "1: \n\t" - "mov.l @%0+, %1 \n\t" - "dt %3 \n\t" - "bf.s 1b \n\t" - " mov.l %1, @%4 \n\t" - : "=&r" (data), "=&r" (tmp1) - : "0" (data), "r" (len), "r"(addr) - : "t", "memory"); + for (; count > 0; count--) { + *(volatile u8 *)to = *(u8 *)from; + to++; + from++; } -} -EXPORT_SYMBOL(__raw_writesl); -void __iomem *ioport_map(unsigned long port, unsigned int nr) -{ - return sh_mv.mv_ioport_map(port, nr); + mb(); } -EXPORT_SYMBOL(ioport_map); +EXPORT_SYMBOL(memcpy_toio); -void ioport_unmap(void __iomem *addr) +/* + * "memset" on IO memory space. + * This needs to be optimized. + */ +void memset_io(volatile void __iomem *dst, int c, unsigned long count) { - sh_mv.mv_ioport_unmap(addr); + while (count) { + count--; + writeb(c, dst); + dst++; + } } -EXPORT_SYMBOL(ioport_unmap); +EXPORT_SYMBOL(memset_io); |