From: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
To: Jonathan Cameron <jic23@kernel.org>
Cc: Lorenzo Bianconi <lorenzo@kernel.org>, linux-iio@vger.kernel.org
Subject: Re: [PATCH 2/2] iio: imu: st_lsm6dsx: express odr in HZ / 10
Date: Sun, 3 Nov 2019 14:06:55 +0100 [thread overview]
Message-ID: <20191103130655.GA5291@localhost.localdomain> (raw)
In-Reply-To: <20191103101302.59356d9e@archlinux>
[-- Attachment #1: Type: text/plain, Size: 15611 bytes --]
On Nov 03, Jonathan Cameron wrote:
> On Sun, 27 Oct 2019 20:21:24 +0100
> Lorenzo Bianconi <lorenzo@kernel.org> wrote:
>
> > Express available frequencies in HZ / 10 in order to support even
> > rational ODRs. This patch is need to fix an Android CTS failure
> >
> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> > ---
> > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +-
> > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 181 ++++++++++---------
> > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 23 ++-
> > 3 files changed, 106 insertions(+), 100 deletions(-)
> >
> > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> > index 9ffc8e06f73d..b32c6389f47b 100644
> > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> > @@ -106,7 +106,7 @@ struct st_lsm6dsx_sensor;
> > struct st_lsm6dsx_hw;
> >
> > struct st_lsm6dsx_odr {
> > - u16 hz;
> > + u16 hz; /* expressed in HZ / 10 */
>
> That is in the non obvious category. Maybe best bet
> is to switch to millihz and make the type bigger if needed?
Hi Jonathan,
ack, I will post a v2.
Regards,
Lorenzo
>
> Thanks,
>
> Jonathan
>
> > u8 val;
> > };
> >
> > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > index 2f9396745bc8..63e113725499 100644
> > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > @@ -127,12 +127,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .addr = 0x20,
> > .mask = GENMASK(7, 5),
> > },
> > - .odr_avl[0] = { 10, 0x01 },
> > - .odr_avl[1] = { 50, 0x02 },
> > - .odr_avl[2] = { 119, 0x03 },
> > - .odr_avl[3] = { 238, 0x04 },
> > - .odr_avl[4] = { 476, 0x05 },
> > - .odr_avl[5] = { 952, 0x06 },
> > + .odr_avl[0] = { 100, 0x01 },
> > + .odr_avl[1] = { 500, 0x02 },
> > + .odr_avl[2] = { 1190, 0x03 },
> > + .odr_avl[3] = { 2380, 0x04 },
> > + .odr_avl[4] = { 4760, 0x05 },
> > + .odr_avl[5] = { 9520, 0x06 },
> > .odr_len = 6,
> > },
> > [ST_LSM6DSX_ID_GYRO] = {
> > @@ -140,12 +140,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .addr = 0x10,
> > .mask = GENMASK(7, 5),
> > },
> > - .odr_avl[0] = { 15, 0x01 },
> > - .odr_avl[1] = { 60, 0x02 },
> > - .odr_avl[2] = { 119, 0x03 },
> > - .odr_avl[3] = { 238, 0x04 },
> > - .odr_avl[4] = { 476, 0x05 },
> > - .odr_avl[5] = { 952, 0x06 },
> > + .odr_avl[0] = { 149, 0x01 },
> > + .odr_avl[1] = { 595, 0x02 },
> > + .odr_avl[2] = { 1190, 0x03 },
> > + .odr_avl[3] = { 2380, 0x04 },
> > + .odr_avl[4] = { 4760, 0x05 },
> > + .odr_avl[5] = { 9520, 0x06 },
> > .odr_len = 6,
> > },
> > },
> > @@ -229,12 +229,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .addr = 0x10,
> > .mask = GENMASK(7, 4),
> > },
> > - .odr_avl[0] = { 13, 0x01 },
> > - .odr_avl[1] = { 26, 0x02 },
> > - .odr_avl[2] = { 52, 0x03 },
> > - .odr_avl[3] = { 104, 0x04 },
> > - .odr_avl[4] = { 208, 0x05 },
> > - .odr_avl[5] = { 416, 0x06 },
> > + .odr_avl[0] = { 125, 0x01 },
> > + .odr_avl[1] = { 260, 0x02 },
> > + .odr_avl[2] = { 520, 0x03 },
> > + .odr_avl[3] = { 1040, 0x04 },
> > + .odr_avl[4] = { 2080, 0x05 },
> > + .odr_avl[5] = { 4160, 0x06 },
> > .odr_len = 6,
> > },
> > [ST_LSM6DSX_ID_GYRO] = {
> > @@ -242,12 +242,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .addr = 0x11,
> > .mask = GENMASK(7, 4),
> > },
> > - .odr_avl[0] = { 13, 0x01 },
> > - .odr_avl[1] = { 26, 0x02 },
> > - .odr_avl[2] = { 52, 0x03 },
> > - .odr_avl[3] = { 104, 0x04 },
> > - .odr_avl[4] = { 208, 0x05 },
> > - .odr_avl[5] = { 416, 0x06 },
> > + .odr_avl[0] = { 125, 0x01 },
> > + .odr_avl[1] = { 260, 0x02 },
> > + .odr_avl[2] = { 520, 0x03 },
> > + .odr_avl[3] = { 1040, 0x04 },
> > + .odr_avl[4] = { 2080, 0x05 },
> > + .odr_avl[5] = { 4160, 0x06 },
> > .odr_len = 6,
> > },
> > },
> > @@ -395,12 +395,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .addr = 0x10,
> > .mask = GENMASK(7, 4),
> > },
> > - .odr_avl[0] = { 13, 0x01 },
> > - .odr_avl[1] = { 26, 0x02 },
> > - .odr_avl[2] = { 52, 0x03 },
> > - .odr_avl[3] = { 104, 0x04 },
> > - .odr_avl[4] = { 208, 0x05 },
> > - .odr_avl[5] = { 416, 0x06 },
> > + .odr_avl[0] = { 125, 0x01 },
> > + .odr_avl[1] = { 260, 0x02 },
> > + .odr_avl[2] = { 520, 0x03 },
> > + .odr_avl[3] = { 1040, 0x04 },
> > + .odr_avl[4] = { 2080, 0x05 },
> > + .odr_avl[5] = { 4160, 0x06 },
> > .odr_len = 6,
> > },
> > [ST_LSM6DSX_ID_GYRO] = {
> > @@ -408,12 +408,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .addr = 0x11,
> > .mask = GENMASK(7, 4),
> > },
> > - .odr_avl[0] = { 13, 0x01 },
> > - .odr_avl[1] = { 26, 0x02 },
> > - .odr_avl[2] = { 52, 0x03 },
> > - .odr_avl[3] = { 104, 0x04 },
> > - .odr_avl[4] = { 208, 0x05 },
> > - .odr_avl[5] = { 416, 0x06 },
> > + .odr_avl[0] = { 125, 0x01 },
> > + .odr_avl[1] = { 260, 0x02 },
> > + .odr_avl[2] = { 520, 0x03 },
> > + .odr_avl[3] = { 1040, 0x04 },
> > + .odr_avl[4] = { 2080, 0x05 },
> > + .odr_avl[5] = { 4160, 0x06 },
> > .odr_len = 6,
> > },
> > },
> > @@ -570,12 +570,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .addr = 0x10,
> > .mask = GENMASK(7, 4),
> > },
> > - .odr_avl[0] = { 13, 0x01 },
> > - .odr_avl[1] = { 26, 0x02 },
> > - .odr_avl[2] = { 52, 0x03 },
> > - .odr_avl[3] = { 104, 0x04 },
> > - .odr_avl[4] = { 208, 0x05 },
> > - .odr_avl[5] = { 416, 0x06 },
> > + .odr_avl[0] = { 125, 0x01 },
> > + .odr_avl[1] = { 260, 0x02 },
> > + .odr_avl[2] = { 520, 0x03 },
> > + .odr_avl[3] = { 1040, 0x04 },
> > + .odr_avl[4] = { 2080, 0x05 },
> > + .odr_avl[5] = { 4160, 0x06 },
> > .odr_len = 6,
> > },
> > [ST_LSM6DSX_ID_GYRO] = {
> > @@ -583,12 +583,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .addr = 0x11,
> > .mask = GENMASK(7, 4),
> > },
> > - .odr_avl[0] = { 13, 0x01 },
> > - .odr_avl[1] = { 26, 0x02 },
> > - .odr_avl[2] = { 52, 0x03 },
> > - .odr_avl[3] = { 104, 0x04 },
> > - .odr_avl[4] = { 208, 0x05 },
> > - .odr_avl[5] = { 416, 0x06 },
> > + .odr_avl[0] = { 125, 0x01 },
> > + .odr_avl[1] = { 260, 0x02 },
> > + .odr_avl[2] = { 520, 0x03 },
> > + .odr_avl[3] = { 1040, 0x04 },
> > + .odr_avl[4] = { 2080, 0x05 },
> > + .odr_avl[5] = { 4160, 0x06 },
> > .odr_len = 6,
> > },
> > },
> > @@ -747,12 +747,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .addr = 0x10,
> > .mask = GENMASK(7, 4),
> > },
> > - .odr_avl[0] = { 13, 0x01 },
> > - .odr_avl[1] = { 26, 0x02 },
> > - .odr_avl[2] = { 52, 0x03 },
> > - .odr_avl[3] = { 104, 0x04 },
> > - .odr_avl[4] = { 208, 0x05 },
> > - .odr_avl[5] = { 416, 0x06 },
> > + .odr_avl[0] = { 125, 0x01 },
> > + .odr_avl[1] = { 260, 0x02 },
> > + .odr_avl[2] = { 520, 0x03 },
> > + .odr_avl[3] = { 1040, 0x04 },
> > + .odr_avl[4] = { 2080, 0x05 },
> > + .odr_avl[5] = { 4160, 0x06 },
> > .odr_len = 6,
> > },
> > [ST_LSM6DSX_ID_GYRO] = {
> > @@ -760,12 +760,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .addr = 0x11,
> > .mask = GENMASK(7, 4),
> > },
> > - .odr_avl[0] = { 13, 0x01 },
> > - .odr_avl[1] = { 26, 0x02 },
> > - .odr_avl[2] = { 52, 0x03 },
> > - .odr_avl[3] = { 104, 0x04 },
> > - .odr_avl[4] = { 208, 0x05 },
> > - .odr_avl[5] = { 416, 0x06 },
> > + .odr_avl[0] = { 125, 0x01 },
> > + .odr_avl[1] = { 260, 0x02 },
> > + .odr_avl[2] = { 520, 0x03 },
> > + .odr_avl[3] = { 1040, 0x04 },
> > + .odr_avl[4] = { 2080, 0x05 },
> > + .odr_avl[5] = { 4160, 0x06 },
> > .odr_len = 6,
> > },
> > },
> > @@ -944,12 +944,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .addr = 0x10,
> > .mask = GENMASK(7, 4),
> > },
> > - .odr_avl[0] = { 13, 0x01 },
> > - .odr_avl[1] = { 26, 0x02 },
> > - .odr_avl[2] = { 52, 0x03 },
> > - .odr_avl[3] = { 104, 0x04 },
> > - .odr_avl[4] = { 208, 0x05 },
> > - .odr_avl[5] = { 416, 0x06 },
> > + .odr_avl[0] = { 125, 0x01 },
> > + .odr_avl[1] = { 260, 0x02 },
> > + .odr_avl[2] = { 520, 0x03 },
> > + .odr_avl[3] = { 1040, 0x04 },
> > + .odr_avl[4] = { 2080, 0x05 },
> > + .odr_avl[5] = { 4160, 0x06 },
> > .odr_len = 6,
> > },
> > [ST_LSM6DSX_ID_GYRO] = {
> > @@ -957,12 +957,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .addr = 0x11,
> > .mask = GENMASK(7, 4),
> > },
> > - .odr_avl[0] = { 13, 0x01 },
> > - .odr_avl[1] = { 26, 0x02 },
> > - .odr_avl[2] = { 52, 0x03 },
> > - .odr_avl[3] = { 104, 0x04 },
> > - .odr_avl[4] = { 208, 0x05 },
> > - .odr_avl[5] = { 416, 0x06 },
> > + .odr_avl[0] = { 125, 0x01 },
> > + .odr_avl[1] = { 260, 0x02 },
> > + .odr_avl[2] = { 520, 0x03 },
> > + .odr_avl[3] = { 1040, 0x04 },
> > + .odr_avl[4] = { 2080, 0x05 },
> > + .odr_avl[5] = { 4160, 0x06 },
> > .odr_len = 6,
> > },
> > },
> > @@ -1121,12 +1121,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .addr = 0x10,
> > .mask = GENMASK(7, 4),
> > },
> > - .odr_avl[0] = { 13, 0x01 },
> > - .odr_avl[1] = { 26, 0x02 },
> > - .odr_avl[2] = { 52, 0x03 },
> > - .odr_avl[3] = { 104, 0x04 },
> > - .odr_avl[4] = { 208, 0x05 },
> > - .odr_avl[5] = { 416, 0x06 },
> > + .odr_avl[0] = { 125, 0x01 },
> > + .odr_avl[1] = { 260, 0x02 },
> > + .odr_avl[2] = { 520, 0x03 },
> > + .odr_avl[3] = { 1040, 0x04 },
> > + .odr_avl[4] = { 2080, 0x05 },
> > + .odr_avl[5] = { 4160, 0x06 },
> > .odr_len = 6,
> > },
> > [ST_LSM6DSX_ID_GYRO] = {
> > @@ -1134,12 +1134,12 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> > .addr = 0x11,
> > .mask = GENMASK(7, 4),
> > },
> > - .odr_avl[0] = { 13, 0x01 },
> > - .odr_avl[1] = { 26, 0x02 },
> > - .odr_avl[2] = { 52, 0x03 },
> > - .odr_avl[3] = { 104, 0x04 },
> > - .odr_avl[4] = { 208, 0x05 },
> > - .odr_avl[5] = { 416, 0x06 },
> > + .odr_avl[0] = { 125, 0x01 },
> > + .odr_avl[1] = { 260, 0x02 },
> > + .odr_avl[2] = { 520, 0x03 },
> > + .odr_avl[3] = { 1040, 0x04 },
> > + .odr_avl[4] = { 2080, 0x05 },
> > + .odr_avl[5] = { 4160, 0x06 },
> > .odr_len = 6,
> > },
> > },
> > @@ -1475,7 +1475,7 @@ static int st_lsm6dsx_read_oneshot(struct st_lsm6dsx_sensor *sensor,
> > if (err < 0)
> > return err;
> >
> > - delay = 1000000 / sensor->odr;
> > + delay = 10000000 / sensor->odr;
> > usleep_range(delay, 2 * delay);
> >
> > err = st_lsm6dsx_read_locked(hw, addr, &data, sizeof(data));
> > @@ -1507,8 +1507,9 @@ static int st_lsm6dsx_read_raw(struct iio_dev *iio_dev,
> > iio_device_release_direct_mode(iio_dev);
> > break;
> > case IIO_CHAN_INFO_SAMP_FREQ:
> > - *val = sensor->odr;
> > - ret = IIO_VAL_INT;
> > + *val = sensor->odr / 10;
> > + *val2 = (sensor->odr % 10) * 100000;
> > + ret = IIO_VAL_INT_PLUS_MICRO;
> > break;
> > case IIO_CHAN_INFO_SCALE:
> > *val = 0;
> > @@ -1541,6 +1542,7 @@ static int st_lsm6dsx_write_raw(struct iio_dev *iio_dev,
> > case IIO_CHAN_INFO_SAMP_FREQ: {
> > u8 data;
> >
> > + val = val * 10 + val2 / 100000;
> > val = st_lsm6dsx_check_odr(sensor, val, &data);
> > if (val < 0)
> > err = val;
> > @@ -1730,8 +1732,9 @@ st_lsm6dsx_sysfs_sampling_frequency_avail(struct device *dev,
> >
> > odr_table = &sensor->hw->settings->odr_table[sensor->id];
> > for (i = 0; i < odr_table->odr_len; i++)
> > - len += scnprintf(buf + len, PAGE_SIZE - len, "%d ",
> > - odr_table->odr_avl[i].hz);
> > + len += scnprintf(buf + len, PAGE_SIZE - len, "%d.%d ",
> > + odr_table->odr_avl[i].hz / 10,
> > + odr_table->odr_avl[i].hz % 10);
> > buf[len - 1] = '\n';
> >
> > return len;
> > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> > index e029cc05a17f..c3b124a73815 100644
> > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> > @@ -51,10 +51,10 @@ static const struct st_lsm6dsx_ext_dev_settings st_lsm6dsx_ext_dev_table[] = {
> > .addr = 0x60,
> > .mask = GENMASK(3, 2),
> > },
> > - .odr_avl[0] = { 10, 0x0 },
> > - .odr_avl[1] = { 20, 0x1 },
> > - .odr_avl[2] = { 50, 0x2 },
> > - .odr_avl[3] = { 100, 0x3 },
> > + .odr_avl[0] = { 100, 0x0 },
> > + .odr_avl[1] = { 200, 0x1 },
> > + .odr_avl[2] = { 500, 0x2 },
> > + .odr_avl[3] = { 1000, 0x3 },
> > .odr_len = 4,
> > },
> > .fs_table = {
> > @@ -97,8 +97,8 @@ static void st_lsm6dsx_shub_wait_complete(struct st_lsm6dsx_hw *hw)
> > u16 odr;
> >
> > sensor = iio_priv(hw->iio_devs[ST_LSM6DSX_ID_ACC]);
> > - odr = (hw->enable_mask & BIT(ST_LSM6DSX_ID_ACC)) ? sensor->odr : 13;
> > - msleep((2000U / odr) + 1);
> > + odr = (hw->enable_mask & BIT(ST_LSM6DSX_ID_ACC)) ? sensor->odr : 125;
> > + msleep((20000U / odr) + 1);
> > }
> >
> > /**
> > @@ -442,7 +442,7 @@ st_lsm6dsx_shub_read_oneshot(struct st_lsm6dsx_sensor *sensor,
> > if (err < 0)
> > return err;
> >
> > - delay = 1000000 / sensor->odr;
> > + delay = 10000000 / sensor->odr;
> > usleep_range(delay, 2 * delay);
> >
> > len = min_t(int, sizeof(data), ch->scan_type.realbits >> 3);
> > @@ -482,8 +482,9 @@ st_lsm6dsx_shub_read_raw(struct iio_dev *iio_dev,
> > iio_device_release_direct_mode(iio_dev);
> > break;
> > case IIO_CHAN_INFO_SAMP_FREQ:
> > - *val = sensor->odr;
> > - ret = IIO_VAL_INT;
> > + *val = sensor->odr / 10;
> > + *val2 = (sensor->odr % 10) * 100000;
> > + ret = IIO_VAL_INT_PLUS_MICRO;
> > break;
> > case IIO_CHAN_INFO_SCALE:
> > *val = 0;
> > @@ -514,6 +515,7 @@ st_lsm6dsx_shub_write_raw(struct iio_dev *iio_dev,
> > case IIO_CHAN_INFO_SAMP_FREQ: {
> > u16 data;
> >
> > + val = val * 10 + val2 / 100000;
> > err = st_lsm6dsx_shub_get_odr_val(sensor, val, &data);
> > if (!err)
> > sensor->odr = val;
> > @@ -542,7 +544,8 @@ st_lsm6dsx_shub_sampling_freq_avail(struct device *dev,
> > for (i = 0; i < settings->odr_table.odr_len; i++) {
> > u16 val = settings->odr_table.odr_avl[i].hz;
> >
> > - len += scnprintf(buf + len, PAGE_SIZE - len, "%d ", val);
> > + len += scnprintf(buf + len, PAGE_SIZE - len, "%d.%d ",
> > + val / 10, val % 10);
> > }
> > buf[len - 1] = '\n';
> >
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2019-11-03 13:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-27 19:21 [PATCH 0/2] support rational ODRs in st_lsm6dsx Lorenzo Bianconi
2019-10-27 19:21 ` [PATCH 1/2] iio: imu: st_lsm6dsx: explicitly define odr table size Lorenzo Bianconi
2019-10-27 19:21 ` [PATCH 2/2] iio: imu: st_lsm6dsx: express odr in HZ / 10 Lorenzo Bianconi
2019-11-03 10:13 ` Jonathan Cameron
2019-11-03 13:06 ` Lorenzo Bianconi [this message]
2019-10-31 14:43 ` [PATCH 0/2] support rational ODRs in st_lsm6dsx Mario TESI
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191103130655.GA5291@localhost.localdomain \
--to=lorenzo.bianconi@redhat.com \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=lorenzo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).