Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Andriy Tryshnivskyy <andriy.tryshnivskyy@opensynergy.com>
To:     jbhayana@google.com, jic23@kernel.org
Cc:     lars@metafoo.de, linux-iio@vger.kernel.org,
        linux-kernel@vger.kernel.org, Vasyl.Vavrychuk@opensynergy.com,
        andy.shevchenko@gmail.com, andriy.tryshnivskyy@opensynergy.com
Subject: [PATCH v7 2/2] iio/scmi: Add reading "raw" attribute.
Date:   Sun, 24 Oct 2021 12:16:27 +0300
Message-Id: <20211024091627.28031-3-andriy.tryshnivskyy@opensynergy.com>
In-Reply-To: <20211024091627.28031-1-andriy.tryshnivskyy@opensynergy.com>
References: <20211024091627.28031-1-andriy.tryshnivskyy@opensynergy.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rQ0r625cE+iM3YBDc6I0/+wqtAowcubg9lXo1iRbCdfgPjktnG4GyvkT9lxW?=
 =?us-ascii?Q?y7t/3I3plTdwTy/oUZu4lxE4DwGgiJ5cP6pDA2RsuRAQ2ntPoyOMwhjvonk0?=
 =?us-ascii?Q?vLEr6ALMy6oOSRDVRA2mDL1a0iLmAaCp62IUFVXEpc19loMRXoSJ/oHDkbW7?=
 =?us-ascii?Q?zt/Zukx4Xzb91XflnLxi8Lv0haDxzTNZsEaegN5iSNyLT9HEhLPScqme0SZf?=
 =?us-ascii?Q?5+t8PEUi0EN+OPzHPHG5ODZ1nzkw/zimyVKXum6maazAhxssGGUlGRoxIqB3?=
 =?us-ascii?Q?rCdC4t4+gqRSKWaC8Gzc1xDp4Ffw432PChaGxpuxnRyeKWBGwtU1p6GLnz70?=
 =?us-ascii?Q?ENw3RF10a6K5oD9jECdgUz9VEkvjyLbgGozkmfBEpf6XS2r1+fSJM1PWi43i?=
 =?us-ascii?Q?Kk2LsAXqE24JktHnTC8RHT9ouuNyRRGmV+u3uHIcUpPwCtgGF1FwvzffYhPV?=
 =?us-ascii?Q?cVX0VmkilxGUGn0zsMDBQNOXUejqnY6SwSqX6tEFkAd4qEsH1WzOQp5nHbtK?=
 =?us-ascii?Q?MRGmyviMh8sojx9O+Qnw/i51H8gcZqc0GZguy0CCg+glV5a6RfPKuhfVvCch?=
 =?us-ascii?Q?qK5o5SAx7tIlE99IkIhzOFmM1uhNWIA8ZZSyS2e3xiAtFCoFXfeYe4Rj0Zza?=
 =?us-ascii?Q?dbAHm1UnoxAyUXgAssiIodRltA7ZjY9OTznkMJLLJ9AYmtWmBuJZ7qS8Yrbz?=
 =?us-ascii?Q?B3tQTYcB8lsZ7uUhWPoQcps+/h2qAOErO5Z6Es+3aee1mMubFoYq4gbvzd6r?=
 =?us-ascii?Q?bBCYvMbt5xZ/DuOwLBI3J36jMN1x6kspoWePDGsOHAO/jOJurkLGI7y6yck+?=
 =?us-ascii?Q?l6OvtlBHN9z+o7jVFVHcxFkw9WDtFte8KIR1+cdUdOTxrtKxtjetVIGVRC+P?=
 =?us-ascii?Q?VDOO9BFUQRAgKY+AbDt+JQun1IVMHO4pV1fPQV6YcC8X5VGOvumwaDUfk8or?=
 =?us-ascii?Q?ItUUUIeKxlFRJ/XDg2ORTzhoK8a2K5qDPlWwcGnBnC8CYw/zjEy3A7l2wakP?=
 =?us-ascii?Q?F9rd4OFroyZPCQ4yG/lQ30OZCKWCflfUIRYRKGqt/DdwYtu8+9iAm0Sze8J3?=
 =?us-ascii?Q?ERdOyrkFoy6qI3HOcwGGP5iYGCEm9TF5Ak8Zj5lp2cnXA7Ab5Csh5lXSnzQW?=
 =?us-ascii?Q?eYnoLbci/b/ug71xO+YN2g1l8MdShwqTvO9qJr8QyNFLTw7RmVK7lBAcpSyi?=
 =?us-ascii?Q?/XIy7MZdkV+nxSPn9P8qBndjuqj43usCnYDrJaAeQlwOv0k66CAMUs9Yd2Cc?=
 =?us-ascii?Q?h9xjdwOM4VSBUMqM1c7eP0Y+wzoT6LJJ1H8OnVjGf2jRwVzgLso8UGRnD58o?=
 =?us-ascii?Q?aPAKRcYNKfO2WyAn+CYLYPdk?=
X-OriginatorOrg: opensynergy.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 61bbfd94-ce80-4c3f-61e7-08d996cf006d
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6359.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2021 09:16:46.0650
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 800fae25-9b1b-4edc-993d-c939c4e84a64
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: gkibR600ULdG0/qxrKjuv04lSDCb9lysIIPbhvL4p9bWF+wf6E3Th1jQnabcOhn1Eg/d6x3Qvpd4xmaxoBW50w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3011
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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>
---
Changes comparing v6 -> v7:
* split into two patches: one for changes in core functionality,
  another - for changes in the driver

Changes comparing v5 -> v6:
* revert v5 changes since with scmi_iio_read_raw() the channel
  can't be used by in kernel users (iio-hwmon)
* returned to v3 with direct mode
* introduce new type IIO_VAL_INT_64 to read 64-bit value

Changes comparing v4 -> v5:
* call iio_device_release_direct_mode() on error
* code cleanup, fix typo

Changes comparing v3 -> v4:
* do not use scmi_iio_get_raw() for reading raw attribute due to 32-bit
  return value limitation (actually I reverted the previous v3)
* introduce scmi_iio_read_raw to scmi_iio_ext_info[] which can return
  64-bit value
* enabling/disabling and reading raw attribute is done in direct mode

Changes comparing v2 -> v3:
* adaptation for changes in structure scmi_iio_priv (no member
  named 'handle')

Changes comparing v0 -> v2:
* added an error return when the error happened during config_set
* removed redundant cast for "readings"
* added check if raw value fits 32 bits

 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 7cf2bf282cef..d538bf3ab1ef 100644
--- a/drivers/iio/common/scmi_sensors/scmi_iio.c
+++ b/drivers/iio/common/scmi_sensors/scmi_iio.c
@@ -279,6 +279,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->sensor_ops->config_set(
+		sensor->ph, 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->sensor_ops->reading_get_timestamped(
+		sensor->ph, 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->sensor_ops->config_set(
+		sensor->ph, 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)
@@ -300,6 +346,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;
 	}
@@ -381,7 +435,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