Merge "icnss: Add support to validate the result and error code" (38df4984) · Commits · e / devices / android_kernel_sony_msm8998

drivers/soc/qcom/icnss.c

+16 −12

Original line number	Diff line number	Diff line
		@@ -152,6 +152,8 @@ bool ignore_qmi_timeout;
		#define ICNSS_QMI_ASSERT() do { } while (0)
		#endif

		#define QMI_ERR_PLAT_CCPM_CLK_INIT_FAILED 0x77

		enum icnss_debug_quirks {
		HW_ALWAYS_ON,
		HW_DEBUG_ENABLE,
		@@ -734,7 +736,7 @@ static int wlfw_vbatt_send_sync_msg(struct icnss_priv *priv,
		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
		icnss_pr_err("QMI vbatt request rejected, result:%d error:%d\n",
		resp.resp.result, resp.resp.error);
		ret = resp.resp.result;
		ret = -resp.resp.result;
		goto out;
		}
		priv->stats.vbatt_resp++;
		@@ -1218,7 +1220,7 @@ static int wlfw_msa_mem_info_send_sync_msg(void)
		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
		icnss_pr_err("QMI MSA Mem info request rejected, result:%d error:%d\n",
		resp.resp.result, resp.resp.error);
		ret = resp.resp.result;
		ret = -resp.resp.result;
		goto out;
		}

		@@ -1290,7 +1292,7 @@ static int wlfw_msa_ready_send_sync_msg(void)
		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
		icnss_pr_err("QMI MSA ready request rejected: result:%d error:%d\n",
		resp.resp.result, resp.resp.error);
		ret = resp.resp.result;
		ret = -resp.resp.result;
		goto out;
		}
		penv->stats.msa_ready_resp++;
		@@ -1353,7 +1355,7 @@ static int wlfw_ind_register_send_sync_msg(void)
		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
		icnss_pr_err("QMI indication register request rejected, resut:%d error:%d\n",
		resp.resp.result, resp.resp.error);
		ret = resp.resp.result;
		ret = -resp.resp.result;
		goto out;
		}
		penv->stats.ind_register_resp++;
		@@ -1400,7 +1402,9 @@ static int wlfw_cap_send_sync_msg(void)
		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
		icnss_pr_err("QMI capability request rejected, result:%d error:%d\n",
		resp.resp.result, resp.resp.error);
		ret = resp.resp.result;
		ret = -resp.resp.result;
		if (resp.resp.error == QMI_ERR_PLAT_CCPM_CLK_INIT_FAILED)
		icnss_pr_err("RF card Not present");
		goto out;
		}

		@@ -1483,7 +1487,7 @@ static int wlfw_wlan_mode_send_sync_msg(enum wlfw_driver_mode_enum_v01 mode)
		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
		icnss_pr_err("QMI mode request rejected, mode:%d result:%d error:%d\n",
		mode, resp.resp.result, resp.resp.error);
		ret = resp.resp.result;
		ret = -resp.resp.result;
		goto out;
		}
		penv->stats.mode_resp++;
		@@ -1533,7 +1537,7 @@ static int wlfw_wlan_cfg_send_sync_msg(struct wlfw_wlan_cfg_req_msg_v01 *data)
		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
		icnss_pr_err("QMI config request rejected, result:%d error:%d\n",
		resp.resp.result, resp.resp.error);
		ret = resp.resp.result;
		ret = -resp.resp.result;
		goto out;
		}
		penv->stats.cfg_resp++;
		@@ -1586,7 +1590,7 @@ static int wlfw_ini_send_sync_msg(uint8_t fw_log_mode)
		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
		icnss_pr_err("QMI INI request rejected, fw_log_mode:%d result:%d error:%d\n",
		fw_log_mode, resp.resp.result, resp.resp.error);
		ret = resp.resp.result;
		ret = -resp.resp.result;
		goto out;
		}
		penv->stats.ini_resp++;
		@@ -1646,7 +1650,7 @@ static int wlfw_athdiag_read_send_sync_msg(struct icnss_priv *priv,
		if (resp->resp.result != QMI_RESULT_SUCCESS_V01) {
		icnss_pr_err("QMI athdiag read request rejected, result:%d error:%d\n",
		resp->resp.result, resp->resp.error);
		ret = resp->resp.result;
		ret = -resp->resp.result;
		goto out;
		}

		@@ -1712,7 +1716,7 @@ static int wlfw_athdiag_write_send_sync_msg(struct icnss_priv *priv,
		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
		icnss_pr_err("QMI athdiag write request rejected, result:%d error:%d\n",
		resp.resp.result, resp.resp.error);
		ret = resp.resp.result;
		ret = -resp.resp.result;
		goto out;
		}
		out:
		@@ -1807,7 +1811,7 @@ static int wlfw_rejuvenate_ack_send_sync_msg(struct icnss_priv *priv)
		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
		icnss_pr_err("QMI rejuvenate ack request rejected, result:%d error %d\n",
		resp.resp.result, resp.resp.error);
		ret = resp.resp.result;
		ret = -resp.resp.result;
		goto out;
		}
		priv->stats.rejuvenate_ack_resp++;
		@@ -1868,7 +1872,7 @@ static int wlfw_dynamic_feature_mask_send_sync_msg(struct icnss_priv *priv,
		if (resp.resp.result != QMI_RESULT_SUCCESS_V01) {
		icnss_pr_err("QMI dynamic feature mask request rejected, result:%d error %d\n",
		resp.resp.result, resp.resp.error);
		ret = resp.resp.result;
		ret = -resp.resp.result;
		goto out;
		}