UPSTREAM: util/intelmetool: Try to activate the ME before scanning PCIe for it

When the ME is hidden (most likely because it was disabled), it cannot
be found until activate_me() is called.

BUG=none
BRANCH=none
TEST=none

Change-Id: Ifef2392e067c2075fafe6c83a3560dcedb2bf75d
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: e8ad3c7b95
Original-Change-Id: Ie1f65f61eb131577d7254af582e2709660f4da27
Original-Signed-off-by: Dan Elkouby <streetwalrus@codewalr.us>
Original-Reviewed-on: https://review.coreboot.org/18149
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://chromium-review.googlesource.com/430616
Commit-Ready: Aaron Durbin <adurbin@chromium.org>
Tested-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Dan Elkouby 2017-01-16 20:04:51 +02:00 committed by chrome-bot
parent d7cedd3f61
commit 16f8968695

View file

@ -68,7 +68,7 @@ static void rehide_me() {
printf("Re-hiding MEI device...");
fd2 = *(uint32_t *)(rcba + FD2);
*(uint32_t *)(rcba + FD2) = fd2 | 0x2;
printf("done, ");
printf("done\n");
}
}
@ -231,12 +231,12 @@ static void dump_me_info() {
exit(1);
}
dev = pci_me_interface_scan(&name);
if (!dev) {
if (activate_me()) {
exit(1);
}
if (activate_me()) {
dev = pci_me_interface_scan(&name);
if (!dev) {
exit(1);
}