Thread (3 messages) flat view 3 messages, 3 authors, 2018-05-11

Re: [PATCH 10/12] ath10k: add bdf/cal indication support

From: Marcus Folkesson <marcus.folkesson@gmail.com>
Date: 2018-03-26 07:37:37

Hi Govind,

On Mon, Mar 26, 2018 at 11:11:26AM +0530, Govind Singh wrote:
quoted hunk ↗ jump to hunk
Add support for bdf download and cold boot
calibration trigger qmi message support.

Signed-off-by: Govind Singh <redacted>
---
 drivers/net/wireless/ath/ath10k/qmi.c | 195 ++++++++++++++++++++++++++++++++++
 drivers/net/wireless/ath/ath10k/qmi.h |  10 ++
 2 files changed, 205 insertions(+)
diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c
index a33681d..f23d0fe 100644
--- a/drivers/net/wireless/ath/ath10k/qmi.c
+++ b/drivers/net/wireless/ath/ath10k/qmi.c
@@ -28,6 +28,7 @@
 #include <linux/soc/qcom/qmi.h>
 #include <linux/qcom_scm.h>
 #include <linux/of.h>
+#include <linux/firmware.h>
 #include "qmi.h"
 #include "qmi_svc_v01.h"
 
@@ -270,6 +271,179 @@ static int ath10k_qmi_msa_ready_send_sync_msg(struct ath10k_qmi *qmi)
 	return ret;
 }
 
+int ath10k_qmi_bdf_dnld_send_sync(struct ath10k_qmi *qmi)
+{
+	struct wlfw_bdf_download_resp_msg_v01 *resp;
+	struct wlfw_bdf_download_req_msg_v01 *req;
+	const struct firmware *fw_entry;
+	unsigned int remaining;
+	struct qmi_txn txn;
+	const u8 *temp;
+	int ret;
+
+	req = kzalloc(sizeof(*req), GFP_KERNEL);
+	if (!req)
+		return -ENOMEM;
+
+	resp = kzalloc(sizeof(*resp), GFP_KERNEL);
+	if (!resp) {
+		kfree(req);
+		return -ENOMEM;
+	}
+
+	ret = request_firmware(&fw_entry, BDF_FILE_NAME, &qmi->pdev->dev);
+	if (ret < 0) {
+		pr_err("fail to load bdf: %s\n", BDF_FILE_NAME);
Do we want to use the dev_* family print functions instead?

For example:
dev_err(&qmi->pdev->dev,"fail to load bdf: %s\n", BDF_FILE_NAME);

+		goto err_req_fw;
+	}
+
+	temp = fw_entry->data;
+	remaining = fw_entry->size;
+
+	pr_debug("downloading bdf: %s, size: %u\n",
+		 BDF_FILE_NAME, remaining);
+
+	while (remaining) {
+		req->valid = 1;
+		req->file_id_valid = 1;
+		req->file_id = 0;
+		req->total_size_valid = 1;
+		req->total_size = fw_entry->size;
+		req->seg_id_valid = 1;
+		req->data_valid = 1;
+		req->end_valid = 1;
+
+		if (remaining > QMI_WLFW_MAX_DATA_SIZE_V01) {
+			req->data_len = QMI_WLFW_MAX_DATA_SIZE_V01;
+		} else {
+			req->data_len = remaining;
+			req->end = 1;
+		}
+
+		memcpy(req->data, temp, req->data_len);
+
+		ret = qmi_txn_init(&qmi->qmi_hdl, &txn,
+				   wlfw_bdf_download_resp_msg_v01_ei,
+				   resp);
+		if (ret < 0) {
+			pr_err("fail to init txn for bdf download %d\n", ret);
+			goto out;
+		}
+
+		ret =
+		qmi_send_request(&qmi->qmi_hdl, NULL, &txn,
+				 QMI_WLFW_BDF_DOWNLOAD_REQ_V01,
+				 WLFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_MSG_LEN,
+				 wlfw_bdf_download_req_msg_v01_ei, req);
+		if (ret < 0) {
+			qmi_txn_cancel(&txn);
+			goto err_send;
+		}
+
+		ret = qmi_txn_wait(&txn, WLFW_TIMEOUT * HZ);
+
+		if (ret < 0)
+			goto err_send;
+
+		if (resp->resp.result != QMI_RESULT_SUCCESS_V01) {
+			pr_err("bdf download failed, res:%d, err:%d\n",
+			       resp->resp.result, resp->resp.error);
+			ret = resp->resp.result;
+			goto err_send;
+		}
+
+		remaining -= req->data_len;
+		temp += req->data_len;
+		req->seg_id++;
+	}
+
+	pr_debug("bdf download request completed\n");
+
+	kfree(resp);
+	kfree(req);
release_firmware(fw_entry);

I think we need to release firmware before return?
+	return 0;
+
+err_send:
+	release_firmware(fw_entry);
+
+err_req_fw:
+	kfree(req);
+	kfree(resp);
+
+out:
+	return ret;
+}
Best regards
Marcus Folkesson

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help