Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Minas Harutyunyan <minas.harutyunyan@synopsys.com>
To:     Dan Carpenter <dan.carpenter@oracle.com>,
        Minas Harutyunyan <minas.harutyunyan@synopsys.com>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        Maynard CABIENTE <maynard.cabiente@raritan.com>
CC:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Felipe Balbi <felipe.balbi@linux.intel.com>,
        Geert Uytterhoeven <geert@linux-m68k.org>,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: Re: [PATCH] usb: dwc2: Revert "usb: dwc2: Disable all EP's on
 disconnect"
Thread-Topic: [PATCH] usb: dwc2: Revert "usb: dwc2: Disable all EP's on
 disconnect"
Thread-Index: AQHUgbE8ouTBXi+nzkarEEkfP9zP5Q==
Date:   Tue, 4 Dec 2018 12:34:08 +0000
Message-ID: <410670D7E743164D87FA6160E7907A56013A7B19C2@am04wembxa.internal.synopsys.com>
References: <CGME20181121154518eucas1p2cc7ffd4d071ff420c747e1d0c387ee5d@eucas1p2.samsung.com>
 <20181121154504.13052-1-m.szyprowski@samsung.com>
 <410670D7E743164D87FA6160E7907A56013A7AA1EE@am04wembxa.internal.synopsys.com>
 <20181123144307.GC2970@unbuntlaptop>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 11/23/2018 6:43 PM, Dan Carpenter wrote:=0A=
> Ugh...  We also had a long thread about the v2 patch but it turns out=0A=
> the list was not CC'd.  I should have checked for that.=0A=
> =0A=
> You have to pass a flag to say if the caller holds the lock or not...=0A=
> =0A=
> regards,=0A=
> dan carpenter=0A=
> =0A=
=0A=
Hi Dan, Marek, Maynard,=0A=
=0A=
Could you please apply bellow patch over follow patches:=0A=
=0A=
dccf1bad4be7 usb: dwc2: Disable all EP's on disconnect=0A=
6f774b501928 usb: dwc2: Fix ep disable spinlock flow.=0A=
=0A=
Please review and test. Feedback is appreciated :-)=0A=
=0A=
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c=0A=
index 8eb25e3597b0..db438d13c36a 100644=0A=
--- a/drivers/usb/dwc2/gadget.c=0A=
+++ b/drivers/usb/dwc2/gadget.c=0A=
@@ -3165,8 +3165,6 @@ static void kill_all_requests(struct dwc2_hsotg =0A=
*hsotg,=0A=
                 dwc2_hsotg_txfifo_flush(hsotg, ep->fifo_index);=0A=
  }=0A=
=0A=
-static int dwc2_hsotg_ep_disable(struct usb_ep *ep);=0A=
-=0A=
  /**=0A=
   * dwc2_hsotg_disconnect - disconnect service=0A=
   * @hsotg: The device state.=0A=
@@ -3185,12 +3183,13 @@ void dwc2_hsotg_disconnect(struct dwc2_hsotg *hsotg=
)=0A=
         hsotg->connected =3D 0;=0A=
         hsotg->test_mode =3D 0;=0A=
=0A=
-       /* all endpoints should be shutdown */=0A=
         for (ep =3D 0; ep < hsotg->num_of_eps; ep++) {=0A=
                 if (hsotg->eps_in[ep])=0A=
-                       dwc2_hsotg_ep_disable(&hsotg->eps_in[ep]->ep);=0A=
+                       kill_all_requests(hsotg, hsotg->eps_in[ep],=0A=
+                                                         -ESHUTDOWN);=0A=
                 if (hsotg->eps_out[ep])=0A=
-                       dwc2_hsotg_ep_disable(&hsotg->eps_out[ep]->ep);=0A=
+                       kill_all_requests(hsotg, hsotg->eps_out[ep],=0A=
+                                                         -ESHUTDOWN);=0A=
         }=0A=
=0A=
         call_gadget(hsotg, disconnect);=0A=
@@ -3234,6 +3233,8 @@ static void dwc2_hsotg_irq_fifoempty(struct =0A=
dwc2_hsotg *hsotg, bool periodic)=0A=
                         GINTSTS_PTXFEMP |  \=0A=
                         GINTSTS_RXFLVL)=0A=
=0A=
+static int dwc2_hsotg_ep_disable(struct usb_ep *ep);=0A=
+=0A=
  /**=0A=
   * dwc2_hsotg_core_init - issue softreset to the core=0A=
   * @hsotg: The device state=0A=
@@ -3258,12 +3259,14 @@ void dwc2_hsotg_core_init_disconnected(struct =0A=
dwc2_hsotg *hsotg,=0A=
                         return;=0A=
         } else {=0A=
                 /* all endpoints should be shutdown */=0A=
+               spin_unlock(&hsotg->lock);=0A=
                 for (ep =3D 1; ep < hsotg->num_of_eps; ep++) {=0A=
                         if (hsotg->eps_in[ep])=0A=
 =0A=
dwc2_hsotg_ep_disable(&hsotg->eps_in[ep]->ep);=0A=
                         if (hsotg->eps_out[ep])=0A=
 =0A=
dwc2_hsotg_ep_disable(&hsotg->eps_out[ep]->ep);=0A=
                 }=0A=
+               spin_lock(&hsotg->lock);=0A=
         }=0A=
=0A=
         /*=0A=
@@ -4072,7 +4075,6 @@ static int dwc2_hsotg_ep_disable(struct usb_ep *ep)=
=0A=
         unsigned long flags;=0A=
         u32 epctrl_reg;=0A=
         u32 ctrl;=0A=
-       int locked;=0A=
=0A=
         dev_dbg(hsotg->dev, "%s(ep %p)\n", __func__, ep);=0A=
=0A=
@@ -4088,7 +4090,7 @@ static int dwc2_hsotg_ep_disable(struct usb_ep *ep)=
=0A=
=0A=
         epctrl_reg =3D dir_in ? DIEPCTL(index) : DOEPCTL(index);=0A=
=0A=
-       locked =3D spin_trylock_irqsave(&hsotg->lock, flags);=0A=
+       spin_lock_irqsave(&hsotg->lock, flags);=0A=
=0A=
         ctrl =3D dwc2_readl(hsotg, epctrl_reg);=0A=
=0A=
@@ -4112,8 +4114,7 @@ static int dwc2_hsotg_ep_disable(struct usb_ep *ep)=
=0A=
         hs_ep->fifo_index =3D 0;=0A=
         hs_ep->fifo_size =3D 0;=0A=
=0A=
-       if (locked)=0A=
-               spin_unlock_irqrestore(&hsotg->lock, flags);=0A=
+       spin_unlock_irqrestore(&hsotg->lock, flags);=0A=
=0A=
         return 0;=0A=
  }=0A=
=0A=
Thanks,=0A=
Minas=0A=