Skip to contentSkip to conversation

ath10k: Add support of QMI indication message

PATCH In review Govind Singh 2 participants 2 messages Mar 26, 2018 – May 11, 2018 Qualcomm Atheros ATH10K wireless driver

lore
Share & tools
lore

Govind Singh

author
#0 lore raw

PATCH 5/12 ath10k: Add support of QMI indication message

Add support of indication qmi message to communicate with wlan qmi server. Indication message request describes client capability and in response client gets the state of wlan qmi service.

Signed-off-by Govind Singh <[email protected]>
---
 drivers/net/wireless/ath/ath10k/qmi.c | 71 ++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/qmi.c +70 -1
index 3a7fcc6..bc80b8f 100644
@@ -29,8 +29,76 @@
 #include "qmi.h"
 #include "qmi_svc_v01.h"
 
+#define WLFW_CLIENT_ID			0x4b4e454c
+#define WLFW_TIMEOUT			500
+
 static struct ath10k_qmi *qmi;
 
+static int
+ath10k_qmi_ind_register_send_sync_msg(struct ath10k_qmi *qmi)
+{
+	struct wlfw_ind_register_resp_msg_v01 *resp;
+	struct wlfw_ind_register_req_msg_v01 *req;
+	struct qmi_txn txn;
+	int ret;
+
+	req = kzalloc(sizeof(*req), GFP_KERNEL);
+	if (!req)
+		return -ENOMEM;
+
+	resp = kzalloc(sizeof(*resp), GFP_KERNEL);
+	if (!resp) {
+		kfree(req);
+		return -ENOMEM;
+	}
+
+	req->client_id_valid = 1;
+	req->client_id = WLFW_CLIENT_ID;
+	req->fw_ready_enable_valid = 1;
+	req->fw_ready_enable = 1;
+	req->msa_ready_enable_valid = 1;
+	req->msa_ready_enable = 1;
+
+	ret = qmi_txn_init(&qmi->qmi_hdl, &txn,
+			   wlfw_ind_register_resp_msg_v01_ei, resp);
+	if (ret < 0) {
+		pr_err("fail to init txn for ind register resp %d\n",
+		       ret);
+		goto out;
+	}
+
+	ret = qmi_send_request(&qmi->qmi_hdl, NULL, &txn,
+			       QMI_WLFW_IND_REGISTER_REQ_V01,
+			       WLFW_IND_REGISTER_REQ_MSG_V01_MAX_MSG_LEN,
+			       wlfw_ind_register_req_msg_v01_ei, req);
+	if (ret < 0) {
+		qmi_txn_cancel(&txn);
+		pr_err("fail to send ind register req %d\n", ret);
+		goto out;
+	}
+
+	ret = qmi_txn_wait(&txn, WLFW_TIMEOUT * HZ);
+	if (ret < 0)
+		goto out;
+
+	if (resp->resp.result != QMI_RESULT_SUCCESS_V01) {
+		pr_err("qmi indication register request rejected:");
+		pr_err("resut:%d error:%d\n",
+		       resp->resp.result, resp->resp.error);
+		ret = resp->resp.result;
+	}
+
+	pr_debug("indication register request completed\n");
+	kfree(resp);
+	kfree(req);
+	return 0;
+
+out:
+	kfree(resp);
+	kfree(req);
+	return ret;
+}
+
 static int ath10k_qmi_event_fw_ready_ind(struct ath10k_qmi *qmi)
 {
 	pr_debug("fw ready event received\n");

@@ -100,11 +168,12 @@ static void ath10k_qmi_event_server_arrive(struct work_struct *work)
 					      work_svc_arrive);
 	int ret;
 
+	pr_debug("wlan qmi server arrive\n");
 	ret = ath10k_qmi_connect_to_fw_server(qmi);
 	if (ret)
 		return;
 
-	pr_debug("qmi server arrive\n");
+	ath10k_qmi_ind_register_send_sync_msg(qmi);
 }
 
 static void ath10k_qmi_event_server_exit(struct work_struct *work)
Signature · 1 line
1.9.1
#1 lore raw
Quoted 17 lines · Govind Singh

Add support of indication qmi message to communicate with wlan qmi server. Indication message request describes client capability and in response client gets the state of wlan qmi service.

Signed-off-by Govind Singh <[email protected]>
---
 drivers/net/wireless/ath/ath10k/qmi.c | 71 ++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/qmi.c +0 -0
index 3a7fcc6..bc80b8f 100644
@@ -29,8 +29,76 @@
 #include "qmi.h"
 #include "qmi_svc_v01.h"

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

Quoted 10 lines
drivers/net/wireless/ath/ath10k/qmi.c +7 -0
 
+#define WLFW_CLIENT_ID			0x4b4e454c
+#define WLFW_TIMEOUT			500
+
 static struct ath10k_qmi *qmi;
 
+static int
+ath10k_qmi_ind_register_send_sync_msg(struct ath10k_qmi *qmi)
+{
+	struct wlfw_ind_register_resp_msg_v01 *resp;

struct wlfw_ind_register_resp_msg_v01 is 12 bytes,

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

Quoted 1 line
drivers/net/wireless/ath/ath10k/qmi.c +1 -0
+	struct wlfw_ind_register_req_msg_v01 *req;

and struct wlfw_ind_register_req_msg_v01 is 30 bytes.

So you can easily just store them on the stack, saving yourself the trouble of allocating and freeing them below.

Quoted 15 lines
drivers/net/wireless/ath/ath10k/qmi.c +15 -0
+	struct qmi_txn txn;
+	int ret;
+
+	req = kzalloc(sizeof(*req), GFP_KERNEL);
+	if (!req)
+		return -ENOMEM;
+
+	resp = kzalloc(sizeof(*resp), GFP_KERNEL);
+	if (!resp) {
+		kfree(req);
+		return -ENOMEM;
+	}
+
+	req->client_id_valid = 1;
+	req->client_id = WLFW_CLIENT_ID;

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

Quoted 10 lines
drivers/net/wireless/ath/ath10k/qmi.c +10 -0
+	req->fw_ready_enable_valid = 1;
+	req->fw_ready_enable = 1;
+	req->msa_ready_enable_valid = 1;
+	req->msa_ready_enable = 1;
+
+	ret = qmi_txn_init(&qmi->qmi_hdl, &txn,
+			   wlfw_ind_register_resp_msg_v01_ei, resp);
+	if (ret < 0) {
+		pr_err("fail to init txn for ind register resp %d\n",
+		       ret);

qmi_txn_init() typically doesn't fail, but when it does it will print an error message. So you can omit yours.

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

Quoted 10 lines
drivers/net/wireless/ath/ath10k/qmi.c +10 -0
+		goto out;
+	}
+
+	ret = qmi_send_request(&qmi->qmi_hdl, NULL, &txn,
+			       QMI_WLFW_IND_REGISTER_REQ_V01,
+			       WLFW_IND_REGISTER_REQ_MSG_V01_MAX_MSG_LEN,
+			       wlfw_ind_register_req_msg_v01_ei, req);
+	if (ret < 0) {
+		qmi_txn_cancel(&txn);
+		pr_err("fail to send ind register req %d\n", ret);

qmi_send_request() does print error messages when things go wrong, if you want to add context to this use dev_err().

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

Quoted 11 lines
drivers/net/wireless/ath/ath10k/qmi.c +11 -0
+		goto out;
+	}
+
+	ret = qmi_txn_wait(&txn, WLFW_TIMEOUT * HZ);
+	if (ret < 0)
+		goto out;
+
+	if (resp->resp.result != QMI_RESULT_SUCCESS_V01) {
+		pr_err("qmi indication register request rejected:");
+		pr_err("resut:%d error:%d\n",
+		       resp->resp.result, resp->resp.error);

If resp->resp.result is not success it is going to be 1, so no need to include that in the printout. Use dev_err() and print your error on a single line.

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

Quoted 1 line
drivers/net/wireless/ath/ath10k/qmi.c +1 -0
+		ret = resp->resp.result;

ret is positive and some QMI_ERR_*, return a negative errno instead to better match future readers assumptions.

Quoted 17 lines
drivers/net/wireless/ath/ath10k/qmi.c +13 -0
+	}
+
+	pr_debug("indication register request completed\n");
+	kfree(resp);
+	kfree(req);
+	return 0;
+
+out:
+	kfree(resp);
+	kfree(req);
+	return ret;
+}
+
 static int ath10k_qmi_event_fw_ready_ind(struct ath10k_qmi *qmi)
 {
 	pr_debug("fw ready event received\n");

drivers/net/wireless/ath/ath10k/qmi.c static void ath10k_qmi_event_server_arrive(struct work_struct *work) · line 171

Quoted 4 lines
drivers/net/wireless/ath/ath10k/qmi.c +1 -0
@@ -100,11 +168,12 @@ static void ath10k_qmi_event_server_arrive(struct work_struct *work)
 					      work_svc_arrive);
 	int ret;
 
+	pr_debug("wlan qmi server arrive\n");

Fold the move of this debug print into the patch that introduced it.

drivers/net/wireless/ath/ath10k/qmi.c static void ath10k_qmi_event_server_arrive(struct work_struct *work) · line 177

Quoted 7 lines
drivers/net/wireless/ath/ath10k/qmi.c +1 -1
 	ret = ath10k_qmi_connect_to_fw_server(qmi);
 	if (ret)
 		return;
 
-	pr_debug("qmi server arrive\n");
+	ath10k_qmi_ind_register_send_sync_msg(qmi);
 }

Regards,
Bjorn