usb: xhci: Add reset controller support

Some atypical users of xhci might need to manually reset their xHCI
controller before starting the HCD setup. Check if a reset controller
device is available to the PCI bus and trigger a reset.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
[mb: squash fix to only build xhci_reset_hw() if CONFIG_DM_BUS]
Signed-off-by: Matthias Brugger <mbrugger@suse.com>

diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index f4465205284584bb0c175dbdf172245a7ec3ebfb..108f4bd8cfd9033baee89ad419f4fba98a295d45 100644 (file)
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -180,6 +180,8 @@ void xhci_cleanup(struct xhci_ctrl *ctrl)
        xhci_free_virt_devices(ctrl);
        free(ctrl->erst.entries);
        free(ctrl->dcbaa);
+       if (reset_valid(&ctrl->reset))
+               reset_free(&ctrl->reset);
        memset(ctrl, '\0', sizeof(struct xhci_ctrl));
 }
 

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index ebd29545715b95205f1bfc45a35b002f7ee9b126..f635bb39f6a42b48e2c8495d773bc126afcd51e6 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -190,6 +190,37 @@ static int xhci_start(struct xhci_hcor *hcor)
        return ret;
 }
 
+#if CONFIG_IS_ENABLED(DM_USB)
+/**
+ * Resets XHCI Hardware
+ *
+ * @param ctrl pointer to host controller
+ * @return 0 if OK, or a negative error code.
+ */
+static int xhci_reset_hw(struct xhci_ctrl *ctrl)
+{
+       int ret;
+
+       ret = reset_get_by_index(ctrl->dev, 0, &ctrl->reset);
+       if (ret && ret != -ENOENT && ret != -ENOTSUPP) {
+               dev_err(ctrl->dev, "failed to get reset\n");
+               return ret;
+       }
+
+       if (reset_valid(&ctrl->reset)) {
+               ret = reset_assert(&ctrl->reset);
+               if (ret)
+                       return ret;
+
+               ret = reset_deassert(&ctrl->reset);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}
+#endif
+
 /**
  * Resets the XHCI Controller
  *
@@ -1508,6 +1539,10 @@ int xhci_register(struct udevice *dev, struct xhci_hccr *hccr,
 
        ctrl->dev = dev;
 
+       ret = xhci_reset_hw(ctrl);
+       if (ret)
+               goto err;
+
        /*
         * XHCI needs to issue a Address device command to setup
         * proper device context structures, before it can interact

diff --git a/include/usb/xhci.h b/include/usb/xhci.h
index 1170c0ac69cf0996be477ff0ff6b362a6dfddf5b..7d34103fd5ca147083cab16d0876dd5803bfe22c 100644 (file)
--- a/include/usb/xhci.h
+++ b/include/usb/xhci.h
@@ -16,6 +16,7 @@
 #ifndef HOST_XHCI_H_
 #define HOST_XHCI_H_
 
+#include <reset.h>
 #include <asm/types.h>
 #include <asm/cache.h>
 #include <asm/io.h>
@@ -1209,6 +1210,7 @@ struct xhci_ctrl {
 #if CONFIG_IS_ENABLED(DM_USB)
        struct udevice *dev;
 #endif
+       struct reset_ctl reset;
        struct xhci_hccr *hccr; /* R/O registers, not need for volatile */
        struct xhci_hcor *hcor;
        struct xhci_doorbell_array *dba;