Changeset 667a4f8 in mainline for kernel/arch/amd64/include/asm.h

Timestamp:

2011-03-22T04:54:29Z (13 years ago)

Author:

Zdenek Bouska <zdenek.bouska@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

abf04a54

Parents:

432f68a

Message:

Memory mapped registers accessible by pio_* frunctions (ia32, amd64)

File:

• kernel/arch/amd64/include/asm.h (modified) (7 diffs)

kernel/arch/amd64/include/asm.h

@@ -77 +77 @@
 }
 
+#define IO_SPACE_BOUNDARY       ((void *) (64 * 1024))
+
 /** Byte from port
  *
@@ -87 +89 @@
 NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
 {
-        uint8_t val;
-        
-        asm volatile (
-                "inb %w[port], %b[val]\n"
-                : [val] "=a" (val)
-                : [port] "d" (port)
-        );
-        
-        return val;
+        if (((void *)port) < IO_SPACE_BOUNDARY) {
+                uint8_t val;
+                asm volatile (
+                        "inb %w[port], %b[val]\n"
+                        : [val] "=a" (val)
+                        : [port] "d" (port)
+                );
+                return val;
+        } else {
+                return (uint8_t) *port;
+        }
 }
 
@@ -108 +112 @@
 NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
 {
-        uint16_t val;
-        
-        asm volatile (
-                "inw %w[port], %w[val]\n"
-                : [val] "=a" (val)
-                : [port] "d" (port)
-        );
-        
-        return val;
+        if (((void *)port) < IO_SPACE_BOUNDARY) {
+                uint16_t val;
+                asm volatile (
+                        "inw %w[port], %w[val]\n"
+                        : [val] "=a" (val)
+                        : [port] "d" (port)
+                );
+                return val;
+        } else {
+                return (uint16_t) *port;
+        }
 }
 
@@ -129 +135 @@
 NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
 {
-        uint32_t val;
-        
-        asm volatile (
-                "inl %w[port], %[val]\n"
-                : [val] "=a" (val)
-                : [port] "d" (port)
-        );
-        
-        return val;
+        if (((void *)port) < IO_SPACE_BOUNDARY) {
+                uint32_t val;
+                asm volatile (
+                        "inl %w[port], %[val]\n"
+                        : [val] "=a" (val)
+                        : [port] "d" (port)
+                );
+                return val;
+        } else {
+                return (uint32_t) *port;
+        }
 }
 
@@ -150 +158 @@
 NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val)
 {
-        asm volatile (
-                "outb %b[val], %w[port]\n"
-                :: [val] "a" (val),
-                   [port] "d" (port)
-        );
+        if (((void *)port) < IO_SPACE_BOUNDARY) {
+                asm volatile (
+                        "outb %b[val], %w[port]\n"
+                        :: [val] "a" (val), [port] "d" (port)
+                );      
+        } else {
+                *((uint8_t *) port) = val;
+        }
 }
 
@@ -167 +178 @@
 NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val)
 {
-        asm volatile (
-                "outw %w[val], %w[port]\n"
-                :: [val] "a" (val),
-                   [port] "d" (port)
-        );
+        if (((void *)port) < IO_SPACE_BOUNDARY) {
+                asm volatile (
+                        "outw %w[val], %w[port]\n"
+                        :: [val] "a" (val), [port] "d" (port)
+                );
+        } else {
+                *((uint16_t *) port) = val;
+        }
 }
 
@@ -184 +198 @@
 NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val)
 {
-        asm volatile (
-                "outl %[val], %w[port]\n"
-                :: [val] "a" (val),
-                   [port] "d" (port)
-        );
+        if (((void *)port) < IO_SPACE_BOUNDARY) {
+                asm volatile (
+                        "outl %[val], %w[port]\n"
+                        :: [val] "a" (val), [port] "d" (port)
+                );
+        } else {
+                *((uint32_t *) port) = val;
+        }
 }