arm: use arm.ids for implementer/part lookup

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

5 files changed, 180 insertions, 77 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a0ee640..66caf399 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,6 +122,7 @@ set(HARDINFO_RESOURCES
 	"data/benchmark.data"
 	"deps/sysobj_early/data/vendor.ids"
 	"deps/sysobj_early/data/sdcard.ids"
+	"deps/sysobj_early/data/arm.ids"
 )
 
 set(HARDINFO_MANPAGES
diff --git a/deps/sysobj_early/data/arm.ids b/deps/sysobj_early/data/arm.ids
new file mode 100644
index 00000000..8e256ec3
--- /dev/null
+++ b/deps/sysobj_early/data/arm.ids
@@ -0,0 +1,133 @@
+#
+#    List of ARM CPU IDs
+#    in a format similar to pci.ids/usb.ids.
+#
+#    Version: 2018.12.22
+#    Maintained by: Burt P. (pburt0@gmail.com)
+#    https://github.com/bp0/armids
+#
+# Syntax:
+# implementer  implementer_name
+#	part  part_name     <-- single tab
+#
+# <implementer> is two hex digits, <part> is three hex digits, keep in order.
+# Comments start with '#'.
+#
+# This file can be distributed under the GNU General Public License
+# (version 2 or higher).
+#
+# Based on lscpu-arm.c by Riku Voipio <riku.voipio@iki.fi>
+#
+# The information here is gathered from
+# - ARM manuals
+# - Linux kernel: arch/armX/include/asm/cputype.h
+# - GCC sources: config/arch/arch-cores.def
+# - Ancient wisdom
+#
+
+41 ARM
+	810 ARM810
+	920 ARM920
+	922 ARM922
+	926 ARM926
+	940 ARM940
+	946 ARM946
+	966 ARM966
+	a20 ARM1020
+	a22 ARM1022
+	a26 ARM1026
+	b02 ARM11 MPCore
+	b36 ARM1136
+	b56 ARM1156
+	b76 ARM1176
+	c05 Cortex-A5
+	c07 Cortex-A7
+	c08 Cortex-A8
+	c09 Cortex-A9
+	c0d Cortex-A17 # Originally A12
+	c0f Cortex-A15
+	c0e Cortex-A17
+	c14 Cortex-R4
+	c15 Cortex-R5
+	c17 Cortex-R7
+	c18 Cortex-R8
+	c20 Cortex-M0
+	c21 Cortex-M1
+	c23 Cortex-M3
+	c24 Cortex-M4
+	c27 Cortex-M7
+	c60 Cortex-M0+
+	d01 Cortex-A32
+	d03 Cortex-A53
+	d04 Cortex-A35
+	d05 Cortex-A55
+	d07 Cortex-A57
+	d08 Cortex-A72
+	d09 Cortex-A73
+	d0a Cortex-A75
+	d13 Cortex-R52
+	d20 Cortex-M23
+	d21 Cortex-M33
+42 Broadcom
+	00f Brahma B15
+	100 Brahma B53
+	516 ThunderX2
+43 Cavium
+	0a0 ThunderX
+	0a1 ThunderX 88XX
+	0a2 ThunderX 81XX
+	0a3 ThunderX 83XX
+	0af ThunderX2 99xx
+44 DEC
+	a10 SA110
+	a11 SA1100
+4e nVidia
+	000 Denver
+	003 Denver 2
+50 APM
+	000 X-Gene
+51 Qualcomm
+	00f Scorpion
+	02d Scorpion
+	04d Krait
+	06f Krait
+	201 Kryo
+	205 Kryo
+	211 Kryo
+	800 Falkor V1/Kryo
+	801 Kryo V2
+	c00 Falkor
+	c01 Saphira
+53 Samsung
+	001 exynos-m1
+54 Texas Instruments
+56 Marvell
+	131 Feroceon 88FR131
+	581 PJ4/PJ4b
+	584 PJ4B-MP
+66 Faraday
+	526 FA526
+	626 FA626
+69 Intel
+	200 i80200
+	210 PXA250A
+	212 PXA210A
+	242 i80321-400
+	243 i80321-600
+	290 PXA250B/PXA26x
+	292 PXA210B
+	2c2 i80321-400-B0
+	2c3 i80321-600-B0
+	2d0 PXA250C/PXA255/PXA26x
+	2d2 PXA210C
+	2e3 i80219
+	411 PXA27x
+	41c IPX425-533
+	41d IPX425-400
+	41f IPX425-266
+	682 PXA32x
+	683 PXA930/PXA935
+	688 PXA30x
+	689 PXA31x
+	b11 SA1110
+	c12 IPX1200
diff --git a/modules/devices/arm/arm_data.c b/modules/devices/arm/arm_data.c
index 60e8ea34..58779c08 100644
--- a/modules/devices/arm/arm_data.c
+++ b/modules/devices/arm/arm_data.c
@@ -82,47 +82,6 @@ static struct {
 };
 
 static struct {
-    int code; char *name;
-} tab_arm_implementer[] = {
-    { 0x41,	"ARM" },
-    { 0x44,	"Intel (formerly DEC) StrongARM" },
-    { 0x4e,	"nVidia" },
-    { 0x54,	"Texas Instruments" },
-    { 0x56,	"Marvell" },
-    { 0x69,	"Intel XScale" },
-    { 0, NULL},
-};
-
-static struct {
-    /* source: t = tested, d = official docs, f = web */
-    int code; char *part_desc;
-} tab_arm_arm_part[] = { /* only valid for implementer 0x41 ARM */
-    /*d */ { 0x920,	"ARM920" },
-    /*d */ { 0x926,	"ARM926" },
-    /*d */ { 0x946,	"ARM946" },
-    /*d */ { 0x966,	"ARM966" },
-    /*d */ { 0xb02,	"ARM11 MPCore" },
-    /*d */ { 0xb36,	"ARM1136" },
-    /*d */ { 0xb56,	"ARM1156" },
-    /*dt*/ { 0xb76,	"ARM1176" },
-    /*dt*/ { 0xc05,	"Cortex-A5" },
-    /*d */ { 0xc07,	"Cortex-A7 MPCore" },
-    /*dt*/ { 0xc08,	"Cortex-A8" },
-    /*dt*/ { 0xc09,	"Cortex-A9" },
-    /*d */ { 0xc0e,	"Cortex-A17 MPCore" },
-    /*d */ { 0xc0f,	"Cortex-A15" },
-    /*d */ { 0xd01,	"Cortex-A32" },
-    /*dt*/ { 0xd03,	"Cortex-A53" },
-    /*d */ { 0xd04,	"Cortex-A35" },
-    /*d */ { 0xd05,	"Cortex-A55" },
-    /*d */ { 0xd07,	"Cortex-A57 MPCore" },
-    /*d */ { 0xd08,	"Cortex-A72" },
-    /*d */ { 0xd09,	"Cortex-A73" },
-    /*d */ { 0xd0a,	"Cortex-A75" },
-           { 0, NULL},
-};
-
-static struct {
     char *code; char *name; char *more;
 } tab_arm_arch[] = {
     { "7",	"AArch32",	"AArch32 (ARMv7)" },
@@ -161,37 +120,47 @@ const char *arm_flag_meaning(const char *flag) {
     return NULL;
 }
 
-static int code_match(int c0, const char* code1) {
-    int c1;
-    if (code1 == NULL) return 0;
-    c1 = strtol(code1, NULL, 0);
-    return (c0 == c1) ? 1 : 0;
-}
-
-const char *arm_implementer(const char *code) {
-    int i = 0;
-    if (code)
-    while(tab_arm_implementer[i].code) {
-        if (code_match(tab_arm_implementer[i].code, code))
-            return tab_arm_implementer[i].name;
-        i++;
+#include "util_ids.h"
+
+gchar *arm_ids_file = NULL;
+
+void find_arm_ids_file() {
+    if (arm_ids_file) return;
+    char *file_search_order[] = {
+        g_build_filename(g_get_user_config_dir(), "hardinfo", "arm.ids", NULL),
+        g_build_filename(params.path_data, "arm.ids", NULL),
+        NULL
+    };
+    int n;
+    for(n = 0; file_search_order[n]; n++) {
+        if (!access(file_search_order[n], R_OK))
+            arm_ids_file = file_search_order[n];
+        else
+            g_free(file_search_order[n]);
     }
-    return NULL;
 }
 
-const char *arm_part(const char *imp_code, const char *part_code) {
-    int i = 0;
-    if (imp_code && part_code) {
-        if (code_match(0x41, imp_code)) {
-            /* 0x41=ARM parts */
-            while(tab_arm_arm_part[i].code) {
-                if (code_match(tab_arm_arm_part[i].code, part_code))
-                    return tab_arm_arm_part[i].part_desc;
-                i++;
-            }
-        }
-    }
-    return NULL;
+void arm_part(const char *imp_code, const char *part_code, char **imp, char **part) {
+    gchar *qpath = NULL;
+    ids_query_result result = {};
+    unsigned int i,p;
+
+    if (!arm_ids_file)
+        find_arm_ids_file();
+
+    i = strtol(imp_code, NULL, 0);
+    p = strtol(part_code, NULL, 0);
+    qpath = g_strdup_printf("%02x/%03x", i, p);
+    scan_ids_file(arm_ids_file, qpath, &result, -1);
+    g_free(qpath);
+    if (imp)
+        *imp = result.results[0]
+            ? g_strdup(result.results[0])
+            : NULL;
+    if (part)
+        *part = result.results[1]
+            ? g_strdup(result.results[1])
+            : NULL;
 }
 
 const char *arm_arch(const char *cpuinfo_arch_str) {
@@ -229,8 +198,7 @@ char *arm_decoded_name(const char *imp, const char *part, const char *var, const
              * variant and revision can be rendered r{variant}p{revision} */
             r = strtol(var, NULL, 0);
             p = strtol(rev, NULL, 0);
-            imp_name = (char*) arm_implementer(imp);
-            part_desc = (char*) arm_part(imp, part);
+            arm_part(imp, part, &imp_name, &part_desc);
             arch_name = (char*) arm_arch(arch);
             if (imp_name || part_desc) {
                 if (arch_name != arch)
@@ -251,6 +219,8 @@ char *arm_decoded_name(const char *imp, const char *part, const char *var, const
                         (part_desc) ? part_desc : part,
                         r, p, arch);
             }
+            g_free(imp_name);
+            g_free(part_desc);
         } else {
             /* prolly not ARM arch at all */
             if (model_name)
diff --git a/modules/devices/arm/arm_data.h b/modules/devices/arm/arm_data.h
index 63b3c906..0e93d323 100644
--- a/modules/devices/arm/arm_data.h
+++ b/modules/devices/arm/arm_data.h
@@ -22,13 +22,12 @@
 #define _ARMDATA_H_
 
 /* table lookups */
-const char *arm_implementer(const char *code);
-const char *arm_part(const char *imp_code, const char *part_code);
+void arm_part(const char *imp_code, const char *part_code, char **imp, char **part);
 const char *arm_arch(const char *cpuinfo_arch_str);
 const char *arm_arch_more(const char *cpuinfo_arch_str);
 
 /* cpu_implementer, cpu_part, cpu_variant, cpu_revision, cpu_architecture from /proc/cpuinfo
- * model_name is returned as a fallback if not enough data is known */
+ * strdup(model_name) is returned as a fallback if not enough data is known */
 char *arm_decoded_name(
     const char *imp, const char *part, const char *var, const char *rev,
     const char *arch, const char *model_name);
diff --git a/modules/devices/arm/processor.c b/modules/devices/arm/processor.c
index d350e518..a1b7f81a 100644
--- a/modules/devices/arm/processor.c
+++ b/modules/devices/arm/processor.c
@@ -311,10 +311,10 @@ gchar *clocks_summary(GSList * processors)
 gchar *
 processor_get_detailed_info(Processor *processor)
 {
-    gchar *tmp_flags, *tmp_imp, *tmp_part, *tmp_arch, *tmp_cpufreq, *tmp_topology, *ret;
+    gchar *tmp_flags, *tmp_imp = NULL, *tmp_part = NULL,
+        *tmp_arch, *tmp_cpufreq, *tmp_topology, *ret;
     tmp_flags = processor_get_capabilities_from_flags(processor->flags);
-    tmp_imp = (char*)arm_implementer(processor->cpu_implementer);
-    tmp_part = (char*)arm_part(processor->cpu_implementer, processor->cpu_part);
+    arm_part(processor->cpu_implementer, processor->cpu_part, &tmp_imp, &tmp_part);
     tmp_arch = (char*)arm_arch_more(processor->cpu_architecture);
 
     tmp_topology = cputopo_section_str(processor->cputopo);