Merge "soc: qcom: sysmon-qmi: Fix max qmi msg length" (76435aab) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/soc/qcom/sysmon-qmi.c

+4 −8

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,7 @@
	#define QMI_SSCTL_SUBSYS_EVENT_REQ_LENGTH 40		#define QMI_SSCTL_SUBSYS_EVENT_REQ_LENGTH 40
	#define QMI_SSCTL_RESP_MSG_LENGTH 7		#define QMI_SSCTL_RESP_MSG_LENGTH 7
	#define QMI_SSCTL_EMPTY_MSG_LENGTH 0		#define QMI_SSCTL_EMPTY_MSG_LENGTH 0
			#define QMI_SSCTL_MAX_MSG_LENGTH 90

	#define SSCTL_SERVICE_ID 0x2B		#define SSCTL_SERVICE_ID 0x2B
	#define SSCTL_VER_2 2		#define SSCTL_VER_2 2
	@@ -532,11 +533,10 @@ static struct qmi_elem_info qmi_ssctl_get_failure_reason_resp_msg_ei[] = {
	*/		*/
	int sysmon_get_reason(struct subsys_desc dest_desc, char buf, size_t len)		int sysmon_get_reason(struct subsys_desc dest_desc, char buf, size_t len)
	{		{
	struct qmi_ssctl_get_failure_reason_resp_msg resp;		struct qmi_ssctl_get_failure_reason_resp_msg resp = { { 0 } };
	struct sysmon_qmi_data data = NULL, temp;		struct sysmon_qmi_data data = NULL, temp;
	struct qmi_txn txn;		struct qmi_txn txn;
	const char *dest_ss = dest_desc->name;		const char *dest_ss = dest_desc->name;
	const char expect[] = "ssr:return:";
	char req = 0;		char req = 0;
	int ret;		int ret;

	@@ -601,12 +601,8 @@ int sysmon_get_reason(struct subsys_desc dest_desc, char buf, size_t len)
	goto out;		goto out;
	}		}

	if (!strcmp(resp.error_message, expect)) {
	pr_err("Unexpected response %s\n", resp.error_message);
	ret = -EPROTO;
	goto out;
	}
	strlcpy(buf, resp.error_message, resp.error_message_len);		strlcpy(buf, resp.error_message, resp.error_message_len);
			return 0;
	out:		out:
	return ret;		return ret;
	}		}
	@@ -643,7 +639,7 @@ int sysmon_notifier_register(struct subsys_desc *desc)
	}		}

	rc = qmi_handle_init(&data->clnt_handle,		rc = qmi_handle_init(&data->clnt_handle,
	QMI_SSCTL_RESP_MSG_LENGTH, &ssctl_ops,		QMI_SSCTL_MAX_MSG_LENGTH, &ssctl_ops,
	qmi_indication_handler);		qmi_indication_handler);
	if (rc < 0) {		if (rc < 0) {
	pr_err("Sysmon QMI handle init failed rc:%d\n", rc);		pr_err("Sysmon QMI handle init failed rc:%d\n", rc);