On Sat, 31 Aug 2019 13:18:22 +0200
Lorenzo Bianconi <lorenzo@xxxxxxxxxx> wrote:
> Do not allow configuring null sensor gain since it will force to 0
> device outputs
>
> Fixes: c8d4066c7246 ("iio: imu: st_lsm6dsx: remove invalid gain value for LSM9DS1")
> Signed-off-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx>
I've queued this up for just after the coming merge window.
Applied to the fixes-togreg branch of iio.git which is now based on
staging/staging-next in anticipation of the merge window.
Thanks,
Jonathan
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 ++
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 28 +++++++++++++-------
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 11 +++-----
> 3 files changed, 25 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> index 5e3cd96b0059..92d318b27fcd 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> @@ -99,7 +99,9 @@ struct st_lsm6dsx_fs {
> #define ST_LSM6DSX_FS_LIST_SIZE 4
> struct st_lsm6dsx_fs_table_entry {
> struct st_lsm6dsx_reg reg;
> +
> struct st_lsm6dsx_fs fs_avl[ST_LSM6DSX_FS_LIST_SIZE];
> + int fs_len;
> };
>
> /**
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index 2d3495560136..fd5ebe1e1594 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -145,6 +145,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> .fs_avl[3] = { IIO_G_TO_M_S_2(732), 0x1 },
> + .fs_len = 4,
> },
> [ST_LSM6DSX_ID_GYRO] = {
> .reg = {
> @@ -154,6 +155,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .fs_avl[0] = { IIO_DEGREE_TO_RAD(245), 0x0 },
> .fs_avl[1] = { IIO_DEGREE_TO_RAD(500), 0x1 },
> .fs_avl[2] = { IIO_DEGREE_TO_RAD(2000), 0x3 },
> + .fs_len = 3,
> },
> },
> },
> @@ -215,6 +217,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + .fs_len = 4,
> },
> [ST_LSM6DSX_ID_GYRO] = {
> .reg = {
> @@ -225,6 +228,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + .fs_len = 4,
> },
> },
> .decimator = {
> @@ -327,6 +331,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + .fs_len = 4,
> },
> [ST_LSM6DSX_ID_GYRO] = {
> .reg = {
> @@ -337,6 +342,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + .fs_len = 4,
> },
> },
> .decimator = {
> @@ -448,6 +454,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + .fs_len = 4,
> },
> [ST_LSM6DSX_ID_GYRO] = {
> .reg = {
> @@ -458,6 +465,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + .fs_len = 4,
> },
> },
> .decimator = {
> @@ -563,6 +571,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + .fs_len = 4,
> },
> [ST_LSM6DSX_ID_GYRO] = {
> .reg = {
> @@ -573,6 +582,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + .fs_len = 4,
> },
> },
> .batch = {
> @@ -693,6 +703,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + .fs_len = 4,
> },
> [ST_LSM6DSX_ID_GYRO] = {
> .reg = {
> @@ -703,6 +714,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + .fs_len = 4,
> },
> },
> .batch = {
> @@ -800,6 +812,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
> .fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
> .fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
> + .fs_len = 4,
> },
> [ST_LSM6DSX_ID_GYRO] = {
> .reg = {
> @@ -810,6 +823,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
> .fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
> .fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
> + .fs_len = 4,
> },
> },
> .batch = {
> @@ -933,11 +947,12 @@ static int st_lsm6dsx_set_full_scale(struct st_lsm6dsx_sensor *sensor,
> int i, err;
>
> fs_table = &sensor->hw->settings->fs_table[sensor->id];
> - for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++)
> + for (i = 0; i < fs_table->fs_len; i++) {
> if (fs_table->fs_avl[i].gain == gain)
> break;
> + }
>
> - if (i == ST_LSM6DSX_FS_LIST_SIZE)
> + if (i == fs_table->fs_len)
> return -EINVAL;
>
> data = ST_LSM6DSX_SHIFT_VAL(fs_table->fs_avl[i].val,
> @@ -1196,18 +1211,13 @@ static ssize_t st_lsm6dsx_sysfs_scale_avail(struct device *dev,
> {
> struct st_lsm6dsx_sensor *sensor = iio_priv(dev_get_drvdata(dev));
> const struct st_lsm6dsx_fs_table_entry *fs_table;
> - enum st_lsm6dsx_sensor_id id = sensor->id;
> struct st_lsm6dsx_hw *hw = sensor->hw;
> int i, len = 0;
>
> - fs_table = &hw->settings->fs_table[id];
> - for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++) {
> - if (!fs_table->fs_avl[i].gain)
> - break;
> -
> + fs_table = &hw->settings->fs_table[sensor->id];
> + for (i = 0; i < fs_table->fs_len; i++)
> len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
> fs_table->fs_avl[i].gain);
> - }
> 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 66fbcd94642d..f5fca2171954 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
> @@ -61,6 +61,7 @@ static const struct st_lsm6dsx_ext_dev_settings st_lsm6dsx_ext_dev_table[] = {
> .gain = 1500,
> .val = 0x0,
> }, /* 1500 uG/LSB */
> + .fs_len = 1,
> },
> .temp_comp = {
> .addr = 0x60,
> @@ -555,13 +556,9 @@ static ssize_t st_lsm6dsx_shub_scale_avail(struct device *dev,
> int i, len = 0;
>
> settings = sensor->ext_info.settings;
> - for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++) {
> - u16 val = settings->fs_table.fs_avl[i].gain;
> -
> - if (val > 0)
> - len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
> - val);
> - }
> + for (i = 0; i < settings->fs_table.fs_len; i++)
> + len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
> + settings->fs_table.fs_avl[i].gain);
> buf[len - 1] = '\n';
>
> return len;
