Changeset 59e4864 in mainline for kernel/arch/ia64/include

Timestamp:

2008-11-11T08:00:42Z (17 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

f3c4a26

Parents:

a2a5529

Message:

Alfa of SMP support on IA64

Location:

kernel/arch/ia64/include

Files:

• atomic.h (modified) (1 diff)
• bootinfo.h (modified) (2 diffs)
• cpu.h (modified) (2 diffs)
• mm/page.h (modified) (1 diff)

kernel/arch/ia64/include/atomic.h

@@ -52 +52 @@
 }
 
+
+static inline uint64_t test_and_set(atomic_t *val) {
+        uint64_t v;
+                
+        asm volatile (
+                "movl %0=0x01;;\n"
+                "xchg8 %0=%1,%0;;\n"
+                : "=r" (v),"+m" (val->count)
+        );
+        
+        return v;
+}
+
+
 static inline void atomic_inc(atomic_t *val) { atomic_add(val, 1); }
 static inline void atomic_dec(atomic_t *val) { atomic_add(val, -1); }

kernel/arch/ia64/include/bootinfo.h

@@ -30 +30 @@
 #define KERN_ia64_BOOTINFO_H_
 
-
+#define BOOTINFO_ADDRESS 0x4401000
 
 #define CONFIG_INIT_TASKS       32
@@ -47 +47 @@
 typedef struct {
         binit_t taskmap;
+
+        unsigned long * sapic;
+        unsigned int wakeup_intno;
+
 } bootinfo_t;
 

kernel/arch/ia64/include/cpu.h

@@ -39 +39 @@
 #include <arch/register.h>
 #include <arch/asm.h>
+#include <arch/bootinfo.h>
 
 #define FAMILY_ITANIUM  0x7
@@ -64 +65 @@
 }
 
+
+#define CR64_ID_SHIFT 24
+#define CR64_ID_MASK 0xff000000
+#define CR64_EID_SHIFT 16
+#define CR64_EID_MASK 0xff0000
+
+static inline int ia64_get_cpu_id(void)
+{
+        uint64_t cr64=cr64_read();
+        return ((CR64_ID_MASK)&cr64)>>CR64_ID_SHIFT;
+}
+
+static inline int ia64_get_cpu_eid(void)
+{
+        uint64_t cr64=cr64_read();
+        return ((CR64_EID_MASK)&cr64)>>CR64_EID_SHIFT;
+}
+
+
+
+static inline void ipi_send_ipi(int id,int eid,int intno)
+{
+        (bootinfo->sapic)[2*(id*256+eid)]=intno;
+}
+
+
+
 #endif
 

kernel/arch/ia64/include/mm/page.h

@@ -47 +47 @@
 #define KERNEL_PAGE_WIDTH               28      /* 256M */
 #define IO_PAGE_WIDTH                   26      /* 64M */
+#define FW_PAGE_WIDTH                   28      /* 256M */
+
+/** Staticly mapped IO spaces */
+
+/* Firmware area (bellow 4GB in phys mem) */
+#define FW_OFFSET             0x00000000F0000000
+/* Legacy IO space */
+#define IO_OFFSET             0x0001000000000000
+/* Videoram - now mapped to 0 as VGA text mode vram on 0xb8000*/
+#define VIO_OFFSET            0x0002000000000000
+
+