<p>Raul Rangel has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27477">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libpayload/generic_hub: Detect port disconnect after reset<br><br>If a port disconnects after a reset we should abort any initialization<br>on the port. At the same time this might mean the device has<br>re-enumerated as a 3.0 device so we should rescan all the ports.<br><br>I decided to not add a return status enum since that would require a lot<br>of changes. I opted to just return 2 as the magic reenum value.<br><br>BUG=b:76831439<br>TEST=Verified USB-C devices that get detected correctly in depthcharge.<br><br>Change-Id: Iad899544684312df1bef08d69b5c7f41eac3a21c<br>Signed-off-by: Raul E Rangel <rrangel@chromium.org><br>---<br>M payloads/libpayload/drivers/usb/generic_hub.c<br>1 file changed, 26 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/27477/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/libpayload/drivers/usb/generic_hub.c b/payloads/libpayload/drivers/usb/generic_hub.c</span><br><span>index 89da934..a2aea7c 100644</span><br><span>--- a/payloads/libpayload/drivers/usb/generic_hub.c</span><br><span>+++ b/payloads/libpayload/drivers/usb/generic_hub.c</span><br><span>@@ -157,6 +157,15 @@</span><br><span> if (hub->ops->reset_port) {</span><br><span> if (hub->ops->reset_port(dev, port) < 0)</span><br><span> return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!hub->ops->port_connected(dev, port)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_debug(</span><br><span style="color: hsl(120, 100%, 40%);">+ "generic_hub: Port %d disconnected after "</span><br><span style="color: hsl(120, 100%, 40%);">+ "reset. Possibly upgraded, rescan required.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ port);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* after reset the port will be enabled automatically */</span><br><span> const int ret = generic_hub_wait_for_port(</span><br><span> /* time out after 1,000 * 10us = 10ms */</span><br><span>@@ -214,15 +223,24 @@</span><br><span> hub->ops->hub_status_changed(dev) != 1)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int port;</span><br><span style="color: hsl(0, 100%, 40%);">- for (port = 1; port <= hub->num_ports; ++port) {</span><br><span style="color: hsl(0, 100%, 40%);">- const int ret = hub->ops->port_status_changed(dev, port);</span><br><span style="color: hsl(0, 100%, 40%);">- if (ret < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (ret == 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- usb_debug("generic_hub: Port change at %d\n", port);</span><br><span style="color: hsl(0, 100%, 40%);">- if (generic_hub_scanport(dev, port) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ int reenum_limit = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int i = 0; i < reenum_limit && i < 2; ++i) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int port = 1; port <= hub->num_ports; ++port) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const int ret =</span><br><span style="color: hsl(120, 100%, 40%);">+ hub->ops->port_status_changed(dev, port);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret < 0) {</span><br><span> return;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (ret == 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_debug("generic_hub: Port change at %d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ port);</span><br><span style="color: hsl(120, 100%, 40%);">+ int rtn = generic_hub_scanport(dev, port);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rtn == 2) {</span><br><span style="color: hsl(120, 100%, 40%);">+ reenum_limit++;</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (rtn < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27477">change 27477</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/27477"/><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: Iad899544684312df1bef08d69b5c7f41eac3a21c </div>
<div style="display:none"> Gerrit-Change-Number: 27477 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Raul Rangel <rrangel@chromium.org> </div>