[coreboot-gerrit] New patch to review for coreboot: msrtool: use a bit more clever cpuid vendor match

[Lubomir Rintel (lkundrak@v3.sk)]

Lubomir Rintel (lkundrak at v3.sk) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18255

-gerrit

commit 8a4d9964378ccae662166e0526af6a10ac608bb2
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Sun Jan 22 22:19:21 2017 +0100

    msrtool: use a bit more clever cpuid vendor match
    
    Not everyting non-intel is AMD.
    
    Change-Id: I06d6fbaa0b4f2c9e61d9b3b4aeeb349a91aa090e
    Signed-off-by: Lubomir Rintel <lkundrak at v3.sk>
---
 util/msrtool/msrtool.h | 4 ++--
 util/msrtool/sys.c     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/msrtool/msrtool.h b/util/msrtool/msrtool.h
index fe7f0f0..6565fff 100644
--- a/util/msrtool/msrtool.h
+++ b/util/msrtool/msrtool.h
@@ -94,8 +94,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 cb300d9..f80d067 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__)