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

Commit 61f7223b authored by Gregory Herrero's avatar Gregory Herrero Committed by Felipe Balbi
Browse files

usb: dwc2: gadget: exit hibernation before power down 



When disconnecting cable, controller will detect a suspend condition
and enter partial power down. If vbus_session is called by the phy
driver during hibernation, make sure controller exit hibernation
before it is accessed.

Signed-off-by: default avatarJianqiang Tang <jianqiang.tang@intel.com>
Signed-off-by: default avatarGregory Herrero <gregory.herrero@intel.com>
Signed-off-by: default avatarMian Yousaf Kaukab <yousaf.kaukab@intel.com>
Tested-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
Tested-by: default avatarDinh Nguyen <dinguyen@opensource.altera.com>
Tested-by: default avatarJohn Youn <johnyoun@synopsys.com>
Acked-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 1ee6903b

drivers/usb/dwc2/gadget.c

+7 −6
Original line number Diff line number Diff line
@@ -3285,15 +3285,16 @@ static int dwc2_hsotg_vbus_session(struct usb_gadget *gadget, int is_active) 
	dev_dbg(hsotg->dev, "%s: is_active: %d\n", __func__, is_active);

	spin_lock_irqsave(&hsotg->lock, flags);



	if (is_active) {

		hsotg->op_state = OTG_STATE_B_PERIPHERAL;

	/*

	 * If controller is hibernated, it must exit from hibernation

		 * before being initialized

	 * before being initialized / de-initialized

	 */

	if (hsotg->lx_state == DWC2_L2)

		dwc2_exit_hibernation(hsotg, false);



	if (is_active) {

		hsotg->op_state = OTG_STATE_B_PERIPHERAL;



		dwc2_hsotg_core_init_disconnected(hsotg, false);

		if (hsotg->enabled)

			dwc2_hsotg_core_connect(hsotg);