sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

msrtool: Fix Intel CPUs detection

Browse Source 
Added vendor check in sys.c file and fixed models checking
in intel targets files.

Change-Id: I1ce52bbce431dea79e903d6bc7a12e5b9ad061be
Signed-off-by: Anton Kochkov <anton.kochkov@gmail.com>
Reviewed-on: http://review.coreboot.org/1169
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Anton Kochkov
2012-07-04 07:31:37 +04:00
committed by Stefan Reinauer
parent e1e6a91ce0
commit ffbbecc9ee
8 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
util/msrtool/sys.c
View File

@@ -26,7 +26,23 @@ static struct cpuid_t id;
struct cpuid_t *cpuid(void) {
uint32_t outeax;
uint32_t outebx;
/* First, we need determine which vendor we have */
#if defined(__DARWIN__) && !defined(__LP64__)
asm volatile (
"pushl %%ebx \n"
"cpuid \n"
"popl %%ebx \n"
: "=b" (outebx) : "a" (0) : "%ecx", "%edx"
);
#else
asm ("cpuid" : "=b" (outebx) : "a" (0) : "%ecx", "%edx");
#endif
id.vendor = (outebx == 0x756e6547) ? VENDOR_INTEL : VENDOR_AMD;
/* Then, identificate CPU itself */
#if defined(__DARWIN__) && !defined(__LP64__)
asm volatile (
"pushl %%ebx \n"
@@ -47,7 +63,8 @@ struct cpuid_t *cpuid(void) {
id.ext_model = outeax & 0xf;
outeax >>= 4;
id.ext_family = outeax & 0xff;
if (0xf == id.family) {
if ((0xf == id.family) || ((VENDOR_INTEL == id.vendor)
&& (0x6 == id.family))) {
/* Intel says always do this, AMD says only for family f */
id.model |= (id.ext_model << 4);
id.family += id.ext_family;