On Sun, 17 Nov 2024 18:26:42 +0000
Lothar Rubusch <l.rubusch@xxxxxxxxx> wrote:
> Add basic setup to the interrupt handler function and prepare probe
> for using and not using the FIFO on the adxl345. Interrupt handler and
> basic structure integration is needed to evaluate interrupt source
> register. This is crucial for implementing further features of the
> sensor.
>
> Signed-off-by: Lothar Rubusch <l.rubusch@xxxxxxxxx>
> ---
> drivers/iio/accel/adxl345_core.c | 105 ++++++++++++++++++++++++++++++-
> 1 file changed, 103 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c
> index f98ddef4c5..508de81bb9 100644
> --- a/drivers/iio/accel/adxl345_core.c
> +++ b/drivers/iio/accel/adxl345_core.c
> @@ -15,6 +15,9 @@
>
> #include <linux/iio/iio.h>
> #include <linux/iio/sysfs.h>
> +#include <linux/iio/trigger.h>
> +#include <linux/iio/trigger_consumer.h>
> +#include <linux/iio/triggered_buffer.h>
Probably not appropriate to have a trigger here unless you make it work
with other triggers (e.g. Sysfs, hrtimer etc).
When a fifo is involved the usual control is no trigger means fifo, applying
a trigger means not through fifo.
>
> #include <linux/input/adxl34x.h>
>
> @@ -137,6 +140,7 @@ struct adxl34x_state {
> const struct adxl345_chip_info *info;
> struct regmap *regmap;
> struct adxl34x_platform_data data; /* watermark, fifo_mode, etc */
> + u8 int_map;
Introduce only when used...
> bool fifo_delay; /* delay: delay is needed for SPI */
> u8 intio;
> };
> @@ -302,6 +306,10 @@ static void adxl345_powerdown(void *ptr)
> adxl345_set_measure_en(st, false);
> }
>
> +static const struct iio_dev_attr *adxl345_fifo_attributes[] = {
> + NULL,
Bring this in when it has content, not before.
> +};
> +
> static IIO_CONST_ATTR_SAMP_FREQ_AVAIL(
> "0.09765625 0.1953125 0.390625 0.78125 1.5625 3.125 6.25 12.5 25 50 100 200 400 800 1600 3200"
> );
> @@ -315,6 +323,75 @@ static const struct attribute_group adxl345_attrs_group = {
> .attrs = adxl345_attrs,
> };
>
> +static const struct iio_buffer_setup_ops adxl345_buffer_ops = {
> +};
> +
> +static int adxl345_get_status(struct adxl34x_state *st, u8 *int_stat)
> +{
> + int ret;
> + unsigned int regval;
> +
> + *int_stat = 0;
Why not return it?
Negative error, value if positive.
> + ret = regmap_read(st->regmap, ADXL345_REG_INT_SOURCE, ®val);
> + if (ret) {
> + pr_warn("%s(): Failed to read INT_SOURCE register\n", __func__);
dev_err()
Though odd to do that for this specific read and no others.
> + return -EINVAL;
> + }
> +
> + *int_stat = 0xff & regval;
> + pr_debug("%s(): int_stat 0x%02X (INT_SOURCE)\n", __func__, *int_stat);
Clean these debug statements out to only keep the particularly useful ones.
> +
> + return 0;
> +}
> +
> +/**
> + * irqreturn_t adxl345_trigger_handler() - Interrupt handler used for several
> + * features of the ADXL345.
If it is used for anything other than triggers, you should rethink that naming.
You are probably better off registering the interrupt directly. See comments
on not using a trigger below. They aren't always appropriate.
> + * @irq: The interrupt number.
> + * @p: The iio poll function instance, used to derive the device and data.
> + *
> + * Having an interrupt imples FIFO_STREAM mode was enabled. Since this is given
> + * there will no be further test for being in FIFO_BYPASS mode. FIFO_TRIGGER
> + * and FIFO_FIFO mode (being similar to FIFO_STREAM mode) are not separately
> + * implemented so far. Both should be work smoothly with the same way of
> + * interrupt handling.
> + *
> + * Return: Describe if the interrupt was handled.
> + */
> +static irqreturn_t adxl345_trigger_handler(int irq, void *p)
> +{
> + struct iio_dev *indio_dev = ((struct iio_poll_func *) p)->indio_dev;
> + struct adxl34x_state *st = iio_priv(indio_dev);
> + u8 int_stat;
> + int ret;
> +
> + ret = adxl345_get_status(st, &int_stat);
> + if (ret < 0)
> + goto done;
> +
> + /* Ignore already read event by reissued too fast */
> + if (int_stat == 0x0)
> + goto done;
> +
> + /* evaluation */
Don't see this comment as useful. Probably drop it or expand to make
it more useful.
> +
> + if (int_stat & ADXL345_INT_OVERRUN) {
> + pr_debug("%s(): OVERRUN event detected\n", __func__);
dev_dbg()
> + goto done;
> + }
> +
> + if (int_stat & (ADXL345_INT_DATA_READY | ADXL345_INT_WATERMARK))
> + pr_debug("%s(): WATERMARK or DATA_READY event detected\n", __func__);
Bring this in only when you actually do something in the handler.
Much better to supply a full function in one go so it can be easily reviewed.
> +
> + goto done;
> +done:
> +
> + if (indio_dev)
> + iio_trigger_notify_done(indio_dev->trig);
> +
> + return IRQ_HANDLED;
> +}
> +
> static const struct iio_info adxl345_info = {
> .attrs = &adxl345_attrs_group,
> .read_raw = adxl345_read_raw,
> @@ -351,6 +428,7 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap,
> ADXL345_DATA_FORMAT_FULL_RES |
> ADXL345_DATA_FORMAT_SELF_TEST);
> const struct adxl34x_platform_data *data;
> + u8 fifo_ctl;
> int ret;
>
> indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
> @@ -419,9 +497,32 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap,
> if (ret < 0)
> return dev_err_probe(dev, ret, "Failed to add action or reset\n");
>
> - /* Enable measurement mode */
> - adxl345_set_measure_en(st, true);
> + /* Basic common initialization of the driver is done now */
Code flow comments like this are rarely useful and often become wrong
as a driver evolves. Better to not add it.
> +
> + if (st->irq) { /* Initialization to prepare for FIFO_STREAM mode */
> + ret = devm_iio_triggered_buffer_setup_ext(dev, indio_dev,
If you are supporting only fifo mode, why use a triggered buffer?
Those require one interrupt (or trigger) per scan (here read of all the axes).
For a device using only fifo based accesses it is fine to have no trigger.
If you look around you will find various drivers calling
devm_iio_kfifo_buffer_setup() directly - look at how they do things.
There is an ext version of that as well.
> + NULL,
> + adxl345_trigger_handler,
> + IIO_BUFFER_DIRECTION_IN,
> + &adxl345_buffer_ops,
> + adxl345_fifo_attributes);
> + if (ret)
> + return dev_err_probe(dev, ret, "Failed to setup triggered buffer\n");
> +
> + } else { /* Initialization to prepare for FIFO_BYPASS mode (fallback) */
>
> + /* The following defaults to 0x00, anyway */
Not a lot of point in an | with 0x00
I'm not sure the comment adds any value.
> + fifo_ctl = 0x00 | ADXL345_FIFO_CTL_MODE(ADXL_FIFO_BYPASS);
> +
> + dev_dbg(dev, "fifo_ctl 0x%02X [0x00]\n", fifo_ctl);
Not generally worth keeping this level of low level dbg in driver. There is infrastructure
in regmap for tracing if you really need to know.
> + ret = regmap_write(st->regmap, ADXL345_REG_FIFO_CTL, fifo_ctl);
> + if (ret < 0)
> + return ret;
> +
> + /* Enable measurement mode */
> + adxl345_set_measure_en(st, true);
Check for errors.
> + }
> + dev_dbg(dev, "Driver operational\n");
Drop this from code for upstream. It is wrong anyway as if the next call fails
it is definitely not operational.
> return devm_iio_device_register(dev, indio_dev);
> }
> EXPORT_SYMBOL_NS_GPL(adxl345_core_probe, IIO_ADXL345);
