Changeset 925a21e in mainline for kernel/arch/ia32/include/asm.h

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/ia32/include/asm.h (modified) (9 diffs)

kernel/arch/ia32/include/asm.h

@@ -101 +101 @@
 GEN_WRITE_REG(dr7)
 
+#define IO_SPACE_BOUNDARY       ((void *) (64 * 1024))
+
 /** Byte to port
  *
@@ -111 +113 @@
 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 (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
+                asm volatile (
+                        "outb %b[val], %w[port]\n"
+                        :: [val] "a" (val), [port] "d" (port)
+                );      
+        } else
+                *port = val;
 }
 
@@ -128 +132 @@
 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 (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
+                asm volatile (
+                        "outw %w[val], %w[port]\n"
+                        :: [val] "a" (val), [port] "d" (port)
+                );
+        } else
+                *port = val;
 }
 
@@ -145 +151 @@
 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 (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
+                asm volatile (
+                        "outl %[val], %w[port]\n"
+                        :: [val] "a" (val), [port] "d" (port)
+                );
+        } else
+                *port = val;
 }
 
@@ -162 +170 @@
 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;
 }
 
@@ -183 +194 @@
 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;
 }
 
@@ -204 +218 @@
 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;
 }
 
@@ -311 +328 @@
 }
 
+#ifndef PROCESSOR_i486
+
 /** Write to MSR */
 NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value)
@@ -335 +354 @@
         return ((uint64_t) dx << 32) | ax;
 }
+
+#endif /* PROCESSOR_i486 */