Re: [PATCH 5/9] usb: xhci-pci: Add support for reset controllers
From: Florian Fainelli <f.fainelli@gmail.com>
Date: 2020-06-08 19:43:53
Also in:
linux-devicetree, linux-pci, linux-usb, lkml
On 6/8/2020 12:26 PM, Nicolas Saenz Julienne wrote:
quoted hunk ↗ jump to hunk
Some atypical users of xhci-pci 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 <redacted> --- drivers/usb/host/xhci-pci.c | 9 +++++++++ 1 file changed, 9 insertions(+)diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index ef513c2fb843..45f70facdfcd 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c@@ -12,6 +12,7 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/acpi.h> +#include <linux/reset.h> #include "xhci.h" #include "xhci-trace.h"@@ -339,6 +340,7 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) struct xhci_hcd *xhci; struct usb_hcd *hcd; struct xhci_driver_data *driver_data; + struct reset_control *reset; driver_data = (struct xhci_driver_data *)id->driver_data; if (driver_data && driver_data->quirks & XHCI_RENESAS_FW_QUIRK) {@@ -347,6 +349,13 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) return retval; } + reset = devm_reset_control_get(&dev->bus->dev, NULL);
Should not this be devm_reset_control_get_optional()?
+ if (IS_ERR(reset)) {
+ retval = PTR_ERR(reset);
+ return retval;
+ }
+ reset_control_reset(reset);
+
/* Prevent runtime suspending between USB-2 and USB-3 initialization */
pm_runtime_get_noresume(&dev->dev);
-- Florian _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel