<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25398">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/intelmetool: Fix crash on strict devmem kernels<br><br>Don't crash if mapping MEI PCI memory fails.<br>This can happen if CONFIG_STRICT_DEVMEM is enabled.<br><br>Change-Id: I33c75a7cccb4cefaa26f70aed4bdc4bd620cdad0<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>---<br>M util/intelmetool/intelmetool.c<br>M util/intelmetool/me.c<br>2 files changed, 9 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/25398/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/intelmetool/intelmetool.c b/util/intelmetool/intelmetool.c</span><br><span>index 0b0e509..9de6bb5 100644</span><br><span>--- a/util/intelmetool/intelmetool.c</span><br><span>+++ b/util/intelmetool/intelmetool.c</span><br><span>@@ -287,17 +287,21 @@</span><br><span>           printf("ME: has a broken implementation on your board with"</span><br><span>                       "this firmware\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        intel_mei_setup(dev);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (intel_mei_setup(dev))</span><br><span style="color: hsl(120, 100%, 40%);">+             goto out;</span><br><span>    usleep(ME_COMMAND_DELAY);</span><br><span>    mei_reset();</span><br><span>         usleep(ME_COMMAND_DELAY);</span><br><span style="color: hsl(0, 100%, 40%);">-       mkhi_get_fw_version(&ME_major_ver, &ME_minor_ver);</span><br><span style="color: hsl(120, 100%, 40%);">+    if (mkhi_get_fw_version(&ME_major_ver, &ME_minor_ver))</span><br><span style="color: hsl(120, 100%, 40%);">+                goto out;</span><br><span>    usleep(ME_COMMAND_DELAY);</span><br><span>    mei_reset();</span><br><span>         usleep(ME_COMMAND_DELAY);</span><br><span style="color: hsl(0, 100%, 40%);">-       mkhi_get_fwcaps();</span><br><span style="color: hsl(120, 100%, 40%);">+    if (mkhi_get_fwcaps())</span><br><span style="color: hsl(120, 100%, 40%);">+                goto out;</span><br><span>    usleep(ME_COMMAND_DELAY);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+out:</span><br><span>  rehide_me();</span><br><span> }</span><br><span> </span><br><span>diff --git a/util/intelmetool/me.c b/util/intelmetool/me.c</span><br><span>index 6517022..f14f4cd 100644</span><br><span>--- a/util/intelmetool/me.c</span><br><span>+++ b/util/intelmetool/me.c</span><br><span>@@ -582,7 +582,8 @@</span><br><span>         mei_mmap = map_physical(pagerounded, 0x2000);</span><br><span>        mei_mmap += mei_base_address - pagerounded;</span><br><span>  if (mei_mmap == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">-         printf("Could not map ME setup memory\n");</span><br><span style="color: hsl(120, 100%, 40%);">+          printf("Could not map ME setup memory.\n"</span><br><span style="color: hsl(120, 100%, 40%);">+                  "Do you have cmdline argument 'iomem=relaxed' set ?\n");</span><br><span>            return 1;</span><br><span>    }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25398">change 25398</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/25398"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I33c75a7cccb4cefaa26f70aed4bdc4bd620cdad0 </div>
<div style="display:none"> Gerrit-Change-Number: 25398 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>