firmware: arm_scmi: Align few names in sensors protocol with SCMI specification

Looks like more code developed during the draft versions of the
specification slipped through and they don't match the final
released version. This seem to have happened only with sensor
protocol.

Renaming few command and function names here to match exactly with
the released version of SCMI specification for ease of maintenance.

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 0e94ab56f679834ca0fb89b772c01861a6a8768c..17dbabd8a94aeb50b39824e09d3002650cf3d995 100644 (file)
--- a/drivers/firmware/arm_scmi/sensors.c
+++ b/drivers/firmware/arm_scmi/sensors.c
@@ -9,8 +9,8 @@
 
 enum scmi_sensor_protocol_cmd {
        SENSOR_DESCRIPTION_GET = 0x3,
-       SENSOR_CONFIG_SET = 0x4,
-       SENSOR_TRIP_POINT_SET = 0x5,
+       SENSOR_TRIP_POINT_NOTIFY = 0x4,
+       SENSOR_TRIP_POINT_CONFIG = 0x5,
        SENSOR_READING_GET = 0x6,
 };
 
@@ -42,9 +42,10 @@ struct scmi_msg_resp_sensor_description {
        } desc[0];
 };
 
-struct scmi_msg_set_sensor_config {
+struct scmi_msg_sensor_trip_point_notify {
        __le32 id;
        __le32 event_control;
+#define SENSOR_TP_NOTIFY_ALL   BIT(0)
 };
 
 struct scmi_msg_set_sensor_trip_point {
@@ -160,15 +161,15 @@ static int scmi_sensor_description_get(const struct scmi_handle *handle,
        return ret;
 }
 
-static int
-scmi_sensor_configuration_set(const struct scmi_handle *handle, u32 sensor_id)
+static int scmi_sensor_trip_point_notify(const struct scmi_handle *handle,
+                                        u32 sensor_id, bool enable)
 {
        int ret;
-       u32 evt_cntl = BIT(0);
+       u32 evt_cntl = enable ? SENSOR_TP_NOTIFY_ALL : 0;
        struct scmi_xfer *t;
-       struct scmi_msg_set_sensor_config *cfg;
+       struct scmi_msg_sensor_trip_point_notify *cfg;
 
-       ret = scmi_xfer_get_init(handle, SENSOR_CONFIG_SET,
+       ret = scmi_xfer_get_init(handle, SENSOR_TRIP_POINT_NOTIFY,
                                 SCMI_PROTOCOL_SENSOR, sizeof(*cfg), 0, &t);
        if (ret)
                return ret;
@@ -183,15 +184,16 @@ scmi_sensor_configuration_set(const struct scmi_handle *handle, u32 sensor_id)
        return ret;
 }
 
-static int scmi_sensor_trip_point_set(const struct scmi_handle *handle,
-                                     u32 sensor_id, u8 trip_id, u64 trip_value)
+static int
+scmi_sensor_trip_point_config(const struct scmi_handle *handle, u32 sensor_id,
+                             u8 trip_id, u64 trip_value)
 {
        int ret;
        u32 evt_cntl = SENSOR_TP_BOTH;
        struct scmi_xfer *t;
        struct scmi_msg_set_sensor_trip_point *trip;
 
-       ret = scmi_xfer_get_init(handle, SENSOR_TRIP_POINT_SET,
+       ret = scmi_xfer_get_init(handle, SENSOR_TRIP_POINT_CONFIG,
                                 SCMI_PROTOCOL_SENSOR, sizeof(*trip), 0, &t);
        if (ret)
                return ret;
@@ -255,8 +257,8 @@ 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,
-       .configuration_set = scmi_sensor_configuration_set,
-       .trip_point_set = scmi_sensor_trip_point_set,
+       .trip_point_notify = scmi_sensor_trip_point_notify,
+       .trip_point_config = scmi_sensor_trip_point_config,
        .reading_get = scmi_sensor_reading_get,
 };
 

diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h
index aa1e791779b4f881fc97da803a87c52958fa4316..1383d47e643536fe8fb39a90d3a7117274a1ae6b 100644 (file)
--- a/include/linux/scmi_protocol.h
+++ b/include/linux/scmi_protocol.h
@@ -167,9 +167,9 @@ enum scmi_sensor_class {
  *
  * @count_get: get the count of sensors provided by SCMI
  * @info_get: get the information of the specified sensor
- * @configuration_set: control notifications on cross-over events for
+ * @trip_point_notify: control notifications on cross-over events for
  *     the trip-points
- * @trip_point_set: selects and configures a trip-point of interest
+ * @trip_point_config: selects and configures a trip-point of interest
  * @reading_get: gets the current value of the sensor
  */
 struct scmi_sensor_ops {
@@ -177,10 +177,10 @@ struct scmi_sensor_ops {
 
        const struct scmi_sensor_info *(*info_get)
                (const struct scmi_handle *handle, u32 sensor_id);
-       int (*configuration_set)(const struct scmi_handle *handle,
-                                u32 sensor_id);
-       int (*trip_point_set)(const struct scmi_handle *handle, u32 sensor_id,
-                             u8 trip_id, u64 trip_value);
+       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,
                           bool async, u64 *value);
 };