On Mon, 2020-06-08 at 22:44 +0300, Andy Shevchenko wrote:
>
>
> On Monday, June 8, 2020, Nicolas Saenz Julienne <nsaenzjulienne@xxxxxxx>
> wrote:
> > 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 <nsaenzjulienne@xxxxxxx>
> > ---
> > 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);
>
>
> > + if (IS_ERR(reset)) {
> > + retval = PTR_ERR(reset);
> > + return retval;
> > + }
>
> These four can be two, we have too many LOCs in the kernel for no reason.
Noted
>
> > + reset_control_reset(reset);
> > +
> > /* Prevent runtime suspending between USB-2 and USB-3 initialization
> > */
> > pm_runtime_get_noresume(&dev->dev);
> >
> > --
> > 2.26.2
> >
> >
>
>
Attachment:
signature.asc
Description: This is a digitally signed message part
