arm: Try to lookup the SOC name from dt/compatible

Just ARM for now, but maybe this will become more generic and
it will be possible to have the processor package name and
description seperate, even for x86 and whatnot. Also perhaps
work in Sockets/Threads/Cores information.

Signed-off-by: Burt P <pburt0@gmail.com>

5 files changed, 96 insertions, 14 deletions

diff --git a/includes/dt_util.h b/includes/dt_util.h
index b4506d19..7ef6808b 100644
--- a/includes/dt_util.h
+++ b/includes/dt_util.h
@@ -31,9 +31,9 @@ enum {
     DTP_DMAS,    /* dma-specifier list */
 };
 
-/* simplest, no aliases.
+/* simplest, no aliases, doesn't require an existing dt.
  * use dtr_get_prop_str() for complete. */
-char* dtr_get_string(const char *p);
+char* dtr_get_string(const char *p, int decode);
 
 typedef uint32_t dt_uint; /* big-endian */
 
diff --git a/modules/devices.c b/modules/devices.c
index d3fd1110..094f9ec3 100644
--- a/modules/devices.c
+++ b/modules/devices.c
@@ -248,7 +248,7 @@ gchar *get_motherboard(void)
 #endif
 
     /* use device tree "model" */
-    board_vendor = dtr_get_string("/model");
+    board_vendor = dtr_get_string("/model", 0);
     if (board_vendor != NULL)
         return board_vendor;
 
diff --git a/modules/devices/arm/processor.c b/modules/devices/arm/processor.c
index e4712f56..ed570006 100644
--- a/modules/devices/arm/processor.c
+++ b/modules/devices/arm/processor.c
@@ -19,6 +19,7 @@
 #include "hardinfo.h"
 #include "devices.h"
 #include "cpu_util.h"
+#include "dt_util.h"
 
 #include "arm_data.h"
 #include "arm_data.c"
@@ -255,15 +256,93 @@ processor_get_detailed_info(Processor *processor)
     return ret;
 }
 
+gchar *get_soc_name(GSList *processors) {
+    /* compatible contains a list of compatible hardware, so be careful
+     * with matching order.
+     * ex: "ti,omap3-beagleboard-xm", "ti,omap3450", "ti,omap3";
+     * matches "omap3 family" first.
+     * ex: "brcm,bcm2837", "brcm,bcm2836";
+     * would match 2836 when it is a 2837.
+     */
+#define UNKSOC "(Unknown)"
+    const struct {
+        char *search_str;
+        char *vendor;
+        char *soc;
+    } dt_compat_searches[] = {
+        { "brcm,bcm2837", "Broadcom", "BCM2837" },
+        { "brcm,bcm2836", "Broadcom", "BCM2836" },
+        { "brcm,bcm2835", "Broadcom", "BCM2835" },
+        { "ti,omap5432", "Texas Instruments", "OMAP5432" },
+        { "ti,omap5430", "Texas Instruments", "OMAP5430" },
+        { "ti,omap4470", "Texas Instruments", "OMAP4470" },
+        { "ti,omap4460", "Texas Instruments", "OMAP4460" },
+        { "ti,omap4430", "Texas Instruments", "OMAP4430" },
+        { "ti,omap3620", "Texas Instruments", "OMAP3620" },
+        { "ti,omap3450", "Texas Instruments", "OMAP3450" },
+        { "ti,omap5", "Texas Instruments", "OMAP5-family" },
+        { "ti,omap4", "Texas Instruments", "OMAP4-family" },
+        { "ti,omap3", "Texas Instruments", "OMAP3-family" },
+        { "ti,omap2", "Texas Instruments", "OMAP2-family" },
+        { "ti,omap1", "Texas Instruments", "OMAP1-family" },
+        { "qcom,msm8939", "Qualcomm", "Snapdragon 615"},
+        { "qcom,msm", "Qualcomm", "Snapdragon-family"},
+        { "nvidia,tegra" "nVidia", "Tegra-family" },
+        { "bcm,", "Broadcom", UNKSOC },
+        { "nvidia," "nVidia", UNKSOC },
+        { "rockchip," "Rockchip", UNKSOC },
+        { "ti,", "Texas Instruments", UNKSOC },
+        { "qcom,", "Qualcom", UNKSOC },
+        { NULL, NULL }
+    };
+    gchar *ret = NULL;
+    gchar *compat = NULL;
+    int i;
+
+    compat = dtr_get_string("/compatible", 1);
+
+    if (compat != NULL) {
+        i = 0;
+        while(dt_compat_searches[i].search_str != NULL) {
+            if (strstr(compat, dt_compat_searches[i].search_str) != NULL) {
+                ret = g_strdup_printf("%s %s", dt_compat_searches[i].vendor, dt_compat_searches[i].soc);
+                break;
+            }
+            i++;
+        }
+    }
+    g_free(compat);
+    return ret;
+}
+
+gchar *processor_meta(GSList * processors) {
+    gchar *meta_soc = get_soc_name(processors);
+    gchar *meta_cpu_desc = processor_describe(processors);
+    gchar *ret = NULL;
+    UNKIFNULL(meta_soc);
+    UNKIFNULL(meta_cpu_desc);
+    ret = g_strdup_printf("[%s]\n"
+                            "%s=%s\n"
+                            "%s=%s\n",
+                            _("SOC/Package"),
+                            _("Name"), meta_soc,
+                            _("Description"), meta_cpu_desc);
+    g_free(meta_soc);
+    g_free(meta_cpu_desc);
+    return ret;
+}
+
 gchar *processor_get_info(GSList * processors)
 {
     Processor *processor;
-
-    if (g_slist_length(processors) > 1) {
     gchar *ret, *tmp, *hashkey;
+    gchar *meta; /* becomes owned by more_info? no need to free? */
     GSList *l;
 
-    tmp = g_strdup("");
+    tmp = g_strdup_printf("$CPU_META$%s=\n", _("SOC/Package Information") );
+
+    meta = processor_meta(processors);
+    moreinfo_add_with_prefix("DEV", "CPU_META", meta);
 
     for (l = processors; l; l = l->next) {
         processor = (Processor *) l->data;
@@ -276,7 +355,7 @@ gchar *processor_get_info(GSList * processors)
         hashkey = g_strdup_printf("CPU%d", processor->id);
         moreinfo_add_with_prefix("DEV", hashkey,
                 processor_get_detailed_info(processor));
-           g_free(hashkey);
+        g_free(hashkey);
     }
 
     ret = g_strdup_printf("[$ShellParam$]\n"
@@ -286,8 +365,4 @@ gchar *processor_get_info(GSList * processors)
     g_free(tmp);
 
     return ret;
-    }
-
-    processor = (Processor *) processors->data;
-    return processor_get_detailed_info(processor);
 }
diff --git a/modules/devices/devicetree.c b/modules/devices/devicetree.c
index 7401a7b4..c07a3402 100644
--- a/modules/devices/devicetree.c
+++ b/modules/devices/devicetree.c
@@ -148,6 +148,7 @@ gchar *get_node(char *np) {
     return ret;
 }
 
+/* different from  dtr_get_string() in that it re-uses the existing dt */
 char *get_dt_string(char *path, int decode) {
     dtr_obj *obj;
     char *ret = NULL;
diff --git a/modules/devices/devicetree/dt_util.c b/modules/devices/devicetree/dt_util.c
index 5a67005a..9678042d 100644
--- a/modules/devices/devicetree/dt_util.c
+++ b/modules/devices/devicetree/dt_util.c
@@ -441,10 +441,16 @@ char *dtr_get_prop_str(dtr *s, dtr_obj *node, const char *name) {
     return ret;
 }
 
-char *dtr_get_string(const char *p) {
+char *dtr_get_string(const char *p, int decode) {
     dtr *dt = dtr_new_x(NULL, 1);
-    char *ret;
-    ret = dtr_get_prop_str(dt, NULL, p);
+    dtr_obj *obj;
+    char *ret = NULL;
+    if (decode) {
+        obj = dtr_get_prop_obj(dt, NULL, p);
+        ret = dtr_str(obj);
+        dtr_obj_free(obj);
+    } else
+        ret = dtr_get_prop_str(dt, NULL, p);
     dtr_free(dt);
     return ret;
 }