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

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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) (6 diffs)

kernel/arch/ia64/include/asm.h

@@ -38 +38 @@
 #include <config.h>
 #include <typedefs.h>
-#include <typedefs.h>
 #include <arch/register.h>
+#include <arch/legacyio.h>
 #include <trace.h>
 
-#define IA64_IOSPACE_ADDRESS  0xE001000000000000ULL
-
 #define IO_SPACE_BOUNDARY       ((void *) (64 * 1024))
 
+/** Map the I/O port address to a legacy I/O address. */
+NO_TRACE static inline uintptr_t p2a(volatile void *p)
+{
+        uintptr_t prt = (uintptr_t) p;
+
+        return legacyio_virt_base + (((prt >> 2) << 12) | (prt & 0xfff));
+}
+        
 NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t 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 {
+        if (port < (ioport8_t *) IO_SPACE_BOUNDARY)
+                *((ioport8_t *) p2a(port)) = v;
+        else
                 *port = v;
-        }
         
         asm volatile (
@@ -65 +67 @@
 NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t 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 {
+        if (port < (ioport16_t *) IO_SPACE_BOUNDARY)
+                *((ioport16_t *) p2a(port)) = v;
+        else
                 *port = v;
-        }
         
         asm volatile (
@@ -82 +80 @@
 NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t 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 {
+        if (port < (ioport32_t *) IO_SPACE_BOUNDARY)
+                *((ioport32_t *) p2a(port)) = v;
+        else
                 *port = v;
-        }
         
         asm volatile (
@@ -106 +100 @@
         );
 
-        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 {
+        if (port < (ioport8_t *) IO_SPACE_BOUNDARY)
+                v = *((ioport8_t *) p2a(port));
+        else
                 v = *port;
-        }
         
         return v;
@@ -127 +117 @@
         );
 
-        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 {
+        if (port < (ioport16_t *) IO_SPACE_BOUNDARY)
+                v = *((ioport16_t *) p2a(port));
+        else
                 v = *port;
-        }
         
         return v;
@@ -148 +134 @@
         );
         
-        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 {
+        if (port < (ioport32_t *) IO_SPACE_BOUNDARY)
+                v = *((ioport32_t *) p2a(port));
+        else
                 v = *port;
-        }
 
         return v;