diff options
| author | Patrick Rudolph <patrick.rudolph@9elements.com> | 2018-02-01 16:12:47 +0100 |
|---|---|---|
| committer | Philipp Deppenwiese <zaolin.daisuki@gmail.com> | 2018-04-16 22:26:46 +0000 |
| commit | aac3b31dbbc5b46aeb9393fb5594f0271d50a007 (patch) | |
| tree | 0b0adc6d364b3a7c4f77b29c31820ffe62e72246 /util | |
| parent | 44ad86a723b365f597a3a0243783c8fd05837250 (diff) | |
util/intelmetool: Fix crash on strict devmem kernels
Don't crash if mapping MEI PCI memory fails.
This can happen if CONFIG_STRICT_DEVMEM is enabled.
Change-Id: I33c75a7cccb4cefaa26f70aed4bdc4bd620cdad0
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/25398
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/intelmetool/intelmetool.c | 10 | ||||
| -rw-r--r-- | util/intelmetool/me.c | 3 |
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; } |