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

Commit 3eb42df3 authored by Gregory Herrero's avatar Gregory Herrero Committed by Felipe Balbi
Browse files

usb: dwc2: controller must update lx_state before releasing lock 



During suspend, there could a race condition between ep_queue and
suspend interrupt if lx_state is updated after releasing spinlock in
call_gadget(hsotg, suspend).

Acked-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarGregory Herrero <gregory.herrero@intel.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent f81f46e1

drivers/usb/dwc2/core_intr.c

+8 −3
Original line number Diff line number Diff line
@@ -439,6 +439,12 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg) 
			if (!IS_ERR_OR_NULL(hsotg->uphy))

				usb_phy_set_suspend(hsotg->uphy, true);

skip_power_saving:

			/*

			 * Change to L2 (suspend) state before releasing

			 * spinlock

			 */

			hsotg->lx_state = DWC2_L2;



			/* Call gadget suspend callback */

			call_gadget(hsotg, suspend);

		}
@@ -446,6 +452,8 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg) 
		if (hsotg->op_state == OTG_STATE_A_PERIPHERAL) {

			dev_dbg(hsotg->dev, "a_peripheral->a_host\n");



			/* Change to L2 (suspend) state */

			hsotg->lx_state = DWC2_L2;

			/* Clear the a_peripheral flag, back to a_host */

			spin_unlock(&hsotg->lock);

			dwc2_hcd_start(hsotg);
@@ -454,9 +462,6 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg) 
		}

	}



	/* Change to L2 (suspend) state */

	hsotg->lx_state = DWC2_L2;



clear_int:

	/* Clear interrupt */

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