fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-frv / io.h

diff --git a/include/asm-frv/io.h b/include/asm-frv/io.h
index 48829f7..20e44fe 100644 (file)
--- a/include/asm-frv/io.h
+++ b/include/asm-frv/io.h
@@ -17,7 +17,7 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
+#include <linux/types.h>
 #include <asm/virtconvert.h>
 #include <asm/string.h>
 #include <asm/mb-regs.h>
@@ -40,13 +40,13 @@ static inline unsigned long _swapl(unsigned long v)
 //#define __iormb() asm volatile("membar")
 //#define __iowmb() asm volatile("membar")
 
-#define __raw_readb(addr) __builtin_read8((void *) (addr))
-#define __raw_readw(addr) __builtin_read16((void *) (addr))
-#define __raw_readl(addr) __builtin_read32((void *) (addr))
+#define __raw_readb __builtin_read8
+#define __raw_readw __builtin_read16
+#define __raw_readl __builtin_read32
 
-#define __raw_writeb(datum, addr) __builtin_write8((void *) (addr), datum)
-#define __raw_writew(datum, addr) __builtin_write16((void *) (addr), datum)
-#define __raw_writel(datum, addr) __builtin_write32((void *) (addr), datum)
+#define __raw_writeb(datum, addr) __builtin_write8(addr, datum)
+#define __raw_writew(datum, addr) __builtin_write16(addr, datum)
+#define __raw_writel(datum, addr) __builtin_write32(addr, datum)
 
 static inline void io_outsb(unsigned int addr, const void *buf, int len)
 {
@@ -104,6 +104,8 @@ static inline void __insl(unsigned long addr, void *buf, int len, int swap)
                __insl_sw(addr, buf, len);
 }
 
+#define mmiowb() mb()
+
 /*
  *     make the short names macros so specific devices
  *     can override them as required
@@ -114,7 +116,7 @@ static inline void memset_io(volatile void __iomem *addr, unsigned char val, int
        memset((void __force *) addr, val, count);
 }
 
-static inline void memcpy_fromio(void *dst, volatile void __iomem *src, int count)
+static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, int count)
 {
        memcpy(dst, (void __force *) src, count);
 }
@@ -126,12 +128,12 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int
 
 static inline uint8_t inb(unsigned long addr)
 {
-       return __builtin_read8((void *)addr);
+       return __builtin_read8((void __iomem *)addr);
 }
 
 static inline uint16_t inw(unsigned long addr)
 {
-       uint16_t ret = __builtin_read16((void *)addr);
+       uint16_t ret = __builtin_read16((void __iomem *)addr);
 
        if (__is_PCI_IO(addr))
                ret = _swapw(ret);
@@ -141,7 +143,7 @@ static inline uint16_t inw(unsigned long addr)
 
 static inline uint32_t inl(unsigned long addr)
 {
-       uint32_t ret = __builtin_read32((void *)addr);
+       uint32_t ret = __builtin_read32((void __iomem *)addr);
 
        if (__is_PCI_IO(addr))
                ret = _swapl(ret);
@@ -151,21 +153,21 @@ static inline uint32_t inl(unsigned long addr)
 
 static inline void outb(uint8_t datum, unsigned long addr)
 {
-       __builtin_write8((void *)addr, datum);
+       __builtin_write8((void __iomem *)addr, datum);
 }
 
 static inline void outw(uint16_t datum, unsigned long addr)
 {
        if (__is_PCI_IO(addr))
                datum = _swapw(datum);
-       __builtin_write16((void *)addr, datum);
+       __builtin_write16((void __iomem *)addr, datum);
 }
 
 static inline void outl(uint32_t datum, unsigned long addr)
 {
        if (__is_PCI_IO(addr))
                datum = _swapl(datum);
-       __builtin_write32((void *)addr, datum);
+       __builtin_write32((void __iomem *)addr, datum);
 }
 
 #define inb_p(addr)    inb(addr)
@@ -187,12 +189,12 @@ static inline void outl(uint32_t datum, unsigned long addr)
 
 static inline uint8_t readb(const volatile void __iomem *addr)
 {
-       return __builtin_read8((volatile uint8_t __force *) addr);
+       return __builtin_read8((__force void volatile __iomem *) addr);
 }
 
 static inline uint16_t readw(const volatile void __iomem *addr)
 {
-       uint16_t ret =  __builtin_read16((volatile uint16_t __force *)addr);
+       uint16_t ret =  __builtin_read16((__force void volatile __iomem *)addr);
 
        if (__is_PCI_MEM(addr))
                ret = _swapw(ret);
@@ -201,7 +203,7 @@ static inline uint16_t readw(const volatile void __iomem *addr)
 
 static inline uint32_t readl(const volatile void __iomem *addr)
 {
-       uint32_t ret =  __builtin_read32((volatile uint32_t __force *)addr);
+       uint32_t ret =  __builtin_read32((__force void volatile __iomem *)addr);
 
        if (__is_PCI_MEM(addr))
                ret = _swapl(ret);
@@ -209,9 +211,13 @@ static inline uint32_t readl(const volatile void __iomem *addr)
        return ret;
 }
 
+#define readb_relaxed readb
+#define readw_relaxed readw
+#define readl_relaxed readl
+
 static inline void writeb(uint8_t datum, volatile void __iomem *addr)
 {
-       __builtin_write8((volatile uint8_t __force *) addr, datum);
+       __builtin_write8(addr, datum);
        if (__is_PCI_MEM(addr))
                __flush_PCI_writes();
 }
@@ -221,7 +227,7 @@ static inline void writew(uint16_t datum, volatile void __iomem *addr)
        if (__is_PCI_MEM(addr))
                datum = _swapw(datum);
 
-       __builtin_write16((volatile uint16_t __force *) addr, datum);
+       __builtin_write16(addr, datum);
        if (__is_PCI_MEM(addr))
                __flush_PCI_writes();
 }
@@ -231,7 +237,7 @@ static inline void writel(uint32_t datum, volatile void __iomem *addr)
        if (__is_PCI_MEM(addr))
                datum = _swapl(datum);
 
-       __builtin_write32((volatile uint32_t __force *) addr, datum);
+       __builtin_write32(addr, datum);
        if (__is_PCI_MEM(addr))
                __flush_PCI_writes();
 }
@@ -244,7 +250,6 @@ static inline void writel(uint32_t datum, volatile void __iomem *addr)
 #define IOMAP_WRITETHROUGH             3
 
 extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag);
-extern void __iounmap(void __iomem *addr, unsigned long size);
 
 static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size)
 {
@@ -266,13 +271,108 @@ static inline void __iomem *ioremap_fullcache(unsigned long physaddr, unsigned l
        return __ioremap(physaddr, size, IOMAP_FULL_CACHING);
 }
 
-extern void iounmap(void __iomem *addr);
+extern void iounmap(void volatile __iomem *addr);
+
+static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
+{
+       return (void __iomem *) port;
+}
+
+static inline void ioport_unmap(void __iomem *p)
+{
+}
 
 static inline void flush_write_buffers(void)
 {
        __asm__ __volatile__ ("membar" : : :"memory");
 }
 
+/*
+ * do appropriate I/O accesses for token type
+ */
+static inline unsigned int ioread8(void __iomem *p)
+{
+       return __builtin_read8(p);
+}
+
+static inline unsigned int ioread16(void __iomem *p)
+{
+       uint16_t ret = __builtin_read16(p);
+       if (__is_PCI_addr(p))
+               ret = _swapw(ret);
+       return ret;
+}
+
+static inline unsigned int ioread32(void __iomem *p)
+{
+       uint32_t ret = __builtin_read32(p);
+       if (__is_PCI_addr(p))
+               ret = _swapl(ret);
+       return ret;
+}
+
+static inline void iowrite8(u8 val, void __iomem *p)
+{
+       __builtin_write8(p, val);
+       if (__is_PCI_MEM(p))
+               __flush_PCI_writes();
+}
+
+static inline void iowrite16(u16 val, void __iomem *p)
+{
+       if (__is_PCI_addr(p))
+               val = _swapw(val);
+       __builtin_write16(p, val);
+       if (__is_PCI_MEM(p))
+               __flush_PCI_writes();
+}
+
+static inline void iowrite32(u32 val, void __iomem *p)
+{
+       if (__is_PCI_addr(p))
+               val = _swapl(val);
+       __builtin_write32(p, val);
+       if (__is_PCI_MEM(p))
+               __flush_PCI_writes();
+}
+
+static inline void ioread8_rep(void __iomem *p, void *dst, unsigned long count)
+{
+       io_insb((unsigned long) p, dst, count);
+}
+
+static inline void ioread16_rep(void __iomem *p, void *dst, unsigned long count)
+{
+       io_insw((unsigned long) p, dst, count);
+}
+
+static inline void ioread32_rep(void __iomem *p, void *dst, unsigned long count)
+{
+       __insl_ns((unsigned long) p, dst, count);
+}
+
+static inline void iowrite8_rep(void __iomem *p, const void *src, unsigned long count)
+{
+       io_outsb((unsigned long) p, src, count);
+}
+
+static inline void iowrite16_rep(void __iomem *p, const void *src, unsigned long count)
+{
+       io_outsw((unsigned long) p, src, count);
+}
+
+static inline void iowrite32_rep(void __iomem *p, const void *src, unsigned long count)
+{
+       __outsl_ns((unsigned long) p, src, count);
+}
+
+/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
+struct pci_dev;
+extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
+static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
+{
+}
+
 
 /*
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem