virtualization/linux-yocto: iio/scmi: Add reading "raw" attribute support.

agl-service-iiodevices reads IIO device "raw" attribute.
Patches were adapted for current kernel version.

Bug-AGL: SPEC-3865
Upstream-Status: Submitted [https://lore.kernel.org/all/20211024091627.28031-1-andriy.tryshnivskyy@opensynergy.com/]
Signed-off-by: Andriy Tryshnivskyy <andriy.tryshnivskyy@opensynergy.com>
Change-Id: I4f3e14e9d557a13ff955de43035e564d80873038

3 files changed, 143 insertions, 0 deletions

diff --git a/meta-egvirt/recipes-kernel/linux/linux-yocto/iio-scmi/0002-iio-core-Introduce-IIO_VAL_INT_64.patch b/meta-egvirt/recipes-kernel/linux/linux-yocto/iio-scmi/0002-iio-core-Introduce-IIO_VAL_INT_64.patch
new file mode 100644
index 00000000..3245a806
--- /dev/null
+++ b/meta-egvirt/recipes-kernel/linux/linux-yocto/iio-scmi/0002-iio-core-Introduce-IIO_VAL_INT_64.patch
@@ -0,0 +1,43 @@
+From 41b693ffea78e5e754ba7c1b7b85a20deff8ba9f Mon Sep 17 00:00:00 2001
+From: Andriy Tryshnivskyy <andriy.tryshnivskyy@opensynergy.com>
+Date: Mon, 25 Oct 2021 13:30:19 +0300
+Subject: [PATCH] iio: core: Introduce IIO_VAL_INT_64.
+
+Introduce IIO_VAL_INT_64 to read 64-bit value for
+channel attribute. Val is used as lower 32 bits.
+
+Signed-off-by: Andriy Tryshnivskyy <andriy.tryshnivskyy@opensynergy.com>
+---
+ drivers/iio/industrialio-core.c | 3 +++
+ include/linux/iio/types.h       | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
+index 261d3b17edc9..71ecb2e66714 100644
+--- a/drivers/iio/industrialio-core.c
++++ b/drivers/iio/industrialio-core.c
+@@ -638,6 +638,9 @@ static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type,
+ 	}
+ 	case IIO_VAL_CHAR:
+ 		return scnprintf(buf, len, "%c", (char)vals[0]);
++	case IIO_VAL_INT_64:
++		tmp = (s64)((((u64)vals[1]) << 32) | (u32)vals[0]);
++		return scnprintf(buf, len, "%lld", tmp);
+ 	default:
+ 		return 0;
+ 	}
+diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
+index 1e3ed6f55bca..8d37cc5a3883 100644
+--- a/include/linux/iio/types.h
++++ b/include/linux/iio/types.h
+@@ -23,6 +23,7 @@ enum iio_event_info {
+ #define IIO_VAL_INT_PLUS_NANO 3
+ #define IIO_VAL_INT_PLUS_MICRO_DB 4
+ #define IIO_VAL_INT_MULTIPLE 5
++#define IIO_VAL_INT_64 6 /* 64-bit data, val is lower 32 bits */
+ #define IIO_VAL_FRACTIONAL 10
+ #define IIO_VAL_FRACTIONAL_LOG2 11
+ #define IIO_VAL_CHAR 12
+-- 
+2.17.1
+
diff --git a/meta-egvirt/recipes-kernel/linux/linux-yocto/iio-scmi/0003-iio-scmi-Add-reading-raw-attribute.patch b/meta-egvirt/recipes-kernel/linux/linux-yocto/iio-scmi/0003-iio-scmi-Add-reading-raw-attribute.patch
new file mode 100644
index 00000000..678aa89b
--- /dev/null
+++ b/meta-egvirt/recipes-kernel/linux/linux-yocto/iio-scmi/0003-iio-scmi-Add-reading-raw-attribute.patch
@@ -0,0 +1,98 @@
+From 642e7a22d9f9e7c02869e1689d513dd84d118388 Mon Sep 17 00:00:00 2001
+From: Andriy Tryshnivskyy <andriy.tryshnivskyy@opensynergy.com>
+Date: Mon, 25 Oct 2021 13:41:18 +0300
+Subject: [PATCH] iio/scmi: Add reading "raw" attribute.
+
+Add IIO_CHAN_INFO_RAW to the mask and implement corresponding
+reading "raw" attribute in scmi_iio_read_raw.
+
+Signed-off-by: Andriy Tryshnivskyy <andriy.tryshnivskyy@opensynergy.com>
+---
+ drivers/iio/common/scmi_sensors/scmi_iio.c | 57 +++++++++++++++++++++-
+ 1 file changed, 56 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/iio/common/scmi_sensors/scmi_iio.c b/drivers/iio/common/scmi_sensors/scmi_iio.c
+index 31977c3bc600..53b3242f0f19 100644
+--- a/drivers/iio/common/scmi_sensors/scmi_iio.c
++++ b/drivers/iio/common/scmi_sensors/scmi_iio.c
+@@ -296,6 +296,52 @@ static int scmi_iio_get_odr_val(struct iio_dev *iio_dev, int *val, int *val2)
+ 	return 0;
+ }
+ 
++static int scmi_iio_read_channel_data(struct iio_dev *iio_dev,
++			     struct iio_chan_spec const *ch, int *val, int *val2)
++{
++	struct scmi_iio_priv *sensor = iio_priv(iio_dev);
++	u32 sensor_config;
++	struct scmi_sensor_reading readings[SCMI_IIO_NUM_OF_AXIS];
++	int err;
++
++	sensor_config = FIELD_PREP(SCMI_SENS_CFG_SENSOR_ENABLED_MASK,
++					SCMI_SENS_CFG_SENSOR_ENABLE);
++	err = sensor->handle->sensor_ops->config_set(
++		sensor->handle, sensor->sensor_info->id, sensor_config);
++	if (err) {
++		dev_err(&iio_dev->dev,
++			"Error in enabling sensor %s err %d",
++			sensor->sensor_info->name, err);
++		return err;
++	}
++
++	err = sensor->handle->sensor_ops->reading_get_timestamped(
++		sensor->handle, sensor->sensor_info->id,
++		sensor->sensor_info->num_axis, readings);
++	if (err) {
++		dev_err(&iio_dev->dev,
++			"Error in reading raw attribute for sensor %s err %d",
++			sensor->sensor_info->name, err);
++		return err;
++	}
++
++	sensor_config = FIELD_PREP(SCMI_SENS_CFG_SENSOR_ENABLED_MASK,
++					SCMI_SENS_CFG_SENSOR_DISABLE);
++	err = sensor->handle->sensor_ops->config_set(
++		sensor->handle, sensor->sensor_info->id, sensor_config);
++	if (err) {
++		dev_err(&iio_dev->dev,
++			"Error in disabling sensor %s err %d",
++			sensor->sensor_info->name, err);
++		return err;
++	}
++
++	*val = lower_32_bits(readings[ch->scan_index].value);
++	*val2 = upper_32_bits(readings[ch->scan_index].value);
++
++	return IIO_VAL_INT_64;
++}
++
+ static int scmi_iio_read_raw(struct iio_dev *iio_dev,
+ 			     struct iio_chan_spec const *ch, int *val,
+ 			     int *val2, long mask)
+@@ -317,6 +363,14 @@ static int scmi_iio_read_raw(struct iio_dev *iio_dev,
+ 	case IIO_CHAN_INFO_SAMP_FREQ:
+ 		ret = scmi_iio_get_odr_val(iio_dev, val, val2);
+ 		return ret ? ret : IIO_VAL_INT_PLUS_MICRO;
++	case IIO_CHAN_INFO_RAW:
++		ret = iio_device_claim_direct_mode(iio_dev);
++		if (ret)
++			return ret;
++
++		ret = scmi_iio_read_channel_data(iio_dev, ch, val, val2);
++		iio_device_release_direct_mode(iio_dev);
++		return ret;
+ 	default:
+ 		return -EINVAL;
+ 	}
+@@ -398,7 +452,8 @@ static void scmi_iio_set_data_channel(struct iio_chan_spec *iio_chan,
+ 	iio_chan->type = type;
+ 	iio_chan->modified = 1;
+ 	iio_chan->channel2 = mod;
+-	iio_chan->info_mask_separate = BIT(IIO_CHAN_INFO_SCALE);
++	iio_chan->info_mask_separate =
++		BIT(IIO_CHAN_INFO_SCALE) | BIT(IIO_CHAN_INFO_RAW);
+ 	iio_chan->info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SAMP_FREQ);
+ 	iio_chan->info_mask_shared_by_type_available =
+ 		BIT(IIO_CHAN_INFO_SAMP_FREQ);
+-- 
+2.17.1
+
diff --git a/meta-egvirt/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-egvirt/recipes-kernel/linux/linux-yocto_%.bbappend
index d8ae5856..4c76db4a 100644
--- a/meta-egvirt/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/meta-egvirt/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -26,5 +26,7 @@ SRC_URI += " \
 # IIO SCMI
 SRC_URI += " \
     file://iio-scmi/0001-iio-scmi-Adding-support-for-IIO-SCMI-Based-Sensors.patch \
+    file://iio-scmi/0002-iio-core-Introduce-IIO_VAL_INT_64.patch \
+    file://iio-scmi/0003-iio-scmi-Add-reading-raw-attribute.patch \
     file://iio_scmi.cfg \
 "