Changes in / [826599a2:4cb938b] in mainline

Files:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• kernel/arch/ppc32/include/arch/interrupt.h (modified) (1 diff)
• kernel/arch/ppc32/src/interrupt.c (modified) (3 diffs)
• kernel/arch/ppc32/src/ppc32.c (modified) (2 diffs)

boot/arch/amd64/Makefile.inc

@@ -64 +64 @@
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/mixerctl/mixerctl \
-        $(USPACE_PATH)/app/wavplay/wavplay \
-        
+        $(USPACE_PATH)/app/wavplay/wavplay
+
 BOOT_OUTPUT = $(ROOT_PATH)/image.iso
 PREBUILD = $(INITRD).img

kernel/arch/ppc32/include/arch/interrupt.h

@@ -49 +49 @@
 #define VECTOR_DTLB_MISS_STORE      15
 
-extern void start_decrementer(void);
+extern void decrementer_start(uint32_t);
+extern void decrementer_restart(void);
 extern void interrupt_init(void);
 extern void extint_handler(unsigned int, istate_t *);

kernel/arch/ppc32/src/interrupt.c

@@ -38 +38 @@
 #include <typedefs.h>
 #include <arch.h>
-#include <time/clock.h>
 #include <ipc/sysipc.h>
 #include <arch/drivers/pic.h>
@@ -46 +45 @@
 #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)
         );
 }
@@ -140 +147 @@
 static void exception_decrementer(unsigned int n, istate_t *istate)
 {
-        start_decrementer();
+        decrementer_restart();
         clock();
 }

kernel/arch/ppc32/src/ppc32.c

@@ -47 +47 @@
 #include <mm/page.h>
 #include <mm/km.h>
+#include <time/clock.h>
 #include <abi/proc/uarg.h>
 #include <console/console.h>
@@ -99 +100 @@
         interrupt_init();
         
+        ofw_tree_node_t *cpus_node;
+        ofw_tree_node_t *cpu_node;
+        ofw_tree_property_t *freq_prop;
+
+        cpus_node = ofw_tree_lookup("/cpus");
+        if (!cpus_node)
+                panic("Could not find cpus node.");
+
+        cpu_node = cpus_node->child;
+        if (!cpu_node)
+                panic("Could not find first cpu.");     
+
+        freq_prop = ofw_tree_getprop(cpu_node, "clock-frequency");
+        if (!freq_prop)
+                panic("Could not get frequency property.");
+
+        uint32_t freq;
+        freq = *((uint32_t *) freq_prop->value);
+
         /* Start decrementer */
-        start_decrementer();
+        decrementer_start(freq / HZ);
 }