X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-h8300%2Fio.h;h=91b7487cb7ae9582cc0d0c3e3d00ab9d7cfec071;hb=refs%2Fheads%2Fvserver;hp=ceef5200c85a42988b3067af824be61197e74f82;hpb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;p=linux-2.6.git diff --git a/include/asm-h8300/io.h b/include/asm-h8300/io.h index ceef5200c..91b7487cb 100644 --- a/include/asm-h8300/io.h +++ b/include/asm-h8300/io.h @@ -3,7 +3,6 @@ #ifdef __KERNEL__ -#include #include #if defined(CONFIG_H83007) || defined(CONFIG_H83068) @@ -35,39 +34,59 @@ static inline unsigned short _swapw(volatile unsigned short v) { - unsigned short r,t; - __asm__("mov.b %w2,%x1\n\t" - "mov.b %x2,%w1\n\t" - "mov.w %1,%0" - :"=r"(r),"=r"(t) - :"r"(v)); +#ifndef H8300_IO_NOSWAP + unsigned short r; + __asm__("xor.b %w0,%x0\n\t" + "xor.b %x0,%w0\n\t" + "xor.b %w0,%x0" + :"=r"(r) + :"0"(v)); return r; +#else + return v; +#endif } -static inline unsigned int _swapl(volatile unsigned long v) +static inline unsigned long _swapl(volatile unsigned long v) { - unsigned int r,t; - __asm__("mov.b %w2,%x1\n\t" - "mov.b %x2,%w1\n\t" - "mov.w %f1,%e0\n\t" - "mov.w %e2,%f1\n\t" - "mov.b %w1,%x0\n\t" - "mov.b %x1,%w0" - :"=r"(r),"=r"(t) - :"r"(v)); +#ifndef H8300_IO_NOSWAP + unsigned long r; + __asm__("xor.b %w0,%x0\n\t" + "xor.b %x0,%w0\n\t" + "xor.b %w0,%x0\n\t" + "xor.w %e0,%f0\n\t" + "xor.w %f0,%e0\n\t" + "xor.w %e0,%f0\n\t" + "xor.b %w0,%x0\n\t" + "xor.b %x0,%w0\n\t" + "xor.b %w0,%x0" + :"=r"(r) + :"0"(v)); return r; +#else + return v; +#endif } #define readb(addr) \ - ({ unsigned char __v = (*(volatile unsigned char *) ((addr) & 0x00ffffff)); __v; }) + ({ unsigned char __v = \ + *(volatile unsigned char *)((unsigned long)(addr) & 0x00ffffff); \ + __v; }) #define readw(addr) \ - ({ unsigned short __v = (*(volatile unsigned short *) ((addr) & 0x00ffffff)); __v; }) + ({ unsigned short __v = \ + *(volatile unsigned short *)((unsigned long)(addr) & 0x00ffffff); \ + __v; }) #define readl(addr) \ - ({ unsigned int __v = (*(volatile unsigned int *) ((addr) & 0x00ffffff)); __v; }) - -#define writeb(b,addr) (void)((*(volatile unsigned char *) ((addr) & 0x00ffffff)) = (b)) -#define writew(b,addr) (void)((*(volatile unsigned short *) ((addr) & 0x00ffffff)) = (b)) -#define writel(b,addr) (void)((*(volatile unsigned int *) ((addr) & 0x00ffffff)) = (b)) + ({ unsigned long __v = \ + *(volatile unsigned long *)((unsigned long)(addr) & 0x00ffffff); \ + __v; }) + +#define writeb(b,addr) (void)((*(volatile unsigned char *) \ + ((unsigned long)(addr) & 0x00ffffff)) = (b)) +#define writew(b,addr) (void)((*(volatile unsigned short *) \ + ((unsigned long)(addr) & 0x00ffffff)) = (b)) +#define writel(b,addr) (void)((*(volatile unsigned long *) \ + ((unsigned long)(addr) & 0x00ffffff)) = (b)) #define readb_relaxed(addr) readb(addr) #define readw_relaxed(addr) readw(addr) #define readl_relaxed(addr) readl(addr) @@ -109,12 +128,28 @@ static inline void io_outsw(unsigned int addr, const void *buf, int len) static inline void io_outsl(unsigned int addr, const void *buf, int len) { - volatile unsigned int *ap = (volatile unsigned int *) addr; + volatile unsigned long *ap = (volatile unsigned long *) addr; unsigned long *bp = (unsigned long *) buf; while (len--) *ap = _swapl(*bp++); } +static inline void io_outsw_noswap(unsigned int addr, const void *buf, int len) +{ + volatile unsigned short *ap = (volatile unsigned short *) addr; + unsigned short *bp = (unsigned short *) buf; + while (len--) + *ap = *bp++; +} + +static inline void io_outsl_noswap(unsigned int addr, const void *buf, int len) +{ + volatile unsigned long *ap = (volatile unsigned long *) addr; + unsigned long *bp = (unsigned long *) buf; + while (len--) + *ap = *bp++; +} + static inline void io_insb(unsigned int addr, void *buf, int len) { volatile unsigned char *ap_b; @@ -142,12 +177,28 @@ static inline void io_insw(unsigned int addr, void *buf, int len) static inline void io_insl(unsigned int addr, void *buf, int len) { - volatile unsigned int *ap = (volatile unsigned int *) addr; + volatile unsigned long *ap = (volatile unsigned long *) addr; unsigned long *bp = (unsigned long *) buf; while (len--) *bp++ = _swapl(*ap); } +static inline void io_insw_noswap(unsigned int addr, void *buf, int len) +{ + volatile unsigned short *ap = (volatile unsigned short *) addr; + unsigned short *bp = (unsigned short *) buf; + while (len--) + *bp++ = *ap; +} + +static inline void io_insl_noswap(unsigned int addr, void *buf, int len) +{ + volatile unsigned long *ap = (volatile unsigned long *) addr; + unsigned long *bp = (unsigned long *) buf; + while (len--) + *bp++ = *ap; +} + /* * make the short names macros so specific devices * can override them as required @@ -157,10 +208,13 @@ static inline void io_insl(unsigned int addr, void *buf, int len) #define memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) #define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) +#define mmiowb() + #define inb(addr) ((h8300_buswidth(addr))?readw((addr) & ~1) & 0xff:readb(addr)) #define inw(addr) _swapw(readw(addr)) #define inl(addr) _swapl(readl(addr)) -#define outb(x,addr) ((void)((h8300_buswidth(addr) && ((addr) & 1))?writew(x,(addr) & ~1):writeb(x,addr))) +#define outb(x,addr) ((void)((h8300_buswidth(addr) && \ + ((addr) & 1))?writew(x,(addr) & ~1):writeb(x,addr))) #define outw(x,addr) ((void) writew(_swapw(x),addr)) #define outl(x,addr) ((void) writel(_swapl(x),addr)) @@ -227,7 +281,7 @@ static __inline__ unsigned short ctrl_inw(unsigned long addr) return *(volatile unsigned short*)addr; } -static __inline__ unsigned int ctrl_inl(unsigned long addr) +static __inline__ unsigned long ctrl_inl(unsigned long addr) { return *(volatile unsigned long*)addr; } @@ -242,7 +296,7 @@ static __inline__ void ctrl_outw(unsigned short b, unsigned long addr) *(volatile unsigned short*)addr = b; } -static __inline__ void ctrl_outl(unsigned int b, unsigned long addr) +static __inline__ void ctrl_outl(unsigned long b, unsigned long addr) { *(volatile unsigned long*)addr = b; } @@ -262,6 +316,17 @@ static __inline__ void ctrl_outl(unsigned int b, unsigned long addr) #define virt_to_bus virt_to_phys #define bus_to_virt phys_to_virt +/* + * 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 /* __KERNEL__ */ #endif /* _H8300_IO_H */