[PATCH 1/2] firmware: arm_scpi: add support for 64-bit sensor values

[PATCH 1/2] firmware: arm_scpi: add support for 64-bit sensor values

[Sudeep Holla]

SCPI specification version 1.1 extended the sensor from 32-bit to 64-bit
values in order to accommodate new sensor class with 64-bit requirements

Since the SCPI driver sets the higher 32-bit for older protocol version
to zeros, there's no need to explicitly check the SCPI protocol version
and the backward compatibility is maintainted.

Cc: Punit Agrawal <punit.agrawal@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 drivers/firmware/arm_scpi.c   | 8 +++++---
 drivers/hwmon/scpi-hwmon.c    | 6 +++---
 include/linux/scpi_protocol.h | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

Hi Guenter,

Since I have couple of other fixes for SCPI driver, if you can provide
your ACKs to this couple of patches after your review, I can take all of
them together via ARM-SoC if that's fine with you.

Regards,
Sudeep

diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c
index c32ac6e61ba2..7e3e595c9f30 100644
--- a/drivers/firmware/arm_scpi.c
+++ b/drivers/firmware/arm_scpi.c
@@ -231,7 +231,8 @@ struct _scpi_sensor_info {
 };
 
 struct sensor_value {
-	__le32 val;
+	__le32 lo_val;
+	__le32 hi_val;
 } __packed;
 
 static struct scpi_drvinfo *scpi_info;
@@ -525,7 +526,7 @@ static int scpi_sensor_get_info(u16 sensor_id, struct scpi_sensor_info *info)
 	return ret;
 }
 
-int scpi_sensor_get_value(u16 sensor, u32 *val)
+int scpi_sensor_get_value(u16 sensor, u64 *val)
 {
 	__le16 id = cpu_to_le16(sensor);
 	struct sensor_value buf;
@@ -534,7 +535,8 @@ int scpi_sensor_get_value(u16 sensor, u32 *val)
 	ret = scpi_send_message(SCPI_CMD_SENSOR_VALUE, &id, sizeof(id),
 				&buf, sizeof(buf));
 	if (!ret)
-		*val = le32_to_cpu(buf.val);
+		*val = (u64)le32_to_cpu(buf.hi_val) << 32 |
+			le32_to_cpu(buf.lo_val);
 
 	return ret;
 }
diff --git a/drivers/hwmon/scpi-hwmon.c b/drivers/hwmon/scpi-hwmon.c
index 7e20567bc369..7101b14b5137 100644
--- a/drivers/hwmon/scpi-hwmon.c
+++ b/drivers/hwmon/scpi-hwmon.c
@@ -52,7 +52,7 @@ static int scpi_read_temp(void *dev, int *temp)
 	struct scpi_sensors *scpi_sensors = zone->scpi_sensors;
 	struct scpi_ops *scpi_ops = scpi_sensors->scpi_ops;
 	struct sensor_data *sensor = &scpi_sensors->data[zone->sensor_id];
-	u32 value;
+	u64 value;
 	int ret;
 
 	ret = scpi_ops->sensor_get_value(sensor->info.sensor_id, &value);
@@ -70,7 +70,7 @@ scpi_show_sensor(struct device *dev, struct device_attribute *attr, char *buf)
 	struct scpi_sensors *scpi_sensors = dev_get_drvdata(dev);
 	struct scpi_ops *scpi_ops = scpi_sensors->scpi_ops;
 	struct sensor_data *sensor;
-	u32 value;
+	u64 value;
 	int ret;
 
 	sensor = container_of(attr, struct sensor_data, dev_attr_input);
@@ -79,7 +79,7 @@ scpi_show_sensor(struct device *dev, struct device_attribute *attr, char *buf)
 	if (ret)
 		return ret;
 
-	return sprintf(buf, "%u\n", value);
+	return sprintf(buf, "%llu\n", value);
 }
 
 static ssize_t
diff --git a/include/linux/scpi_protocol.h b/include/linux/scpi_protocol.h
index 72ce932c69b2..ecd248d46281 100644
--- a/include/linux/scpi_protocol.h
+++ b/include/linux/scpi_protocol.h
@@ -68,7 +68,7 @@ struct scpi_ops {
 	struct scpi_dvfs_info *(*dvfs_get_info)(u8);
 	int (*sensor_get_capability)(u16 *sensors);
 	int (*sensor_get_info)(u16 sensor_id, struct scpi_sensor_info *);
-	int (*sensor_get_value)(u16, u32 *);
+	int (*sensor_get_value)(u16, u64 *);
 };
 
 #if IS_REACHABLE(CONFIG_ARM_SCPI_PROTOCOL)
-- 
1.9.1

[PATCH 2/2] hwmon: (scpi) add energy meter support

[Sudeep Holla]

SCPI specification v1.1 adds support for energy sensors. This patch
adds support for the same.

Cc: Punit Agrawal <punit.agrawal@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 drivers/hwmon/scpi-hwmon.c    | 8 ++++++++
 include/linux/scpi_protocol.h | 1 +
 2 files changed, 9 insertions(+)

diff --git a/drivers/hwmon/scpi-hwmon.c b/drivers/hwmon/scpi-hwmon.c
index 7101b14b5137..912b449c8303 100644
--- a/drivers/hwmon/scpi-hwmon.c
+++ b/drivers/hwmon/scpi-hwmon.c
@@ -114,6 +114,7 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
 {
 	u16 nr_sensors, i;
 	int num_temp = 0, num_volt = 0, num_current = 0, num_power = 0;
+	int num_energy = 0;
 	struct scpi_ops *scpi_ops;
 	struct device *hwdev, *dev = &pdev->dev;
 	struct scpi_sensors *scpi_sensors;
@@ -182,6 +183,13 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
 				 "power%d_label", num_power + 1);
 			num_power++;
 			break;
+		case ENERGY:
+			snprintf(sensor->input, sizeof(sensor->input),
+				 "energy%d_input", num_energy + 1);
+			snprintf(sensor->label, sizeof(sensor->input),
+				 "energy%d_label", num_energy + 1);
+			num_energy++;
+			break;
 		default:
 			continue;
 		}
diff --git a/include/linux/scpi_protocol.h b/include/linux/scpi_protocol.h
index ecd248d46281..35de50a65665 100644
--- a/include/linux/scpi_protocol.h
+++ b/include/linux/scpi_protocol.h
@@ -33,6 +33,7 @@ enum scpi_sensor_class {
 	VOLTAGE,
 	CURRENT,
 	POWER,
+	ENERGY,
 };
 
 struct scpi_sensor_info {
-- 
1.9.1

Re: [PATCH 1/2] firmware: arm_scpi: add support for 64-bit sensor values

[Punit Agrawal]

Sudeep Holla <sudeep.holla@arm.com> writes:

> SCPI specification version 1.1 extended the sensor from 32-bit to 64-bit
> values in order to accommodate new sensor class with 64-bit requirements
>
> Since the SCPI driver sets the higher 32-bit for older protocol version
> to zeros, there's no need to explicitly check the SCPI protocol version
> and the backward compatibility is maintainted.
>
> Cc: Punit Agrawal <punit.agrawal@arm.com>

Thanks for the update to the driver.

       Reviewed-by: Punit Agrawal <punit.agrawal@arm.com>

> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  drivers/firmware/arm_scpi.c   | 8 +++++---
>  drivers/hwmon/scpi-hwmon.c    | 6 +++---
>  include/linux/scpi_protocol.h | 2 +-
>  3 files changed, 9 insertions(+), 7 deletions(-)
>
> Hi Guenter,
>
> Since I have couple of other fixes for SCPI driver, if you can provide
> your ACKs to this couple of patches after your review, I can take all of
> them together via ARM-SoC if that's fine with you.
>
> Regards,
> Sudeep
>

[...]

Re: [PATCH 2/2] hwmon: (scpi) add energy meter support

[Punit Agrawal]

Sudeep Holla <sudeep.holla@arm.com> writes:

> SCPI specification v1.1 adds support for energy sensors. This patch
> adds support for the same.
>
> Cc: Punit Agrawal <punit.agrawal@arm.com>

  Reviewed-by: Punit Agrawal <punit.agrawal@arm.com>

> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>  drivers/hwmon/scpi-hwmon.c    | 8 ++++++++
>  include/linux/scpi_protocol.h | 1 +
>  2 files changed, 9 insertions(+)
>

[...]

Re: [PATCH 1/2] firmware: arm_scpi: add support for 64-bit sensor values

[Guenter Roeck]

On 02/09/2016 06:32 AM, Sudeep Holla wrote:
> SCPI specification version 1.1 extended the sensor from 32-bit to 64-bit
> values in order to accommodate new sensor class with 64-bit requirements
>
> Since the SCPI driver sets the higher 32-bit for older protocol version
> to zeros, there's no need to explicitly check the SCPI protocol version
> and the backward compatibility is maintainted.
>
> Cc: Punit Agrawal <punit.agrawal@arm.com>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

Acked-by: Guenter Roeck <linux@roeck-us.net>

> ---
>   drivers/firmware/arm_scpi.c   | 8 +++++---
>   drivers/hwmon/scpi-hwmon.c    | 6 +++---
>   include/linux/scpi_protocol.h | 2 +-
>   3 files changed, 9 insertions(+), 7 deletions(-)
>
> Hi Guenter,
>
> Since I have couple of other fixes for SCPI driver, if you can provide
> your ACKs to this couple of patches after your review, I can take all of
> them together via ARM-SoC if that's fine with you.
>
> Regards,
> Sudeep
>
> diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c
> index c32ac6e61ba2..7e3e595c9f30 100644
> --- a/drivers/firmware/arm_scpi.c
> +++ b/drivers/firmware/arm_scpi.c
> @@ -231,7 +231,8 @@ struct _scpi_sensor_info {
>   };
>
>   struct sensor_value {
> -	__le32 val;
> +	__le32 lo_val;
> +	__le32 hi_val;
>   } __packed;
>
>   static struct scpi_drvinfo *scpi_info;
> @@ -525,7 +526,7 @@ static int scpi_sensor_get_info(u16 sensor_id, struct scpi_sensor_info *info)
>   	return ret;
>   }
>
> -int scpi_sensor_get_value(u16 sensor, u32 *val)
> +int scpi_sensor_get_value(u16 sensor, u64 *val)
>   {
>   	__le16 id = cpu_to_le16(sensor);
>   	struct sensor_value buf;
> @@ -534,7 +535,8 @@ int scpi_sensor_get_value(u16 sensor, u32 *val)
>   	ret = scpi_send_message(SCPI_CMD_SENSOR_VALUE, &id, sizeof(id),
>   				&buf, sizeof(buf));
>   	if (!ret)
> -		*val = le32_to_cpu(buf.val);
> +		*val = (u64)le32_to_cpu(buf.hi_val) << 32 |
> +			le32_to_cpu(buf.lo_val);
>
>   	return ret;
>   }
> diff --git a/drivers/hwmon/scpi-hwmon.c b/drivers/hwmon/scpi-hwmon.c
> index 7e20567bc369..7101b14b5137 100644
> --- a/drivers/hwmon/scpi-hwmon.c
> +++ b/drivers/hwmon/scpi-hwmon.c
> @@ -52,7 +52,7 @@ static int scpi_read_temp(void *dev, int *temp)
>   	struct scpi_sensors *scpi_sensors = zone->scpi_sensors;
>   	struct scpi_ops *scpi_ops = scpi_sensors->scpi_ops;
>   	struct sensor_data *sensor = &scpi_sensors->data[zone->sensor_id];
> -	u32 value;
> +	u64 value;
>   	int ret;
>
>   	ret = scpi_ops->sensor_get_value(sensor->info.sensor_id, &value);
> @@ -70,7 +70,7 @@ scpi_show_sensor(struct device *dev, struct device_attribute *attr, char *buf)
>   	struct scpi_sensors *scpi_sensors = dev_get_drvdata(dev);
>   	struct scpi_ops *scpi_ops = scpi_sensors->scpi_ops;
>   	struct sensor_data *sensor;
> -	u32 value;
> +	u64 value;
>   	int ret;
>
>   	sensor = container_of(attr, struct sensor_data, dev_attr_input);
> @@ -79,7 +79,7 @@ scpi_show_sensor(struct device *dev, struct device_attribute *attr, char *buf)
>   	if (ret)
>   		return ret;
>
> -	return sprintf(buf, "%u\n", value);
> +	return sprintf(buf, "%llu\n", value);
>   }
>
>   static ssize_t
> diff --git a/include/linux/scpi_protocol.h b/include/linux/scpi_protocol.h
> index 72ce932c69b2..ecd248d46281 100644
> --- a/include/linux/scpi_protocol.h
> +++ b/include/linux/scpi_protocol.h
> @@ -68,7 +68,7 @@ struct scpi_ops {
>   	struct scpi_dvfs_info *(*dvfs_get_info)(u8);
>   	int (*sensor_get_capability)(u16 *sensors);
>   	int (*sensor_get_info)(u16 sensor_id, struct scpi_sensor_info *);
> -	int (*sensor_get_value)(u16, u32 *);
> +	int (*sensor_get_value)(u16, u64 *);
>   };
>
>   #if IS_REACHABLE(CONFIG_ARM_SCPI_PROTOCOL)
>

Re: [PATCH 2/2] hwmon: (scpi) add energy meter support

[Guenter Roeck]

On 02/09/2016 06:32 AM, Sudeep Holla wrote:
> SCPI specification v1.1 adds support for energy sensors. This patch
> adds support for the same.
>
> Cc: Punit Agrawal <punit.agrawal@arm.com>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

Acked-by: Guenter Roeck <linux@roeck-us.net>

> ---
>   drivers/hwmon/scpi-hwmon.c    | 8 ++++++++
>   include/linux/scpi_protocol.h | 1 +
>   2 files changed, 9 insertions(+)
>
> diff --git a/drivers/hwmon/scpi-hwmon.c b/drivers/hwmon/scpi-hwmon.c
> index 7101b14b5137..912b449c8303 100644
> --- a/drivers/hwmon/scpi-hwmon.c
> +++ b/drivers/hwmon/scpi-hwmon.c
> @@ -114,6 +114,7 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
>   {
>   	u16 nr_sensors, i;
>   	int num_temp = 0, num_volt = 0, num_current = 0, num_power = 0;
> +	int num_energy = 0;
>   	struct scpi_ops *scpi_ops;
>   	struct device *hwdev, *dev = &pdev->dev;
>   	struct scpi_sensors *scpi_sensors;
> @@ -182,6 +183,13 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
>   				 "power%d_label", num_power + 1);
>   			num_power++;
>   			break;
> +		case ENERGY:
> +			snprintf(sensor->input, sizeof(sensor->input),
> +				 "energy%d_input", num_energy + 1);
> +			snprintf(sensor->label, sizeof(sensor->input),
> +				 "energy%d_label", num_energy + 1);
> +			num_energy++;
> +			break;
>   		default:
>   			continue;
>   		}
> diff --git a/include/linux/scpi_protocol.h b/include/linux/scpi_protocol.h
> index ecd248d46281..35de50a65665 100644
> --- a/include/linux/scpi_protocol.h
> +++ b/include/linux/scpi_protocol.h
> @@ -33,6 +33,7 @@ enum scpi_sensor_class {
>   	VOLTAGE,
>   	CURRENT,
>   	POWER,
> +	ENERGY,
>   };
>
>   struct scpi_sensor_info {
>