| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20260127060939.3914006-8-o.rempel@pengutronix.de>
Date: Tue, 27 Jan 2026 07:09:38 +0100
From: Oleksij Rempel <o.rempel@...gutronix.de>
To: Jonathan Cameron <jic23@...nel.org>,
Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>
Cc: Oleksij Rempel <o.rempel@...gutronix.de>,
kernel@...gutronix.de,
linux-kernel@...r.kernel.org,
linux-iio@...r.kernel.org,
devicetree@...r.kernel.org,
Andy Shevchenko <andy@...nel.org>,
David Lechner <dlechner@...libre.com>,
Nuno Sá <nuno.sa@...log.com>,
David Jander <david@...tonic.nl>
Subject: [PATCH v2 7/8] iio: dac: ds4424: add Rfs-based scale and per-variant limits
Parse optional maxim,rfs-ohms values to derive the per-channel output
current scale (mA per step) for the IIO current ABI.
Select per-variant parameters to match the shared register map while
handling different data widths and full-scale current calculations.
Behavior changes:
- If maxim,rfs-ohms is present, IIO_CHAN_INFO_SCALE becomes available
and reports mA/step derived from Rfs.
- If maxim,rfs-ohms is missing, SCALE is not exposed to keep older DTs
working without requiring updates.
- RAW writes are now limited to the representable sign-magnitude range
of the detected variant to avoid silent truncation (e.g. +/-31 on
DS440x).
Signed-off-by: Oleksij Rempel <o.rempel@...gutronix.de>
---
changes v2:
- Reorder struct ds4424_chip_info members to optimize padding.
- Use GENMASK() for chip variant masks instead of hex constants.
- Simplify ds4424_setup_channels: use direct devm_kmemdup to avoid stack
usage and memcpy.
- Use local 'dev' pointer and dev_err_probe() in ds4424_parse_rfs for
cleaner error handling.
- Rename the static iio_info struct to ds4424_iio_info to prevent name
collision with the new hardware chip_info structs.
- Use unsigned int for loop counters.
- Rebase on top of regmap and symmetrical raw_access refactoring.
---
drivers/iio/dac/ds4424.c | 121 +++++++++++++++++++++++++++++++++++++--
1 file changed, 116 insertions(+), 5 deletions(-)
diff --git a/drivers/iio/dac/ds4424.c b/drivers/iio/dac/ds4424.c
index 8110ca7f062f..891069d8c80a 100644
--- a/drivers/iio/dac/ds4424.c
+++ b/drivers/iio/dac/ds4424.c
@@ -14,6 +14,7 @@
#include <linux/iio/machine.h>
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/property.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
@@ -21,6 +22,7 @@
#define DS4424_MAX_DAC_CHANNELS 4
#define DS4424_DAC_MASK GENMASK(6, 0)
+#define DS4404_DAC_MASK GENMASK(4, 0)
#define DS4424_DAC_SOURCE BIT(7)
#define DS4424_DAC_ADDR(chan) ((chan) + 0xf8)
@@ -40,9 +42,38 @@ enum ds4424_device_ids {
ID_DS4424,
};
+/*
+ * Two variant groups share the same register map but differ in:
+ * - resolution/data mask (DS4402/DS4404: 5-bit, DS4422/DS4424: 7-bit)
+ * - full-scale current calculation (different Vref and divider)
+ * Addressing also differs (DS440x tri-level, DS442x bi-level), but is
+ * handled via board configuration, not driver logic.
+ */
+struct ds4424_chip_info {
+ int vref_mv;
+ int scale_denom;
+ u8 result_mask;
+};
+
+static const struct ds4424_chip_info ds4424_info = {
+ .vref_mv = 976,
+ .scale_denom = 16,
+ .result_mask = DS4424_DAC_MASK,
+};
+
+/* DS4402 is handled like DS4404 (same resolution and scale formula). */
+static const struct ds4424_chip_info ds4404_info = {
+ .vref_mv = 1230,
+ .scale_denom = 4,
+ .result_mask = DS4404_DAC_MASK,
+};
+
struct ds4424_data {
struct regmap *regmap;
struct regulator *vcc_reg;
+ const struct ds4424_chip_info *chip_info;
+ u32 rfs_ohms[DS4424_MAX_DAC_CHANNELS];
+ bool has_rfs;
};
static const struct iio_chan_spec ds4424_channels[] = {
@@ -125,11 +156,20 @@ static int ds4424_read_raw(struct iio_dev *indio_dev,
return ret;
}
- *val = regval & DS4424_DAC_MASK;
+ *val = regval & data->chip_info->result_mask;
if (!(regval & DS4424_DAC_SOURCE))
*val = -*val;
return IIO_VAL_INT;
+ case IIO_CHAN_INFO_SCALE:
+ if (!data->has_rfs)
+ return -EINVAL;
+
+ /* SCALE is mA/step: mV / Ohm = mA. */
+ *val = data->chip_info->vref_mv;
+ *val2 = data->rfs_ohms[chan->channel] *
+ data->chip_info->scale_denom;
+ return IIO_VAL_FRACTIONAL;
default:
return -EINVAL;
@@ -150,7 +190,7 @@ static int ds4424_write_raw(struct iio_dev *indio_dev,
case IIO_CHAN_INFO_RAW:
abs_val = abs(val);
- if (abs_val > DS4424_DAC_MASK)
+ if (abs_val > data->chip_info->result_mask)
return -EINVAL;
/*
@@ -185,6 +225,65 @@ static int ds4424_verify_chip(struct iio_dev *indio_dev)
return 0;
}
+static int ds4424_setup_channels(struct i2c_client *client,
+ struct ds4424_data *data,
+ struct iio_dev *indio_dev)
+{
+ struct iio_chan_spec *channels;
+ size_t channels_size;
+
+ channels_size = indio_dev->num_channels * sizeof(ds4424_channels[0]);
+ /* Use a local non-const pointer for modification */
+ channels = devm_kmemdup(&client->dev, ds4424_channels, channels_size,
+ GFP_KERNEL);
+ if (!channels)
+ return -ENOMEM;
+
+ if (data->has_rfs) {
+ for (unsigned int i = 0; i < indio_dev->num_channels; i++)
+ channels[i].info_mask_separate |=
+ BIT(IIO_CHAN_INFO_SCALE);
+ }
+
+ indio_dev->channels = channels;
+
+ return 0;
+}
+
+static int ds4424_parse_rfs(struct i2c_client *client,
+ struct ds4424_data *data,
+ struct iio_dev *indio_dev)
+{
+ struct device *dev = &client->dev;
+ int count, ret;
+
+ if (!device_property_present(dev, "maxim,rfs-ohms")) {
+ dev_info_once(dev, "maxim,rfs-ohms missing, scale not supported\n");
+ return 0;
+ }
+
+ count = device_property_count_u32(dev, "maxim,rfs-ohms");
+ if (count != indio_dev->num_channels)
+ return dev_err_probe(dev, -EINVAL, "maxim,rfs-ohms must have %u entries\n",
+ indio_dev->num_channels);
+
+ ret = device_property_read_u32_array(dev, "maxim,rfs-ohms",
+ data->rfs_ohms,
+ indio_dev->num_channels);
+ if (ret)
+ return dev_err_probe(dev, ret, "Failed to read maxim,rfs-ohms property\n");
+
+ for (unsigned int i = 0; i < indio_dev->num_channels; i++) {
+ if (!data->rfs_ohms[i])
+ return dev_err_probe(dev, -EINVAL, "maxim,rfs-ohms entry %d is zero\n",
+ i);
+ }
+
+ data->has_rfs = true;
+
+ return 0;
+}
+
static int ds4424_suspend(struct device *dev)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
@@ -220,7 +319,7 @@ static int ds4424_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(ds4424_pm_ops, ds4424_suspend, ds4424_resume);
-static const struct iio_info ds4424_info = {
+static const struct iio_info ds4424_iio_info = {
.read_raw = ds4424_read_raw,
.write_raw = ds4424_write_raw,
};
@@ -257,15 +356,20 @@ static int ds4424_probe(struct i2c_client *client)
switch (id->driver_data) {
case ID_DS4402:
indio_dev->num_channels = DS4422_MAX_DAC_CHANNELS;
+ /* See ds4404_info comment above. */
+ data->chip_info = &ds4404_info;
break;
case ID_DS4404:
indio_dev->num_channels = DS4424_MAX_DAC_CHANNELS;
+ data->chip_info = &ds4404_info;
break;
case ID_DS4422:
indio_dev->num_channels = DS4422_MAX_DAC_CHANNELS;
+ data->chip_info = &ds4424_info;
break;
case ID_DS4424:
indio_dev->num_channels = DS4424_MAX_DAC_CHANNELS;
+ data->chip_info = &ds4424_info;
break;
default:
dev_err(&client->dev,
@@ -282,9 +386,16 @@ static int ds4424_probe(struct i2c_client *client)
if (ret < 0)
goto fail;
- indio_dev->channels = ds4424_channels;
+ ret = ds4424_parse_rfs(client, data, indio_dev);
+ if (ret)
+ goto fail;
+
+ ret = ds4424_setup_channels(client, data, indio_dev);
+ if (ret)
+ goto fail;
+
indio_dev->modes = INDIO_DIRECT_MODE;
- indio_dev->info = &ds4424_info;
+ indio_dev->info = &ds4424_iio_info;
ret = iio_device_register(indio_dev);
if (ret < 0) {
--
2.47.3
Powered by blists - more mailing lists