<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23768">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libpayload/usb: Disable ports for unused devices<br><br>USB devices that aren't controlled by libpayload due to missing<br>driver support do have an address assigned libpayload doesn't know<br>about. To avoid address conflicts disable the hub port if no driver<br>is loaded after probing the device.<br><br>Change-Id: I4882ba81cc0bed8dc0001f31142dc783e1f4259d<br>Signed-off-by: Patrick Rudolph <siro@das-labor.org><br>---<br>M payloads/libpayload/drivers/usb/ehci_rh.c<br>M payloads/libpayload/drivers/usb/generic_hub.c<br>M payloads/libpayload/drivers/usb/ohci_rh.c<br>M payloads/libpayload/drivers/usb/uhci_rh.c<br>M payloads/libpayload/drivers/usb/usbhub.c<br>M payloads/libpayload/drivers/usb/xhci_rh.c<br>6 files changed, 57 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/23768/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/libpayload/drivers/usb/ehci_rh.c b/payloads/libpayload/drivers/usb/ehci_rh.c</span><br><span>index da8d8af..4eb8dfd 100644</span><br><span>--- a/payloads/libpayload/drivers/usb/ehci_rh.c</span><br><span>+++ b/payloads/libpayload/drivers/usb/ehci_rh.c</span><br><span>@@ -149,6 +149,22 @@</span><br><span> RH_INST(dev)->devices[port] = usb_attach_device(dev->controller</span><br><span> , dev->address, port, port_speed);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (RH_INST(dev)->devices[port] == -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ // Keep software and hardware state in sync.</span><br><span style="color: hsl(120, 100%, 40%);">+ // Disable port to make sure that the assigned address isn't</span><br><span style="color: hsl(120, 100%, 40%);">+ // valid any more.</span><br><span style="color: hsl(120, 100%, 40%);">+ // Deassert enable, assert reset. These must change atomically.</span><br><span style="color: hsl(120, 100%, 40%);">+ RH_INST(dev)->ports[port] =</span><br><span style="color: hsl(120, 100%, 40%);">+ (RH_INST(dev)->ports[port] & ~P_PORT_ENABLE) | P_PORT_RESET;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Wait a bit while reset is active (+1 to avoid Tegra race). */</span><br><span style="color: hsl(120, 100%, 40%);">+ mdelay(50 + 1); // usb20 spec 7.1.7.5 (TDRSTR)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Deassert reset. */</span><br><span style="color: hsl(120, 100%, 40%);">+ RH_INST(dev)->ports[port] &= ~P_PORT_RESET;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* RW/C register, so clear it by writing 1 */</span><br><span> RH_INST(dev)->ports[port] |= P_CONN_STATUS_CHANGE;</span><br><span> }</span><br><span>diff --git a/payloads/libpayload/drivers/usb/generic_hub.c b/payloads/libpayload/drivers/usb/generic_hub.c</span><br><span>index 9f86705..ea2b71f 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>@@ -177,6 +177,15 @@</span><br><span> hub->ports[port] = usb_attach_device(</span><br><span> dev->controller, dev->address, port, speed);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((hub->ports[port] == -1) && hub->ops->disable_port) {</span><br><span style="color: hsl(120, 100%, 40%);">+ // Keep software and hardware state in sync.</span><br><span style="color: hsl(120, 100%, 40%);">+ // Disable port to make sure that the assigned address isn't</span><br><span style="color: hsl(120, 100%, 40%);">+ // valid any more.</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hub->ops->disable_port(dev, port) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/payloads/libpayload/drivers/usb/ohci_rh.c b/payloads/libpayload/drivers/usb/ohci_rh.c</span><br><span>index 5d82bd5..770a563 100644</span><br><span>--- a/payloads/libpayload/drivers/usb/ohci_rh.c</span><br><span>+++ b/payloads/libpayload/drivers/usb/ohci_rh.c</span><br><span>@@ -128,6 +128,13 @@</span><br><span> </span><br><span> usb_speed speed = (OHCI_INST(dev->controller)->opreg->HcRhPortStatus[port] & LowSpeedDeviceAttached) != 0;</span><br><span> RH_INST (dev)->port[port] = usb_attach_device(dev->controller, dev->address, port, speed);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (RH_INST(dev)->port[port] == -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ // Keep software and hardware state in sync.</span><br><span style="color: hsl(120, 100%, 40%);">+ // Disable port to make sure that the assigned address isn't</span><br><span style="color: hsl(120, 100%, 40%);">+ // valid any more.</span><br><span style="color: hsl(120, 100%, 40%);">+ ohci_rh_disable_port(dev, port);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static int</span><br><span>diff --git a/payloads/libpayload/drivers/usb/uhci_rh.c b/payloads/libpayload/drivers/usb/uhci_rh.c</span><br><span>index e08cce1..742d491 100644</span><br><span>--- a/payloads/libpayload/drivers/usb/uhci_rh.c</span><br><span>+++ b/payloads/libpayload/drivers/usb/uhci_rh.c</span><br><span>@@ -137,6 +137,13 @@</span><br><span> </span><br><span> RH_INST (dev)->port[offset] = usb_attach_device(dev->controller, dev->address, portsc, speed);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (RH_INST(dev)->port[offset] == -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ // Keep software and hardware state in sync.</span><br><span style="color: hsl(120, 100%, 40%);">+ // Disable port to make sure that the assigned address isn't</span><br><span style="color: hsl(120, 100%, 40%);">+ // valid any more.</span><br><span style="color: hsl(120, 100%, 40%);">+ uhci_rh_disable_port(dev, port);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> static int</span><br><span>diff --git a/payloads/libpayload/drivers/usb/usbhub.c b/payloads/libpayload/drivers/usb/usbhub.c</span><br><span>index 340e47a..18ed406 100644</span><br><span>--- a/payloads/libpayload/drivers/usb/usbhub.c</span><br><span>+++ b/payloads/libpayload/drivers/usb/usbhub.c</span><br><span>@@ -119,6 +119,12 @@</span><br><span> }</span><br><span> </span><br><span> static int</span><br><span style="color: hsl(120, 100%, 40%);">+usb_hub_disable_port(usbdev_t *const dev, const int port)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return clear_feature(dev, port, SEL_PORT_POWER, DR_PORT);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int</span><br><span> usb_hub_start_port_reset(usbdev_t *const dev, const int port)</span><br><span> {</span><br><span> return set_feature (dev, port, SEL_PORT_RESET, DR_PORT);</span><br><span>@@ -153,7 +159,7 @@</span><br><span> .port_enabled = usb_hub_port_enabled,</span><br><span> .port_speed = usb_hub_port_speed,</span><br><span> .enable_port = usb_hub_enable_port,</span><br><span style="color: hsl(0, 100%, 40%);">- .disable_port = NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .disable_port = usb_hub_disable_port,</span><br><span> .start_port_reset = usb_hub_start_port_reset,</span><br><span> .reset_port = generic_hub_resetport,</span><br><span> };</span><br><span>diff --git a/payloads/libpayload/drivers/usb/xhci_rh.c b/payloads/libpayload/drivers/usb/xhci_rh.c</span><br><span>index d7ba82c..5650076 100644</span><br><span>--- a/payloads/libpayload/drivers/usb/xhci_rh.c</span><br><span>+++ b/payloads/libpayload/drivers/usb/xhci_rh.c</span><br><span>@@ -136,6 +136,16 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int</span><br><span style="color: hsl(120, 100%, 40%);">+xhci_rh_disable_port(usbdev_t *const dev, int port)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ xhci_t *const xhci = XHCI_INST(dev->controller);</span><br><span style="color: hsl(120, 100%, 40%);">+ volatile u32 *const portsc =</span><br><span style="color: hsl(120, 100%, 40%);">+ &xhci->opreg->prs[port - 1].portsc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ *portsc = ((*portsc & PORTSC_RW_MASK) | PORTSC_PED) & ~PORTSC_PP;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> static const generic_hub_ops_t xhci_rh_ops = {</span><br><span> .hub_status_changed = xhci_rh_hub_status_changed,</span><br><span>@@ -145,7 +155,7 @@</span><br><span> .port_enabled = xhci_rh_port_enabled,</span><br><span> .port_speed = xhci_rh_port_speed,</span><br><span> .enable_port = xhci_rh_enable_port,</span><br><span style="color: hsl(0, 100%, 40%);">- .disable_port = NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .disable_port = xhci_rh_disable_port,</span><br><span> .start_port_reset = NULL,</span><br><span> .reset_port = xhci_rh_reset_port,</span><br><span> };</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23768">change 23768</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/23768"/><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: I4882ba81cc0bed8dc0001f31142dc783e1f4259d </div>
<div style="display:none"> Gerrit-Change-Number: 23768 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <siro@das-labor.org> </div>