summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util/intelmetool/intelmetool.c10
-rw-r--r--util/intelmetool/me.c3
2 files changed, 9 insertions, 4 deletions
diff --git a/util/intelmetool/intelmetool.c b/util/intelmetool/intelmetool.c
index 14cb035a1f..bc5f26c4b5 100644
--- a/util/intelmetool/intelmetool.c
+++ b/util/intelmetool/intelmetool.c
@@ -288,17 +288,21 @@ static void dump_me_info(void)
printf("ME: has a broken implementation on your board with"
"this firmware\n");
- intel_mei_setup(dev);
+ if (intel_mei_setup(dev))
+ goto out;
usleep(ME_COMMAND_DELAY);
mei_reset();
usleep(ME_COMMAND_DELAY);
- mkhi_get_fw_version(&ME_major_ver, &ME_minor_ver);
+ if (mkhi_get_fw_version(&ME_major_ver, &ME_minor_ver))
+ goto out;
usleep(ME_COMMAND_DELAY);
mei_reset();
usleep(ME_COMMAND_DELAY);
- mkhi_get_fwcaps();
+ if (mkhi_get_fwcaps())
+ goto out;
usleep(ME_COMMAND_DELAY);
+out:
rehide_me();
}
diff --git a/util/intelmetool/me.c b/util/intelmetool/me.c
index 6517022c64..f14f4cd623 100644
--- a/util/intelmetool/me.c
+++ b/util/intelmetool/me.c
@@ -582,7 +582,8 @@ uint32_t intel_mei_setup(struct pci_dev *dev)
mei_mmap = map_physical(pagerounded, 0x2000);
mei_mmap += mei_base_address - pagerounded;
if (mei_mmap == NULL) {
- printf("Could not map ME setup memory\n");
+ printf("Could not map ME setup memory.\n"
+ "Do you have cmdline argument 'iomem=relaxed' set ?\n");
return 1;
}