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

Commit f2449fb6 authored by Jack Pham's avatar Jack Pham Committed by Abhijeet Dharmapurikar
Browse files

usb: pd: Clear PD_IN_HARD_RESET in PE_SNK_TRANSITION_TO_DEFAULT 



Make sure to properly clear the PD_IN_HARD_RESET property upon
reaching the SNK_Transition_to_default state to ensure that the
charger driver is notified that hard reset has completed. Move
the clearing of pd->hard_reset flag here as well for clarity.

Also clear the pd->in_pr_swap flag when initiating or receiving
hard reset signal as that should promptly abort any PR swap
operation in progress.

Change-Id: I967e3841af614ecd2129bf60dc08a1b19731c4e3
Signed-off-by: default avatarJack Pham <jackp@codeaurora.org>
parent 7ae4a171

drivers/usb/pd/policy_engine.c

+8 −2
Original line number Diff line number Diff line
@@ -497,6 +497,7 @@ static void pd_send_hard_reset(struct usbpd *pd) 
	ret = pd_phy_signal(HARD_RESET_SIG, 5); /* tHardResetComplete */

	if (!ret)

		pd->hard_reset = true;

	pd->in_pr_swap = false;

}



static void kick_sm(struct usbpd *pd, int ms)
@@ -913,8 +914,6 @@ static void usbpd_set_state(struct usbpd *pd, enum usbpd_state next_state) 
		break;



	case PE_SNK_TRANSITION_TO_DEFAULT:

		pd->hard_reset = false;



		if (pd->current_dr != DR_UFP) {

			extcon_set_cable_state_(pd->extcon, EXTCON_USB_HOST, 0);
@@ -1462,6 +1461,7 @@ static void usbpd_sm(struct work_struct *w) 
		power_supply_set_property(pd->usb_psy,

				POWER_SUPPLY_PROP_PD_IN_HARD_RESET, &val);



		pd->in_pr_swap = false;

		reset_vdm_state(pd);



		if (pd->current_pr == PR_SINK)
@@ -1829,6 +1829,12 @@ static void usbpd_sm(struct work_struct *w) 
		break;



	case PE_SNK_TRANSITION_TO_DEFAULT:

		pd->hard_reset = false;



		val.intval = 0;

		power_supply_set_property(pd->usb_psy,

				POWER_SUPPLY_PROP_PD_IN_HARD_RESET, &val);



		if (pd->vbus_present) {

			usbpd_set_state(pd, PE_SNK_STARTUP);

		} else {