<p>Hannah Williams has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26590">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libpayload-x86: i8042: fix i8042_data_ready_ps2 and i8042_data_ready_aux<br><br>keyboard_disconnect was called without keyboard_init being called and in this<br>case keyboard_havechar returns true because i8042_data_ready_ps2 is<br>dereferencing uninitialized variable ps2_fifo from within fifo_is_empty causing<br>keyboard_disconnect to be stuck in this while loop.<br>while (keyboard_havechar())<br>    keyboard_getchar();<br><br>BUG=b:80299098<br>TEST=Check if the normal mode path in depthcharge is not causing a hang<br><br>Change-Id: I944b4836005c887a2715717dff2df1b5a220818e<br>Signed-off-by: Hannah Williams <hannah.williams@intel.com><br>---<br>M payloads/libpayload/drivers/i8042/i8042.c<br>1 file changed, 4 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/26590/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/libpayload/drivers/i8042/i8042.c b/payloads/libpayload/drivers/i8042/i8042.c</span><br><span>index 1bf1855..6eb618a 100644</span><br><span>--- a/payloads/libpayload/drivers/i8042/i8042.c</span><br><span>+++ b/payloads/libpayload/drivers/i8042/i8042.c</span><br><span>@@ -332,6 +332,8 @@</span><br><span>  */</span><br><span> u8 i8042_data_ready_ps2(void)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+        if (!initialized)</span><br><span style="color: hsl(120, 100%, 40%);">+             return 0;</span><br><span>    i8042_data_poll();</span><br><span>   return !fifo_is_empty(ps2_fifo);</span><br><span> }</span><br><span>@@ -341,6 +343,8 @@</span><br><span>  */</span><br><span> u8 i8042_data_ready_aux(void)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+      if (!initialized)</span><br><span style="color: hsl(120, 100%, 40%);">+             return 0;</span><br><span>    i8042_data_poll();</span><br><span>   return !fifo_is_empty(aux_fifo);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26590">change 26590</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/26590"/><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: I944b4836005c887a2715717dff2df1b5a220818e </div>
<div style="display:none"> Gerrit-Change-Number: 26590 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hannah Williams <hannah.williams@intel.com> </div>