| Message ID | 15dadc531c5b30819a72b289ccd5c25e04f73657.1594388801.git.lorenzo@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iio: imu: st_lsm6dsx: reset hw ts after resume | expand |
On 10/07/2020 15.49, Lorenzo Bianconi wrote: > Reset hw time sampling after the device resume in order to keep timing > in sync > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Tested-by: Sean Nyekjaer <sean@geanix.com> > --- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 3 +-- > .../iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 23 ++++++++++++------- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 +- > 3 files changed, 17 insertions(+), 11 deletions(-) > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > index b56df409ed0f..529970195b39 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > @@ -436,8 +436,7 @@ int st_lsm6dsx_update_watermark(struct st_lsm6dsx_sensor *sensor, > u16 watermark); > int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable); > int st_lsm6dsx_flush_fifo(struct st_lsm6dsx_hw *hw); > -int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw, > - enum st_lsm6dsx_fifo_mode fifo_mode); > +int st_lsm6dsx_resume_fifo(struct st_lsm6dsx_hw *hw); > int st_lsm6dsx_read_fifo(struct st_lsm6dsx_hw *hw); > int st_lsm6dsx_read_tagged_fifo(struct st_lsm6dsx_hw *hw); > int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u32 odr, u8 *val); > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > index afd00daeefb2..7de10bd636ea 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > @@ -184,8 +184,8 @@ static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw) > return err; > } > > -int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw, > - enum st_lsm6dsx_fifo_mode fifo_mode) > +static int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw, > + enum st_lsm6dsx_fifo_mode fifo_mode) > { > unsigned int data; > > @@ -302,6 +302,18 @@ static int st_lsm6dsx_reset_hw_ts(struct st_lsm6dsx_hw *hw) > return 0; > } > > +int st_lsm6dsx_resume_fifo(struct st_lsm6dsx_hw *hw) > +{ > + int err; > + > + /* reset hw ts counter */ > + err = st_lsm6dsx_reset_hw_ts(hw); > + if (err < 0) > + return err; > + > + return st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT); > +} > + > /* > * Set max bulk read to ST_LSM6DSX_MAX_WORD_LEN/ST_LSM6DSX_MAX_TAGGED_WORD_LEN > * in order to avoid a kmalloc for each bus access > @@ -675,12 +687,7 @@ int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable) > goto out; > > if (fifo_mask) { > - /* reset hw ts counter */ > - err = st_lsm6dsx_reset_hw_ts(hw); > - if (err < 0) > - goto out; > - > - err = st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT); > + err = st_lsm6dsx_resume_fifo(hw); > if (err < 0) > goto out; > } > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > index c8ddeb3f48ff..346c24281d26 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > @@ -2457,7 +2457,7 @@ static int __maybe_unused st_lsm6dsx_resume(struct device *dev) > } > > if (hw->fifo_mask) > - err = st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT); > + err = st_lsm6dsx_resume_fifo(hw); > > return err; > }
On Sat, 11 Jul 2020 13:49:37 +0200 Sean Nyekjaer <sean@geanix.com> wrote: > On 10/07/2020 15.49, Lorenzo Bianconi wrote: > > Reset hw time sampling after the device resume in order to keep timing > > in sync > > > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > Tested-by: Sean Nyekjaer <sean@geanix.com> Hi Lorenzo, Patch is fine, but I'd like a couple of changes to the description: 1. More detail! For what we have here no one will have any real idea of whether an issue they are seeing is the same one or not. 2. Fixes tag / or something telling me why this shouldn't be back ported. Thanks, Jonathan > > --- > > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 3 +-- > > .../iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 23 ++++++++++++------- > > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 +- > > 3 files changed, 17 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > > index b56df409ed0f..529970195b39 100644 > > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > > @@ -436,8 +436,7 @@ int st_lsm6dsx_update_watermark(struct st_lsm6dsx_sensor *sensor, > > u16 watermark); > > int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable); > > int st_lsm6dsx_flush_fifo(struct st_lsm6dsx_hw *hw); > > -int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw, > > - enum st_lsm6dsx_fifo_mode fifo_mode); > > +int st_lsm6dsx_resume_fifo(struct st_lsm6dsx_hw *hw); > > int st_lsm6dsx_read_fifo(struct st_lsm6dsx_hw *hw); > > int st_lsm6dsx_read_tagged_fifo(struct st_lsm6dsx_hw *hw); > > int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u32 odr, u8 *val); > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > > index afd00daeefb2..7de10bd636ea 100644 > > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > > @@ -184,8 +184,8 @@ static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw) > > return err; > > } > > > > -int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw, > > - enum st_lsm6dsx_fifo_mode fifo_mode) > > +static int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw, > > + enum st_lsm6dsx_fifo_mode fifo_mode) > > { > > unsigned int data; > > > > @@ -302,6 +302,18 @@ static int st_lsm6dsx_reset_hw_ts(struct st_lsm6dsx_hw *hw) > > return 0; > > } > > > > +int st_lsm6dsx_resume_fifo(struct st_lsm6dsx_hw *hw) > > +{ > > + int err; > > + > > + /* reset hw ts counter */ > > + err = st_lsm6dsx_reset_hw_ts(hw); > > + if (err < 0) > > + return err; > > + > > + return st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT); > > +} > > + > > /* > > * Set max bulk read to ST_LSM6DSX_MAX_WORD_LEN/ST_LSM6DSX_MAX_TAGGED_WORD_LEN > > * in order to avoid a kmalloc for each bus access > > @@ -675,12 +687,7 @@ int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable) > > goto out; > > > > if (fifo_mask) { > > - /* reset hw ts counter */ > > - err = st_lsm6dsx_reset_hw_ts(hw); > > - if (err < 0) > > - goto out; > > - > > - err = st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT); > > + err = st_lsm6dsx_resume_fifo(hw); > > if (err < 0) > > goto out; > > } > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > > index c8ddeb3f48ff..346c24281d26 100644 > > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > > @@ -2457,7 +2457,7 @@ static int __maybe_unused st_lsm6dsx_resume(struct device *dev) > > } > > > > if (hw->fifo_mask) > > - err = st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT); > > + err = st_lsm6dsx_resume_fifo(hw); > > > > return err; > > } >
> On Sat, 11 Jul 2020 13:49:37 +0200 > Sean Nyekjaer <sean@geanix.com> wrote: > > > On 10/07/2020 15.49, Lorenzo Bianconi wrote: > > > Reset hw time sampling after the device resume in order to keep timing > > > in sync > > > > > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > > Tested-by: Sean Nyekjaer <sean@geanix.com> > Hi Lorenzo, Hi Jonathan, > > Patch is fine, but I'd like a couple of changes to the description: > 1. More detail! For what we have here no one will have any real idea > of whether an issue they are seeing is the same one or not. > 2. Fixes tag / or something telling me why this shouldn't be back ported. sure, I will fix them in v2. Regards, Lorenzo > > Thanks, > > Jonathan > > > > --- > > > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 3 +-- > > > .../iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 23 ++++++++++++------- > > > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 +- > > > 3 files changed, 17 insertions(+), 11 deletions(-) > > > > > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > > > index b56df409ed0f..529970195b39 100644 > > > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > > > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > > > @@ -436,8 +436,7 @@ int st_lsm6dsx_update_watermark(struct st_lsm6dsx_sensor *sensor, > > > u16 watermark); > > > int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable); > > > int st_lsm6dsx_flush_fifo(struct st_lsm6dsx_hw *hw); > > > -int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw, > > > - enum st_lsm6dsx_fifo_mode fifo_mode); > > > +int st_lsm6dsx_resume_fifo(struct st_lsm6dsx_hw *hw); > > > int st_lsm6dsx_read_fifo(struct st_lsm6dsx_hw *hw); > > > int st_lsm6dsx_read_tagged_fifo(struct st_lsm6dsx_hw *hw); > > > int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u32 odr, u8 *val); > > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > > > index afd00daeefb2..7de10bd636ea 100644 > > > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > > > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > > > @@ -184,8 +184,8 @@ static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw) > > > return err; > > > } > > > > > > -int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw, > > > - enum st_lsm6dsx_fifo_mode fifo_mode) > > > +static int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw, > > > + enum st_lsm6dsx_fifo_mode fifo_mode) > > > { > > > unsigned int data; > > > > > > @@ -302,6 +302,18 @@ static int st_lsm6dsx_reset_hw_ts(struct st_lsm6dsx_hw *hw) > > > return 0; > > > } > > > > > > +int st_lsm6dsx_resume_fifo(struct st_lsm6dsx_hw *hw) > > > +{ > > > + int err; > > > + > > > + /* reset hw ts counter */ > > > + err = st_lsm6dsx_reset_hw_ts(hw); > > > + if (err < 0) > > > + return err; > > > + > > > + return st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT); > > > +} > > > + > > > /* > > > * Set max bulk read to ST_LSM6DSX_MAX_WORD_LEN/ST_LSM6DSX_MAX_TAGGED_WORD_LEN > > > * in order to avoid a kmalloc for each bus access > > > @@ -675,12 +687,7 @@ int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable) > > > goto out; > > > > > > if (fifo_mask) { > > > - /* reset hw ts counter */ > > > - err = st_lsm6dsx_reset_hw_ts(hw); > > > - if (err < 0) > > > - goto out; > > > - > > > - err = st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT); > > > + err = st_lsm6dsx_resume_fifo(hw); > > > if (err < 0) > > > goto out; > > > } > > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > > > index c8ddeb3f48ff..346c24281d26 100644 > > > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > > > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > > > @@ -2457,7 +2457,7 @@ static int __maybe_unused st_lsm6dsx_resume(struct device *dev) > > > } > > > > > > if (hw->fifo_mask) > > > - err = st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT); > > > + err = st_lsm6dsx_resume_fifo(hw); > > > > > > return err; > > > } > > >
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h index b56df409ed0f..529970195b39 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h @@ -436,8 +436,7 @@ int st_lsm6dsx_update_watermark(struct st_lsm6dsx_sensor *sensor, u16 watermark); int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable); int st_lsm6dsx_flush_fifo(struct st_lsm6dsx_hw *hw); -int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw, - enum st_lsm6dsx_fifo_mode fifo_mode); +int st_lsm6dsx_resume_fifo(struct st_lsm6dsx_hw *hw); int st_lsm6dsx_read_fifo(struct st_lsm6dsx_hw *hw); int st_lsm6dsx_read_tagged_fifo(struct st_lsm6dsx_hw *hw); int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u32 odr, u8 *val); diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c index afd00daeefb2..7de10bd636ea 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c @@ -184,8 +184,8 @@ static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw) return err; } -int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw, - enum st_lsm6dsx_fifo_mode fifo_mode) +static int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw, + enum st_lsm6dsx_fifo_mode fifo_mode) { unsigned int data; @@ -302,6 +302,18 @@ static int st_lsm6dsx_reset_hw_ts(struct st_lsm6dsx_hw *hw) return 0; } +int st_lsm6dsx_resume_fifo(struct st_lsm6dsx_hw *hw) +{ + int err; + + /* reset hw ts counter */ + err = st_lsm6dsx_reset_hw_ts(hw); + if (err < 0) + return err; + + return st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT); +} + /* * Set max bulk read to ST_LSM6DSX_MAX_WORD_LEN/ST_LSM6DSX_MAX_TAGGED_WORD_LEN * in order to avoid a kmalloc for each bus access @@ -675,12 +687,7 @@ int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable) goto out; if (fifo_mask) { - /* reset hw ts counter */ - err = st_lsm6dsx_reset_hw_ts(hw); - if (err < 0) - goto out; - - err = st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT); + err = st_lsm6dsx_resume_fifo(hw); if (err < 0) goto out; } diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c index c8ddeb3f48ff..346c24281d26 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c @@ -2457,7 +2457,7 @@ static int __maybe_unused st_lsm6dsx_resume(struct device *dev) } if (hw->fifo_mask) - err = st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT); + err = st_lsm6dsx_resume_fifo(hw); return err; }
Reset hw time sampling after the device resume in order to keep timing in sync Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> --- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 3 +-- .../iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 23 ++++++++++++------- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-)