X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-sparc%2Fio.h;h=f98570f54b53472ab9b4c01f46a3d177af8ffdde;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=30328ee80d048ed867877f0d0a4f4022b01dc955;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/include/asm-sparc/io.h b/include/asm-sparc/io.h index 30328ee80..f98570f54 100644 --- a/include/asm-sparc/io.h +++ b/include/asm-sparc/io.h @@ -23,89 +23,82 @@ static inline u16 flip_word (u16 w) return ((w&0xff) << 8) | ((w>>8)&0xff); } +#define mmiowb() + /* * Memory mapped I/O to PCI - * - * Observe that ioremap returns void* cookie, but accessors, such - * as readb, take unsigned long as address, by API. This mismatch - * happened historically. The ioremap is much older than accessors, - * so at one time ioremap's cookie was used as address (*a = val). - * When accessors came about, they were designed to be compatible across - * buses, so that drivers can select proper ones like sunhme.c did. - * To make that easier, they use same aruments (ulong) for sbus, pci, isa. - * The offshot is, we must cast readb et. al. arguments with a #define. */ -static inline u8 __raw_readb(unsigned long addr) +static inline u8 __raw_readb(const volatile void __iomem *addr) { - return *(volatile u8 *)addr; + return *(__force volatile u8 *)addr; } -static inline u16 __raw_readw(unsigned long addr) +static inline u16 __raw_readw(const volatile void __iomem *addr) { - return *(volatile u16 *)addr; + return *(__force volatile u16 *)addr; } -static inline u32 __raw_readl(unsigned long addr) +static inline u32 __raw_readl(const volatile void __iomem *addr) { - return *(volatile u32 *)addr; + return *(__force volatile u32 *)addr; } -static inline void __raw_writeb(u8 b, unsigned long addr) +static inline void __raw_writeb(u8 b, volatile void __iomem *addr) { - *(volatile u8 *)addr = b; + *(__force volatile u8 *)addr = b; } -static inline void __raw_writew(u16 w, unsigned long addr) +static inline void __raw_writew(u16 w, volatile void __iomem *addr) { - *(volatile u16 *)addr = w; + *(__force volatile u16 *)addr = w; } -static inline void __raw_writel(u32 l, unsigned long addr) +static inline void __raw_writel(u32 l, volatile void __iomem *addr) { - *(volatile u32 *)addr = l; + *(__force volatile u32 *)addr = l; } -static inline u8 __readb(unsigned long addr) +static inline u8 __readb(const volatile void __iomem *addr) { - return *(volatile u8 *)addr; + return *(__force volatile u8 *)addr; } -static inline u16 __readw(unsigned long addr) +static inline u16 __readw(const volatile void __iomem *addr) { - return flip_word(*(volatile u16 *)addr); + return flip_word(*(__force volatile u16 *)addr); } -static inline u32 __readl(unsigned long addr) +static inline u32 __readl(const volatile void __iomem *addr) { - return flip_dword(*(volatile u32 *)addr); + return flip_dword(*(__force volatile u32 *)addr); } -static inline void __writeb(u8 b, unsigned long addr) +static inline void __writeb(u8 b, volatile void __iomem *addr) { - *(volatile u8 *)addr = b; + *(__force volatile u8 *)addr = b; } -static inline void __writew(u16 w, unsigned long addr) +static inline void __writew(u16 w, volatile void __iomem *addr) { - *(volatile u16 *)addr = flip_word(w); + *(__force volatile u16 *)addr = flip_word(w); } -static inline void __writel(u32 l, unsigned long addr) +static inline void __writel(u32 l, volatile void __iomem *addr) { - *(volatile u32 *)addr = flip_dword(l); + *(__force volatile u32 *)addr = flip_dword(l); } -#define readb(__addr) __readb((unsigned long)(__addr)) -#define readw(__addr) __readw((unsigned long)(__addr)) -#define readl(__addr) __readl((unsigned long)(__addr)) +#define readb(__addr) __readb(__addr) +#define readw(__addr) __readw(__addr) +#define readl(__addr) __readl(__addr) #define readb_relaxed(__addr) readb(__addr) #define readw_relaxed(__addr) readw(__addr) #define readl_relaxed(__addr) readl(__addr) -#define writeb(__b, __addr) __writeb((__b),(unsigned long)(__addr)) -#define writew(__w, __addr) __writew((__w),(unsigned long)(__addr)) -#define writel(__l, __addr) __writel((__l),(unsigned long)(__addr)) +#define writeb(__b, __addr) __writeb((__b),(__addr)) +#define writew(__w, __addr) __writew((__w),(__addr)) +#define writel(__l, __addr) __writel((__l),(__addr)) /* * I/O space operations @@ -124,15 +117,15 @@ static inline void __writel(u32 l, unsigned long addr) * mapped somewhere into virtual kernel space and we * can use inb/outb again. */ -#define inb_local(__addr) __readb((unsigned long)(__addr)) -#define inb(__addr) __readb((unsigned long)(__addr)) -#define inw(__addr) __readw((unsigned long)(__addr)) -#define inl(__addr) __readl((unsigned long)(__addr)) +#define inb_local(__addr) __readb((void __iomem *)(unsigned long)(__addr)) +#define inb(__addr) __readb((void __iomem *)(unsigned long)(__addr)) +#define inw(__addr) __readw((void __iomem *)(unsigned long)(__addr)) +#define inl(__addr) __readl((void __iomem *)(unsigned long)(__addr)) -#define outb_local(__b, __addr) __writeb(__b, (unsigned long)(__addr)) -#define outb(__b, __addr) __writeb(__b, (unsigned long)(__addr)) -#define outw(__w, __addr) __writew(__w, (unsigned long)(__addr)) -#define outl(__l, __addr) __writel(__l, (unsigned long)(__addr)) +#define outb_local(__b, __addr) __writeb(__b, (void __iomem *)(unsigned long)(__addr)) +#define outb(__b, __addr) __writeb(__b, (void __iomem *)(unsigned long)(__addr)) +#define outw(__w, __addr) __writew(__w, (void __iomem *)(unsigned long)(__addr)) +#define outl(__l, __addr) __writel(__l, (void __iomem *)(unsigned long)(__addr)) #define inb_p(__addr) inb(__addr) #define outb_p(__b, __addr) outb(__b, __addr) @@ -141,12 +134,12 @@ static inline void __writel(u32 l, unsigned long addr) #define inl_p(__addr) inl(__addr) #define outl_p(__l, __addr) outl(__l, __addr) -extern void outsb(unsigned long addr, const void *src, unsigned long cnt); -extern void outsw(unsigned long addr, const void *src, unsigned long cnt); -extern void outsl(unsigned long addr, const void *src, unsigned long cnt); -extern void insb(unsigned long addr, void *dst, unsigned long count); -extern void insw(unsigned long addr, void *dst, unsigned long count); -extern void insl(unsigned long addr, void *dst, unsigned long count); +void outsb(unsigned long addr, const void *src, unsigned long cnt); +void outsw(unsigned long addr, const void *src, unsigned long cnt); +void outsl(unsigned long addr, const void *src, unsigned long cnt); +void insb(unsigned long addr, void *dst, unsigned long count); +void insw(unsigned long addr, void *dst, unsigned long count); +void insl(unsigned long addr, void *dst, unsigned long count); #define IO_SPACE_LIMIT 0xffffffff @@ -156,73 +149,112 @@ extern void insl(unsigned long addr, void *dst, unsigned long count); * SBus has only one, memory mapped, I/O space. * We do not need to flip bytes for SBus of course. */ -static inline u8 _sbus_readb(unsigned long addr) +static inline u8 _sbus_readb(const volatile void __iomem *addr) { - return *(volatile u8 *)addr; + return *(__force volatile u8 *)addr; } -static inline u16 _sbus_readw(unsigned long addr) +static inline u16 _sbus_readw(const volatile void __iomem *addr) { - return *(volatile u16 *)addr; + return *(__force volatile u16 *)addr; } -static inline u32 _sbus_readl(unsigned long addr) +static inline u32 _sbus_readl(const volatile void __iomem *addr) { - return *(volatile u32 *)addr; + return *(__force volatile u32 *)addr; } -static inline void _sbus_writeb(u8 b, unsigned long addr) +static inline void _sbus_writeb(u8 b, volatile void __iomem *addr) { - *(volatile u8 *)addr = b; + *(__force volatile u8 *)addr = b; } -static inline void _sbus_writew(u16 w, unsigned long addr) +static inline void _sbus_writew(u16 w, volatile void __iomem *addr) { - *(volatile u16 *)addr = w; + *(__force volatile u16 *)addr = w; } -static inline void _sbus_writel(u32 l, unsigned long addr) +static inline void _sbus_writel(u32 l, volatile void __iomem *addr) { - *(volatile u32 *)addr = l; + *(__force volatile u32 *)addr = l; } /* * The only reason for #define's is to hide casts to unsigned long. */ -#define sbus_readb(__addr) _sbus_readb((unsigned long)(__addr)) -#define sbus_readw(__addr) _sbus_readw((unsigned long)(__addr)) -#define sbus_readl(__addr) _sbus_readl((unsigned long)(__addr)) -#define sbus_writeb(__b, __addr) _sbus_writeb(__b, (unsigned long)(__addr)) -#define sbus_writew(__w, __addr) _sbus_writew(__w, (unsigned long)(__addr)) -#define sbus_writel(__l, __addr) _sbus_writel(__l, (unsigned long)(__addr)) +#define sbus_readb(__addr) _sbus_readb(__addr) +#define sbus_readw(__addr) _sbus_readw(__addr) +#define sbus_readl(__addr) _sbus_readl(__addr) +#define sbus_writeb(__b, __addr) _sbus_writeb(__b, __addr) +#define sbus_writew(__w, __addr) _sbus_writew(__w, __addr) +#define sbus_writel(__l, __addr) _sbus_writel(__l, __addr) + +static inline void sbus_memset_io(volatile void __iomem *__dst, int c, __kernel_size_t n) +{ + while(n--) { + sbus_writeb(c, __dst); + __dst++; + } +} -static inline void *sbus_memset_io(void *__dst, int c, __kernel_size_t n) +static inline void +_memset_io(volatile void __iomem *dst, int c, __kernel_size_t n) { - unsigned long dst = (unsigned long)__dst; + volatile void __iomem *d = dst; - while(n--) { - sbus_writeb(c, dst); - dst++; + while (n--) { + writeb(c, d); + d++; + } +} + +#define memset_io(d,c,sz) _memset_io(d,c,sz) + +static inline void +_memcpy_fromio(void *dst, const volatile void __iomem *src, __kernel_size_t n) +{ + char *d = dst; + + while (n--) { + char tmp = readb(src); + *d++ = tmp; + src++; + } +} + +#define memcpy_fromio(d,s,sz) _memcpy_fromio(d,s,sz) + +static inline void +_memcpy_toio(volatile void __iomem *dst, const void *src, __kernel_size_t n) +{ + const char *s = src; + volatile void __iomem *d = dst; + + while (n--) { + char tmp = *s++; + writeb(tmp, d); + d++; } - return (void *) dst; } +#define memcpy_toio(d,s,sz) _memcpy_toio(d,s,sz) + #ifdef __KERNEL__ /* * Bus number may be embedded in the higher bits of the physical address. * This is why we have no bus number argument to ioremap(). */ -extern void *ioremap(unsigned long offset, unsigned long size); +extern void __iomem *ioremap(unsigned long offset, unsigned long size); #define ioremap_nocache(X,Y) ioremap((X),(Y)) -extern void iounmap(void *addr); +extern void iounmap(volatile void __iomem *addr); /* * Bus number may be in res->flags... somewhere. */ -extern unsigned long sbus_ioremap(struct resource *res, unsigned long offset, +extern void __iomem *sbus_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); -extern void sbus_iounmap(unsigned long vaddr, unsigned long size); +extern void sbus_iounmap(volatile void __iomem *vaddr, unsigned long size); /*