> The interrupt source can come from multiple sources, fifo and wake interrupts.
> Enter interrupt thread to check which interrupt that has fired.
>
> Signed-off-by: Sean Nyekjaer <sean@xxxxxxxxxx>
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 30 +++++++++++++++-----
> 1 file changed, 23 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index 59a34894e495..76aec5024d83 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -78,6 +78,12 @@
> #define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR 0x24
> #define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR 0x26
>
> +#define ST_LSM6DSX_REG_WAKE_UP_SRC_ADDR 0x1B
> +#define ST_LSM6DSX_REG_WAKE_UP_SRC_Z_WU_MASK BIT(0)
> +#define ST_LSM6DSX_REG_WAKE_UP_SRC_Y_WU_MASK BIT(1)
> +#define ST_LSM6DSX_REG_WAKE_UP_SRC_X_WU_MASK BIT(2)
> +#define ST_LSM6DSX_REG_WAKE_UP_SRC_WU_MASK BIT(4)
> +
> #define ST_LSM6DSX_REG_TAP_CFG_ADDR 0x58
> #define ST_LSM6DSX_REG_TAP_CFG_INT_EN_MASK BIT(7)
> #define ST_LSM6DSX_REG_TAP_CFG_INACT_EN_MASK GENMASK(6, 5)
> @@ -946,19 +952,29 @@ int st_lsm6dsx_event_setup(struct st_lsm6dsx_hw *hw)
>
> static irqreturn_t st_lsm6dsx_handler_irq(int irq, void *private)
> {
> - struct st_lsm6dsx_hw *hw = private;
> -
> - return hw->sip > 0 ? IRQ_WAKE_THREAD : IRQ_NONE;
> + return IRQ_WAKE_THREAD;
I guess this will break shared interrupt, isn't it?
> }
>
> static irqreturn_t st_lsm6dsx_handler_thread(int irq, void *private)
> {
> struct st_lsm6dsx_hw *hw = private;
> - int count;
> + int count = 0;
> + int data, err;
> +
> + if (hw->enable_event) {
> + err = regmap_read(hw->regmap,
> + ST_LSM6DSX_REG_WAKE_UP_SRC_ADDR, &data);
> + if (err < 0)
> + goto try_fifo;
You can simplify this just doing something like:
if (err < 0 && !hw->sip)
return IRQ_NONE;
> +
> + }
>
> - mutex_lock(&hw->fifo_lock);
> - count = st_lsm6dsx_read_fifo(hw);
> - mutex_unlock(&hw->fifo_lock);
> +try_fifo:
> + if (hw->sip > 0) {
> + mutex_lock(&hw->fifo_lock);
> + count = st_lsm6dsx_read_fifo(hw);
> + mutex_unlock(&hw->fifo_lock);
> + }
>
> return !count ? IRQ_NONE : IRQ_HANDLED;
> }
> --
> 2.22.0
>
Attachment:
signature.asc
Description: PGP signature
