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

Commit baf28399 authored by Xiaoyu Ye's avatar Xiaoyu Ye
Browse files

dsp: q6afe: fix sleeping function called from invalid context 



afe_callback indirectly calls q6core_send_uevent which might
sleep due to use of mutex. Move this send uevent function call
to work queue to prevent the issue.

Change-Id: I74ad151a9bae84860059d0a11042cda6475394c2
Signed-off-by: default avatarXiaoyu Ye <benyxy@codeaurora.org>
parent e58c940b

dsp/q6afe.c

+12 −3
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ struct afe_ctl { 
	struct afe_fw_info *fw_data;

	u32 island_mode[AFE_MAX_PORTS];

	struct vad_config vad_cfg[AFE_MAX_PORTS];

	struct work_struct afe_dc_work;

};



static atomic_t afe_ports_mad_type[SLIMBUS_PORT_LAST - SLIMBUS_0_RX];
@@ -335,15 +336,21 @@ static int32_t sp_make_afe_callback(uint32_t opcode, uint32_t *payload, 
}



static void afe_notify_dc_presence(void)

{

	msm_aud_evt_notifier_call_chain(MSM_AUD_DC_EVENT, NULL);



	schedule_work(&this_afe.afe_dc_work);

}



static void afe_notify_dc_presence_work_fn(struct work_struct *work)

{

	int ret = 0;

	char event[] = "DC_PRESENCE=TRUE";



	msm_aud_evt_notifier_call_chain(MSM_AUD_DC_EVENT, NULL);



	ret = q6core_send_uevent(this_afe.uevent_data, event);

	if (ret)

		pr_err("%s: Send UEvent %s failed :%d\n", __func__, event, ret);

		pr_err("%s: Send UEvent %s failed :%d\n",

		       __func__, event, ret);

}



static int32_t afe_callback(struct apr_client_data *data, void *priv)
@@ -7575,6 +7582,8 @@ int __init afe_init(void) 
	this_afe.uevent_data->ktype.release = afe_release_uevent_data;

	q6core_init_uevent_data(this_afe.uevent_data, "q6afe_uevent");



	INIT_WORK(&this_afe.afe_dc_work, afe_notify_dc_presence_work_fn);



	return 0;

}