Changeset eb87adb in mainline for kernel/arch/ia64/include/asm.h

Timestamp:

2011-09-24T20:25:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d03da17

Parents:

4093b14 (diff), f1a9e87 (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/ia64/include/asm.h (modified) (4 diffs)

kernel/arch/ia64/include/asm.h

@@ -44 +44 @@
 #define IA64_IOSPACE_ADDRESS  0xE001000000000000ULL
 
+#define IO_SPACE_BOUNDARY       ((void *) (64 * 1024))
+
 NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
 {
-        uintptr_t prt = (uintptr_t) port;
-        
-        *((ioport8_t *) (IA64_IOSPACE_ADDRESS +
-            ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+        if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
+                uintptr_t prt = (uintptr_t) port;
+        
+                *((ioport8_t *) (IA64_IOSPACE_ADDRESS +
+                    ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+        } else {
+                *port = v;
+        }
         
         asm volatile (
@@ -59 +65 @@
 NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v)
 {
-        uintptr_t prt = (uintptr_t) port;
-        
-        *((ioport16_t *) (IA64_IOSPACE_ADDRESS +
-            ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+        if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
+                uintptr_t prt = (uintptr_t) port;
+        
+                *((ioport16_t *) (IA64_IOSPACE_ADDRESS +
+                    ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+        } else {
+                *port = v;
+        }
         
         asm volatile (
@@ -72 +82 @@
 NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v)
 {
-        uintptr_t prt = (uintptr_t) port;
-        
-        *((ioport32_t *) (IA64_IOSPACE_ADDRESS +
-            ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+        if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
+                uintptr_t prt = (uintptr_t) port;
+        
+                *((ioport32_t *) (IA64_IOSPACE_ADDRESS +
+                    ((prt & 0xfff) | ((prt >> 2) << 12)))) = v;
+        } else {
+                *port = v;
+        }
         
         asm volatile (
@@ -85 +99 @@
 NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
 {
-        uintptr_t prt = (uintptr_t) port;
-        
-        asm volatile (
-                "mf\n"
-                ::: "memory"
-        );
-        
-        return *((ioport8_t *) (IA64_IOSPACE_ADDRESS +
-            ((prt & 0xfff) | ((prt >> 2) << 12))));
+        uint8_t v;
+
+        asm volatile (
+                "mf\n"
+                ::: "memory"
+        );
+
+        if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
+                uintptr_t prt = (uintptr_t) port;
+
+                v = *((ioport8_t *) (IA64_IOSPACE_ADDRESS +
+                    ((prt & 0xfff) | ((prt >> 2) << 12))));
+        } else {
+                v = *port;
+        }
+        
+        return v;
 }
 
 NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
 {
-        uintptr_t prt = (uintptr_t) port;
-        
-        asm volatile (
-                "mf\n"
-                ::: "memory"
-        );
-        
-        return *((ioport16_t *) (IA64_IOSPACE_ADDRESS +
-            ((prt & 0xfff) | ((prt >> 2) << 12))));
+        uint16_t v;
+
+        asm volatile (
+                "mf\n"
+                ::: "memory"
+        );
+
+        if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
+                uintptr_t prt = (uintptr_t) port;
+
+                v = *((ioport16_t *) (IA64_IOSPACE_ADDRESS +
+                    ((prt & 0xfff) | ((prt >> 2) << 12))));
+        } else {
+                v = *port;
+        }
+        
+        return v;
 }
 
 NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
 {
-        uintptr_t prt = (uintptr_t) port;
-        
-        asm volatile (
-                "mf\n"
-                ::: "memory"
-        );
-        
-        return *((ioport32_t *) (IA64_IOSPACE_ADDRESS +
-            ((prt & 0xfff) | ((prt >> 2) << 12))));
+        uint32_t v;
+        
+        asm volatile (
+                "mf\n"
+                ::: "memory"
+        );
+        
+        if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
+                uintptr_t prt = (uintptr_t) port;
+                
+                v = *((ioport32_t *) (IA64_IOSPACE_ADDRESS +
+                    ((prt & 0xfff) | ((prt >> 2) << 12))));
+        } else {
+                v = *port;
+        }
+
+        return v;
 }