Changeset 05d9dd89 in mainline for arch/ia64/src

Timestamp:

2005-11-03T21:55:52Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

dd118f0

Parents:

0259524

Message:

ia64 work.
Fix definition of u32.
Add more register manipulation functions.
Add unions describing bit-structured registers.
Distinguish between timer, unhandled and spurious external interrupts.
Initialize interval timer to generate first timer interrupt.

Location:

arch/ia64/src

Files:

• ia64.c (modified) (2 diffs)
• interrupt.c (modified) (1 diff)

arch/ia64/src/ia64.c

@@ -29 +29 @@
 #include <arch.h>
 #include <arch/ski/ski.h>
+#include <arch/asm.h>
+#include <arch/register.h>
+#include <arch/barrier.h>
+#include <arch/interrupt.h>
+
+/** TODO: read ticks per second from firmware */
+#define IT_DELTA        50000000
 
 void arch_pre_mm_init(void)
@@ -37 +44 @@
 void arch_post_mm_init(void)
 {
+        cr_itv_t itv;
+
+        /* initialize Interval Timer external interrupt vector */
+        itv.value = itv_read();
+        itv.vector = INTERRUPT_TIMER;
+        itv.m = 0;
+        itv_write(itv.value);
+        srlz_d();
+
+        /* set Interval Timer Counter to zero */
+        itc_write(0);
+        srlz_d();
+        
+        /* generate first Interval Timer interrupt in IT_DELTA ticks */
+        itm_write(IT_DELTA);
+        srlz_d();
 }

arch/ia64/src/interrupt.c

@@ -30 +30 @@
 #include <arch/interrupt.h>
 #include <panic.h>
+#include <print.h>
 #include <arch/types.h>
 #include <arch/asm.h>
 #include <arch/barrier.h>
 #include <arch/register.h>
+#include <arch.h>
 
 void external_interrupt(void)
 {
-        __u8 ivr;
+        cr_ivr_t ivr;
         
-        srlz_d();
-        ivr = ivr_read() & CR_IVR_MASK;
+        ivr.value = ivr_read();
         srlz_d();
         
-        switch(ivr) {
+        switch(ivr.value) {
+            case INTERRUPT_TIMER:
+                panic("cpu%d: timer interrupt\n", CPU->id);
+                break;
+            case INTERRUPT_SPURIOUS:
+                printf("cpu%d: spurious interrupt\n", CPU->id);
+                break;
             default:
-                panic("\nUnhandled External Interrupt Vector %d\n", ivr);
+                panic("\nUnhandled External Interrupt Vector %d\n", ivr.vector);
+                break;
         }
 }