[coreboot-gerrit] New patch to review for coreboot: libpayload: usb: dwc2: fix usb plug/unplug bug

[Aaron Durbin (adurbin@chromium.org)]

Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11236

-gerrit

commit 855d6b1fc98048a6bf8cf88a7686c9f0d9767b4c
Author: Yunzhi Li <lyz at rock-chips.com>
Date:   Tue Aug 11 17:58:14 2015 +0800

    libpayload: usb: dwc2: fix usb plug/unplug bug
    
    Check device connect status while waiting for usb transfer complete
    Avoid coreboot get stuck when usb device unplugged
    
    BUG=chrome-os-partner:35525
    TEST=None
    BRANCH=None
    
    Original-Change-Id: Id103501aa0d8b31b0b81bef773679c0fad79f689
    Original-Signed-off-by: Yunzhi Li <lyz at rock-chips.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/292630
    Original-Reviewed-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Reviewed-by: Julius Werner <jwerner at chromium.org>
    Original-Commit-Queue: Lin Huang <hl at rock-chips.com>
    Original-Tested-by: Lin Huang <hl at rock-chips.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/292966
    Original-Reviewed-by: David Hendricks <dhendrix at chromium.org>
    Original-Tested-by: David Hendricks <dhendrix at chromium.org>
    Original-Commit-Queue: David Hendricks <dhendrix at chromium.org>
    
    Change-Id: I49396b74131dbfda505d9d3de5adbdc87eb92ce1
    Signed-off-by: Yunzhi Li <lyz at rock-chips.com>
---
 payloads/libpayload/drivers/usb/dwc2.c         | 19 +++++++++++++++++--
 payloads/libpayload/drivers/usb/dwc2_private.h |  1 +
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/payloads/libpayload/drivers/usb/dwc2.c b/payloads/libpayload/drivers/usb/dwc2.c
index 267dea7..9d19bc6 100644
--- a/payloads/libpayload/drivers/usb/dwc2.c
+++ b/payloads/libpayload/drivers/usb/dwc2.c
@@ -140,6 +140,16 @@ static void dwc2_shutdown(hci_t *controller)
 	free(controller);
 }
 
+/* Test root port device connect status */
+static int dwc2_disconnected(hci_t *controller)
+{
+	dwc2_reg_t *reg = DWC2_REG(controller);
+	hprt_t hprt;
+
+	hprt.d32 = readl(&reg->host.hprt);
+	return !(hprt.prtena && hprt.prtconnsts);
+}
+
 /*
  * This function returns the actual transfer length when the transfer succeeded
  * or an error code if the transfer failed
@@ -179,9 +189,11 @@ wait_for_complete(endpoint_t *ep, uint32_t ch_num)
 			else
 				return -HCSTAT_UNKNOW;
 		}
-	} while (timeout--);
 
-	/* Release the channel on timeout */
+		if (dwc2_disconnected(ep->dev->controller))
+			return -HCSTAT_DISCONNECTED;
+	} while (timeout--);
+	/* Release the channel when hit timeout condition */
 	hcchar.d32 = readl(&reg->host.hchn[ch_num].hccharn);
 	if (hcchar.chen) {
 		/*
@@ -310,6 +322,9 @@ dwc2_split_transfer(endpoint_t *ep, int size, int pid, ep_dir_t dir,
 	/* Wait for next frame boundary */
 	do {
 		hfnum.d32 = readl(&reg->host.hfnum);
+
+		if (dwc2_disconnected(ep->dev->controller))
+			return -HCSTAT_DISCONNECTED;
 	} while (hfnum.frnum % 8 != 0);
 
 	/* Handle Start-Split */
diff --git a/payloads/libpayload/drivers/usb/dwc2_private.h b/payloads/libpayload/drivers/usb/dwc2_private.h
index 5b1a547..73b6371 100644
--- a/payloads/libpayload/drivers/usb/dwc2_private.h
+++ b/payloads/libpayload/drivers/usb/dwc2_private.h
@@ -54,5 +54,6 @@ typedef enum {
 	HCSTAT_NYET,
 	HCSTAT_UNKNOW,
 	HCSTAT_TIMEOUT,
+	HCSTAT_DISCONNECTED,
 } hcstat_t;
 #endif