Changeset de3db94a in mainline

Timestamp:

2012-03-02T15:12:01Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

71232af

Parents:

dabbe28

Message:

map OpenFirmware device tree into sysinfo

Location:

kernel

Files:

• arch/ppc32/src/ppc32.c (modified) (1 diff)
• arch/sparc64/src/sun4u/sparc64.c (modified) (1 diff)
• arch/sparc64/src/sun4v/sparc64.c (modified) (1 diff)
• genarch/include/ofw/ofw_tree.h (modified) (1 diff)
• genarch/src/ofw/ofw_tree.c (modified) (2 diffs)

kernel/arch/ppc32/src/ppc32.c

@@ -173 +173 @@
                 ofw_tree_walk_by_device_type("display", display_register, NULL);
 #endif
+                /* Map OFW information into sysinfo */
+                ofw_sysinfo_map();
                 
                 /* Initialize IRQ routing */

kernel/arch/sparc64/src/sun4u/sparc64.c

@@ -94 +94 @@
 {
         if (config.cpu_active == 1) {
+                /* Map OFW information into sysinfo */
+                ofw_sysinfo_map();
+                
                 /*
                  * We have 2^11 different interrupt vectors.

kernel/arch/sparc64/src/sun4v/sparc64.c

@@ -92 +92 @@
 {
         if (config.cpu_active == 1) {
+                /* Map OFW information into sysinfo */
+                ofw_sysinfo_map();
+                
                 /*
                  * We have 2^11 different interrupt vectors.

kernel/genarch/include/ofw/ofw_tree.h

@@ -68 +68 @@
 extern void ofw_tree_init(ofw_tree_node_t *);
 extern void ofw_tree_print(void);
+extern void ofw_sysinfo_map(void);
 
 extern const char *ofw_tree_node_name(const ofw_tree_node_t *);

kernel/genarch/src/ofw/ofw_tree.c

@@ -38 +38 @@
 #include <genarch/ofw/ofw_tree.h>
 #include <mm/slab.h>
+#include <sysinfo/sysinfo.h>
 #include <memstr.h>
 #include <str.h>
@@ -355 +356 @@
 }
 
+/** Map OpenFirmware device subtree rooted in a node into sysinfo.
+ *
+ * Child nodes are processed recursively and peer nodes are processed
+ * iteratively in order to avoid stack overflow.
+ *
+ * @param node Root of the subtree.
+ * @param path Current path, NULL for the very root of the entire tree.
+ *
+ */
+static void ofw_tree_node_sysinfo(ofw_tree_node_t *node, const char *path)
+{
+        char *cur_path = (char *) malloc(PATH_MAX_LEN, 0);
+        
+        for (ofw_tree_node_t *cur = node; cur; cur = cur->peer) {
+                if ((cur->parent) && (path))
+                        snprintf(cur_path, PATH_MAX_LEN, "%s.%s", path, cur->da_name);
+                else
+                        snprintf(cur_path, PATH_MAX_LEN, "firmware.%s", cur->da_name);
+                
+                sysinfo_set_item_undefined(cur_path, NULL);
+                
+                if (cur->child)
+                        ofw_tree_node_sysinfo(cur->child, cur_path);
+        }
+        
+        free(cur_path);
+}
+
+/** Map the OpenFirmware device tree into sysinfo. */
+void ofw_sysinfo_map(void)
+{
+        ofw_tree_node_sysinfo(ofw_root, NULL);
+}
+
 /** @}
  */