Changeset 91d5ad6 in mainline

Timestamp:

2006-03-15T00:55:05Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

286e03d

Parents:

d1e414c

Message:

ppc32: basic exception and interrupt handling

Files:

• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/amd64/src/dummy.s (deleted)
• arch/ppc32/Makefile.inc (modified) (1 diff)
• arch/ppc32/include/asm/regname.h (modified) (1 diff)
• arch/ppc32/include/drivers/cuda.h (modified) (1 diff)
• arch/ppc32/include/interrupt.h (modified) (1 diff)
• arch/ppc32/src/asm.S (modified) (2 diffs)
• arch/ppc32/src/boot/boot.S (modified) (1 diff)
• arch/ppc32/src/drivers/cuda.c (modified) (2 diffs)
• arch/ppc32/src/exception.S (modified) (2 diffs)
• arch/ppc32/src/interrupt.c (moved) (moved from arch/ppc32/include/asm/spr.h ) (2 diffs)
• arch/ppc32/src/ppc32.c (modified) (1 diff)
• arch/ppc32/src/proc/scheduler.c (modified) (1 diff)
• kernel.config (modified) (1 diff)

arch/amd64/Makefile.inc

@@ -84 +84 @@
 
 ARCH_SOURCES = \
-        arch/$(ARCH)/src/dummy.s \
         arch/$(ARCH)/src/fpu_context.c \
         arch/$(ARCH)/src/boot/boot.S \

arch/ppc32/Makefile.inc

@@ -63 +63 @@
         arch/$(ARCH)/src/dummy.s \
         arch/$(ARCH)/src/exception.S \
+        arch/$(ARCH)/src/interrupt.c \
         arch/$(ARCH)/src/asm.S \
         arch/$(ARCH)/src/cpu/cpu.c \

arch/ppc32/include/asm/regname.h

@@ -190 +190 @@
 #define prv             287
 
+/* MSR bits */
+#define msr_ir  (1 << 4)
+#define msr_dr  (1 << 5)
+
 #endif

arch/ppc32/include/drivers/cuda.h

@@ -30 +30 @@
 #define __CUDA_H__
 
+#include <arch/types.h>
 
-void cuda_init(void);
-
+extern void cuda_init(void);
+extern void cuda_packet(const __u8 data);
 
 #endif

arch/ppc32/include/interrupt.h

@@ -30 +30 @@
 #define __ppc32_INTERRUPT_H__
 
-extern void interrupt(void);
+#define IVT_ITEMS   15
+#define INT_OFFSET  0
+
+#define VECTOR_DECREMENTER 10
+
+extern void interrupt_init(void);
 
 #endif

arch/ppc32/src/asm.S

@@ -32 +32 @@
 
 .global cpu_sleep
+.global iret
 .global memsetb
 .global memcpy
@@ -38 +39 @@
         b cpu_sleep
 
+iret:
+        lwz r3, 144(sp)
+        mtxer r3
+        
+        lwz r3, 140(sp)
+        mtctr r3
+        
+        lwz r3, 136(sp)
+        mtcr r3
+        
+        lwz r3, 132(sp)
+        mtlr r3
+        
+        lwz r3, 128(sp)
+        mtspr srr1, r3
+        
+        lwz r3, 124(sp)
+        mtspr srr0, r3
+        
+        lwz r0, 0(sp)
+        lwz r2, 4(sp)
+        lwz r3, 8(sp)
+        lwz r4, 12(sp)
+        lwz r5, 16(sp)
+        lwz r6, 20(sp)
+        lwz r7, 24(sp)
+        lwz r8, 28(sp)
+        lwz r9, 32(sp)
+        lwz r10, 36(sp)
+        lwz r11, 40(sp)
+        lwz r12, 44(sp)
+        lwz r13, 48(sp)
+        lwz r14, 52(sp)
+        lwz r15, 56(sp)
+        lwz r16, 60(sp)
+        lwz r17, 64(sp)
+        lwz r18, 68(sp)
+        lwz r19, 72(sp)
+        lwz r20, 76(sp)
+        lwz r21, 80(sp)
+        lwz r22, 84(sp)
+        lwz r23, 88(sp)
+        lwz r24, 92(sp)
+        lwz r25, 96(sp)
+        lwz r26, 100(sp)
+        lwz r27, 104(sp)
+        lwz r28, 108(sp)
+        lwz r29, 112(sp)
+        lwz r30, 116(sp)
+        lwz r31, 120(sp)
+        
+        mfspr sp, sprg1
+        
+        rfi
+        
 memsetb:
         rlwimi r5, r5, 8, 16, 23

arch/ppc32/src/boot/boot.S

@@ -28 +28 @@
 
 #include <arch/asm/regname.h>
-#include <arch/asm/spr.h>
 #include <arch/boot/boot.h>
 #include <arch/boot/memmap.h>

arch/ppc32/src/drivers/cuda.c

@@ -54 +54 @@
 
 
-static void cuda_packet(const __u8 data)
+void cuda_packet(const __u8 data)
 {
         cuda[B] = cuda[B] | TIP;
@@ -70 +70 @@
 
 void cpu_halt(void) {
+#ifdef CONFIG_POWEROFF
         cuda_packet(CUDA_POWERDOWN);
-        
+#endif
         cpu_sleep();
 }

arch/ppc32/src/exception.S

@@ -28 +28 @@
 
 #include <arch/asm/regname.h>
-#include <arch/asm/spr.h>
+#include <arch/mm/page.h>
 
 .section K_UNMAPPED_TEXT_START, "ax"
@@ -85 +85 @@
 .global exc_decrementer
 exc_decrementer:
+        mtspr sprg1, sp
+        
+        subis sp, sp, 0x8000
+        
+        subi sp, sp, 144
+        stw r0, 0(sp)
+        stw r2, 4(sp)
+        stw r3, 8(sp)
+        stw r4, 12(sp)
+        stw r5, 16(sp)
+        stw r6, 20(sp)
+        stw r7, 24(sp)
+        stw r8, 28(sp)
+        stw r9, 32(sp)
+        stw r10, 36(sp)
+        stw r11, 40(sp)
+        stw r12, 44(sp)
+        stw r13, 48(sp)
+        stw r14, 52(sp)
+        stw r15, 56(sp)
+        stw r16, 60(sp)
+        stw r17, 64(sp)
+        stw r18, 68(sp)
+        stw r19, 72(sp)
+        stw r20, 76(sp)
+        stw r21, 80(sp)
+        stw r22, 84(sp)
+        stw r23, 88(sp)
+        stw r24, 92(sp)
+        stw r25, 96(sp)
+        stw r26, 100(sp)
+        stw r27, 104(sp)
+        stw r28, 108(sp)
+        stw r29, 112(sp)
+        stw r30, 116(sp)
+        stw r31, 120(sp)
+        
+        mfspr r3, srr0
+        stw r3, 124(sp)
+        
+        mfspr r3, srr1
+        stw r3, 128(sp)
+        
+        mflr r3
+        stw r3, 132(sp)
+        
+        mfcr r3
+        stw r3, 136(sp)
+        
+        mfctr r3
+        stw r3, 140(sp)
+        
+        mfxer r3
+        stw r3, 144(sp)
+
+        lis r3, exc_dispatch@ha
+        addi r3, r3, exc_dispatch@l
+        mtspr srr0, r3
+        
+        mfmsr r3
+        ori r3, r3, (msr_ir | msr_dr)@l
+        mtspr srr1, r3
+        
+        lis r3, iret@ha
+        addi r3, r3, iret@l
+        mtlr r3
+        
+        addis sp, sp, 0x8000
+        li r3, 10
         rfi
-        b exc_decrementer
 
 .org 0xa00

arch/ppc32/src/interrupt.c

@@ -1 +1 @@
 /*
- * Copyright (C) 2006 Ondrej Palkovsky
+ * Copyright (C) 2006 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef __ppc32_SPR_H__
-#define __ppc32_SPR_H__
+#include <interrupt.h>
+#include <arch/interrupt.h>
+#include <arch/types.h>
+#include <arch.h>
+#include <time/clock.h>
+#include <print.h>
 
-#define MSR_IR (1 << 4)
-#define MSR_DR (1 << 5)
+static void exception_decrementer(int n, istate_t *istate)
+{
+        clock();
+}
 
-#define SPRN_SRR0  0x1a
-#define SPRN_SRR1  0x1b
 
-/* Works for PPC32 */
-#define L1_CACHE_BYTES (1 << 5)
-
-#endif
+/* Initialize basic tables for exception dispatching */
+void interrupt_init(void)
+{
+        exc_register(VECTOR_DECREMENTER, "timer", exception_decrementer);
+}

arch/ppc32/src/ppc32.c

@@ -31 +31 @@
 #include <arch/drivers/cuda.h>
 #include <arch/mm/memory_init.h>
+#include <arch/interrupt.h>
 
 void arch_pre_mm_init(void)
 {
+        /* Initialize dispatch table */
+        interrupt_init();       
+
         ppc32_console_init();
         cuda_init();

arch/ppc32/src/proc/scheduler.c

@@ -27 +27 @@
  */
 
+#include <arch/mm/page.h>
 #include <proc/scheduler.h>
+#include <proc/thread.h>
+#include <arch.h>
+
+__address supervisor_sp;
+__address supervisor_sp_physical;
 
 void before_thread_runs_arch(void)
 {
+        supervisor_sp = (__address) &THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA];
+        supervisor_sp_physical = KA2PA(supervisor_sp_physical);
 }
 

kernel.config

@@ -60 +60 @@
 ! [(ARCH=mips32&MIPS_MACHINE!=msim&MIPS_MACHINE!=simics)|ARCH=amd64|ARCH=ia32] CONFIG_FPU_LAZY (y/n)
 
+# Power off on halt
+! [ARCH=ppc32] CONFIG_POWEROFF (y/n)
+
 ## Debugging configuration directives