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

util/intelmetool: Fix some platforms

Browse Source 
Bootguard:
* Fix Mac support (ME_version can't be detected)
* Skip MSR read on older platforms (as it would fail anyway)
* Refactor MSR error handling
* Print Bootguard state "Unknown" on MSR read error

Change-Id: Iafe3f5c22c6caeedc556933405b9f6d83ec876a1
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-on: https://review.coreboot.org/22598
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
This commit is contained in:
Patrick Rudolph
2017-11-25 14:43:06 +01:00
committed by Stefan Reinauer
parent 214dde058c
commit 3df9dbe886
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
util/intelmetool/intelmetool.c
View File

@@ -308,9 +308,6 @@ static void dump_bootguard_info(void)
const char *name;
uint64_t bootguard = 0;
if (msr_bootguard(&bootguard, debug) < 0)
return;
if (pci_platform_scan())
exit(1);
@@ -328,9 +325,11 @@ static void dump_bootguard_info(void)
bootguard &= ~0xff;
}
if (ME_major_ver < 9 ||
(ME_major_ver == 9 && ME_minor_ver < 5) ||
!BOOTGUARD_CAPABILITY(bootguard)) {
/* ME_major_ver is zero on some platforms (Mac) */
if (ME_major_ver &&
(ME_major_ver < 9 ||
(ME_major_ver == 9 && ME_minor_ver < 5) ||
!BOOTGUARD_CAPABILITY(bootguard))) {
print_cap("BootGuard ", 0);
printf(CGRN "\nYour system isn't bootguard ready. You can "
"flash other firmware!\n" RESET);
@@ -338,6 +337,12 @@ static void dump_bootguard_info(void)
return;
}
if (msr_bootguard(&bootguard, debug) < 0) {
printf("ME Capability: %-43s: " CCYN "%s\n" RESET,
"BootGuard Mode", "Unknown");
return;
}
print_cap("BootGuard ", 1);
if (pci_read_long(dev, 0x40) & 0x10)
printf(CYEL "Your southbridge configuration is insecure!! "