Commit 7c6d67b1 authored by Rakesh Pillai's avatar Rakesh Pillai Committed by Kalle Valo
Browse files

ath10k: Skip handling del_server during driver exit 



The qmi infrastructure sends the client a del_server
event when the client releases its qmi handle. This
is not the msg indicating the actual qmi server exiting.
In such cases the del_server msg should not be processed,
since the wifi firmware does not reset its qmi state.

Hence skip the processing of del_server event when the
driver is unloading.

Tested HW: WCN3990
Tested FW: WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1

Fixes: ba94c753 ("ath10k: add QMI message handshake for wcn3990 client")
Signed-off-by: default avatarRakesh Pillai <pillair@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1588663061-12138-1-git-send-email-pillair@codeaurora.org
parent 32a2be49

drivers/net/wireless/ath/ath10k/qmi.c

+12 −1
Original line number Diff line number Diff line
@@ -961,7 +961,16 @@ static void ath10k_qmi_del_server(struct qmi_handle *qmi_hdl, 
		container_of(qmi_hdl, struct ath10k_qmi, qmi_hdl);



	qmi->fw_ready = false;

	ath10k_qmi_driver_event_post(qmi, ATH10K_QMI_EVENT_SERVER_EXIT, NULL);



	/*

	 * The del_server event is to be processed only if coming from

	 * the qmi server. The qmi infrastructure sends del_server, when

	 * any client releases the qmi handle. In this case do not process

	 * this del_server event.

	 */

	if (qmi->state == ATH10K_QMI_STATE_INIT_DONE)

		ath10k_qmi_driver_event_post(qmi, ATH10K_QMI_EVENT_SERVER_EXIT,

					     NULL);

}



static struct qmi_ops ath10k_qmi_ops = {
@@ -1046,6 +1055,7 @@ int ath10k_qmi_init(struct ath10k *ar, u32 msa_size) 
	if (ret)

		goto err_qmi_lookup;



	qmi->state = ATH10K_QMI_STATE_INIT_DONE;

	return 0;



err_qmi_lookup:
@@ -1064,6 +1074,7 @@ int ath10k_qmi_deinit(struct ath10k *ar) 
	struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);

	struct ath10k_qmi *qmi = ar_snoc->qmi;



	qmi->state = ATH10K_QMI_STATE_DEINIT;

	qmi_handle_release(&qmi->qmi_hdl);

	cancel_work_sync(&qmi->event_work);

	destroy_workqueue(qmi->event_wq);

drivers/net/wireless/ath/ath10k/qmi.h

+6 −0
Original line number Diff line number Diff line
@@ -83,6 +83,11 @@ struct ath10k_qmi_driver_event { 
	void *data;

};



enum ath10k_qmi_state {

	ATH10K_QMI_STATE_INIT_DONE,

	ATH10K_QMI_STATE_DEINIT,

};



struct ath10k_qmi {

	struct ath10k *ar;

	struct qmi_handle qmi_hdl;
@@ -102,6 +107,7 @@ struct ath10k_qmi { 
	char fw_build_timestamp[MAX_TIMESTAMP_LEN + 1];

	struct ath10k_qmi_cal_data cal_data[MAX_NUM_CAL_V01];

	bool msa_fixed_perm;

	enum ath10k_qmi_state state;

};



int ath10k_qmi_wlan_enable(struct ath10k *ar,

CRA Git | Maintained and supported by SUSTech CRA and CCSE