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

Timestamp:

2008-11-11T07:50:04Z (16 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

59e4864

Parents:

b24786a

Message:

Support for serial port console on IA64 as a compensation for keyboard - based on SPARC ns16550 driver

File:

• kernel/arch/ia64/include/asm.h (modified) (8 diffs)

kernel/arch/ia64/include/asm.h

@@ -40 +40 @@
 #include <arch/register.h>
 
+typedef uint64_t ioport_t;
 
 #define IA64_IOSPACE_ADDRESS 0xE001000000000000ULL
 
-static inline void  outb(uint64_t port,uint8_t v)
+static inline void  outb(ioport_t port,uint8_t v)
 {
         *((uint8_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
@@ -50 +51 @@
 }
 
-static inline void  outw(uint64_t port,uint16_t v)
+static inline void  outw(ioport_t port,uint16_t v)
 {
         *((uint16_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
@@ -57 +58 @@
 }
 
-static inline void  outl(uint64_t port,uint32_t v)
+static inline void  outl(ioport_t port,uint32_t v)
 {
         *((uint32_t *)(IA64_IOSPACE_ADDRESS + ( (port & 0xfff) | ( (port >> 2) << 12 )))) = v;
@@ -66 +67 @@
 
 
-static inline uint8_t inb(uint64_t port)
+static inline uint8_t inb(ioport_t port)
 {
         asm volatile ("mf\n" ::: "memory");
@@ -73 +74 @@
 }
 
-static inline uint16_t inw(uint64_t port)
+static inline uint16_t inw(ioport_t port)
 {
         asm volatile ("mf\n" ::: "memory");
@@ -80 +81 @@
 }
 
-static inline uint32_t inl(uint64_t port)
+static inline uint32_t inl(ioport_t port)
 {
         asm volatile ("mf\n" ::: "memory");
@@ -99 +100 @@
         uint64_t v;
 
-        asm volatile ("and %0 = %1, r12" : "=r" (v) : "r" (~(STACK_SIZE-1)));
-        
-        return v;
+        //I'm not sure why but this code bad inlines in scheduler, 
+        //so THE shifts about 16B and causes kernel panic
+        //asm volatile ("and %0 = %1, r12" : "=r" (v) : "r" (~(STACK_SIZE-1)));
+        //return v;
+        
+        //this code have the same meaning but inlines well
+        asm volatile ("mov %0 = r12" : "=r" (v)  );
+        return v & (~(STACK_SIZE-1));
 }
 
@@ -152 +158 @@
         return v;
 }
+
+static inline uint64_t cr64_read(void)
+{
+        uint64_t v;
+        
+        asm volatile ("mov %0 = cr64\n" : "=r" (v));
+        
+        return v;
+}
+
 
 /** Write ITC (Interval Timer Counter) register.