From: Cristian Marussi <cristian.marussi@arm.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: sudeep.holla@arm.com, lukasz.luba@arm.com,
james.quinlan@broadcom.com, Jonathan.Cameron@Huawei.com,
cristian.marussi@arm.com
Subject: [RFC PATCH v2 11/13] firmware: arm_scmi: Add Sensor notifications support
Date: Fri, 14 Feb 2020 15:35:33 +0000 [thread overview]
Message-ID: <20200214153535.32046-12-cristian.marussi@arm.com> (raw)
In-Reply-To: <20200214153535.32046-1-cristian.marussi@arm.com>
Make SCMI Sensor protocol register with the notification core.
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
---
V1 --> V2
- simplified .set_notify_enabled() implementation moving the ALL_SRCIDs
logic out of protocol. ALL_SRCIDs logic is now in charge of the
notification core, together with proper reference counting of enables
- switched to devres protocol-registration
---
drivers/firmware/arm_scmi/sensors.c | 73 ++++++++++++++++++++++++++++-
include/linux/scmi_protocol.h | 7 +++
2 files changed, 79 insertions(+), 1 deletion(-)
diff --git a/drivers/firmware/arm_scmi/sensors.c b/drivers/firmware/arm_scmi/sensors.c
index db1b1ab303da..99c5c67a9b6d 100644
--- a/drivers/firmware/arm_scmi/sensors.c
+++ b/drivers/firmware/arm_scmi/sensors.c
@@ -6,6 +6,7 @@
*/
#include "common.h"
+#include "notify.h"
enum scmi_sensor_protocol_cmd {
SENSOR_DESCRIPTION_GET = 0x3,
@@ -71,6 +72,12 @@ struct scmi_msg_sensor_reading_get {
#define SENSOR_READ_ASYNC BIT(0)
};
+struct scmi_sensor_trip_notify_payld {
+ __le32 agent_id;
+ __le32 sensor_id;
+ __le32 trip_point_desc;
+};
+
struct sensors_info {
u32 version;
int num_sensors;
@@ -78,8 +85,11 @@ struct sensors_info {
u64 reg_addr;
u32 reg_size;
struct scmi_sensor_info *sensors;
+ const struct scmi_handle *handle;
};
+static struct sensors_info *sinfo;
+
static int scmi_sensor_attributes_get(const struct scmi_handle *handle,
struct sensors_info *si)
{
@@ -276,10 +286,64 @@ static struct scmi_sensor_ops sensor_ops = {
.reading_get = scmi_sensor_reading_get,
};
+static bool scmi_sensor_set_notify_enabled(u8 evt_id, u32 src_id, bool enable)
+{
+ int ret;
+
+ ret = scmi_sensor_trip_point_notify(sinfo->handle, src_id, enable);
+ if (ret)
+ pr_warn("SCMI Notifications - Proto:%X - FAIL_ENABLED - evt[%X] dom[%d] - ret:%d\n",
+ SCMI_PROTOCOL_SENSOR, evt_id, src_id, ret);
+
+ return !ret ? true : false;
+}
+
+static void *scmi_sensor_fill_custom_report(u8 evt_id, u64 timestamp,
+ const void *payld, size_t payld_sz,
+ void *report, u32 *src_id)
+{
+ void *rep = NULL;
+
+ switch (evt_id) {
+ case SENSOR_TRIP_POINT_EVENT:
+ {
+ const struct scmi_sensor_trip_notify_payld *p = payld;
+ struct scmi_sensor_trip_point_report *r = report;
+
+ if (sizeof(*p) != payld_sz)
+ break;
+
+ r->timestamp = timestamp;
+ r->agent_id = le32_to_cpu(p->agent_id);
+ r->sensor_id = le32_to_cpu(p->sensor_id);
+ r->trip_point_desc = le32_to_cpu(p->trip_point_desc);
+ *src_id = r->sensor_id;
+ rep = r;
+ break;
+ }
+ default:
+ break;
+ }
+
+ return rep;
+}
+
+static const struct scmi_event sensor_events[] = {
+ {
+ .evt_id = SENSOR_TRIP_POINT_EVENT,
+ .max_payld_sz = 12,
+ .max_report_sz = sizeof(struct scmi_sensor_trip_point_report),
+ },
+};
+
+static const struct scmi_protocol_event_ops sensor_event_ops = {
+ .set_notify_enabled = scmi_sensor_set_notify_enabled,
+ .fill_custom_report = scmi_sensor_fill_custom_report,
+};
+
static int scmi_sensors_protocol_init(struct scmi_handle *handle)
{
u32 version;
- struct sensors_info *sinfo;
scmi_version_get(handle, SCMI_PROTOCOL_SENSOR, &version);
@@ -299,7 +363,14 @@ static int scmi_sensors_protocol_init(struct scmi_handle *handle)
scmi_sensor_description_get(handle, sinfo);
+ scmi_register_protocol_events(handle->dev,
+ SCMI_PROTOCOL_SENSOR, PAGE_SIZE,
+ &sensor_event_ops, sensor_events,
+ ARRAY_SIZE(sensor_events),
+ sinfo->num_sensors);
+
sinfo->version = version;
+ sinfo->handle = handle;
handle->sensor_ops = &sensor_ops;
handle->sensor_priv = sinfo;
diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h
index da4f8bfda168..77cf107a7391 100644
--- a/include/linux/scmi_protocol.h
+++ b/include/linux/scmi_protocol.h
@@ -411,4 +411,11 @@ struct scmi_perf_level_report {
u32 performance_level;
};
+struct scmi_sensor_trip_point_report {
+ ktime_t timestamp;
+ u32 agent_id;
+ u32 sensor_id;
+ u32 trip_point_desc;
+};
+
#endif /* _LINUX_SCMI_PROTOCOL_H */
--
2.17.1
next prev parent reply other threads:[~2020-02-14 15:36 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-14 15:35 [RFC PATCH v2 00/13] SCMI Notifications Core Support Cristian Marussi
2020-02-14 15:35 ` [RFC PATCH v2 01/13] firmware: arm_scmi: Add receive buffer support for notifications Cristian Marussi
2020-02-14 15:35 ` [RFC PATCH v2 02/13] firmware: arm_scmi: Update protocol commands and notification list Cristian Marussi
2020-02-14 15:35 ` [RFC PATCH v2 03/13] firmware: arm_scmi: Add notifications support in transport layer Cristian Marussi
2020-02-17 10:49 ` Viresh Kumar
2020-02-14 15:35 ` [RFC PATCH v2 04/13] firmware: arm_scmi: Add support for notifications message processing Cristian Marussi
2020-02-14 15:35 ` [RFC PATCH v2 05/13] firmware: arm_scmi: Add notification protocol-registration Cristian Marussi
2020-02-14 15:35 ` [RFC PATCH v2 06/13] firmware: arm_scmi: Add notification callbacks-registration Cristian Marussi
2020-02-14 15:35 ` [RFC PATCH v2 07/13] firmware: arm_scmi: Add notification dispatch and delivery Cristian Marussi
2020-02-21 13:25 ` Lukasz Luba
2020-02-21 19:01 ` Cristian Marussi
2020-02-21 19:11 ` Lukasz Luba
2020-02-24 9:59 ` Lukasz Luba
2020-02-24 14:33 ` Cristian Marussi
2020-02-14 15:35 ` [RFC PATCH v2 08/13] firmware: arm_scmi: Enable notification core Cristian Marussi
2020-02-14 15:35 ` [RFC PATCH v2 09/13] firmware: arm_scmi: Add Power notifications support Cristian Marussi
2020-02-14 15:35 ` [RFC PATCH v2 10/13] firmware: arm_scmi: Add Perf " Cristian Marussi
2020-02-14 15:35 ` Cristian Marussi [this message]
2020-02-14 15:35 ` [RFC PATCH v2 12/13] firmware: arm_scmi: Add Reset " Cristian Marussi
2020-02-14 15:35 ` [RFC PATCH v2 13/13] firmware: arm_scmi: Add Base " Cristian Marussi
2020-02-18 20:19 ` [RFC PATCH v2 00/13] SCMI Notifications Core Support Jim Quinlan
2020-02-19 17:43 ` Cristian Marussi
2020-02-24 14:40 ` Cristian Marussi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200214153535.32046-12-cristian.marussi@arm.com \
--to=cristian.marussi@arm.com \
--cc=Jonathan.Cameron@Huawei.com \
--cc=james.quinlan@broadcom.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=sudeep.holla@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®