vserver 2.0 rc7

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

diff --git a/include/asm-sh64/io.h b/include/asm-sh64/io.h
index 2703207..cfafaa7 100644 (file)
--- a/include/asm-sh64/io.h
+++ b/include/asm-sh64/io.h
@@ -25,9 +25,11 @@
  * onchip_remap();
  */
 
+#include <linux/compiler.h>
 #include <asm/cache.h>
 #include <asm/system.h>
 #include <asm/page.h>
+#include <asm-generic/iomap.h>
 
 #define virt_to_bus virt_to_phys
 #define bus_to_virt phys_to_virt
@@ -39,75 +41,90 @@
  * with an implicit size. The traditional read{b,w,l}/write{b,w,l}
  * mess is wrapped to this, as are the SH-specific ctrl_in/out routines.
  */
-static inline unsigned char sh64_in8(unsigned long addr)
+static inline unsigned char sh64_in8(const volatile void __iomem *addr)
 {
-       return *(volatile unsigned char *)addr;
+       return *(volatile unsigned char __force *)addr;
 }
 
-static inline unsigned short sh64_in16(unsigned long addr)
+static inline unsigned short sh64_in16(const volatile void __iomem *addr)
 {
-       return *(volatile unsigned short *)addr;
+       return *(volatile unsigned short __force *)addr;
 }
 
-static inline unsigned long sh64_in32(unsigned long addr)
+static inline unsigned int sh64_in32(const volatile void __iomem *addr)
 {
-       return *(volatile unsigned long *)addr;
+       return *(volatile unsigned int __force *)addr;
 }
 
-static inline unsigned long long sh64_in64(unsigned long addr)
+static inline unsigned long long sh64_in64(const volatile void __iomem *addr)
 {
-       return *(volatile unsigned long long *)addr;
+       return *(volatile unsigned long long __force *)addr;
 }
 
-static inline void sh64_out8(unsigned char b, unsigned long addr)
+static inline void sh64_out8(unsigned char b, volatile void __iomem *addr)
 {
-       *(volatile unsigned char *)addr = b;
+       *(volatile unsigned char __force *)addr = b;
        wmb();
 }
 
-static inline void sh64_out16(unsigned short b, unsigned long addr)
+static inline void sh64_out16(unsigned short b, volatile void __iomem *addr)
 {
-       *(volatile unsigned short *)addr = b;
+       *(volatile unsigned short __force *)addr = b;
        wmb();
 }
 
-static inline void sh64_out32(unsigned long b, unsigned long addr)
+static inline void sh64_out32(unsigned int b, volatile void __iomem *addr)
 {
-       *(volatile unsigned long *)addr = b;
+       *(volatile unsigned int __force *)addr = b;
        wmb();
 }
 
-static inline void sh64_out64(unsigned long long b, unsigned long addr)
+static inline void sh64_out64(unsigned long long b, volatile void __iomem *addr)
 {
-       *(volatile unsigned long long *)addr = b;
+       *(volatile unsigned long long __force *)addr = b;
        wmb();
 }
 
 #define readb(addr)            sh64_in8(addr)
 #define readw(addr)            sh64_in16(addr)
 #define readl(addr)            sh64_in32(addr)
-#define readb_relaxed(addr)            sh64_in8(addr)
-#define readw_relaxed(addr)            sh64_in16(addr)
-#define readl_relaxed(addr)            sh64_in32(addr)
+#define readb_relaxed(addr)    sh64_in8(addr)
+#define readw_relaxed(addr)    sh64_in16(addr)
+#define readl_relaxed(addr)    sh64_in32(addr)
 
 #define writeb(b, addr)                sh64_out8(b, addr)
 #define writew(b, addr)                sh64_out16(b, addr)
 #define writel(b, addr)                sh64_out32(b, addr)
 
-#define ctrl_inb(addr)         sh64_in8(addr)
-#define ctrl_inw(addr)         sh64_in16(addr)
-#define ctrl_inl(addr)         sh64_in32(addr)
+#define ctrl_inb(addr)         sh64_in8(ioport_map(addr, 1))
+#define ctrl_inw(addr)         sh64_in16(ioport_map(addr, 2))
+#define ctrl_inl(addr)         sh64_in32(ioport_map(addr, 4))
 
-#define ctrl_outb(b, addr)     sh64_out8(b, addr)
-#define ctrl_outw(b, addr)     sh64_out16(b, addr)
-#define ctrl_outl(b, addr)     sh64_out32(b, addr)
+#define ctrl_outb(b, addr)     sh64_out8(b, ioport_map(addr, 1))
+#define ctrl_outw(b, addr)     sh64_out16(b, ioport_map(addr, 2))
+#define ctrl_outl(b, addr)     sh64_out32(b, ioport_map(addr, 4))
 
-unsigned long inb(unsigned long port);
-unsigned long inw(unsigned long port);
-unsigned long inl(unsigned long port);
-void outb(unsigned long value, unsigned long port);
-void outw(unsigned long value, unsigned long port);
-void outl(unsigned long value, unsigned long port);
+#define ioread8(addr)          sh64_in8(addr)
+#define ioread16(addr)         sh64_in16(addr)
+#define ioread32(addr)         sh64_in32(addr)
+#define iowrite8(b, addr)      sh64_out8(b, addr)
+#define iowrite16(b, addr)     sh64_out16(b, addr)
+#define iowrite32(b, addr)     sh64_out32(b, addr)
+
+#define inb(addr)              ctrl_inb(addr)
+#define inw(addr)              ctrl_inw(addr)
+#define inl(addr)              ctrl_inl(addr)
+#define outb(b, addr)          ctrl_outb(b, addr)
+#define outw(b, addr)          ctrl_outw(b, addr)
+#define outl(b, addr)          ctrl_outl(b, addr)
+
+void outsw(unsigned long port, const void *addr, unsigned long count);
+void insw(unsigned long port, void *addr, unsigned long count);
+void outsl(unsigned long port, const void *addr, unsigned long count);
+void insl(unsigned long port, void *addr, unsigned long count);
+
+void memcpy_toio(void __iomem *to, const void *from, long count);
+void memcpy_fromio(void *to, void __iomem *from, long count);
 
 #define mmiowb()
 
@@ -154,7 +171,7 @@ extern void iounmap(void *addr);
 unsigned long onchip_remap(unsigned long addr, unsigned long size, const char* name);
 extern void onchip_unmap(unsigned long vaddr);
 
-static __inline__ int check_signature(unsigned long io_addr,
+static __inline__ int check_signature(volatile void __iomem *io_addr,
                        const unsigned char *signature, int length)
 {
        int retval = 0;
@@ -218,5 +235,16 @@ static __inline__ void dma_cache_wback (unsigned long start, unsigned long size)
                asm volatile ("ocbwb    %0, 0" : : "r" (s));
 }
 
+/*
+ * 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 /* __ASM_SH64_IO_H */