aboutsummaryrefslogtreecommitdiff
path: root/modules/devices/x86
diff options
context:
space:
mode:
Diffstat (limited to 'modules/devices/x86')
-rw-r--r--modules/devices/x86/processor.c506
-rw-r--r--modules/devices/x86/x86_data.c344
-rw-r--r--modules/devices/x86/x86_data.h28
3 files changed, 509 insertions, 369 deletions
diff --git a/modules/devices/x86/processor.c b/modules/devices/x86/processor.c
index 25dc6c4a..ad3c7ca4 100644
--- a/modules/devices/x86/processor.c
+++ b/modules/devices/x86/processor.c
@@ -18,6 +18,10 @@
#include "hardinfo.h"
#include "devices.h"
+#include "cpu_util.h"
+
+#include "x86_data.h"
+#include "x86_data.c"
/*
* This function is partly based on x86cpucaps
@@ -148,10 +152,10 @@ static gchar *__cache_get_info_as_string(Processor *processor)
for (cache_list = processor->cache; cache_list; cache_list = cache_list->next) {
cache = (ProcessorCache *)cache_list->data;
- result = h_strdup_cprintf("Level %d (%s)=%d-way set-associative, %d sets, %dKB size\n",
+ result = h_strdup_cprintf(_("Level %d (%s)=%d-way set-associative, %d sets, %dKB size\n"),
result,
cache->level,
- cache->type,
+ C_("cache-type", cache->type),
cache->ways_of_associativity,
cache->number_of_sets,
cache->size);
@@ -160,6 +164,14 @@ static gchar *__cache_get_info_as_string(Processor *processor)
return result;
}
+/* This is not used directly, but creates translatable strings for
+ * the type string returned from /sys/.../cache */
+static const char* cache_types[] = {
+ NC_("cache-type", /*/cache type, as appears in: Level 1 (Data)*/ "Data"),
+ NC_("cache-type", /*/cache type, as appears in: Level 1 (Instruction)*/ "Instruction"),
+ NC_("cache-type", /*/cache type, as appears in: Level 2 (Unified)*/ "Unified")
+};
+
static void __cache_obtain_info(Processor *processor)
{
ProcessorCache *cache;
@@ -214,33 +226,6 @@ fail:
g_free(endpoint);
}
-int processor_has_flag(gchar * strflags, gchar * strflag)
-{
- gchar **flags;
- gint ret = 0;
- if (strflags == NULL || strflag == NULL)
- return 0;
- flags = g_strsplit(strflags, " ", 0);
- ret = g_strv_contains((const gchar * const *)flags, strflag);
- g_strfreev(flags);
- return ret;
-}
-
-static gint get_cpu_int(const gchar* file, gint cpuid) {
- gchar *tmp0 = NULL;
- gchar *tmp1 = NULL;
- gint ret = 0;
-
- tmp0 = g_strdup_printf("/sys/devices/system/cpu/cpu%d/%s", cpuid, file);
- g_file_get_contents(tmp0, &tmp1, NULL, NULL);
- if (tmp1)
- ret = atol(tmp1);
-
- g_free(tmp0);
- g_free(tmp1);
- return ret;
-}
-
GSList *processor_scan(void)
{
GSList *procs = NULL, *l = NULL;
@@ -248,7 +233,7 @@ GSList *processor_scan(void)
FILE *cpuinfo;
gchar buffer[512];
- cpuinfo = fopen("/proc/cpuinfo", "r");
+ cpuinfo = fopen(PROC_CPUINFO, "r");
if (!cpuinfo)
return NULL;
@@ -280,6 +265,7 @@ GSList *processor_scan(void)
get_str("flags", processor->flags);
get_str("bugs", processor->bugs);
get_str("power management", processor->pm);
+ get_str("microcode", processor->microcode);
get_int("cache size", processor->cache_size);
get_float("cpu MHz", processor->cpu_mhz);
get_float("bogomips", processor->bogomips);
@@ -290,6 +276,7 @@ GSList *processor_scan(void)
get_str("hlt_bug", processor->bug_hlt);
get_str("f00f_bug", processor->bug_f00f);
get_str("coma_bug", processor->bug_coma);
+ /* sep_bug? */
get_int("model", processor->model);
get_int("cpu family", processor->family);
@@ -298,6 +285,8 @@ GSList *processor_scan(void)
g_strfreev(tmp);
}
+ fclose(cpuinfo);
+
/* finish last */
if (processor)
procs = g_slist_append(procs, processor);
@@ -305,9 +294,17 @@ GSList *processor_scan(void)
for (l = procs; l; l = l->next) {
processor = (Processor *) l->data;
+ STRIFNULL(processor->microcode, _("(Not Available)") );
+
get_processor_strfamily(processor);
__cache_obtain_info(processor);
+#define NULLIFNOTYES(f) if (processor->f) if (strcmp(processor->f, "yes") != 0) { g_free(processor->f); processor->f = NULL; }
+ NULLIFNOTYES(bug_fdiv);
+ NULLIFNOTYES(bug_hlt);
+ NULLIFNOTYES(bug_f00f);
+ NULLIFNOTYES(bug_coma);
+
if (processor->bugs == NULL || g_strcmp0(processor->bugs, "") == 0) {
g_free(processor->bugs);
/* make bugs list on old kernels that don't offer one */
@@ -337,291 +334,38 @@ GSList *processor_scan(void)
g_strchug(processor->pm);
}
- /* freq */
- processor->cpukhz_cur = get_cpu_int("cpufreq/scaling_cur_freq", processor->id);
- processor->cpukhz_min = get_cpu_int("cpufreq/scaling_min_freq", processor->id);
- processor->cpukhz_max = get_cpu_int("cpufreq/scaling_max_freq", processor->id);
- if (processor->cpukhz_max)
- processor->cpu_mhz = processor->cpukhz_max / 1000;
- }
-
- fclose(cpuinfo);
-
- return procs;
-}
-
-/*
- * Sources:
- * - Linux' cpufeature.h
- * - http://gentoo-wiki.com/Cpuinfo
- * - Intel IA-32 Architecture Software Development Manual
- * - https://unix.stackexchange.com/questions/43539/what-do-the-flags-in-proc-cpuinfo-mean
- */
-static struct {
- char *name, *meaning;
-} flag_meaning[] = {
- { "3dnow", "3DNow! Technology" },
- { "3dnowext", "Extended 3DNow! Technology" },
- { "fpu", "Floating Point Unit" },
- { "vme", "Virtual 86 Mode Extension" },
- { "de", "Debug Extensions - I/O breakpoints" },
- { "pse", "Page Size Extensions (4MB pages)" },
- { "tsc", "Time Stamp Counter and RDTSC instruction" },
- { "msr", "Model Specific Registers" },
- { "pae", "Physical Address Extensions" },
- { "mce", "Machine Check Architecture" },
- { "cx8", "CMPXCHG8 instruction" },
- { "apic", "Advanced Programmable Interrupt Controller" },
- { "sep", "Fast System Call (SYSENTER/SYSEXIT)" },
- { "mtrr", "Memory Type Range Registers" },
- { "pge", "Page Global Enable" },
- { "mca", "Machine Check Architecture" },
- { "cmov", "Conditional Move instruction" },
- { "pat", "Page Attribute Table" },
- { "pse36", "36bit Page Size Extensions" },
- { "psn", "96 bit Processor Serial Number" },
- { "mmx", "MMX technology" },
- { "mmxext", "Extended MMX Technology" },
- { "cflush", "Cache Flush" },
- { "dtes", "Debug Trace Store" },
- { "fxsr", "FXSAVE and FXRSTOR instructions" },
- { "kni", "Streaming SIMD instructions" },
- { "xmm", "Streaming SIMD instructions" },
- { "ht", "HyperThreading" },
- { "mp", "Multiprocessing Capable" },
- { "sse", "SSE instructions" },
- { "sse2", "SSE2 (WNI) instructions" },
- { "acc", "Automatic Clock Control" },
- { "ia64", "IA64 Instructions" },
- { "syscall", "SYSCALL and SYSEXIT instructions" },
- { "nx", "No-execute Page Protection" },
- { "xd", "Execute Disable" },
- { "clflush", "Cache Line Flush instruction" },
- { "acpi", "Thermal Monitor and Software Controlled Clock" },
- { "dts", "Debug Store" },
- { "ss", "Self Snoop" },
- { "tm", "Thermal Monitor" },
- { "pbe", "Pending Break Enable" },
- { "pb", "Pending Break Enable" },
- { "pn", "Processor serial number" },
- { "ds", "Debug Store" },
- { "xmm2", "Streaming SIMD Extensions-2" },
- { "xmm3", "Streaming SIMD Extensions-3" },
- { "selfsnoop", "CPU self snoop" },
- { "rdtscp", "RDTSCP" },
- { "recovery", "CPU in recovery mode" },
- { "longrun", "Longrun power control" },
- { "lrti", "LongRun table interface" },
- { "cxmmx", "Cyrix MMX extensions" },
- { "k6_mtrr", "AMD K6 nonstandard MTRRs" },
- { "cyrix_arr", "Cyrix ARRs (= MTRRs)" },
- { "centaur_mcr","Centaur MCRs (= MTRRs)" },
- { "constant_tsc","TSC ticks at a constant rate" },
- { "up", "smp kernel running on up" },
- { "fxsave_leak","FXSAVE leaks FOP/FIP/FOP" },
- { "arch_perfmon","Intel Architectural PerfMon" },
- { "pebs", "Precise-Event Based Sampling" },
- { "bts", "Branch Trace Store" },
- { "sync_rdtsc", "RDTSC synchronizes the CPU" },
- { "rep_good", "rep microcode works well on this CPU" },
- { "mwait", "Monitor/Mwait support" },
- { "ds_cpl", "CPL Qualified Debug Store" },
- { "est", "Enhanced SpeedStep" },
- { "tm2", "Thermal Monitor 2" },
- { "cid", "Context ID" },
- { "xtpr", "Send Task Priority Messages" },
- { "xstore", "on-CPU RNG present (xstore insn)" },
- { "xstore_en", "on-CPU RNG enabled" },
- { "xcrypt", "on-CPU crypto (xcrypt insn)" },
- { "xcrypt_en", "on-CPU crypto enabled" },
- { "ace2", "Advanced Cryptography Engine v2" },
- { "ace2_en", "ACE v2 enabled" },
- { "phe", "PadLock Hash Engine" },
- { "phe_en", "PHE enabled" },
- { "pmm", "PadLock Montgomery Multiplier" },
- { "pmm_en", "PMM enabled" },
- { "lahf_lm", "LAHF/SAHF in long mode" },
- { "cmp_legacy", "HyperThreading not valid" },
- { "lm", "LAHF/SAHF in long mode" },
- { "ds_cpl", "CPL Qualified Debug Store" },
- { "vmx", "Virtualization support (Intel)" },
- { "svm", "Virtualization support (AMD)" },
- { "est", "Enhanced SpeedStep" },
- { "tm2", "Thermal Monitor 2" },
- { "ssse3", "Supplemental Streaming SIMD Extension 3" },
- { "cx16", "CMPXCHG16B instruction" },
- { "xptr", "Send Task Priority Messages" },
- { "pebs", "Precise Event Based Sampling" },
- { "bts", "Branch Trace Store" },
- { "ida", "Intel Dynamic Acceleration" },
- { "arch_perfmon","Intel Architectural PerfMon" },
- { "pni", "Streaming SIMD Extension 3 (Prescott New Instruction)" },
- { "rep_good", "rep microcode works well on this CPU" },
- { "ts", "Thermal Sensor" },
- { "sse3", "Streaming SIMD Extension 3" },
- { "sse4", "Streaming SIMD Extension 4" },
- { "tni", "Tejas New Instruction" },
- { "nni", "Nehalem New Instruction" },
- { "tpr", "Task Priority Register" },
- { "vid", "Voltage Identifier" },
- { "fid", "Frequency Identifier" },
- { "dtes64", "64-bit Debug Store" },
- { "monitor", "Monitor/Mwait support" },
- { "sse4_1", "Streaming SIMD Extension 4.1" },
- { "sse4_2", "Streaming SIMD Extension 4.2" },
- { "nopl", "NOPL instructions" },
- { "cxmmx", "Cyrix MMX extensions" },
- { "xtopology", "CPU topology enum extensions" },
- { "nonstop_tsc", "TSC does not stop in C states" },
- { "eagerfpu", "Non lazy FPU restor" },
- { "pclmulqdq", "Perform a Carry-Less Multiplication of Quadword instruction" },
- { "smx", "Safer mode: TXT (TPM support)" },
- { "pdcm", "Performance capabilities" },
- { "pcid", "Process Context Identifiers" },
- { "x2apic", "x2APIC" },
- { "popcnt", "Set bit count instructions" },
- { "aes", "Advanced Encryption Standard" },
- { "aes-ni", "Advanced Encryption Standard (New Instructions)" },
- { "xsave", "Save Processor Extended States" },
- { "avx", "Advanced Vector Instructions" },
- { NULL, NULL },
-};
-
-static struct {
- char *name, *meaning;
-} bug_meaning[] = {
- { "f00f", "Intel F00F bug" },
- { "fdiv", "FPU FDIV" },
- { "coma", "Cyrix 6x86 coma" },
- { "tlb_mmatch", "AMD Erratum 383" },
- { "apic_c1e", "AMD Erratum 400" },
- { "11ap", "Bad local APIC aka 11AP" },
- { "fxsave_leak", "FXSAVE leaks FOP/FIP/FOP" },
- { "clflush_monitor", "AAI65, CLFLUSH required before MONITOR" },
- { "sysret_ss_attrs", "SYSRET doesn't fix up SS attrs" },
- { "espfix", "IRET to 16-bit SS corrupts ESP/RSP high bits" },
- { "null_seg", "Nulling a selector preserves the base" }, /* see: detect_null_seg_behavior() */
- { "swapgs_fence","SWAPGS without input dep on GS" },
- { "monitor", "IPI required to wake up remote CPU" },
- { "amd_e400", "AMD Erratum 400" },
- { NULL, NULL },
-};
-
-/* from arch/x86/kernel/cpu/powerflags.h */
-static struct {
- char *name, *meaning;
-} pm_meaning[] = {
- { "ts", "temperature sensor" },
- { "fid", "frequency id control" },
- { "vid", "voltage id control" },
- { "ttp", "thermal trip" },
- { "tm", "hardware thermal control" },
- { "stc", "software thermal control" },
- { "100mhzsteps", "100 MHz multiplier control" },
- { "hwpstate", "hardware P-state control" },
-/* { "", "tsc invariant mapped to constant_tsc" }, */
- { "cpb", "core performance boost" },
- { "eff_freq_ro", "Readonly aperf/mperf" },
- { "proc_feedback", "processor feedback interface" },
- { "acc_power", "accumulated power mechanism" },
- { NULL, NULL },
-};
-
-GHashTable *cpu_flags = NULL;
-
-static void
-populate_cpu_flags_list_internal()
-{
- int i;
-
- DEBUG("using internal CPU flags database");
+ /* topo & freq */
+ processor->cpufreq = cpufreq_new(processor->id);
+ processor->cputopo = cputopo_new(processor->id);
- for (i = 0; flag_meaning[i].name != NULL; i++) {
- g_hash_table_insert(cpu_flags, flag_meaning[i].name,
- flag_meaning[i].meaning);
+ if (processor->cpufreq->cpukhz_max)
+ processor->cpu_mhz = processor->cpufreq->cpukhz_max / 1000;
}
- for (i = 0; bug_meaning[i].name != NULL; i++) {
- g_hash_table_insert(cpu_flags, bug_meaning[i].name,
- bug_meaning[i].meaning);
- }
- for (i = 0; pm_meaning[i].name != NULL; i++) {
- g_hash_table_insert(cpu_flags, pm_meaning[i].name,
- pm_meaning[i].meaning);
- }
-}
-
-void cpu_flags_init(void)
-{
- gint i;
- gchar *path;
-
- cpu_flags = g_hash_table_new(g_str_hash, g_str_equal);
-
- path = g_build_filename(g_get_home_dir(), ".hardinfo", "cpuflags.conf", NULL);
- if (!g_file_test(path, G_FILE_TEST_EXISTS)) {
- populate_cpu_flags_list_internal();
- } else {
- GKeyFile *flags_file;
- DEBUG("using %s as CPU flags database", path);
-
- flags_file = g_key_file_new();
- if (g_key_file_load_from_file(flags_file, path, 0, NULL)) {
- gchar **flag_keys;
-
- flag_keys = g_key_file_get_keys(flags_file, "flags",
- NULL, NULL);
- if (!flag_keys) {
- DEBUG("error while using %s as CPU flags database, falling back to internal",
- path);
- populate_cpu_flags_list_internal();
- } else {
- for (i = 0; flag_keys[i]; i++) {
- gchar *meaning;
-
- meaning = g_key_file_get_string(flags_file, "flags",
- flag_keys[i], NULL);
-
- g_hash_table_insert(cpu_flags, g_strdup(flag_keys[i]), meaning);
-
- /* can't free meaning */
- }
-
- g_strfreev(flag_keys);
- }
- }
-
- g_key_file_free(flags_file);
- }
-
- g_free(path);
+ return procs;
}
-gchar *processor_get_capabilities_from_flags(gchar * strflags)
+gchar *processor_get_capabilities_from_flags(gchar *strflags, gchar *lookup_prefix)
{
- /* FIXME:
- * - Separate between processor capabilities, additional instructions and whatnot.
- */
gchar **flags, **old;
+ gchar tmp_flag[64] = "";
+ const gchar *meaning;
gchar *tmp = NULL;
gint j = 0;
- if (!cpu_flags) {
- cpu_flags_init();
- }
-
flags = g_strsplit(strflags, " ", 0);
old = flags;
while (flags[j]) {
- gchar *meaning = g_hash_table_lookup(cpu_flags, flags[j]);
+ sprintf(tmp_flag, "%s%s", lookup_prefix, flags[j]);
+ meaning = x86_flag_meaning(tmp_flag);
- if (meaning) {
- tmp = h_strdup_cprintf("%s=%s\n", tmp, flags[j], meaning);
+ if (meaning) {
+ tmp = h_strdup_cprintf("%s=%s\n", tmp, flags[j], meaning);
} else {
- tmp = h_strdup_cprintf("%s=\n", tmp, flags[j]);
+ tmp = h_strdup_cprintf("%s=\n", tmp, flags[j]);
}
- j++;
+ j++;
}
if (tmp == NULL || g_strcmp0(tmp, "") == 0)
tmp = g_strdup_printf("%s=%s\n", "empty", _("Empty List"));
@@ -632,96 +376,120 @@ gchar *processor_get_capabilities_from_flags(gchar * strflags)
gchar *processor_get_detailed_info(Processor * processor)
{
- gchar *tmp_flags, *tmp_bugs, *tmp_pm, *ret, *cache_info;
+ gchar *tmp_flags, *tmp_bugs, *tmp_pm, *tmp_cpufreq, *tmp_topology, *ret, *cache_info;
- tmp_flags = processor_get_capabilities_from_flags(processor->flags);
- tmp_bugs = processor_get_capabilities_from_flags(processor->bugs);
- tmp_pm = processor_get_capabilities_from_flags(processor->pm);
+ tmp_flags = processor_get_capabilities_from_flags(processor->flags, "");
+ tmp_bugs = processor_get_capabilities_from_flags(processor->bugs, "bug:");
+ tmp_pm = processor_get_capabilities_from_flags(processor->pm, "pm:");
cache_info = __cache_get_info_as_string(processor);
- ret = g_strdup_printf(_("[Processor]\n"
- "Name=%s\n"
- "Family, model, stepping=%d, %d, %d (%s)\n"
- "Vendor=%s\n"
- "[Configuration]\n"
- "Cache Size=%dkb\n"
- "Frequency=%.2fMHz\n"
- "BogoMIPS=%.2f\n"
- "Byte Order=%s\n"
- "[Frequency Scaling]\n"
- "Minimum=%d kHz\n"
- "Maximum=%d kHz\n"
- "Current=%d kHz\n"
- "[Features]\n"
- "Has FPU=%s\n"
- "[Cache]\n"
- "%s\n"
- "[Power Management]\n"
- "%s"
- "[Bugs]\n"
- "%s"
- "[Capabilities]\n"
- "%s"),
- processor->model_name,
- processor->family,
- processor->model,
- processor->stepping,
- processor->strmodel,
- vendor_get_name(processor->vendor_id),
- processor->cache_size,
- processor->cpu_mhz, processor->bogomips,
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
- "Little Endian",
-#else
- "Big Endian",
-#endif
- processor->cpukhz_min,
- processor->cpukhz_max,
- processor->cpukhz_cur,
- processor->has_fpu ? processor->has_fpu : "no",
- cache_info,
- tmp_pm, tmp_bugs, tmp_flags);
+ tmp_topology = cputopo_section_str(processor->cputopo);
+ tmp_cpufreq = cpufreq_section_str(processor->cpufreq);
+
+ ret = g_strdup_printf("[%s]\n"
+ "%s=%s\n"
+ "%s=%d, %d, %d (%s)\n" /* family, model, stepping (decoded name) */
+ "%s=%s\n" /* vendor */
+ "%s=%s\n" /* microcode */
+ "[%s]\n" /* configuration */
+ "%s=%d %s\n" /* cache size (from cpuinfo) */
+ "%s=%.2f %s\n" /* frequency */
+ "%s=%.2f\n" /* bogomips */
+ "%s=%s\n" /* byte order */
+ "%s" /* topology */
+ "%s" /* frequency scaling */
+ "[%s]\n" /* cache */
+ "%s\n"
+ "[%s]\n" /* pm */
+ "%s"
+ "[%s]\n" /* bugs */
+ "%s"
+ "[%s]\n" /* flags */
+ "%s",
+ _("Processor"),
+ _("Model Name"), processor->model_name,
+ _("Family, model, stepping"),
+ processor->family,
+ processor->model,
+ processor->stepping,
+ processor->strmodel,
+ _("Vendor"), vendor_get_name(processor->vendor_id),
+ _("Microcode Version"), processor->microcode,
+ _("Configuration"),
+ _("Cache Size"), processor->cache_size, _("kb"),
+ _("Frequency"), processor->cpu_mhz, _("MHz"),
+ _("BogoMips"), processor->bogomips,
+ _("Byte Order"), byte_order_str(),
+ tmp_topology,
+ tmp_cpufreq,
+ _("Cache"), cache_info,
+ _("Power Management"), tmp_pm,
+ _("Bug Workarounds"), tmp_bugs,
+ _("Capabilities"), tmp_flags );
g_free(tmp_flags);
g_free(tmp_bugs);
g_free(tmp_pm);
g_free(cache_info);
+ g_free(tmp_cpufreq);
+ g_free(tmp_topology);
+ return ret;
+}
+
+gchar *processor_name(GSList * processors) {
+ return processor_name_default(processors);
+}
+gchar *processor_describe(GSList * processors) {
+ return processor_describe_default(processors);
+}
+
+gchar *processor_meta(GSList * processors) {
+ gchar *meta_cpu_name = processor_name(processors);
+ gchar *meta_cpu_desc = processor_describe(processors);
+ gchar *ret = NULL;
+ UNKIFNULL(meta_cpu_desc);
+ ret = g_strdup_printf("[%s]\n"
+ "%s=%s\n"
+ "%s=%s\n",
+ _("Package Information"),
+ _("Name"), meta_cpu_name,
+ _("Description"), meta_cpu_desc);
+ g_free(meta_cpu_desc);
return ret;
}
gchar *processor_get_info(GSList * processors)
{
Processor *processor;
+ gchar *ret, *tmp, *hashkey;
+ gchar *meta; /* becomes owned by more_info? no need to free? */
+ GSList *l;
- if (g_slist_length(processors) > 1) {
- gchar *ret, *tmp, *hashkey;
- GSList *l;
-
- tmp = g_strdup("");
+ tmp = g_strdup_printf("$CPU_META$%s=\n", _("Package Information") );
- for (l = processors; l; l = l->next) {
- processor = (Processor *) l->data;
+ meta = processor_meta(processors);
+ moreinfo_add_with_prefix("DEV", "CPU_META", meta);
- tmp = g_strdup_printf(_("%s$CPU%d$%s=%.2fMHz\n"),
- tmp, processor->id,
- processor->model_name,
- processor->cpu_mhz);
-
- hashkey = g_strdup_printf("CPU%d", processor->id);
- moreinfo_add_with_prefix("DEV", hashkey,
- processor_get_detailed_info(processor));
- g_free(hashkey);
- }
+ for (l = processors; l; l = l->next) {
+ processor = (Processor *) l->data;
- ret = g_strdup_printf("[$ShellParam$]\n"
- "ViewType=1\n"
- "[Processors]\n"
- "%s", tmp);
- g_free(tmp);
+ tmp = g_strdup_printf("%s$CPU%d$%s=%.2f %s\n",
+ tmp, processor->id,
+ processor->model_name,
+ processor->cpu_mhz, _("MHz"));
- return ret;
+ hashkey = g_strdup_printf("CPU%d", processor->id);
+ moreinfo_add_with_prefix("DEV", hashkey,
+ processor_get_detailed_info(processor));
+ g_free(hashkey);
}
- processor = (Processor *) processors->data;
- return processor_get_detailed_info(processor);
+ ret = g_strdup_printf("[$ShellParam$]\n"
+ "ViewType=1\n"
+ "[Processors]\n"
+ "%s", tmp);
+ g_free(tmp);
+
+ return ret;
}
+
diff --git a/modules/devices/x86/x86_data.c b/modules/devices/x86/x86_data.c
new file mode 100644
index 00000000..ebd434bb
--- /dev/null
+++ b/modules/devices/x86/x86_data.c
@@ -0,0 +1,344 @@
+/*
+ * rpiz - https://github.com/bp0/rpiz
+ * Copyright (C) 2017 Burt P. <pburt0@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "x86_data.h"
+
+#ifndef C_
+#define C_(Ctx, String) String
+#endif
+#ifndef NC_
+#define NC_(Ctx, String) String
+#endif
+
+/* sources:
+ * https://unix.stackexchange.com/a/43540
+ * https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/arch/x86/include/asm/cpufeatures.h?id=refs/tags/v4.9
+ * hardinfo: modules/devices/x86/processor.c
+ */
+static struct {
+ char *name, *meaning;
+} tab_flag_meaning[] = {
+/* Intel-defined CPU features, CPUID level 0x00000001 (edx)
+ * See also Wikipedia and table 2-27 in Intel Advanced Vector Extensions Programming Reference */
+ { "fpu", NC_("x86-flag", /*/flag:fpu*/ "Onboard FPU (floating point support)") },
+ { "vme", NC_("x86-flag", /*/flag:vme*/ "Virtual 8086 mode enhancements") },
+ { "de", NC_("x86-flag", /*/flag:de*/ "Debugging Extensions (CR4.DE)") },
+ { "pse", NC_("x86-flag", /*/flag:pse*/ "Page Size Extensions (4MB memory pages)") },
+ { "tsc", NC_("x86-flag", /*/flag:tsc*/ "Time Stamp Counter (RDTSC)") },
+ { "msr", NC_("x86-flag", /*/flag:msr*/ "Model-Specific Registers (RDMSR, WRMSR)") },
+ { "pae", NC_("x86-flag", /*/flag:pae*/ "Physical Address Extensions (support for more than 4GB of RAM)") },
+ { "mce", NC_("x86-flag", /*/flag:mce*/ "Machine Check Exception") },
+ { "cx8", NC_("x86-flag", /*/flag:cx8*/ "CMPXCHG8 instruction (64-bit compare-and-swap)") },
+ { "apic", NC_("x86-flag", /*/flag:apic*/ "Onboard APIC") },
+ { "sep", NC_("x86-flag", /*/flag:sep*/ "SYSENTER/SYSEXIT") },
+ { "mtrr", NC_("x86-flag", /*/flag:mtrr*/ "Memory Type Range Registers") },
+ { "pge", NC_("x86-flag", /*/flag:pge*/ "Page Global Enable (global bit in PDEs and PTEs)") },
+ { "mca", NC_("x86-flag", /*/flag:mca*/ "Machine Check Architecture") },
+ { "cmov", NC_("x86-flag", /*/flag:cmov*/ "CMOV instructions (conditional move) (also FCMOV)") },
+ { "pat", NC_("x86-flag", /*/flag:pat*/ "Page Attribute Table") },
+ { "pse36", NC_("x86-flag", /*/flag:pse36*/ "36-bit PSEs (huge pages)") },
+ { "pn", NC_("x86-flag", /*/flag:pn*/ "Processor serial number") },
+ { "clflush", NC_("x86-flag", /*/flag:clflush*/ "Cache Line Flush instruction") },
+ { "dts", NC_("x86-flag", /*/flag:dts*/ "Debug Store (buffer for debugging and profiling instructions), or alternately: digital thermal sensor") },
+ { "acpi", NC_("x86-flag", /*/flag:acpi*/ "ACPI via MSR (temperature monitoring and clock speed modulation)") },
+ { "mmx", NC_("x86-flag", /*/flag:mmx*/ "Multimedia Extensions") },
+ { "fxsr", NC_("x86-flag", /*/flag:fxsr*/ "FXSAVE/FXRSTOR, CR4.OSFXSR") },
+ { "sse", NC_("x86-flag", /*/flag:sse*/ "Intel SSE vector instructions") },
+ { "sse2", NC_("x86-flag", /*/flag:sse2*/ "SSE2") },
+ { "ss", NC_("x86-flag", /*/flag:ss*/ "CPU self snoop") },
+ { "ht", NC_("x86-flag", /*/flag:ht*/ "Hyper-Threading") },
+ { "tm", NC_("x86-flag", /*/flag:tm*/ "Automatic clock control (Thermal Monitor)") },
+ { "ia64", NC_("x86-flag", /*/flag:ia64*/ "Intel Itanium Architecture 64-bit (not to be confused with Intel's 64-bit x86 architecture with flag x86-64 or \"AMD64\" bit indicated by flag lm)") },
+ { "pbe", NC_("x86-flag", /*/flag:pbe*/ "Pending Break Enable (PBE# pin) wakeup support") },
+/* AMD-defined CPU features, CPUID level 0x80000001
+ * See also Wikipedia and table 2-23 in Intel Advanced Vector Extensions Programming Reference */
+ { "syscall", NC_("x86-flag", /*/flag:syscall*/ "SYSCALL (Fast System Call) and SYSRET (Return From Fast System Call)") },
+ { "mp", NC_("x86-flag", /*/flag:mp*/ "Multiprocessing Capable.") },
+ { "nx", NC_("x86-flag", /*/flag:nx*/ "Execute Disable") },
+ { "mmxext", NC_("x86-flag", /*/flag:mmxext*/ "AMD MMX extensions") },
+ { "fxsr_opt", NC_("x86-flag", /*/flag:fxsr_opt*/ "FXSAVE/FXRSTOR optimizations") },
+ { "pdpe1gb", NC_("x86-flag", /*/flag:pdpe1gb*/ "One GB pages (allows hugepagesz=1G)") },
+ { "rdtscp", NC_("x86-flag", /*/flag:rdtscp*/ "Read Time-Stamp Counter and Processor ID") },
+ { "lm", NC_("x86-flag", /*/flag:lm*/ "Long Mode (x86-64: amd64, also known as Intel 64, i.e. 64-bit capable)") },
+ { "3dnow", NC_("x86-flag", /*/flag:3dnow*/ "3DNow! (AMD vector instructions, competing with Intel's SSE1)") },
+ { "3dnowext", NC_("x86-flag", /*/flag:3dnowext*/ "AMD 3DNow! extensions") },
+/* Transmeta-defined CPU features, CPUID level 0x80860001 */
+ { "recovery", NC_("x86-flag", /*/flag:recovery*/ "CPU in recovery mode") },
+ { "longrun", NC_("x86-flag", /*/flag:longrun*/ "Longrun power control") },
+ { "lrti", NC_("x86-flag", /*/flag:lrti*/ "LongRun table interface") },
+/* Other features, Linux-defined mapping */
+ { "cxmmx", NC_("x86-flag", /*/flag:cxmmx*/ "Cyrix MMX extensions") },
+ { "k6_mtrr", NC_("x86-flag", /*/flag:k6_mtrr*/ "AMD K6 nonstandard MTRRs") },
+ { "cyrix_arr", NC_("x86-flag", /*/flag:cyrix_arr*/ "Cyrix ARRs (= MTRRs)") },
+ { "centaur_mcr", NC_("x86-flag", /*/flag:centaur_mcr*/ "Centaur MCRs (= MTRRs)") },
+ { "constant_tsc", NC_("x86-flag", /*/flag:constant_tsc*/ "TSC ticks at a constant rate") },
+ { "up", NC_("x86-flag", /*/flag:up*/ "SMP kernel running on UP") },
+ { "art", NC_("x86-flag", /*/flag:art*/ "Always-Running Timer") },
+ { "arch_perfmon", NC_("x86-flag", /*/flag:arch_perfmon*/ "Intel Architectural PerfMon") },
+ { "pebs", NC_("x86-flag", /*/flag:pebs*/ "Precise-Event Based Sampling") },
+ { "bts", NC_("x86-flag", /*/flag:bts*/ "Branch Trace Store") },
+ { "rep_good", NC_("x86-flag", /*/flag:rep_good*/ "rep microcode works well") },
+ { "acc_power", NC_("x86-flag", /*/flag:acc_power*/ "AMD accumulated power mechanism") },
+ { "nopl", NC_("x86-flag", /*/flag:nopl*/ "The NOPL (0F 1F) instructions") },
+ { "xtopology", NC_("x86-flag", /*/flag:xtopology*/ "cpu topology enum extensions") },
+ { "tsc_reliable", NC_("x86-flag", /*/flag:tsc_reliable*/ "TSC is known to be reliable") },
+ { "nonstop_tsc", NC_("x86-flag", /*/flag:nonstop_tsc*/ "TSC does not stop in C states") },
+ { "extd_apicid", NC_("x86-flag", /*/flag:extd_apicid*/ "has extended APICID (8 bits)") },
+ { "amd_dcm", NC_("x86-flag", /*/flag:amd_dcm*/ "multi-node processor") },
+ { "aperfmperf", NC_("x86-flag", /*/flag:aperfmperf*/ "APERFMPERF") },
+ { "eagerfpu", NC_("x86-flag", /*/flag:eagerfpu*/ "Non lazy FPU restore") },
+ { "nonstop_tsc_s3", NC_("x86-flag", /*/flag:nonstop_tsc_s3*/ "TSC doesn't stop in S3 state") },
+ { "mce_recovery", NC_("x86-flag", /*/flag:mce_recovery*/ "CPU has recoverable machine checks") },
+/* Intel-defined CPU features, CPUID level 0x00000001 (ecx)
+ * See also Wikipedia and table 2-26 in Intel Advanced Vector Extensions Programming Reference */
+ { "pni", NC_("x86-flag", /*/flag:pni*/ "SSE-3 (\"Prescott New Instructions\")") },
+ { "pclmulqdq", NC_("x86-flag", /*/flag:pclmulqdq*/ "Perform a Carry-Less Multiplication of Quadword instruction - accelerator for GCM)") },
+ { "dtes64", NC_("x86-flag", /*/flag:dtes64*/ "64-bit Debug Store") },
+ { "monitor", NC_("x86-flag", /*/flag:monitor*/ "Monitor/Mwait support (Intel SSE3 supplements)") },
+ { "ds_cpl", NC_("x86-flag", /*/flag:ds_cpl*/ "CPL Qual. Debug Store") },
+ { "vmx", NC_("x86-flag", /*/flag:vmx*/ "Hardware virtualization, Intel VMX") },
+ { "smx", NC_("x86-flag", /*/flag:smx*/ "Safer mode TXT (TPM support)") },
+ { "est", NC_("x86-flag", /*/flag:est*/ "Enhanced SpeedStep") },
+ { "tm2", NC_("x86-flag", /*/flag:tm2*/ "Thermal Monitor 2") },
+ { "ssse3", NC_("x86-flag", /*/flag:ssse3*/ "Supplemental SSE-3") },
+ { "cid", NC_("x86-flag", /*/flag:cid*/ "Context ID") },
+ { "sdbg", NC_("x86-flag", /*/flag:sdbg*/ "silicon debug") },
+ { "fma", NC_("x86-flag", /*/flag:fma*/ "Fused multiply-add") },
+ { "cx16", NC_("x86-flag", /*/flag:cx16*/ "CMPXCHG16B") },
+ { "xtpr", NC_("x86-flag", /*/flag:xtpr*/ "Send Task Priority Messages") },
+ { "pdcm", NC_("x86-flag", /*/flag:pdcm*/ "Performance Capabilities") },
+ { "pcid", NC_("x86-flag", /*/flag:pcid*/ "Process Context Identifiers") },
+ { "dca", NC_("x86-flag", /*/flag:dca*/ "Direct Cache Access") },
+ { "sse4_1", NC_("x86-flag", /*/flag:sse4_1*/ "SSE-4.1") },
+ { "sse4_2", NC_("x86-flag", /*/flag:sse4_2*/ "SSE-4.2") },
+ { "x2apic", NC_("x86-flag", /*/flag:x2apic*/ "x2APIC") },
+ { "movbe", NC_("x86-flag", /*/flag:movbe*/ "Move Data After Swapping Bytes instruction") },
+ { "popcnt", NC_("x86-flag", /*/flag:popcnt*/ "Return the Count of Number of Bits Set to 1 instruction (Hamming weight, i.e. bit count)") },
+ { "tsc_deadline_timer", NC_("x86-flag", /*/flag:tsc_deadline_timer*/ "Tsc deadline timer") },
+ { "aes/aes-ni", NC_("x86-flag", /*/flag:aes/aes-ni*/ "Advanced Encryption Standard (New Instructions)") },
+ { "xsave", NC_("x86-flag", /*/flag:xsave*/ "Save Processor Extended States: also provides XGETBY,XRSTOR,XSETBY") },
+ { "avx", NC_("x86-flag", /*/flag:avx*/ "Advanced Vector Extensions") },
+ { "f16c", NC_("x86-flag", /*/flag:f16c*/ "16-bit fp conversions (CVT16)") },
+ { "rdrand", NC_("x86-flag", /*/flag:rdrand*/ "Read Random Number from hardware random number generator instruction") },
+ { "hypervisor", NC_("x86-flag", /*/flag:hypervisor*/ "Running on a hypervisor") },
+/* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001 */
+ { "rng", NC_("x86-flag", /*/flag:rng*/ "Random Number Generator present (xstore)") },
+ { "rng_en", NC_("x86-flag", /*/flag:rng_en*/ "Random Number Generator enabled") },
+ { "ace", NC_("x86-flag", /*/flag:ace*/ "on-CPU crypto (xcrypt)") },
+ { "ace_en", NC_("x86-flag", /*/flag:ace_en*/ "on-CPU crypto enabled") },
+ { "ace2", NC_("x86-flag", /*/flag:ace2*/ "Advanced Cryptography Engine v2") },
+ { "ace2_en", NC_("x86-flag", /*/flag:ace2_en*/ "ACE v2 enabled") },
+ { "phe", NC_("x86-flag", /*/flag:phe*/ "PadLock Hash Engine") },
+ { "phe_en", NC_("x86-flag", /*/flag:phe_en*/ "PHE enabled") },
+ { "pmm", NC_("x86-flag", /*/flag:pmm*/ "PadLock Montgomery Multiplier") },
+ { "pmm_en", NC_("x86-flag", /*/flag:pmm_en*/ "PMM enabled") },
+/* More extended AMD flags: CPUID level 0x80000001, ecx */
+ { "lahf_lm", NC_("x86-flag", /*/flag:lahf_lm*/ "Load AH from Flags (LAHF) and Store AH into Flags (SAHF) in long mode") },
+ { "cmp_legacy", NC_("x86-flag", /*/flag:cmp_legacy*/ "If yes HyperThreading not valid") },
+ { "svm", NC_("x86-flag", /*/flag:svm*/ "\"Secure virtual machine\": AMD-V") },
+ { "extapic", NC_("x86-flag", /*/flag:extapic*/ "Extended APIC space") },
+ { "cr8_legacy", NC_("x86-flag", /*/flag:cr8_legacy*/ "CR8 in 32-bit mode") },
+ { "abm", NC_("x86-flag", /*/flag:abm*/ "Advanced Bit Manipulation") },
+ { "sse4a", NC_("x86-flag", /*/flag:sse4a*/ "SSE-4A") },
+ { "misalignsse", NC_("x86-flag", /*/flag:misalignsse*/ "indicates if a general-protection exception (#GP) is generated when some legacy SSE instructions operate on unaligned data. Also depends on CR0 and Alignment Checking bit") },
+ { "3dnowprefetch", NC_("x86-flag", /*/flag:3dnowprefetch*/ "3DNow prefetch instructions") },
+ { "osvw", NC_("x86-flag", /*/flag:osvw*/ "indicates OS Visible Workaround, which allows the OS to work around processor errata.") },
+ { "ibs", NC_("x86-flag", /*/flag:ibs*/ "Instruction Based Sampling") },
+ { "xop", NC_("x86-flag", /*/flag:xop*/ "extended AVX instructions") },
+ { "skinit", NC_("x86-flag", /*/flag:skinit*/ "SKINIT/STGI instructions") },
+ { "wdt", NC_("x86-flag", /*/flag:wdt*/ "Watchdog timer") },
+ { "lwp", NC_("x86-flag", /*/flag:lwp*/ "Light Weight Profiling") },
+ { "fma4", NC_("x86-flag", /*/flag:fma4*/ "4 operands MAC instructions") },
+ { "tce", NC_("x86-flag", /*/flag:tce*/ "translation cache extension") },
+ { "nodeid_msr", NC_("x86-flag", /*/flag:nodeid_msr*/ "NodeId MSR") },
+ { "tbm", NC_("x86-flag", /*/flag:tbm*/ "Trailing Bit Manipulation") },
+ { "topoext", NC_("x86-flag", /*/flag:topoext*/ "Topology Extensions CPUID leafs") },
+ { "perfctr_core", NC_("x86-flag", /*/flag:perfctr_core*/ "Core Performance Counter Extensions") },
+ { "perfctr_nb", NC_("x86-flag", /*/flag:perfctr_nb*/ "NB Performance Counter Extensions") },
+ { "bpext", NC_("x86-flag", /*/flag:bpext*/ "data breakpoint extension") },
+ { "ptsc", NC_("x86-flag", /*/flag:ptsc*/ "performance time-stamp counter") },
+ { "perfctr_l2", NC_("x86-flag", /*/flag:perfctr_l2*/ "L2 Performance Counter Extensions") },
+ { "mwaitx", NC_("x86-flag", /*/flag:mwaitx*/ "MWAIT extension (MONITORX/MWAITX)") },
+/* Auxiliary flags: Linux defined - For features scattered in various CPUID levels */
+ { "cpb", NC_("x86-flag", /*/flag:cpb*/ "AMD Core Performance Boost") },
+ { "epb", NC_("x86-flag", /*/flag:epb*/ "IA32_ENERGY_PERF_BIAS support") },
+ { "hw_pstate", NC_("x86-flag", /*/flag:hw_pstate*/ "AMD HW-PState") },
+ { "proc_feedback", NC_("x86-flag", /*/flag:proc_feedback*/ "AMD ProcFeedbackInterface") },
+ { "intel_pt", NC_("x86-flag", /*/flag:intel_pt*/ "Intel Processor Tracing") },
+/* Virtualization flags: Linux defined */
+ { "tpr_shadow", NC_("x86-flag", /*/flag:tpr_shadow*/ "Intel TPR Shadow") },
+ { "vnmi", NC_("x86-flag", /*/flag:vnmi*/ "Intel Virtual NMI") },
+ { "flexpriority", NC_("x86-flag", /*/flag:flexpriority*/ "Intel FlexPriority") },
+ { "ept", NC_("x86-flag", /*/flag:ept*/ "Intel Extended Page Table") },
+ { "vpid", NC_("x86-flag", /*/flag:vpid*/ "Intel Virtual Processor ID") },
+ { "vmmcall", NC_("x86-flag", /*/flag:vmmcall*/ "prefer VMMCALL to VMCALL") },
+/* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx) */
+ { "fsgsbase", NC_("x86-flag", /*/flag:fsgsbase*/ "{RD/WR}{FS/GS}BASE instructions") },
+ { "tsc_adjust", NC_("x86-flag", /*/flag:tsc_adjust*/ "TSC adjustment MSR") },
+ { "bmi1", NC_("x86-flag", /*/flag:bmi1*/ "1st group bit manipulation extensions") },
+ { "hle", NC_("x86-flag", /*/flag:hle*/ "Hardware Lock Elision") },
+ { "avx2", NC_("x86-flag", /*/flag:avx2*/ "AVX2 instructions") },
+ { "smep", NC_("x86-flag", /*/flag:smep*/ "Supervisor Mode Execution Protection") },
+ { "bmi2", NC_("x86-flag", /*/flag:bmi2*/ "2nd group bit manipulation extensions") },
+ { "erms", NC_("x86-flag", /*/flag:erms*/ "Enhanced REP MOVSB/STOSB") },
+ { "invpcid", NC_("x86-flag", /*/flag:invpcid*/ "Invalidate Processor Context ID") },
+ { "rtm", NC_("x86-flag", /*/flag:rtm*/ "Restricted Transactional Memory") },
+ { "cqm", NC_("x86-flag", /*/flag:cqm*/ "Cache QoS Monitoring") },
+ { "mpx", NC_("x86-flag", /*/flag:mpx*/ "Memory Protection Extension") },
+ { "avx512f", NC_("x86-flag", /*/flag:avx512f*/ "AVX-512 foundation") },
+ { "avx512dq", NC_("x86-flag", /*/flag:avx512dq*/ "AVX-512 Double/Quad instructions") },
+ { "rdseed", NC_("x86-flag", /*/flag:rdseed*/ "The RDSEED instruction") },
+ { "adx", NC_("x86-flag", /*/flag:adx*/ "The ADCX and ADOX instructions") },
+ { "smap", NC_("x86-flag", /*/flag:smap*/ "Supervisor Mode Access Prevention") },
+ { "clflushopt", NC_("x86-flag", /*/flag:clflushopt*/ "CLFLUSHOPT instruction") },
+ { "clwb", NC_("x86-flag", /*/flag:clwb*/ "CLWB instruction") },
+ { "avx512pf", NC_("x86-flag", /*/flag:avx512pf*/ "AVX-512 Prefetch") },
+ { "avx512er", NC_("x86-flag", /*/flag:avx512er*/ "AVX-512 Exponential and Reciprocal") },
+ { "avx512cd", NC_("x86-flag", /*/flag:avx512cd*/ "AVX-512 Conflict Detection") },
+ { "sha_ni", NC_("x86-flag", /*/flag:sha_ni*/ "SHA1/SHA256 Instruction Extensions") },
+ { "avx512bw", NC_("x86-flag", /*/flag:avx512bw*/ "AVX-512 Byte/Word instructions") },
+ { "avx512vl", NC_("x86-flag", /*/flag:avx512vl*/ "AVX-512 128/256 Vector Length extensions") },
+/* Extended state features, CPUID level 0x0000000d:1 (eax) */
+ { "xsaveopt", NC_("x86-flag", /*/flag:xsaveopt*/ "Optimized XSAVE") },
+ { "xsavec", NC_("x86-flag", /*/flag:xsavec*/ "XSAVEC") },
+ { "xgetbv1", NC_("x86-flag", /*/flag:xgetbv1*/ "XGETBV with ECX = 1") },
+ { "xsaves", NC_("x86-flag", /*/flag:xsaves*/ "XSAVES/XRSTORS") },
+/* Intel-defined CPU QoS sub-leaf, CPUID level 0x0000000F:0 (edx) */
+ { "cqm_llc", NC_("x86-flag", /*/flag:cqm_llc*/ "LLC QoS") },
+/* Intel-defined CPU QoS sub-leaf, CPUID level 0x0000000F:1 (edx) */
+ { "cqm_occup_llc", NC_("x86-flag", /*/flag:cqm_occup_llc*/ "LLC occupancy monitoring") },
+ { "cqm_mbm_total", NC_("x86-flag", /*/flag:cqm_mbm_total*/ "LLC total MBM monitoring") },
+ { "cqm_mbm_local", NC_("x86-flag", /*/flag:cqm_mbm_local*/ "LLC local MBM monitoring") },
+/* AMD-defined CPU features, CPUID level 0x80000008 (ebx) */
+ { "clzero", NC_("x86-flag", /*/flag:clzero*/ "CLZERO instruction") },
+ { "irperf", NC_("x86-flag", /*/flag:irperf*/ "instructions retired performance counter") },
+/* Thermal and Power Management leaf, CPUID level 0x00000006 (eax) */
+ { "dtherm", NC_("x86-flag", /*/flag:dtherm*/ "digital thermal sensor") }, /* formerly dts */
+ { "ida", NC_("x86-flag", /*/flag:ida*/ "Intel Dynamic Acceleration") },
+ { "arat", NC_("x86-flag", /*/flag:arat*/ "Always Running APIC Timer") },
+ { "pln", NC_("x86-flag", /*/flag:pln*/ "Intel Power Limit Notification") },
+ { "pts", NC_("x86-flag", /*/flag:pts*/ "Intel Package Thermal Status") },
+ { "hwp", NC_("x86-flag", /*/flag:hwp*/ "Intel Hardware P-states") },
+ { "hwp_notify", NC_("x86-flag", /*/flag:hwp_notify*/ "HWP notification") },
+ { "hwp_act_window", NC_("x86-flag", /*/flag:hwp_act_window*/ "HWP Activity Window") },
+ { "hwp_epp", NC_("x86-flag", /*/flag:hwp_epp*/ "HWP Energy Performance Preference") },
+ { "hwp_pkg_req", NC_("x86-flag", /*/flag:hwp_pkg_req*/ "HWP package-level request") },
+/* AMD SVM Feature Identification, CPUID level 0x8000000a (edx) */
+ { "npt", NC_("x86-flag", /*/flag:npt*/ "AMD Nested Page Table support") },
+ { "lbrv", NC_("x86-flag", /*/flag:lbrv*/ "AMD LBR Virtualization support") },
+ { "svm_lock", NC_("x86-flag", /*/flag:svm_lock*/ "AMD SVM locking MSR") },
+ { "nrip_save", NC_("x86-flag", /*/flag:nrip_save*/ "AMD SVM next_rip save") },
+ { "tsc_scale", NC_("x86-flag", /*/flag:tsc_scale*/ "AMD TSC scaling support") },
+ { "vmcb_clean", NC_("x86-flag", /*/flag:vmcb_clean*/ "AMD VMCB clean bits support") },
+ { "flushbyasid", NC_("x86-flag", /*/flag:flushbyasid*/ "AMD flush-by-ASID support") },
+ { "decodeassists", NC_("x86-flag", /*/flag:decodeassists*/ "AMD Decode Assists support") },
+ { "pausefilter", NC_("x86-flag", /*/flag:pausefilter*/ "AMD filtered pause intercept") },
+ { "pfthreshold", NC_("x86-flag", /*/flag:pfthreshold*/ "AMD pause filter threshold") },
+ { "avic", NC_("x86-flag", /*/flag:avic*/ "Virtual Interrupt Controller") },
+/* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx) */
+ { "pku", NC_("x86-flag", /*/flag:pku*/ "Protection Keys for Userspace") },
+ { "ospke", NC_("x86-flag", /*/flag:ospke*/ "OS Protection Keys Enable") },
+/* AMD-defined CPU features, CPUID level 0x80000007 (ebx) */
+ { "overflow_recov", NC_("x86-flag", /*/flag:overflow_recov*/ "MCA overflow recovery support") },
+ { "succor", NC_("x86-flag", /*/flag:succor*/ "uncorrectable error containment and recovery") },
+ { "smca", NC_("x86-flag", /*/flag:smca*/ "Scalable MCA") },
+
+/* bug workarounds */
+ { "bug:f00f", NC_("x86-flag", /*/bug:f00f*/ "Intel F00F bug") },
+ { "bug:fdiv", NC_("x86-flag", /*/bug:fdiv*/ "FPU FDIV") },
+ { "bug:coma", NC_("x86-flag", /*/bug:coma*/ "Cyrix 6x86 coma") },
+ { "bug:tlb_mmatch", NC_("x86-flag", /*/bug:tlb_mmatch*/ "AMD Erratum 383") },
+ { "bug:apic_c1e", NC_("x86-flag", /*/bug:apic_c1e*/ "AMD Erratum 400") },
+ { "bug:11ap", NC_("x86-flag", /*/bug:11ap*/ "Bad local APIC aka 11AP") },
+ { "bug:fxsave_leak", NC_("x86-flag", /*/bug:fxsave_leak*/ "FXSAVE leaks FOP/FIP/FOP") },
+ { "bug:clflush_monitor", NC_("x86-flag", /*/bug:clflush_monitor*/ "AAI65, CLFLUSH required before MONITOR") },
+ { "bug:sysret_ss_attrs", NC_("x86-flag", /*/bug:sysret_ss_attrs*/ "SYSRET doesn't fix up SS attrs") },
+ { "bug:espfix", NC_("x86-flag", /*/bug:espfix*/ "IRET to 16-bit SS corrupts ESP/RSP high bits") },
+ { "bug:null_seg", NC_("x86-flag", /*/bug:null_seg*/ "Nulling a selector preserves the base") }, /* see: detect_null_seg_behavior() */
+ { "bug:swapgs_fence", NC_("x86-flag", /*/bug:swapgs_fence*/ "SWAPGS without input dep on GS") },
+ { "bug:monitor", NC_("x86-flag", /*/bug:monitor*/ "IPI required to wake up remote CPU") },
+ { "bug:amd_e400", NC_("x86-flag", /*/bug:amd_e400*/ "AMD Erratum 400") },
+/* power management
+ * ... from arch/x86/kernel/cpu/powerflags.h */
+ { "pm:ts", NC_("x86-flag", /*/flag:pm:ts*/ "temperature sensor") },
+ { "pm:fid", NC_("x86-flag", /*/flag:pm:fid*/ "frequency id control") },
+ { "pm:vid", NC_("x86-flag", /*/flag:pm:vid*/ "voltage id control") },
+ { "pm:ttp", NC_("x86-flag", /*/flag:pm:ttp*/ "thermal trip") },
+ { "pm:tm", NC_("x86-flag", /*/flag:pm:tm*/ "hardware thermal control") },
+ { "pm:stc", NC_("x86-flag", /*/flag:pm:stc*/ "software thermal control") },
+ { "pm:100mhzsteps", NC_("x86-flag", /*/flag:pm:100mhzsteps*/ "100 MHz multiplier control") },
+ { "pm:hwpstate", NC_("x86-flag", /*/flag:pm:hwpstate*/ "hardware P-state control") },
+ { "pm:cpb", NC_("x86-flag", /*/flag:pm:cpb*/ "core performance boost") },
+ { "pm:eff_freq_ro", NC_("x86-flag", /*/flag:pm:eff_freq_ro*/ "Readonly aperf/mperf") },
+ { "pm:proc_feedback", NC_("x86-flag", /*/flag:pm:proc_feedback*/ "processor feedback interface") },
+ { "pm:acc_power", NC_("x86-flag", /*/flag:pm:acc_power*/ "accumulated power mechanism") },
+ { NULL, NULL},
+};
+
+static char all_flags[4096] = "";
+
+#define APPEND_FLAG(f) strcat(all_flags, f); strcat(all_flags, " ");
+const char *x86_flag_list() {
+ int i = 0, built = 0;
+ built = strlen(all_flags);
+ if (!built) {
+ while(tab_flag_meaning[i].name != NULL) {
+ APPEND_FLAG(tab_flag_meaning[i].name);
+ i++;
+ }
+ }
+ return all_flags;
+}
+
+const char *x86_flag_meaning(const char *flag) {
+ int i = 0;
+ if (flag)
+ while(tab_flag_meaning[i].name != NULL) {
+ if (strcmp(tab_flag_meaning[i].name, flag) == 0) {
+ if (tab_flag_meaning[i].meaning != NULL)
+ return C_("x86-flag", tab_flag_meaning[i].meaning);
+ else return NULL;
+ }
+ i++;
+ }
+ return NULL;
+}
+
+static void x86_flag_find_dups(void) {
+ int t, i;
+
+ t = 0;
+ while(tab_flag_meaning[t].name != NULL) {
+ i = t+1;
+ while(tab_flag_meaning[i].name != NULL) {
+ if (strcmp(tab_flag_meaning[t].name, tab_flag_meaning[i].name) == 0) {
+ printf("x86-flag duplicate definition: %s\n ... %d: %s\n ... %d: %s\n",
+ tab_flag_meaning[i].name,
+ t, tab_flag_meaning[t].meaning,
+ i, tab_flag_meaning[i].meaning);
+ }
+ i++;
+ }
+ t++;
+ }
+}
diff --git a/modules/devices/x86/x86_data.h b/modules/devices/x86/x86_data.h
new file mode 100644
index 00000000..66a4c80f
--- /dev/null
+++ b/modules/devices/x86/x86_data.h
@@ -0,0 +1,28 @@
+/*
+ * rpiz - https://github.com/bp0/rpiz
+ * Copyright (C) 2017 Burt P. <pburt0@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef _X86DATA_H_
+#define _X86DATA_H_
+
+/* cpu flags from /proc/cpuinfo */
+const char *x86_flag_list(void); /* list of all known flags */
+const char *x86_flag_meaning(const char *flag); /* lookup flag meaning */
+
+#endif