Skip to content

Commit

Permalink
iio: inv_mpu6050: Clear timestamps fifo while resetting hardware fifo
Browse files Browse the repository at this point in the history
A hardware fifo reset always imply an invalidation of the
existing timestamps, so we'll clear timestamps fifo on
successfull hardware fifo reset.

Signed-off-by: Viorel Suman <viorel.suman@gmail.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
  • Loading branch information
Viorel Suman authored and Jonathan Cameron committed Mar 14, 2015
1 parent 8d09f48 commit 4dac0a8
Showing 1 changed file with 14 additions and 11 deletions.
25 changes: 14 additions & 11 deletions drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@
#include <linux/poll.h>
#include "inv_mpu_iio.h"

static void inv_clear_kfifo(struct inv_mpu6050_state *st)
{
unsigned long flags;

/* take the spin lock sem to avoid interrupt kick in */
spin_lock_irqsave(&st->time_stamp_lock, flags);
kfifo_reset(&st->timestamps);
spin_unlock_irqrestore(&st->time_stamp_lock, flags);
}

int inv_reset_fifo(struct iio_dev *indio_dev)
{
int result;
Expand All @@ -50,6 +60,10 @@ int inv_reset_fifo(struct iio_dev *indio_dev)
INV_MPU6050_BIT_FIFO_RST);
if (result)
goto reset_fifo_fail;

/* clear timestamps fifo */
inv_clear_kfifo(st);

/* enable interrupt */
if (st->chip_config.accl_fifo_enable ||
st->chip_config.gyro_fifo_enable) {
Expand Down Expand Up @@ -83,16 +97,6 @@ int inv_reset_fifo(struct iio_dev *indio_dev)
return result;
}

static void inv_clear_kfifo(struct inv_mpu6050_state *st)
{
unsigned long flags;

/* take the spin lock sem to avoid interrupt kick in */
spin_lock_irqsave(&st->time_stamp_lock, flags);
kfifo_reset(&st->timestamps);
spin_unlock_irqrestore(&st->time_stamp_lock, flags);
}

/**
* inv_mpu6050_irq_handler() - Cache a timestamp at each data ready interrupt.
*/
Expand Down Expand Up @@ -184,7 +188,6 @@ irqreturn_t inv_mpu6050_read_fifo(int irq, void *p)
flush_fifo:
/* Flush HW and SW FIFOs. */
inv_reset_fifo(indio_dev);
inv_clear_kfifo(st);
mutex_unlock(&indio_dev->mlock);
iio_trigger_notify_done(indio_dev->trig);

Expand Down

0 comments on commit 4dac0a8

Please sign in to comment.