firmware: arm_scmi: Add sensor notifications support

Make SCMI sensor protocol register with the notification core.

Link: https://lore.kernel.org/r/20200701155348.52864-8-cristian.marussi@arm.com
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/firmware/arm_scmi/sensors.c b/drivers/firmware/arm_scmi/sensors.c
index db1b1ab303da6681e61bca7bdc02718b528b75a8..2120ac4787c928ffdce0b141f6fb09258532c1ad 100644 (file)
--- a/drivers/firmware/arm_scmi/sensors.c
+++ b/drivers/firmware/arm_scmi/sensors.c
@@ -5,7 +5,12 @@
  * Copyright (C) 2018 ARM Ltd.
  */
 
+#define pr_fmt(fmt) "SCMI Notifications SENSOR - " fmt
+
+#include <linux/scmi_protocol.h>
+
 #include "common.h"
+#include "notify.h"
 
 enum scmi_sensor_protocol_cmd {
        SENSOR_DESCRIPTION_GET = 0x3,
@@ -14,10 +19,6 @@ enum scmi_sensor_protocol_cmd {
        SENSOR_READING_GET = 0x6,
 };
 
-enum scmi_sensor_protocol_notify {
-       SENSOR_TRIP_POINT_EVENT = 0x0,
-};
-
 struct scmi_msg_resp_sensor_attributes {
        __le16 num_sensors;
        u8 max_requests;
@@ -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;
@@ -271,11 +278,57 @@ static int scmi_sensor_count_get(const struct scmi_handle *handle)
 static struct scmi_sensor_ops sensor_ops = {
        .count_get = scmi_sensor_count_get,
        .info_get = scmi_sensor_info_get,
-       .trip_point_notify = scmi_sensor_trip_point_notify,
        .trip_point_config = scmi_sensor_trip_point_config,
        .reading_get = scmi_sensor_reading_get,
 };
 
+static int scmi_sensor_set_notify_enabled(const struct scmi_handle *handle,
+                                         u8 evt_id, u32 src_id, bool enable)
+{
+       int ret;
+
+       ret = scmi_sensor_trip_point_notify(handle, src_id, enable);
+       if (ret)
+               pr_debug("FAIL_ENABLED - evt[%X] dom[%d] - ret:%d\n",
+                        evt_id, src_id, ret);
+
+       return ret;
+}
+
+static void *scmi_sensor_fill_custom_report(const struct scmi_handle *handle,
+                                           u8 evt_id, u64 timestamp,
+                                           const void *payld, size_t payld_sz,
+                                           void *report, u32 *src_id)
+{
+       const struct scmi_sensor_trip_notify_payld *p = payld;
+       struct scmi_sensor_trip_point_report *r = report;
+
+       if (evt_id != SCMI_EVENT_SENSOR_TRIP_POINT_EVENT ||
+           sizeof(*p) != payld_sz)
+               return NULL;
+
+       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;
+
+       return r;
+}
+
+static const struct scmi_event sensor_events[] = {
+       {
+               .id = SCMI_EVENT_SENSOR_TRIP_POINT_EVENT,
+               .max_payld_sz = sizeof(struct scmi_sensor_trip_notify_payld),
+               .max_report_sz = sizeof(struct scmi_sensor_trip_point_report),
+       },
+};
+
+static const struct scmi_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;
@@ -299,6 +352,12 @@ static int scmi_sensors_protocol_init(struct scmi_handle *handle)
 
        scmi_sensor_description_get(handle, sinfo);
 
+       scmi_register_protocol_events(handle,
+                                     SCMI_PROTOCOL_SENSOR, SCMI_PROTO_QUEUE_SZ,
+                                     &sensor_event_ops, sensor_events,
+                                     ARRAY_SIZE(sensor_events),
+                                     sinfo->num_sensors);
+
        sinfo->version = version;
        handle->sensor_ops = &sensor_ops;
        handle->sensor_priv = sinfo;

diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h
index 65ad83ddde7076fcfd68b7fb90b0dcd0925cd16b..d0ea4a5037e74dba330d647a19a0f32a28d035ad 100644 (file)
--- a/include/linux/scmi_protocol.h
+++ b/include/linux/scmi_protocol.h
@@ -176,18 +176,13 @@ enum scmi_sensor_class {
  *
  * @count_get: get the count of sensors provided by SCMI
  * @info_get: get the information of the specified sensor
- * @trip_point_notify: control notifications on cross-over events for
- *     the trip-points
  * @trip_point_config: selects and configures a trip-point of interest
  * @reading_get: gets the current value of the sensor
  */
 struct scmi_sensor_ops {
        int (*count_get)(const struct scmi_handle *handle);
-
        const struct scmi_sensor_info *(*info_get)
                (const struct scmi_handle *handle, u32 sensor_id);
-       int (*trip_point_notify)(const struct scmi_handle *handle,
-                                u32 sensor_id, bool enable);
        int (*trip_point_config)(const struct scmi_handle *handle,
                                 u32 sensor_id, u8 trip_id, u64 trip_value);
        int (*reading_get)(const struct scmi_handle *handle, u32 sensor_id,
@@ -380,6 +375,7 @@ enum scmi_notification_events {
        SCMI_EVENT_POWER_STATE_CHANGED = 0x0,
        SCMI_EVENT_PERFORMANCE_LIMITS_CHANGED = 0x0,
        SCMI_EVENT_PERFORMANCE_LEVEL_CHANGED = 0x1,
+       SCMI_EVENT_SENSOR_TRIP_POINT_EVENT = 0x0,
 };
 
 struct scmi_power_state_changed_report {
@@ -404,4 +400,11 @@ struct scmi_perf_level_report {
        u32 performance_level;
 };
 
+struct scmi_sensor_trip_point_report {
+       u64 timestamp;
+       u32 agent_id;
+       u32 sensor_id;
+       u32 trip_point_desc;
+};
+
 #endif /* _LINUX_SCMI_PROTOCOL_H */