On Sun, 1 Dec 2019 23:07:27 +0200
Lorenzo Bianconi <lorenzo@xxxxxxxxxx> wrote:
> > On Fri, 29 Nov 2019 11:37:24 +0200
> > Lorenzo Bianconi <lorenzo@xxxxxxxxxx> wrote:
> >
> > > Do not power-off accel unconditionally if wake-up events are enabled
> > > powering off the hw FIFO. At the same time do not power-off the accel
> > > sensor if it is 'batched' in the hw FIFO disabling sensor events
> > >
> > > Fixes: b5969abfa8b8 ("iio: imu: st_lsm6dsx: add motion events")
> > > Tested-by: Sean Nyekjaer <sean@xxxxxxxxxx>
> > > Signed-off-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx>
> > Not applied as this seems to be dependent on one of the earlier patches.
> > Please put them in a series and resend.
>
> Hi Jonathan,
>
> Sorry for the noise, but I discovered the issue after I have already sent
> the other patch out. I will post them together in v2.
I've picked it up given I now have the other one anyway.
Applied to the fixes-togreg branch of iio.git
Thanks,
Jonathan
>
> Regards,
> Lorenzo
>
> >
> > Thanks,
> >
> > Jonathan
> > > ---
> > > This patch is based on https://patchwork.kernel.org/patch/11266301/
> > > ---
> > > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 30 +++++++++++++++++---
> > > 1 file changed, 26 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > > index 13590c041d22..990643da9f4e 100644
> > > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > > @@ -1447,8 +1447,9 @@ st_lsm6dsx_set_odr(struct st_lsm6dsx_sensor *sensor, u32 req_odr)
> > > return st_lsm6dsx_update_bits_locked(hw, reg->addr, reg->mask, data);
> > > }
> > >
> > > -int st_lsm6dsx_sensor_set_enable(struct st_lsm6dsx_sensor *sensor,
> > > - bool enable)
> > > +static int
> > > +__st_lsm6dsx_sensor_set_enable(struct st_lsm6dsx_sensor *sensor,
> > > + bool enable)
> > > {
> > > struct st_lsm6dsx_hw *hw = sensor->hw;
> > > u32 odr = enable ? sensor->odr : 0;
> > > @@ -1466,6 +1467,26 @@ int st_lsm6dsx_sensor_set_enable(struct st_lsm6dsx_sensor *sensor,
> > > return 0;
> > > }
> > >
> > > +static int
> > > +st_lsm6dsx_check_events(struct st_lsm6dsx_sensor *sensor, bool enable)
> > > +{
> > > + struct st_lsm6dsx_hw *hw = sensor->hw;
> > > +
> > > + if (sensor->id == ST_LSM6DSX_ID_GYRO || enable)
> > > + return 0;
> > > +
> > > + return hw->enable_event;
> > > +}
> > > +
> > > +int st_lsm6dsx_sensor_set_enable(struct st_lsm6dsx_sensor *sensor,
> > > + bool enable)
> > > +{
> > > + if (st_lsm6dsx_check_events(sensor, enable))
> > > + return 0;
> > > +
> > > + return __st_lsm6dsx_sensor_set_enable(sensor, enable);
> > > +}
> > > +
> > > static int st_lsm6dsx_read_oneshot(struct st_lsm6dsx_sensor *sensor,
> > > u8 addr, int *val)
> > > {
> > > @@ -1662,7 +1683,7 @@ st_lsm6dsx_write_event_config(struct iio_dev *iio_dev,
> > > struct st_lsm6dsx_sensor *sensor = iio_priv(iio_dev);
> > > struct st_lsm6dsx_hw *hw = sensor->hw;
> > > u8 enable_event;
> > > - int err = 0;
> > > + int err;
> > >
> > > if (type != IIO_EV_TYPE_THRESH)
> > > return -EINVAL;
> > > @@ -1690,7 +1711,8 @@ st_lsm6dsx_write_event_config(struct iio_dev *iio_dev,
> > > return err;
> > >
> > > mutex_lock(&hw->conf_lock);
> > > - err = st_lsm6dsx_sensor_set_enable(sensor, state);
> > > + if (enable_event || !(hw->fifo_mask & BIT(sensor->id)))
> > > + err = __st_lsm6dsx_sensor_set_enable(sensor, state);
> > > mutex_unlock(&hw->conf_lock);
> > > if (err < 0)
> > > return err;
> >
