From 16f8968695e05249d8e88774eb6711be4e273cf4 Mon Sep 17 00:00:00 2001 From: Dan Elkouby Date: Mon, 16 Jan 2017 20:04:51 +0200 Subject: [PATCH] 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 Original-Commit-Id: e8ad3c7b954b81a26073c5a4d529034db993db0e Original-Change-Id: Ie1f65f61eb131577d7254af582e2709660f4da27 Original-Signed-off-by: Dan Elkouby Original-Reviewed-on: https://review.coreboot.org/18149 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Martin Roth Reviewed-on: https://chromium-review.googlesource.com/430616 Commit-Ready: Aaron Durbin Tested-by: Aaron Durbin Reviewed-by: Aaron Durbin --- util/intelmetool/intelmetool.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/util/intelmetool/intelmetool.c b/util/intelmetool/intelmetool.c index 7ffd5359b3..70b23fbec2 100644 --- a/util/intelmetool/intelmetool.c +++ b/util/intelmetool/intelmetool.c @@ -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); }