Merge f2729f4a13260d97b6027214ec46acd80d55dd5a on remote branch (e1110222) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/platform/msm/ipa/ipa_v3/ipa.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -7947,8 +7947,10 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p,
		kfree(ipa3_ctx->ipa_tz_unlock_reg);
		ipa3_ctx->ipa_tz_unlock_reg = NULL;
		fail_tz_unlock_reg:
		if (ipa3_ctx->logbuf)
		if (ipa3_ctx->logbuf) {
		ipc_log_context_destroy(ipa3_ctx->logbuf);
		ipa3_ctx->logbuf = NULL;
		}
		fail_uc_file_alloc:
		kfree(ipa3_ctx->gsi_fw_file_name);
		ipa3_ctx->gsi_fw_file_name = NULL;

+13 −8

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@
		#define IPA_Q6_SERVICE_INS_ID 2

		#define QMI_SEND_STATS_REQ_TIMEOUT_MS 5000
		#define QMI_SEND_REQ_TIMEOUT_MS 60000
		#define QMI_SEND_REQ_TIMEOUT_MS 10000
		#define QMI_MHI_SEND_REQ_TIMEOUT_MS 1000

		#define QMI_IPA_FORCE_CLEAR_DATAPATH_TIMEOUT_MS 1000
		@@ -467,14 +467,22 @@ static int ipa3_qmi_send_req_wait(struct qmi_handle *client_handle,
		struct qmi_txn txn;
		int ret;

		mutex_lock(&ipa3_qmi_lock);

		if (!client_handle) {

		mutex_unlock(&ipa3_qmi_lock);
		return -EINVAL;
		}

		ret = qmi_txn_init(client_handle, &txn, resp_desc->ei_array, resp);

		if (ret < 0) {
		IPAWANERR("QMI txn init failed, ret= %d\n", ret);
		mutex_unlock(&ipa3_qmi_lock);
		return ret;
		}

		mutex_lock(&ipa3_qmi_lock);
		ret = qmi_send_request(client_handle,
		&ipa3_qmi_ctx->server_sq,
		&txn,
		@@ -483,19 +491,16 @@ static int ipa3_qmi_send_req_wait(struct qmi_handle *client_handle,
		req_desc->ei_array,
		req);

		if (unlikely(!ipa_q6_clnt)) {
		mutex_unlock(&ipa3_qmi_lock);
		return -EINVAL;
		}

		mutex_unlock(&ipa3_qmi_lock);

		if (ret < 0) {
		qmi_txn_cancel(&txn);
		mutex_unlock(&ipa3_qmi_lock);
		return ret;
		}
		ret = qmi_txn_wait(&txn, msecs_to_jiffies(timeout_ms));

		ret = qmi_txn_wait(&txn, msecs_to_jiffies(timeout_ms));
		mutex_unlock(&ipa3_qmi_lock);
		return ret;
		}