forked from Minki/linux
65925b65ed
commit 98ad8b41f58dff6b30713d7f09ae3834b8df7ded
("iio: st_sensors: verify interrupt event to status") caused
a regression when reading ST sensors from a HRTimer trigger
rather than the intrinsic interrupts: the HRTimer may
trigger faster than the sensor provides new values, and
as the check against new values available as a cause of
the interrupt trigger was done in the poll function,
this would bail out of the HRTimer interrupt with
IRQ_NONE.
So clearly we need to only check the new values available
from the proper interrupt handler and not from the poll
function, which should rather just read the raw values
from the registers, put them into the buffer and be happy.
To achieve this: switch the ST Sensors over to using a true
threaded interrupt handler.
In the interrupt thread, check if new values are available,
else yield to the (potential) next device on the same
interrupt line to check the registers. If the interrupt
was ours, proceed to poll the values.
Instead of relying on iio_trigger_generic_data_rdy_poll() as
a top half to wake up the thread that polls the sensor for
new data, have the thread call iio_trigger_poll_chained()
after determining that is is the proper source of the
interrupt. This is modelled on drivers/iio/accel/mma8452.c
which is already using a properly threaded interrupt handler.
In order to get the same precision in timestamps as
previously, where samples would be timestamped in the
poll function pf->timestamp when calling
iio_trigger_generic_data_rdy_poll() we introduce a
local timestamp in the sensor data, set it in the top half
(fastpath) of the interrupt handler and provide that to the
core when calling iio_push_to_buffers_with_timestamp().
Additionally: if the active scanmask is not set for the
sensor no IRQs should be enabled and we need to bail out
with IRQ_NONE. This can happen if spurious IRQs fire when
installing the threaded interrupt handler.
Tested with hard interrupt triggers on LIS331DL, then also
tested with hrtimers on the same sensor by creating a 75Hz
HRTimer and using it to poll the sensor.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Giuseppe Barba <giuseppe.barba@st.com>
Cc: Denis Ciocca <denis.ciocca@st.com>
Reported-by: Crestez Dan Leonard <cdleonard@gmail.com>
Tested-by: Crestez Dan Leonard <cdleonard@gmail.com>
Tested-by: Jonathan Cameron <jic23@kernel.org>
Fixes: 97865fe413 ("iio: st_sensors: verify interrupt event to status")
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
106 lines
2.6 KiB
C
106 lines
2.6 KiB
C
/*
|
|
* STMicroelectronics accelerometers driver
|
|
*
|
|
* Copyright 2012-2013 STMicroelectronics Inc.
|
|
*
|
|
* Denis Ciocca <denis.ciocca@st.com>
|
|
*
|
|
* Licensed under the GPL-2.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/stat.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/iio/iio.h>
|
|
#include <linux/iio/buffer.h>
|
|
#include <linux/iio/trigger_consumer.h>
|
|
#include <linux/iio/triggered_buffer.h>
|
|
|
|
#include <linux/iio/common/st_sensors.h>
|
|
#include "st_accel.h"
|
|
|
|
int st_accel_trig_set_state(struct iio_trigger *trig, bool state)
|
|
{
|
|
struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
|
|
|
|
return st_sensors_set_dataready_irq(indio_dev, state);
|
|
}
|
|
|
|
static int st_accel_buffer_preenable(struct iio_dev *indio_dev)
|
|
{
|
|
return st_sensors_set_enable(indio_dev, true);
|
|
}
|
|
|
|
static int st_accel_buffer_postenable(struct iio_dev *indio_dev)
|
|
{
|
|
int err;
|
|
struct st_sensor_data *adata = iio_priv(indio_dev);
|
|
|
|
adata->buffer_data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
|
|
if (adata->buffer_data == NULL) {
|
|
err = -ENOMEM;
|
|
goto allocate_memory_error;
|
|
}
|
|
|
|
err = st_sensors_set_axis_enable(indio_dev,
|
|
(u8)indio_dev->active_scan_mask[0]);
|
|
if (err < 0)
|
|
goto st_accel_buffer_postenable_error;
|
|
|
|
err = iio_triggered_buffer_postenable(indio_dev);
|
|
if (err < 0)
|
|
goto st_accel_buffer_postenable_error;
|
|
|
|
return err;
|
|
|
|
st_accel_buffer_postenable_error:
|
|
kfree(adata->buffer_data);
|
|
allocate_memory_error:
|
|
return err;
|
|
}
|
|
|
|
static int st_accel_buffer_predisable(struct iio_dev *indio_dev)
|
|
{
|
|
int err;
|
|
struct st_sensor_data *adata = iio_priv(indio_dev);
|
|
|
|
err = iio_triggered_buffer_predisable(indio_dev);
|
|
if (err < 0)
|
|
goto st_accel_buffer_predisable_error;
|
|
|
|
err = st_sensors_set_axis_enable(indio_dev, ST_SENSORS_ENABLE_ALL_AXIS);
|
|
if (err < 0)
|
|
goto st_accel_buffer_predisable_error;
|
|
|
|
err = st_sensors_set_enable(indio_dev, false);
|
|
|
|
st_accel_buffer_predisable_error:
|
|
kfree(adata->buffer_data);
|
|
return err;
|
|
}
|
|
|
|
static const struct iio_buffer_setup_ops st_accel_buffer_setup_ops = {
|
|
.preenable = &st_accel_buffer_preenable,
|
|
.postenable = &st_accel_buffer_postenable,
|
|
.predisable = &st_accel_buffer_predisable,
|
|
};
|
|
|
|
int st_accel_allocate_ring(struct iio_dev *indio_dev)
|
|
{
|
|
return iio_triggered_buffer_setup(indio_dev, NULL,
|
|
&st_sensors_trigger_handler, &st_accel_buffer_setup_ops);
|
|
}
|
|
|
|
void st_accel_deallocate_ring(struct iio_dev *indio_dev)
|
|
{
|
|
iio_triggered_buffer_cleanup(indio_dev);
|
|
}
|
|
|
|
MODULE_AUTHOR("Denis Ciocca <denis.ciocca@st.com>");
|
|
MODULE_DESCRIPTION("STMicroelectronics accelerometers buffer");
|
|
MODULE_LICENSE("GPL v2");
|