meta-egvirt/recipes-kernel/linux/linux-yocto/scmi/0001-firmware-arm_scmi-rework-scmi_sensors_protocol_init.patch

   1 From d9d8732bdf07755780f37cf083ead8b61ee3c95d Mon Sep 17 00:00:00 2001
   2 From: Cristian Marussi <cristian.marussi@arm.com>
   3 Date: Thu, 19 Nov 2020 17:49:01 +0000
   4 Subject: [PATCH] firmware: arm_scmi: rework scmi_sensors_protocol_init
   5
   6 Properly handle return values from initialization helpers and avoid
   7 setting sensor_ops before sensor_priv.
   8
   9 Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
  10 Signed-off-by: Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>
  11 ---
  12  drivers/firmware/arm_scmi/sensors.c | 16 ++++++++++------
  13  1 file changed, 10 insertions(+), 6 deletions(-)
  14
  15 diff --git a/drivers/firmware/arm_scmi/sensors.c b/drivers/firmware/arm_scmi/sensors.c
  16 index b4232d611033..6aaff478d032 100644
  17 --- a/drivers/firmware/arm_scmi/sensors.c
  18 +++ b/drivers/firmware/arm_scmi/sensors.c
  19 @@ -2,7 +2,7 @@
  20  /*
  21   * System Control and Management Interface (SCMI) Sensor Protocol
  22   *
  23 - * Copyright (C) 2018 ARM Ltd.
  24 + * Copyright (C) 2018-2020 ARM Ltd.
  25   */
  26
  27  #define pr_fmt(fmt) "SCMI Notifications SENSOR - " fmt
  28 @@ -334,6 +334,7 @@ static const struct scmi_event_ops sensor_event_ops = {
  29  static int scmi_sensors_protocol_init(struct scmi_handle *handle)
  30  {
  31         u32 version;
  32 +       int ret;
  33         struct sensors_info *sinfo;
  34
  35         scmi_version_get(handle, SCMI_PROTOCOL_SENSOR, &version);
  36 @@ -344,15 +345,19 @@ static int scmi_sensors_protocol_init(struct scmi_handle *handle)
  37         sinfo = devm_kzalloc(handle->dev, sizeof(*sinfo), GFP_KERNEL);
  38         if (!sinfo)
  39                 return -ENOMEM;
  40 +       sinfo->version = version;
  41
  42 -       scmi_sensor_attributes_get(handle, sinfo);
  43 -
  44 +       ret = scmi_sensor_attributes_get(handle, sinfo);
  45 +       if (ret)
  46 +               return ret;
  47         sinfo->sensors = devm_kcalloc(handle->dev, sinfo->num_sensors,
  48                                       sizeof(*sinfo->sensors), GFP_KERNEL);
  49         if (!sinfo->sensors)
  50                 return -ENOMEM;
  51
  52 -       scmi_sensor_description_get(handle, sinfo);
  53 +       ret = scmi_sensor_description_get(handle, sinfo);
  54 +       if (ret)
  55 +               return ret;
  56
  57         scmi_register_protocol_events(handle,
  58                                       SCMI_PROTOCOL_SENSOR, SCMI_PROTO_QUEUE_SZ,
  59 @@ -360,9 +365,8 @@ static int scmi_sensors_protocol_init(struct scmi_handle *handle)
  60                                       ARRAY_SIZE(sensor_events),
  61                                       sinfo->num_sensors);
  62
  63 -       sinfo->version = version;
  64 -       handle->sensor_ops = &sensor_ops;
  65         handle->sensor_priv = sinfo;
  66 +       handle->sensor_ops = &sensor_ops;
  67
  68         return 0;
  69  }