<p>Daisuke Nojiri has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25878">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cros-ec: Avoid infinitely looping in google_chromeec_pd_get_amode<br><br>Currently, google_chromeec_pd_get_amode infinitely loops if a TCPC port<br>is connected to a device with alternate mode(s) and the call is made for<br>the mode with the index higher than 0 (e.g. Zinger).<br><br>This patch adds delay between calls to the EC to query alternate mode<br>information. This allows the EC to process each call properly.<br>It also resets all the fields of chromeec_command in each iteration in<br>case google_chromeec_command changes them.<br><br>BUG=b:78630899<br>BRANCH=none<br>TEST=Verify Fizz boots without monitors on Zinger. Verify the svid<br>enumeration happens as expected.<br><br>Change-Id: I388ed4bdfac9176d8e690c429e99674ed267004f<br>Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org><br>---<br>M src/ec/google/chromeec/ec.c<br>1 file changed, 16 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/78/25878/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c</span><br><span>index fb3ffab..9676f2d 100644</span><br><span>--- a/src/ec/google/chromeec/ec.c</span><br><span>+++ b/src/ec/google/chromeec/ec.c</span><br><span>@@ -963,23 +963,28 @@</span><br><span>    for (i = 0; i < r.num_ports; i++) {</span><br><span>               struct ec_params_usb_pd_get_mode_request p;</span><br><span>          struct ec_params_usb_pd_get_mode_response res;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-          p.port = i;</span><br><span style="color: hsl(0, 100%, 40%);">-             p.svid_idx = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-         cmd.cmd_code = EC_CMD_USB_PD_GET_AMODE;</span><br><span style="color: hsl(0, 100%, 40%);">-         cmd.cmd_version = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-            cmd.cmd_data_in = &p;</span><br><span style="color: hsl(0, 100%, 40%);">-               cmd.cmd_size_in = sizeof(p);</span><br><span style="color: hsl(0, 100%, 40%);">-            cmd.cmd_data_out = &res;</span><br><span style="color: hsl(0, 100%, 40%);">-            cmd.cmd_size_out = sizeof(res);</span><br><span style="color: hsl(0, 100%, 40%);">-         cmd.cmd_dev_index = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+                int svid_idx = 0;</span><br><span> </span><br><span>                do {</span><br><span style="color: hsl(120, 100%, 40%);">+                  /* Reset cmd in each iteration in case</span><br><span style="color: hsl(120, 100%, 40%);">+                         * google_chromeec_command changes it. */</span><br><span style="color: hsl(120, 100%, 40%);">+                     p.port = i;</span><br><span style="color: hsl(120, 100%, 40%);">+                   p.svid_idx = svid_idx;</span><br><span style="color: hsl(120, 100%, 40%);">+                        cmd.cmd_code = EC_CMD_USB_PD_GET_AMODE;</span><br><span style="color: hsl(120, 100%, 40%);">+                       cmd.cmd_version = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+                  cmd.cmd_data_in = &p;</span><br><span style="color: hsl(120, 100%, 40%);">+                     cmd.cmd_size_in = sizeof(p);</span><br><span style="color: hsl(120, 100%, 40%);">+                  cmd.cmd_data_out = &res;</span><br><span style="color: hsl(120, 100%, 40%);">+                  cmd.cmd_size_out = sizeof(res);</span><br><span style="color: hsl(120, 100%, 40%);">+                       cmd.cmd_dev_index = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>                     if (google_chromeec_command(&cmd) < 0)</span><br><span>                                return -1;</span><br><span>                   if (res.svid == svid)</span><br><span>                                return 1;</span><br><span style="color: hsl(0, 100%, 40%);">-                       p.svid_idx++;</span><br><span style="color: hsl(120, 100%, 40%);">+                 svid_idx++;</span><br><span style="color: hsl(120, 100%, 40%);">+                   /* Avoid storming EC */</span><br><span style="color: hsl(120, 100%, 40%);">+                       mdelay(100);</span><br><span>                 } while (res.svid);</span><br><span>  }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25878">change 25878</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/25878"/><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: I388ed4bdfac9176d8e690c429e99674ed267004f </div>
<div style="display:none"> Gerrit-Change-Number: 25878 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Daisuke Nojiri <dnojiri@chromium.org> </div>