| 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, 18 Nov 2015 15:38:33 +0100
From: Marc Titinger <mtitinger@...libre.com>
To: jic23@...nel.org, knaack.h@....de, lars@...afoo.de,
pmeerw@...erw.net
Cc: daniel.baluta@...el.com, linux-kernel@...r.kernel.org,
linux-iio@...r.kernel.org, Marc Titinger <mtitinger@...libre.com>
Subject: [RFC 7/9] iio: ina2xx: add triggered buffer
Signed-off-by: Marc Titinger <mtitinger@...libre.com>
---
drivers/iio/adc/Kconfig | 3 ++
drivers/iio/adc/ina2xx-iio.c | 74 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+)
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index ebbfff9..929cfb0 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -187,6 +187,9 @@ config INA2XX_IIO
tristate "Texas Instruments INA2xx Power Monitors IIO driver"
depends on I2C
select REGMAP_I2C
+ select IIO_BUFFER
+ select IIO_TRIGGERED_BUFFER
+ select IIO_HRTIMER_TRIGGER
help
Say yes here to build support for TI INA2xx familly Power Monitors.
diff --git a/drivers/iio/adc/ina2xx-iio.c b/drivers/iio/adc/ina2xx-iio.c
index d4dd908..e47f30d 100644
--- a/drivers/iio/adc/ina2xx-iio.c
+++ b/drivers/iio/adc/ina2xx-iio.c
@@ -28,6 +28,10 @@
#include <linux/util_macros.h>
+#include <linux/iio/buffer.h>
+#include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
+
/*
* INA2XX registers definition
*/
@@ -294,6 +298,10 @@ static int ina2xx_write_raw(struct iio_dev *indio_dev,
case IIO_CHAN_INFO_SAMP_FREQ:
ret = ina226_set_frequency(chip, val, &tmp);
+
+ trace_printk("Enabling buffer w/ freq = %d, avg =%u, period= %u\n",
+ chip->freq, chip->avg, chip->period_us );
+
break;
default:
@@ -379,6 +387,58 @@ static int ina2xx_debug_reg(struct iio_dev *indio_dev,
return regmap_read(chip->regmap, reg, readval);
}
+static s64 prev_ns;
+
+static irqreturn_t ina2xx_trigger_handler(int irq, void *p)
+{
+ struct iio_poll_func *pf = p;
+ struct iio_dev *indio_dev = pf->indio_dev;
+ struct ina2xx_chip_info *chip = iio_priv(indio_dev);
+ unsigned short data[8];
+ int bit, ret = 0, i = 0;
+
+ unsigned long buffer_us = 0, elapsed_us = 0;
+ s64 time_a, time_b;
+
+ time_a = iio_get_time_ns();
+
+ /* Single register reads: bulk_read will not work with ina226
+ * as there is no auto-increment of the address register for
+ * data length longer than 16bits.
+ */
+ for_each_set_bit(bit, indio_dev->active_scan_mask,
+ indio_dev->masklength) {
+ unsigned int val;
+
+ ret = regmap_read(chip->regmap,
+ INA2XX_SHUNT_VOLTAGE + bit, &val);
+ if (ret < 0)
+ goto _err;
+
+ data[i++] = val;
+ }
+
+ time_b = iio_get_time_ns();
+
+ iio_push_to_buffers_with_timestamp(indio_dev, (unsigned int *)data,
+ time_b);
+
+ buffer_us = (unsigned long)(time_b - time_a) / 1000;
+ elapsed_us = (unsigned long)(time_a - prev_ns) / 1000;
+
+ /* delais in uS */
+ trace_printk("T[k]-T[k_1] = %lu, xfer %lu", elapsed_us, buffer_us);
+
+ ret = IRQ_HANDLED;
+
+ prev_ns = time_a;
+
+_err:
+ iio_trigger_notify_done(indio_dev->trig);
+
+ return ret;
+}
+
/* frequencies matching the cummulated integration times for vshunt and vbus */
static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("61 120 236 455 850 1506 2450 3571");
@@ -486,9 +546,22 @@ static int ina2xx_probe(struct i2c_client *client,
return -ENODEV;
}
+ ret = iio_triggered_buffer_setup(indio_dev, NULL,
+ &ina2xx_trigger_handler, NULL);
+ if (ret)
+ return ret;
+
return devm_iio_device_register(&client->dev, indio_dev);
}
+static int ina2xx_remove(struct i2c_client *client)
+{
+ iio_triggered_buffer_cleanup(dev_get_drvdata(&client->dev));
+
+ return 0;
+}
+
+
static const struct i2c_device_id ina2xx_id[] = {
{"ina219", ina219},
{"ina220", ina219},
@@ -505,6 +578,7 @@ static struct i2c_driver ina2xx_driver = {
.name = KBUILD_MODNAME,
},
.probe = ina2xx_probe,
+ .remove = ina2xx_remove,
.id_table = ina2xx_id,
};
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists