summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2017-01-22 22:19:21 +0100
committerKyösti Mälkki <kyosti.malkki@gmail.com>2018-05-15 03:55:19 +0000
commitfbf57596bb1715ebd05bf81e026862a033d62a03 (patch)
treeb047b5dd799f020cf61d5c12dac00dfa33f3a1f6
parent07e77f13d4987a4424be254f439bb6ac505761a7 (diff)
msrtool: use a bit more clever cpuid vendor match
Not everything non-intel is AMD. Change-Id: I06d6fbaa0b4f2c9e61d9b3b4aeeb349a91aa090e Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Reviewed-on: https://review.coreboot.org/18255 Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--util/msrtool/msrtool.h4
-rw-r--r--util/msrtool/sys.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/util/msrtool/msrtool.h b/util/msrtool/msrtool.h
index 1e923c4bfd..35559c2fb8 100644
--- a/util/msrtool/msrtool.h
+++ b/util/msrtool/msrtool.h
@@ -95,8 +95,8 @@ struct msrdef {
#define MAX_CORES 8
typedef enum {
- VENDOR_INTEL = 1,
- VENDOR_AMD = 2,
+ VENDOR_INTEL = 0x756e6547,
+ VENDOR_AMD = 0x68747541,
} vendor_t;
struct cpuid_t {
diff --git a/util/msrtool/sys.c b/util/msrtool/sys.c
index 3e50f49a26..7ff1131b63 100644
--- a/util/msrtool/sys.c
+++ b/util/msrtool/sys.c
@@ -36,7 +36,7 @@ struct cpuid_t *cpuid(void) {
asm ("cpuid" : "=b" (outebx) : "a" (0) : "%ecx", "%edx");
#endif
- id.vendor = (outebx == 0x756e6547) ? VENDOR_INTEL : VENDOR_AMD;
+ id.vendor = outebx;
/* Then, identificate CPU itself */
#if defined(__DARWIN__) && !defined(__LP64__)