CHROMIUM: usb: dwc3: rockchip: fix hung task timeout when rm xhci-hcd

[firefly-linux-kernel-4.4.55.git] / drivers / usb / dwc3 / dwc3-rockchip.c

diff --git a/drivers/usb/dwc3/dwc3-rockchip.c b/drivers/usb/dwc3/dwc3-rockchip.c
index 036f8742cad8ffa779a4fb3526a4deda59950b96..0488af0b29be4cd1578cca46be87db2ea68ee8b1 100644 (file)
--- a/drivers/usb/dwc3/dwc3-rockchip.c
+++ b/drivers/usb/dwc3/dwc3-rockchip.c
@@ -33,6 +33,7 @@
 
 #include "core.h"
 #include "io.h"
 
 #include "core.h"
 #include "io.h"

+#include "../host/xhci.h"

 
 #define DWC3_ROCKCHIP_AUTOSUSPEND_DELAY  500 /* ms */
 
 
 #define DWC3_ROCKCHIP_AUTOSUSPEND_DELAY  500 /* ms */
 


@@ -82,6 +83,7 @@ static void dwc3_rockchip_otg_extcon_evt_work(struct work_struct *work)
        struct dwc3             *dwc = rockchip->dwc;
        struct extcon_dev       *edev = rockchip->edev;
        struct usb_hcd          *hcd;
        struct dwc3             *dwc = rockchip->dwc;
        struct extcon_dev       *edev = rockchip->edev;
        struct usb_hcd          *hcd;

+       struct xhci_hcd         *xhci;

        unsigned long           flags;
        int                     ret;
        u32                     reg;
        unsigned long           flags;
        int                     ret;
        u32                     reg;


@@ -219,8 +221,10 @@ static void dwc3_rockchip_otg_extcon_evt_work(struct work_struct *work)
                if (DWC3_GCTL_PRTCAP(reg) == DWC3_GCTL_PRTCAP_HOST ||
                    DWC3_GCTL_PRTCAP(reg) == DWC3_GCTL_PRTCAP_OTG) {
                        hcd = dev_get_drvdata(&dwc->xhci->dev);
                if (DWC3_GCTL_PRTCAP(reg) == DWC3_GCTL_PRTCAP_HOST ||
                    DWC3_GCTL_PRTCAP(reg) == DWC3_GCTL_PRTCAP_OTG) {
                        hcd = dev_get_drvdata(&dwc->xhci->dev);

+                       xhci = hcd_to_xhci(hcd);

 
                        if (hcd->state != HC_STATE_HALT) {
 
                        if (hcd->state != HC_STATE_HALT) {

+                               xhci->xhc_state |= XHCI_STATE_REMOVING;

                                usb_remove_hcd(hcd->shared_hcd);
                                usb_remove_hcd(hcd);
                        }
                                usb_remove_hcd(hcd->shared_hcd);
                                usb_remove_hcd(hcd);
                        }