X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-ppc64%2Fio.h;h=46d47573d1a44fa384255a85049d371900cd876f;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=f6262bad7084790e0294822c82bf53077bb3f542;hpb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;p=linux-2.6.git diff --git a/include/asm-ppc64/io.h b/include/asm-ppc64/io.h index f6262bad7..46d47573d 100644 --- a/include/asm-ppc64/io.h +++ b/include/asm-ppc64/io.h @@ -9,6 +9,7 @@ */ #include +#include #include #include #ifdef CONFIG_PPC_ISERIES @@ -17,6 +18,8 @@ #include #include +#include + #define __ide_mm_insw(p, a, c) _insw_ns((volatile u16 *)(p), (a), (c)) #define __ide_mm_insl(p, a, c) _insl_ns((volatile u32 *)(p), (a), (c)) #define __ide_mm_outsw(p, a, c) _outsw_ns((volatile u16 *)(p), (a), (c)) @@ -41,21 +44,22 @@ extern unsigned long pci_io_base; #define __raw_writew(v, addr) { BUG(); 0; } #define __raw_writel(v, addr) { BUG(); 0; } #define __raw_writeq(v, addr) { BUG(); 0; } -#define readb(addr) iSeries_Read_Byte((void*)(addr)) -#define readw(addr) iSeries_Read_Word((void*)(addr)) -#define readl(addr) iSeries_Read_Long((void*)(addr)) -#define writeb(data, addr) iSeries_Write_Byte(data,((void*)(addr))) -#define writew(data, addr) iSeries_Write_Word(data,((void*)(addr))) -#define writel(data, addr) iSeries_Write_Long(data,((void*)(addr))) -#define memset_io(a,b,c) iSeries_memset_io((void *)(a),(b),(c)) -#define memcpy_fromio(a,b,c) iSeries_memcpy_fromio((void *)(a), (void *)(b), (c)) -#define memcpy_toio(a,b,c) iSeries_memcpy_toio((void *)(a), (void *)(b), (c)) -#define inb(addr) readb(((unsigned long)(addr))) -#define inw(addr) readw(((unsigned long)(addr))) -#define inl(addr) readl(((unsigned long)(addr))) -#define outb(data,addr) writeb(data,((unsigned long)(addr))) -#define outw(data,addr) writew(data,((unsigned long)(addr))) -#define outl(data,addr) writel(data,((unsigned long)(addr))) +#define readb(addr) iSeries_Read_Byte(addr) +#define readw(addr) iSeries_Read_Word(addr) +#define readl(addr) iSeries_Read_Long(addr) +#define writeb(data, addr) iSeries_Write_Byte((data),(addr)) +#define writew(data, addr) iSeries_Write_Word((data),(addr)) +#define writel(data, addr) iSeries_Write_Long((data),(addr)) +#define memset_io(a,b,c) iSeries_memset_io((a),(b),(c)) +#define memcpy_fromio(a,b,c) iSeries_memcpy_fromio((a), (b), (c)) +#define memcpy_toio(a,b,c) iSeries_memcpy_toio((a), (b), (c)) + +#define inb(addr) readb(((void __iomem *)(long)(addr))) +#define inw(addr) readw(((void __iomem *)(long)(addr))) +#define inl(addr) readl(((void __iomem *)(long)(addr))) +#define outb(data,addr) writeb(data,((void __iomem *)(long)(addr))) +#define outw(data,addr) writew(data,((void __iomem *)(long)(addr))) +#define outl(data,addr) writel(data,((void __iomem *)(long)(addr))) /* * The *_ns versions below don't do byte-swapping. * Neither do the standard versions now, these are just here @@ -64,25 +68,50 @@ extern unsigned long pci_io_base; #define insw_ns(port, buf, ns) _insw_ns((u16 *)((port)+pci_io_base), (buf), (ns)) #define insl_ns(port, buf, nl) _insl_ns((u32 *)((port)+pci_io_base), (buf), (nl)) #else -#define __raw_readb(addr) (*(volatile unsigned char *)(addr)) -#define __raw_readw(addr) (*(volatile unsigned short *)(addr)) -#define __raw_readl(addr) (*(volatile unsigned int *)(addr)) -#define __raw_readq(addr) (*(volatile unsigned long *)(addr)) -#define __raw_writeb(v, addr) (*(volatile unsigned char *)(addr) = (v)) -#define __raw_writew(v, addr) (*(volatile unsigned short *)(addr) = (v)) -#define __raw_writel(v, addr) (*(volatile unsigned int *)(addr) = (v)) -#define __raw_writeq(v, addr) (*(volatile unsigned long *)(addr) = (v)) -#define readb(addr) eeh_readb((void*)(addr)) -#define readw(addr) eeh_readw((void*)(addr)) -#define readl(addr) eeh_readl((void*)(addr)) -#define readq(addr) eeh_readq((void*)(addr)) -#define writeb(data, addr) eeh_writeb((data), ((void*)(addr))) -#define writew(data, addr) eeh_writew((data), ((void*)(addr))) -#define writel(data, addr) eeh_writel((data), ((void*)(addr))) -#define writeq(data, addr) eeh_writeq((data), ((void*)(addr))) -#define memset_io(a,b,c) eeh_memset_io((void *)(a),(b),(c)) -#define memcpy_fromio(a,b,c) eeh_memcpy_fromio((a),(void *)(b),(c)) -#define memcpy_toio(a,b,c) eeh_memcpy_toio((void *)(a),(b),(c)) + +static inline unsigned char __raw_readb(const volatile void __iomem *addr) +{ + return *(volatile unsigned char __force *)addr; +} +static inline unsigned short __raw_readw(const volatile void __iomem *addr) +{ + return *(volatile unsigned short __force *)addr; +} +static inline unsigned int __raw_readl(const volatile void __iomem *addr) +{ + return *(volatile unsigned int __force *)addr; +} +static inline unsigned long __raw_readq(const volatile void __iomem *addr) +{ + return *(volatile unsigned long __force *)addr; +} +static inline void __raw_writeb(unsigned char v, volatile void __iomem *addr) +{ + *(volatile unsigned char __force *)addr = v; +} +static inline void __raw_writew(unsigned short v, volatile void __iomem *addr) +{ + *(volatile unsigned short __force *)addr = v; +} +static inline void __raw_writel(unsigned int v, volatile void __iomem *addr) +{ + *(volatile unsigned int __force *)addr = v; +} +static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr) +{ + *(volatile unsigned long __force *)addr = v; +} +#define readb(addr) eeh_readb(addr) +#define readw(addr) eeh_readw(addr) +#define readl(addr) eeh_readl(addr) +#define readq(addr) eeh_readq(addr) +#define writeb(data, addr) eeh_writeb((data), (addr)) +#define writew(data, addr) eeh_writew((data), (addr)) +#define writel(data, addr) eeh_writel((data), (addr)) +#define writeq(data, addr) eeh_writeq((data), (addr)) +#define memset_io(a,b,c) eeh_memset_io((a),(b),(c)) +#define memcpy_fromio(a,b,c) eeh_memcpy_fromio((a),(b),(c)) +#define memcpy_toio(a,b,c) eeh_memcpy_toio((a),(b),(c)) #define inb(port) eeh_inb((unsigned long)port) #define outb(val, port) eeh_outb(val, (unsigned long)port) #define inw(port) eeh_inw((unsigned long)port) @@ -149,7 +178,7 @@ extern void _outsl_ns(volatile u32 *port, const void *buf, int nl); #ifdef __KERNEL__ extern int __ioremap_explicit(unsigned long p_addr, unsigned long v_addr, unsigned long size, unsigned long flags); -extern void *__ioremap(unsigned long address, unsigned long size, +extern void __iomem *__ioremap(unsigned long address, unsigned long size, unsigned long flags); /** @@ -163,11 +192,11 @@ extern void *__ioremap(unsigned long address, unsigned long size, * address is not guaranteed to be usable directly as a virtual * address. */ -extern void *ioremap(unsigned long address, unsigned long size); +extern void __iomem *ioremap(unsigned long address, unsigned long size); #define ioremap_nocache(addr, size) ioremap((addr), (size)) -extern int iounmap_explicit(void *addr, unsigned long size); -extern void iounmap(void *addr); +extern int iounmap_explicit(volatile void __iomem *addr, unsigned long size); +extern void iounmap(volatile void __iomem *addr); extern void * reserve_phb_iospace(unsigned long size); /** @@ -377,7 +406,7 @@ static inline void out_be64(volatile unsigned long *addr, unsigned long val) * address should have been obtained by ioremap. * Returns 1 on a match. */ -static inline int check_signature(unsigned long io_addr, +static inline int check_signature(const volatile void __iomem * io_addr, const unsigned char *signature, int length) { int retval = 0;