Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d713c15 authored by Mian Yousaf Kaukab's avatar Mian Yousaf Kaukab Committed by Felipe Balbi
Browse files

usb: dwc2: gadget: report disconnection after reset 



If usb bus is reset without a physical disconnection, all endpoints
will remain open. Call s3c_hsotg_disconnect() from reset handler to
report a disconnect to gadget framework. hsotg->connected is checked
in s3c_hsotg_disconnect() before processing disconnect.

In some cases, USBRst is seen before EnumDone and after it as well.
So move setting of hsotg->connected to set-address to avoid reporting
extra disconnection in this case.

Tested-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
Acked-by: default avatarPaul Zimmerman <paulz@synopsys.com>
Signed-off-by: default avatarMian Yousaf Kaukab <yousaf.kaukab@intel.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 1b7a66b4

drivers/usb/dwc2/gadget.c

+4 −1
Original line number Diff line number Diff line
@@ -1103,6 +1103,7 @@ static void s3c_hsotg_process_control(struct dwc2_hsotg *hsotg, 
	if ((ctrl->bRequestType & USB_TYPE_MASK) == USB_TYPE_STANDARD) {

		switch (ctrl->bRequest) {

		case USB_REQ_SET_ADDRESS:

			hsotg->connected = 1;

			dcfg = readl(hsotg->regs + DCFG);

			dcfg &= ~DCFG_DEVADDR_MASK;

			dcfg |= (le16_to_cpu(ctrl->wValue) <<
@@ -2305,7 +2306,6 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw) 
		writel(GINTSTS_ENUMDONE, hsotg->regs + GINTSTS);



		s3c_hsotg_irq_enumdone(hsotg);

		hsotg->connected = 1;

	}



	if (gintsts & (GINTSTS_OEPINT | GINTSTS_IEPINT)) {
@@ -2343,6 +2343,9 @@ static irqreturn_t s3c_hsotg_irq(int irq, void *pw) 


		writel(GINTSTS_USBRST, hsotg->regs + GINTSTS);



		/* Report disconnection if it is not already done. */

		s3c_hsotg_disconnect(hsotg);



		if (usb_status & GOTGCTL_BSESVLD) {

			if (time_after(jiffies, hsotg->last_rst +

				       msecs_to_jiffies(200))) {