Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40bc3dfa authored by Deepak Katragadda's avatar Deepak Katragadda
Browse files

qcom: sysmon-qmi: Add QMI SSCTL v2 support for sysmon communication 



Add a new sysmon-qmi driver to support QMI Subsystem Control
(QMI_SSCTL) version 2. The SSCTL service is hosted by a hardware
subsystem with the APSS being the client, to send events, or
commands such as power down. The service could also reside on
a seperare chip.
This new driver provides support to communicate with the QMI_SSCTL
server on the subsystem side while retaining legacy sysmon support
which still works for subsystems without the QMI service support.

Change-Id: Ibf9f227a4294c1c8fd45faf3feab11f5eaacf65e
Signed-off-by: default avatarDeepak Katragadda <dkatraga@codeaurora.org>
parent 763e35c9

drivers/soc/qcom/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ ifdef CONFIG_MSM_SUBSYSTEM_RESTART 
       obj-y += subsystem_restart.o

       obj-y += ramdump.o

endif

obj-$(CONFIG_MSM_SYSMON_COMM) += sysmon.o

obj-$(CONFIG_MSM_SYSMON_COMM) += sysmon.o sysmon-qmi.o

obj-$(CONFIG_CP_ACCESS64) += cpaccess64.o

obj-$(CONFIG_MSM_CPU_PWR_CTL) += cpu_pwr_ctl.o

obj-$(CONFIG_MSM8994_V1_PMUIRQ_WA) += cti-pmu-irq.o

drivers/soc/qcom/subsystem_restart.c

+8 −0
Original line number Diff line number Diff line
@@ -1470,12 +1470,19 @@ struct subsys_device *subsys_register(struct subsys_desc *desc) 
								desc->name);

	}



	ret = sysmon_notifier_register(desc);

	if (ret < 0)

		goto err_sysmon_notifier;



	mutex_lock(&subsys_list_lock);

	INIT_LIST_HEAD(&subsys->list);

	list_add_tail(&subsys->list, &subsys_list);

	mutex_unlock(&subsys_list_lock);



	return subsys;

err_sysmon_notifier:

	if (ofnode)

		subsys_free_irqs(subsys);

err_setup_irqs:

	if (ofnode)

		subsys_remove_restart_order(ofnode);
@@ -1516,6 +1523,7 @@ void subsys_unregister(struct subsys_device *subsys) 
		mutex_unlock(&subsys->track.lock);

		subsys_debugfs_remove(subsys);

		subsys_char_device_remove(subsys);

		sysmon_notifier_unregister(subsys->desc);

		put_device(&subsys->dev);

	}

}

drivers/soc/qcom/sysmon-qmi.c

0 → 100644
+702 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/soc/qcom/sysmon.c

+26 −12
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int sysmon_send_msg(struct sysmon_subsys *ss, const char *tx_buf, 
}



/**

 * sysmon_send_event() - Notify a subsystem of another's state change

 * sysmon_send_event_no_qmi() - Notify a subsystem of another's state change

 * @dest_desc:	Subsystem descriptor of the subsystem the notification

 * should be sent to

 * @event_desc:	Subsystem descriptor of the subsystem that generated the
@@ -129,7 +129,7 @@ static int sysmon_send_msg(struct sysmon_subsys *ss, const char *tx_buf, 
 *

 * If CONFIG_MSM_SYSMON_COMM is not defined, always return success (0).

 */

int sysmon_send_event(struct subsys_desc *dest_desc,

int sysmon_send_event_no_qmi(struct subsys_desc *dest_desc,

			struct subsys_desc *event_desc,

			enum subsys_notif_type notif)

{
@@ -160,18 +160,23 @@ int sysmon_send_event(struct subsys_desc *dest_desc, 


	mutex_lock(&ss->lock);

	ret = sysmon_send_msg(ss, tx_buf, strlen(tx_buf));

	if (ret)

	if (ret) {

		pr_err("Message sending failed %d\n", ret);

		goto out;

	}



	if (strncmp(ss->rx_buf, "ssr:ack", ARRAY_SIZE(ss->rx_buf)))

	if (strcmp(ss->rx_buf, "ssr:ack")) {

		pr_err("Unexpected response %s\n", ss->rx_buf);

		ret = -ENOSYS;

	}

out:

	mutex_unlock(&ss->lock);

	return ret;

}

EXPORT_SYMBOL(sysmon_send_event_no_qmi);



/**

 * sysmon_send_shutdown() - send shutdown command to a subsystem.

 * sysmon_send_shutdown_no_qmi() - send shutdown command to a subsystem.

 * @dest_desc:	Subsystem descriptor of the subsystem to send to

 *

 * Returns 0 for success, -EINVAL for an invalid destination, -ENODEV if
@@ -181,12 +186,11 @@ out: 
 *

 * If CONFIG_MSM_SYSMON_COMM is not defined, always return success (0).

 */

int sysmon_send_shutdown(struct subsys_desc *dest_desc)

int sysmon_send_shutdown_no_qmi(struct subsys_desc *dest_desc)

{

	struct sysmon_subsys *tmp, *ss = NULL;

	const char tx_buf[] = "system:shutdown";

	const char expect[] = "system:ack";

	size_t prefix_len = ARRAY_SIZE(expect) - 1;

	int ret;



	mutex_lock(&sysmon_list_lock);
@@ -203,18 +207,23 @@ int sysmon_send_shutdown(struct subsys_desc *dest_desc) 


	mutex_lock(&ss->lock);

	ret = sysmon_send_msg(ss, tx_buf, ARRAY_SIZE(tx_buf));

	if (ret)

	if (ret) {

		pr_err("Message sending failed %d\n", ret);

		goto out;

	}



	if (strncmp(ss->rx_buf, expect, prefix_len))

	if (strcmp(ss->rx_buf, expect)) {

		pr_err("Unexpected response %s\n", ss->rx_buf);

		ret = -ENOSYS;

	}

out:

	mutex_unlock(&ss->lock);

	return ret;

}

EXPORT_SYMBOL(sysmon_send_shutdown_no_qmi);



/**

 * sysmon_get_reason() - Retrieve failure reason from a subsystem.

 * sysmon_get_reason_no_qmi() - Retrieve failure reason from a subsystem.

 * @dest_desc:	Subsystem descriptor of the subsystem to query

 * @buf:	Caller-allocated buffer for the returned NUL-terminated reason

 * @len:	Length of @buf
@@ -226,7 +235,8 @@ out: 
 *

 * If CONFIG_MSM_SYSMON_COMM is not defined, always return success (0).

 */

int sysmon_get_reason(struct subsys_desc *dest_desc, char *buf, size_t len)

int sysmon_get_reason_no_qmi(struct subsys_desc *dest_desc,

				char *buf, size_t len)

{

	struct sysmon_subsys *tmp, *ss = NULL;

	const char tx_buf[] = "ssr:retrieve:sfr";
@@ -248,10 +258,13 @@ int sysmon_get_reason(struct subsys_desc *dest_desc, char *buf, size_t len) 


	mutex_lock(&ss->lock);

	ret = sysmon_send_msg(ss, tx_buf, ARRAY_SIZE(tx_buf));

	if (ret)

	if (ret) {

		pr_err("Message sending failed %d\n", ret);

		goto out;

	}



	if (strncmp(ss->rx_buf, expect, prefix_len)) {

		pr_err("Unexpected response %s\n", ss->rx_buf);

		ret = -ENOSYS;

		goto out;

	}
@@ -260,6 +273,7 @@ out: 
	mutex_unlock(&ss->lock);

	return ret;

}

EXPORT_SYMBOL(sysmon_get_reason_no_qmi);



static void sysmon_smd_notify(void *priv, unsigned int smd_event)

{

include/soc/qcom/sysmon.h

+56 −3

File changed.

Preview size limit exceeded, changes collapsed.