| 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
| ||
|
Date: Wed, 31 Aug 2022 12:05:06 +0200
From: Vincent Whitchurch <vincent.whitchurch@...s.com>
To: <jic23@...nel.org>
CC: <kernel@...s.com>,
Vincent Whitchurch <vincent.whitchurch@...s.com>,
<andy.shevchenko@...il.com>, <lars@...afoo.de>,
<linux-iio@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
Axel Jonsson <axel.jonsson@...s.com>
Subject: [PATCH v2 5/5] iio: adc: mcp320x: add triggered buffer support
From: Axel Jonsson <axel.jonsson@...s.com>
Add support for triggered buffers. The hardware doesn't provide any
special method of reading multiple channels, so just read the channels
in a loop to keep things simple.
Signed-off-by: Axel Jonsson <axel.jonsson@...s.com>
Signed-off-by: Vincent Whitchurch <vincent.whitchurch@...s.com>
---
drivers/iio/adc/Kconfig | 2 +
drivers/iio/adc/mcp320x.c | 100 ++++++++++++++++++++++++++++++--------
2 files changed, 82 insertions(+), 20 deletions(-)
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 48ace7412874..9f2628120885 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -696,6 +696,8 @@ config MAX9611
config MCP320X
tristate "Microchip Technology MCP3x01/02/04/08 and MCP3550/1/3"
depends on SPI
+ select IIO_BUFFER
+ select IIO_TRIGGERED_BUFFER
help
Say yes here to build support for Microchip Technology's
MCP3001, MCP3002, MCP3004, MCP3008, MCP3201, MCP3202, MCP3204,
diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c
index b1c1bf4b8047..bdc986285e1b 100644
--- a/drivers/iio/adc/mcp320x.c
+++ b/drivers/iio/adc/mcp320x.c
@@ -37,13 +37,18 @@
* http://ww1.microchip.com/downloads/en/DeviceDoc/21950D.pdf mcp3550/1/3
*/
-#include <linux/err.h>
#include <linux/delay.h>
-#include <linux/spi/spi.h>
-#include <linux/module.h>
+#include <linux/err.h>
+#include <linux/interrupt.h>
#include <linux/mod_devicetable.h>
-#include <linux/iio/iio.h>
+#include <linux/module.h>
#include <linux/regulator/consumer.h>
+#include <linux/spi/spi.h>
+
+#include <linux/iio/buffer.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
enum {
mcp3001,
@@ -243,31 +248,45 @@ static int mcp320x_read_raw(struct iio_dev *indio_dev,
.indexed = 1, \
.channel = (num), \
.address = (num), \
+ .scan_index = (num), \
+ .scan_type = { \
+ .sign = 's', \
+ .realbits = 32, \
+ .storagebits = 32, \
+ .endianness = IIO_CPU, \
+ }, \
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) \
}
-#define MCP320X_VOLTAGE_CHANNEL_DIFF(chan1, chan2) \
+#define MCP320X_VOLTAGE_CHANNEL_DIFF(si, chan1, chan2) \
{ \
.type = IIO_VOLTAGE, \
.indexed = 1, \
.channel = (chan1), \
.channel2 = (chan2), \
.address = (chan1), \
+ .scan_index = (si), \
+ .scan_type = { \
+ .sign = 's', \
+ .realbits = 32, \
+ .storagebits = 32, \
+ .endianness = IIO_CPU, \
+ }, \
.differential = 1, \
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) \
}
static const struct iio_chan_spec mcp3201_channels[] = {
- MCP320X_VOLTAGE_CHANNEL_DIFF(0, 1),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(0, 0, 1),
};
static const struct iio_chan_spec mcp3202_channels[] = {
MCP320X_VOLTAGE_CHANNEL(0),
MCP320X_VOLTAGE_CHANNEL(1),
- MCP320X_VOLTAGE_CHANNEL_DIFF(0, 1),
- MCP320X_VOLTAGE_CHANNEL_DIFF(1, 0),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(2, 0, 1),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(3, 1, 0),
};
static const struct iio_chan_spec mcp3204_channels[] = {
@@ -275,10 +294,10 @@ static const struct iio_chan_spec mcp3204_channels[] = {
MCP320X_VOLTAGE_CHANNEL(1),
MCP320X_VOLTAGE_CHANNEL(2),
MCP320X_VOLTAGE_CHANNEL(3),
- MCP320X_VOLTAGE_CHANNEL_DIFF(0, 1),
- MCP320X_VOLTAGE_CHANNEL_DIFF(1, 0),
- MCP320X_VOLTAGE_CHANNEL_DIFF(2, 3),
- MCP320X_VOLTAGE_CHANNEL_DIFF(3, 2),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(4, 0, 1),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(5, 1, 0),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(6, 2, 3),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(7, 3, 2),
};
static const struct iio_chan_spec mcp3208_channels[] = {
@@ -290,14 +309,14 @@ static const struct iio_chan_spec mcp3208_channels[] = {
MCP320X_VOLTAGE_CHANNEL(5),
MCP320X_VOLTAGE_CHANNEL(6),
MCP320X_VOLTAGE_CHANNEL(7),
- MCP320X_VOLTAGE_CHANNEL_DIFF(0, 1),
- MCP320X_VOLTAGE_CHANNEL_DIFF(1, 0),
- MCP320X_VOLTAGE_CHANNEL_DIFF(2, 3),
- MCP320X_VOLTAGE_CHANNEL_DIFF(3, 2),
- MCP320X_VOLTAGE_CHANNEL_DIFF(4, 5),
- MCP320X_VOLTAGE_CHANNEL_DIFF(5, 4),
- MCP320X_VOLTAGE_CHANNEL_DIFF(6, 7),
- MCP320X_VOLTAGE_CHANNEL_DIFF(7, 6),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(8, 0, 1),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(9, 1, 0),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(10, 2, 3),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(11, 3, 2),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(12, 4, 5),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(13, 5, 4),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(14, 6, 7),
+ MCP320X_VOLTAGE_CHANNEL_DIFF(15, 7, 6),
};
static const struct iio_info mcp320x_info = {
@@ -390,6 +409,41 @@ static const struct mcp320x_chip_info mcp320x_chip_infos[] = {
},
};
+static irqreturn_t mcp320x_buffer_trigger_handler(int irq, void *pollfunc)
+{
+ struct iio_poll_func *pf = pollfunc;
+ struct iio_dev *indio_dev = pf->indio_dev;
+ struct mcp320x *adc = iio_priv(indio_dev);
+ s32 data[ARRAY_SIZE(mcp3208_channels)];
+ int i = 0;
+ int chan;
+
+ mutex_lock(&adc->lock);
+
+ for_each_set_bit(chan, indio_dev->active_scan_mask, indio_dev->masklength) {
+ const struct iio_chan_spec *spec = &indio_dev->channels[chan];
+ int ret, val;
+
+ ret = mcp320x_adc_conversion(adc, spec, &val);
+ if (ret < 0) {
+ dev_err_ratelimited(&adc->spi->dev, "Failed to read data: %d\n",
+ ret);
+ goto out;
+ }
+
+ data[i++] = val;
+ }
+
+ iio_push_to_buffers(indio_dev, data);
+
+out:
+ mutex_unlock(&adc->lock);
+
+ iio_trigger_notify_done(indio_dev->trig);
+
+ return IRQ_HANDLED;
+}
+
static void mcp320x_reg_disable(void *reg)
{
regulator_disable(reg);
@@ -471,6 +525,12 @@ static int mcp320x_probe(struct spi_device *spi)
mutex_init(&adc->lock);
+ ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, NULL,
+ mcp320x_buffer_trigger_handler,
+ NULL);
+ if (ret)
+ return ret;
+
return devm_iio_device_register(&spi->dev, indio_dev);
}
--
2.34.1
Powered by blists - more mailing lists