Changeset 8e7c9fe in mainline for kernel/arch/ppc32/src/interrupt.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• kernel/arch/ppc32/src/interrupt.c (modified) (5 diffs)

kernel/arch/ppc32/src/interrupt.c

@@ -36 +36 @@
 #include <interrupt.h>
 #include <arch/interrupt.h>
+#include <arch/istate.h>
 #include <typedefs.h>
 #include <arch.h>
-#include <time/clock.h>
 #include <ipc/sysipc.h>
 #include <arch/drivers/pic.h>
@@ -46 +46 @@
 #include <log.h>
 
-void start_decrementer(void)
+static uint32_t decrementer_value;
+
+void decrementer_start(uint32_t val)
+{
+        decrementer_value = val;
+        decrementer_restart();
+}
+
+void decrementer_restart(void)
 {
         asm volatile (
                 "mtdec %[dec]\n"
-                :: [dec] "r" (1000)
+                :: [dec] "r" (decrementer_value)
         );
 }
@@ -104 +112 @@
 {
         uint8_t inum;
-        
+
         while ((inum = pic_get_pending()) != 255) {
                 irq_t *irq = irq_dispatch_and_lock(inum);
@@ -138 +146 @@
 }
 
+static void exception_fp_unavailable(unsigned int n, istate_t *istate)
+{
+#ifdef CONFIG_FPU_LAZY
+        scheduler_fpu_lazy_request();
+        /*
+         * Propagate MSR_FP from MSR back to istate's SRR1, which will become
+         * the next MSR.
+         */
+        istate->srr1 |= msr_read() & MSR_FP;
+#else
+        fault_if_from_uspace(istate, "FPU fault.");
+        panic_badtrap(istate, n, "FPU fault.");
+#endif
+}
+
 static void exception_decrementer(unsigned int n, istate_t *istate)
 {
-        start_decrementer();
+        decrementer_restart();
         clock();
 }
@@ -153 +176 @@
         exc_register(VECTOR_EXTERNAL, "external", true,
             exception_external);
+        exc_register(VECTOR_FP_UNAVAILABLE, "fp_unavailable", true,
+            exception_fp_unavailable);
         exc_register(VECTOR_DECREMENTER, "timer", true,
             exception_decrementer);