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

Timestamp:

2014-09-12T03:45:25Z (11 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/ppc32.c (modified) (2 diffs)

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, "timebase-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);
 }