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

Commit 2e4da3f3 authored by Sundara Vinayagam's avatar Sundara Vinayagam Committed by Gerrit - the friendly Code Review server
Browse files

usb: phy msm: Do msm_otg_notify_chg_current in sleepable context 



The charger driver's implementation of power_supply_set_property() for
POWER_SUPPLY_CURRENT_MAX currently uses a mutex. Since
sleeping is disallowed in this case, instead schedule a
work function to do the call.

Change-Id: Icad8be033dd0782c155ac8858a15580844415ba4
Signed-off-by: default avatarSundara Vinayagam <sundvi@codeaurora.org>
parent f32d3f5f

drivers/usb/phy/phy-msm-usb.c

+15 −4
Original line number Diff line number Diff line
@@ -1861,15 +1861,23 @@ static void msm_otg_notify_chg_current(struct msm_otg *motg, unsigned int mA) 
	motg->cur_power = mA;

}



static int msm_otg_set_power(struct usb_phy *phy, unsigned int mA)

static void msm_otg_notify_chg_current_work(struct work_struct *w)

{

	struct msm_otg *motg = container_of(phy, struct msm_otg, phy);



	struct msm_otg *motg = container_of(w,

				struct msm_otg, notify_chg_current_work);

	/*

	 * Gadget driver uses set_power method to notify about the

	 * available current based on suspend/configured states.

	 */

	msm_otg_notify_chg_current(motg, mA);

	msm_otg_notify_chg_current(motg, motg->notify_current_mA);

}



static int msm_otg_set_power(struct usb_phy *phy, unsigned int mA)

{

	struct msm_otg *motg = container_of(phy, struct msm_otg, phy);



	motg->notify_current_mA = mA;

	schedule_work(&motg->notify_chg_current_work);



	return 0;

}
@@ -3835,6 +3843,8 @@ static int msm_otg_probe(struct platform_device *pdev) 
	INIT_WORK(&motg->sm_work, msm_otg_sm_work);

	INIT_DELAYED_WORK(&motg->id_status_work, msm_id_status_w);

	INIT_DELAYED_WORK(&motg->perf_vote_work, msm_otg_perf_vote_work);

	INIT_WORK(&motg->notify_chg_current_work,

			 msm_otg_notify_chg_current_work);

	motg->otg_wq = alloc_ordered_workqueue("k_otg", 0);

	if (!motg->otg_wq) {

		pr_err("%s: Unable to create workqueue otg_wq\n",
@@ -4189,6 +4199,7 @@ static int msm_otg_remove(struct platform_device *pdev) 
	cancel_delayed_work_sync(&motg->perf_vote_work);

	msm_otg_perf_vote_update(motg, false);

	cancel_work_sync(&motg->sm_work);

	cancel_work_sync(&motg->notify_chg_current_work);

	destroy_workqueue(motg->otg_wq);



	pm_runtime_resume(&pdev->dev);

include/linux/usb/msm_hsusb.h

+2 −0
Original line number Diff line number Diff line
@@ -273,8 +273,10 @@ struct msm_otg { 
	unsigned int vbus_state;

	unsigned int usb_irq_count;

	int pm_qos_latency;

	unsigned int notify_current_mA;

	struct pm_qos_request pm_qos_req_dma;

	struct delayed_work perf_vote_work;

	struct work_struct notify_chg_current_work;

};



struct ci13xxx_platform_data {