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

Commit 532c8014 authored by Manu Gautam's avatar Manu Gautam Committed by Hemant Kumar
Browse files

usb: dwc3-msm: add enum for drd_states to remove otg_state usage 



otg_state enum defines states for USB OTG devices. Since, driver
supports only role change (DRD) and no OTG support, hence, instead
of using otg_states create separate drd_state enums.

Change-Id: Ifda1fac712e751c980ce51b60b473e5921f2001d
Signed-off-by: default avatarManu Gautam <mgautam@codeaurora.org>
parent 93b3d48f

drivers/usb/dwc3/dwc3-msm.c

+57 −30
Original line number Diff line number Diff line
@@ -130,6 +130,33 @@ struct dwc3_msm_req_complete { 
			      struct usb_request *req);

};



enum dwc3_drd_state {

	DRD_STATE_UNDEFINED = 0,



	DRD_STATE_IDLE,

	DRD_STATE_PERIPHERAL,

	DRD_STATE_PERIPHERAL_SUSPEND,



	DRD_STATE_HOST_IDLE,

	DRD_STATE_HOST,

};



static const char *const state_names[] = {

	[DRD_STATE_IDLE] = "idle",

	[DRD_STATE_PERIPHERAL] = "peripheral",

	[DRD_STATE_PERIPHERAL_SUSPEND] = "peripheral_suspend",

	[DRD_STATE_HOST_IDLE] = "host_idle",

	[DRD_STATE_HOST] = "host",

};



const char *dwc3_drd_state_string(enum dwc3_drd_state state)

{

	if (state < 0 || state >= ARRAY_SIZE(state_names))

		return "UNDEFINED";



	return state_names[state];

}



enum dwc3_id_state {

	DWC3_ID_GROUND = 0,

	DWC3_ID_FLOAT,
@@ -242,7 +269,7 @@ struct dwc3_msm { 
	unsigned long		inputs;

	unsigned int		max_power;

	bool			charging_disabled;

	enum usb_otg_state	otg_state;

	enum dwc3_drd_state	drd_state;

	enum bus_vote		override_bus_vote;

	u32			bus_perf_client;

	struct msm_bus_scale_pdata	*bus_scale_table;
@@ -2291,7 +2318,7 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc, bool force_power_collapse) 
	}



	if (!mdwc->vbus_active && dwc3_is_otg_or_drd(dwc) &&

		mdwc->otg_state == OTG_STATE_B_PERIPHERAL) {

		mdwc->drd_state == DRD_STATE_PERIPHERAL) {

		/*

		 * In some cases, the pm_runtime_suspend may be called by

		 * usb_bam when there is pending lpm flag. However, if this is
@@ -2314,7 +2341,7 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc, bool force_power_collapse) 
	 * LPM sequence. Check this for device bus suspend case.

	 */

	if ((dwc3_is_otg_or_drd(dwc) &&

			mdwc->otg_state == OTG_STATE_B_SUSPEND) &&

			mdwc->drd_state == DRD_STATE_PERIPHERAL_SUSPEND) &&

			(dwc->gadget.state != USB_STATE_CONFIGURED)) {

		pr_err("%s(): Trying to go in LPM with state:%d\n",

					__func__, dwc->gadget.state);
@@ -4204,7 +4231,7 @@ static int dwc3_msm_gadget_vbus_draw(struct dwc3_msm *mdwc, unsigned int mA) 
 *

 * @w: Pointer to the dwc3 otg workqueue

 *

 * NOTE: After any change in otg_state, we must reschdule the state machine.

 * NOTE: After any change in drd_state, we must reschdule the state machine.

 */

static void dwc3_otg_sm_work(struct work_struct *w)

{
@@ -4223,13 +4250,13 @@ static void dwc3_otg_sm_work(struct work_struct *w) 
		return;

	}



	state = usb_otg_state_string(mdwc->otg_state);

	state = dwc3_drd_state_string(mdwc->drd_state);

	dev_dbg(mdwc->dev, "%s state\n", state);

	dbg_event(0xFF, state, 0);



	/* Check OTG state */

	switch (mdwc->otg_state) {

	case OTG_STATE_UNDEFINED:

	switch (mdwc->drd_state) {

	case DRD_STATE_UNDEFINED:

		/* put controller and phy in suspend if no cable connected */

		if (test_bit(ID, &mdwc->inputs) &&

				!test_bit(B_SESS_VLD, &mdwc->inputs)) {
@@ -4241,19 +4268,19 @@ static void dwc3_otg_sm_work(struct work_struct *w) 
			pm_runtime_put_sync(mdwc->dev);

			dbg_event(0xFF, "Undef NoUSB",

				atomic_read(&mdwc->dev->power.usage_count));

			mdwc->otg_state = OTG_STATE_B_IDLE;

			mdwc->drd_state = DRD_STATE_IDLE;

			break;

		}



		dbg_event(0xFF, "Exit UNDEF", 0);

		mdwc->otg_state = OTG_STATE_B_IDLE;

		mdwc->drd_state = DRD_STATE_IDLE;

		pm_runtime_set_suspended(mdwc->dev);

		pm_runtime_enable(mdwc->dev);

		/* fall-through */

	case OTG_STATE_B_IDLE:

	case DRD_STATE_IDLE:

		if (!test_bit(ID, &mdwc->inputs)) {

			dev_dbg(mdwc->dev, "!id\n");

			mdwc->otg_state = OTG_STATE_A_IDLE;

			mdwc->drd_state = DRD_STATE_HOST_IDLE;

			work = 1;

		} else if (test_bit(B_SESS_VLD, &mdwc->inputs)) {

			dev_dbg(mdwc->dev, "b_sess_vld\n");
@@ -4264,14 +4291,14 @@ static void dwc3_otg_sm_work(struct work_struct *w) 


			/*

			 * Increment pm usage count upon cable connect. Count

			 * is decremented in OTG_STATE_B_PERIPHERAL state on

			 * is decremented in DRD_STATE_PERIPHERAL state on

			 * cable disconnect or in bus suspend.

			 */

			pm_runtime_get_sync(mdwc->dev);

			dbg_event(0xFF, "BIDLE gsync",

				atomic_read(&mdwc->dev->power.usage_count));

			dwc3_otg_start_peripheral(mdwc, 1);

			mdwc->otg_state = OTG_STATE_B_PERIPHERAL;

			mdwc->drd_state = DRD_STATE_PERIPHERAL;

			work = 1;

		} else {

			dwc3_msm_gadget_vbus_draw(mdwc, 0);
@@ -4279,17 +4306,17 @@ static void dwc3_otg_sm_work(struct work_struct *w) 
		}

		break;



	case OTG_STATE_B_PERIPHERAL:

	case DRD_STATE_PERIPHERAL:

		if (!test_bit(B_SESS_VLD, &mdwc->inputs) ||

				!test_bit(ID, &mdwc->inputs)) {

			dev_dbg(mdwc->dev, "!id || !bsv\n");

			mdwc->otg_state = OTG_STATE_B_IDLE;

			mdwc->drd_state = DRD_STATE_IDLE;

			cancel_delayed_work_sync(&mdwc->sdp_check);

			dwc3_otg_start_peripheral(mdwc, 0);

			/*

			 * Decrement pm usage count upon cable disconnect

			 * which was incremented upon cable connect in

			 * OTG_STATE_B_IDLE state

			 * DRD_STATE_IDLE state

			 */

			pm_runtime_put_sync_suspend(mdwc->dev);

			dbg_event(0xFF, "!BSV psync",
@@ -4298,13 +4325,13 @@ static void dwc3_otg_sm_work(struct work_struct *w) 
		} else if (test_bit(B_SUSPEND, &mdwc->inputs) &&

			test_bit(B_SESS_VLD, &mdwc->inputs)) {

			dev_dbg(mdwc->dev, "BPER bsv && susp\n");

			mdwc->otg_state = OTG_STATE_B_SUSPEND;

			mdwc->drd_state = DRD_STATE_PERIPHERAL_SUSPEND;

			/*

			 * Decrement pm usage count upon bus suspend.

			 * Count was incremented either upon cable

			 * connect in OTG_STATE_B_IDLE or host

			 * connect in DRD_STATE_IDLE or host

			 * initiated resume after bus suspend in

			 * OTG_STATE_B_SUSPEND state

			 * DRD_STATE_PERIPHERAL_SUSPEND state

			 */

			pm_runtime_mark_last_busy(mdwc->dev);

			pm_runtime_put_autosuspend(mdwc->dev);
@@ -4313,20 +4340,20 @@ static void dwc3_otg_sm_work(struct work_struct *w) 
		}

		break;



	case OTG_STATE_B_SUSPEND:

	case DRD_STATE_PERIPHERAL_SUSPEND:

		if (!test_bit(B_SESS_VLD, &mdwc->inputs)) {

			dev_dbg(mdwc->dev, "BSUSP: !bsv\n");

			mdwc->otg_state = OTG_STATE_B_IDLE;

			mdwc->drd_state = DRD_STATE_IDLE;

			cancel_delayed_work_sync(&mdwc->sdp_check);

			dwc3_otg_start_peripheral(mdwc, 0);

		} else if (!test_bit(B_SUSPEND, &mdwc->inputs)) {

			dev_dbg(mdwc->dev, "BSUSP !susp\n");

			mdwc->otg_state = OTG_STATE_B_PERIPHERAL;

			mdwc->drd_state = DRD_STATE_PERIPHERAL;

			/*

			 * Increment pm usage count upon host

			 * initiated resume. Count was decremented

			 * upon bus suspend in

			 * OTG_STATE_B_PERIPHERAL state.

			 * DRD_STATE_PERIPHERAL state.

			 */

			pm_runtime_get_sync(mdwc->dev);

			dbg_event(0xFF, "!SUSP gsync",
@@ -4334,15 +4361,15 @@ static void dwc3_otg_sm_work(struct work_struct *w) 
		}

		break;



	case OTG_STATE_A_IDLE:

	case DRD_STATE_HOST_IDLE:

		/* Switch to A-Device*/

		if (test_bit(ID, &mdwc->inputs)) {

			dev_dbg(mdwc->dev, "id\n");

			mdwc->otg_state = OTG_STATE_B_IDLE;

			mdwc->drd_state = DRD_STATE_IDLE;

			mdwc->vbus_retry_count = 0;

			work = 1;

		} else {

			mdwc->otg_state = OTG_STATE_A_HOST;

			mdwc->drd_state = DRD_STATE_HOST;



			ret = dwc3_otg_start_host(mdwc, 1);

			if ((ret == -EPROBE_DEFER) &&
@@ -4351,24 +4378,24 @@ static void dwc3_otg_sm_work(struct work_struct *w) 
				 * Get regulator failed as regulator driver is

				 * not up yet. Will try to start host after 1sec

				 */

				mdwc->otg_state = OTG_STATE_A_IDLE;

				mdwc->drd_state = DRD_STATE_HOST_IDLE;

				dev_dbg(mdwc->dev, "Unable to get vbus regulator. Retrying...\n");

				delay = VBUS_REG_CHECK_DELAY;

				work = 1;

				mdwc->vbus_retry_count++;

			} else if (ret) {

				dev_err(mdwc->dev, "unable to start host\n");

				mdwc->otg_state = OTG_STATE_A_IDLE;

				mdwc->drd_state = DRD_STATE_HOST_IDLE;

				goto ret;

			}

		}

		break;



	case OTG_STATE_A_HOST:

	case DRD_STATE_HOST:

		if (test_bit(ID, &mdwc->inputs) || mdwc->hc_died) {

			dev_dbg(mdwc->dev, "id || hc_died\n");

			dwc3_otg_start_host(mdwc, 0);

			mdwc->otg_state = OTG_STATE_B_IDLE;

			mdwc->drd_state = DRD_STATE_IDLE;

			mdwc->vbus_retry_count = 0;

			mdwc->hc_died = false;

			work = 1;