Merge "soc: qcom: sysmon-qmi: Fix duplicate BEFORE_POWERUP SSCTL events" (f6f026ce) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/soc/qcom/sysmon-qmi.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ static LIST_HEAD(sysmon_list);
		static DEFINE_MUTEX(sysmon_list_lock);

		static const int notif_map[SUBSYS_NOTIF_TYPE_COUNT] = {
		[0 ... SUBSYS_NOTIF_TYPE_COUNT - 1] = SSCTL_SSR_EVENT_INVALID,
		[SUBSYS_BEFORE_POWERUP] = SSCTL_SSR_EVENT_BEFORE_POWERUP,
		[SUBSYS_AFTER_POWERUP] = SSCTL_SSR_EVENT_AFTER_POWERUP,
		[SUBSYS_BEFORE_SHUTDOWN] = SSCTL_SSR_EVENT_BEFORE_SHUTDOWN,
		@@ -118,6 +119,11 @@ static struct qmi_msg_handler qmi_indication_handler[] = {
		{}
		};

		static bool is_ssctl_event(enum subsys_notif_type notif)
		{
		return notif_map[notif] != SSCTL_SSR_EVENT_INVALID;
		}

		static int ssctl_new_server(struct qmi_handle qmi, struct qmi_service svc)
		{
		struct sysmon_qmi_data *data = container_of(qmi,
		@@ -258,8 +264,8 @@ int sysmon_send_event(struct subsys_desc *dest_desc,
		int ret;
		struct qmi_txn txn;

		if (notif < 0 \|\| notif >= SUBSYS_NOTIF_TYPE_COUNT \|\| event_ss == NULL
		\|\| dest_ss == NULL)
		if (notif < 0 \|\| notif >= SUBSYS_NOTIF_TYPE_COUNT \|\|
		!is_ssctl_event(notif) \|\| event_ss == NULL \|\| dest_ss == NULL)
		return -EINVAL;

		mutex_lock(&sysmon_list_lock);

+2 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
		* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -23,6 +23,7 @@
		*/
		enum ssctl_ssr_event_enum_type {
		SSCTL_SSR_EVENT_ENUM_TYPE_MIN_ENUM_VAL = -2147483647,
		SSCTL_SSR_EVENT_INVALID = -1,
		SSCTL_SSR_EVENT_BEFORE_POWERUP = 0,
		SSCTL_SSR_EVENT_AFTER_POWERUP = 1,
		SSCTL_SSR_EVENT_BEFORE_SHUTDOWN = 2,