On Sun 25 Mar 22:40 PDT 2018, Govind Singh wrote:
> 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 <govinds@xxxxxxxxxxxxxx>
> ---
> drivers/net/wireless/ath/ath10k/qmi.c | 71 ++++++++++++++++++++++++++++++++++-
> 1 file changed, 70 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c
> index 3a7fcc6..bc80b8f 100644
> --- a/drivers/net/wireless/ath/ath10k/qmi.c
> +++ b/drivers/net/wireless/ath/ath10k/qmi.c
> @@ -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_resp_msg_v01 is 12 bytes,
> + 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.
> + 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);
qmi_txn_init() typically doesn't fail, but when it does it will print an
error message. So you can omit yours.
> + 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().
> + 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.
> + ret = resp->resp.result;
ret is positive and some QMI_ERR_*, return a negative errno instead to
better match future readers assumptions.
> + }
> +
> + 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");
Fold the move of this debug print into the patch that introduced it.
> 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
