| Message ID | 20220512160312.3880433-4-Qing-wu.Li@leica-geosystems.com.cn (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | iio: accel: sca3300: add compatible for scl3300 | expand |
On Thu, May 12, 2022 at 6:03 PM LI Qingwu <Qing-wu.Li@leica-geosystems.com.cn> wrote: > > The driver supports sca3300 only, there are some other similar chips, > for instance, SCL3300. This commit prepares the way for multiple chips > and additional channels. Modify the driver to read the device ID and load > the corresponding sensor information from the table to support multiple > chips. add prepares for the addition of extra channels. Add prepares for > handling the operation modes for multiple chips. Reading it again I think you may format it better, i.e. Prepare the way for multiple chips and additional channels: - Modify the driver to read the device ID and load the corresponding sensor information from the table to support multiple chips - Add prepares for the addition of extra channels - Prepare for handling the operation modes for multiple chips ... > +struct sca3300_chip_info { > + const unsigned long *scan_masks; > + const struct iio_chan_spec *channels; > + u8 num_channels; > + u8 num_accel_scales; > + const int (*accel_scale)[2]; > + const int *accel_scale_map; > + u8 num_freqs; > + const int *freq_table; > + const int *freq_map; > + const char *name; You can put it in the first place. > + const int *avail_modes_table; > + u8 num_avail_modes; > + u8 chip_id; > +}; ... > +static const struct sca3300_chip_info sca3300_chip_tbl[] = { > + { .scan_masks = sca3300_scan_masks, Keep { on a separate line. > + .channels = sca3300_channels, > + .num_channels = ARRAY_SIZE(sca3300_channels), > + .num_accel_scales = ARRAY_SIZE(sca3300_accel_scale)*2, > + .accel_scale = sca3300_accel_scale, > + .accel_scale_map = sca3300_accel_scale_map, > + .num_freqs = ARRAY_SIZE(sca3300_lp_freq), > + .freq_table = sca3300_lp_freq, > + .freq_map = sca3300_lp_freq_map, > + .name = "sca3300", > + .avail_modes_table = sca3300_avail_modes_map, > + .num_avail_modes = 4, > + .chip_id = SCA3300_WHOAMI_ID, > + }, > +}; ... > + ret = sca3300_read_reg(sca_data, SCA3300_REG_MODE, ®_val); > + if (ret) > + return ret; > + > + for (i = 0; i < sca_data->chip->num_avail_modes; i++) { > + if (sca_data->chip->avail_modes_table[i] == reg_val&0x03) > + break; > + } > + This blank line is not needed as I explained. > + if (i >= sca_data->chip->num_avail_modes) == is enough and better to understand. > + return -EINVAL; > + > + *index = i; > + return 0; > +} ... > + int index; > + int i; Both can be unsigned. ... > + for (i = 0; i < chip->num_avail_modes; i++) { > + if ((val == chip->freq_table[chip->freq_map[i]]) && > + (chip->accel_scale[chip->accel_scale_map[index]] == > + chip->accel_scale[chip->accel_scale_map[i]])) > + break; > + } > + > + if (i >= chip->num_avail_modes) > + return -EINVAL; Two comments as per above for-loop case.
Hi LI,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on jic23-iio/togreg]
[also build test WARNING on v5.18-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/LI-Qingwu/iio-accel-sca3300-add-compatible-for-scl3300/20220513-000857
base: https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg
config: arm-randconfig-c002-20220512 (https://download.01.org/0day-ci/archive/20220513/202205130756.Q7e8x6jf-lkp@intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 11.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/15579266e58d7cdf4ff8e7ad7a4fa30a0bd3a589
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review LI-Qingwu/iio-accel-sca3300-add-compatible-for-scl3300/20220513-000857
git checkout 15579266e58d7cdf4ff8e7ad7a4fa30a0bd3a589
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash drivers/iio/accel/
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
drivers/iio/accel/sca3300.c: In function 'sca3300_get_op_mode':
>> drivers/iio/accel/sca3300.c:288:58: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
288 | if (sca_data->chip->avail_modes_table[i] == reg_val&0x03)
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~
vim +288 drivers/iio/accel/sca3300.c
276
277 static int sca3300_get_op_mode(struct sca3300_data *sca_data, int *index)
278 {
279 int reg_val;
280 int ret;
281 int i;
282
283 ret = sca3300_read_reg(sca_data, SCA3300_REG_MODE, ®_val);
284 if (ret)
285 return ret;
286
287 for (i = 0; i < sca_data->chip->num_avail_modes; i++) {
> 288 if (sca_data->chip->avail_modes_table[i] == reg_val&0x03)
289 break;
290 }
291
292 if (i >= sca_data->chip->num_avail_modes)
293 return -EINVAL;
294
295 *index = i;
296 return 0;
297 }
298
Hi LI,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on jic23-iio/togreg]
[also build test WARNING on v5.18-rc6 next-20220512]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/LI-Qingwu/iio-accel-sca3300-add-compatible-for-scl3300/20220513-000857
base: https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg
config: hexagon-randconfig-r041-20220512 (https://download.01.org/0day-ci/archive/20220513/202205130824.ObRAkagG-lkp@intel.com/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 9519dacab7b8afd537811fc2abaceb4d14f4e16a)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/15579266e58d7cdf4ff8e7ad7a4fa30a0bd3a589
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review LI-Qingwu/iio-accel-sca3300-add-compatible-for-scl3300/20220513-000857
git checkout 15579266e58d7cdf4ff8e7ad7a4fa30a0bd3a589
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash drivers/iio/accel/
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> drivers/iio/accel/sca3300.c:288:54: warning: & has lower precedence than ==; == will be evaluated first [-Wparentheses]
if (sca_data->chip->avail_modes_table[i] == reg_val&0x03)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
drivers/iio/accel/sca3300.c:288:54: note: place parentheses around the '==' expression to silence this warning
if (sca_data->chip->avail_modes_table[i] == reg_val&0x03)
^
( )
drivers/iio/accel/sca3300.c:288:54: note: place parentheses around the & expression to evaluate it first
if (sca_data->chip->avail_modes_table[i] == reg_val&0x03)
^
( )
1 warning generated.
vim +288 drivers/iio/accel/sca3300.c
276
277 static int sca3300_get_op_mode(struct sca3300_data *sca_data, int *index)
278 {
279 int reg_val;
280 int ret;
281 int i;
282
283 ret = sca3300_read_reg(sca_data, SCA3300_REG_MODE, ®_val);
284 if (ret)
285 return ret;
286
287 for (i = 0; i < sca_data->chip->num_avail_modes; i++) {
> 288 if (sca_data->chip->avail_modes_table[i] == reg_val&0x03)
289 break;
290 }
291
292 if (i >= sca_data->chip->num_avail_modes)
293 return -EINVAL;
294
295 *index = i;
296 return 0;
297 }
298
On Fri, May 13, 2022 at 2:30 AM kernel test robot <lkp@intel.com> wrote: > > Hi LI, > > Thank you for the patch! Perhaps something to improve: > > [auto build test WARNING on jic23-iio/togreg] > [also build test WARNING on v5.18-rc6] > [If your patch is applied to the wrong git tree, kindly drop us a note. > And when submitting patch, we suggest to use '--base' as documented in > https://git-scm.com/docs/git-format-patch] > > url: https://github.com/intel-lab-lkp/linux/commits/LI-Qingwu/iio-accel-sca3300-add-compatible-for-scl3300/20220513-000857 > base: https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg > config: arm-randconfig-c002-20220512 (https://download.01.org/0day-ci/archive/20220513/202205130756.Q7e8x6jf-lkp@intel.com/config) > compiler: arm-linux-gnueabi-gcc (GCC) 11.3.0 > reproduce (this is a W=1 build): > wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross > chmod +x ~/bin/make.cross > # https://github.com/intel-lab-lkp/linux/commit/15579266e58d7cdf4ff8e7ad7a4fa30a0bd3a589 > git remote add linux-review https://github.com/intel-lab-lkp/linux > git fetch --no-tags linux-review LI-Qingwu/iio-accel-sca3300-add-compatible-for-scl3300/20220513-000857 > git checkout 15579266e58d7cdf4ff8e7ad7a4fa30a0bd3a589 > # save the config file > mkdir build_dir && cp config build_dir/.config > COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash drivers/iio/accel/ > > If you fix the issue, kindly add following tag as appropriate > Reported-by: kernel test robot <lkp@intel.com> > > All warnings (new ones prefixed by >>): > > drivers/iio/accel/sca3300.c: In function 'sca3300_get_op_mode': > >> drivers/iio/accel/sca3300.c:288:58: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses] > 288 | if (sca_data->chip->avail_modes_table[i] == reg_val&0x03) > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~ Good catch, LKP! > 277 static int sca3300_get_op_mode(struct sca3300_data *sca_data, int *index) > 278 { > 279 int reg_val; > 280 int ret; > 281 int i; > 282 > 283 ret = sca3300_read_reg(sca_data, SCA3300_REG_MODE, ®_val); > 284 if (ret) > 285 return ret; > 286 Instead, I suggest to split the below, which is invariant to the loop, into a line here: regval &= GENMASK(1, 0); > 287 for (i = 0; i < sca_data->chip->num_avail_modes; i++) { > > 288 if (sca_data->chip->avail_modes_table[i] == reg_val&0x03) > 289 break; > 290 } > 291 > 292 if (i >= sca_data->chip->num_avail_modes) > 293 return -EINVAL; > 294 > 295 *index = i; > 296 return 0; > 297 }
diff --git a/drivers/iio/accel/sca3300.c b/drivers/iio/accel/sca3300.c index ff16d2cc8c70..80168f926b9d 100644 --- a/drivers/iio/accel/sca3300.c +++ b/drivers/iio/accel/sca3300.c @@ -93,15 +93,35 @@ static const struct iio_chan_spec sca3300_channels[] = { IIO_CHAN_SOFT_TIMESTAMP(4), }; -static const int sca3300_lp_freq[] = {70, 70, 70, 10}; -static const int sca3300_accel_scale[][2] = {{0, 370}, {0, 741}, {0, 185}, {0, 185}}; +static const int sca3300_lp_freq[] = {70, 10}; +static const int sca3300_lp_freq_map[] = {0, 0, 0, 1}; +static const int sca3300_accel_scale[][2] = {{0, 370}, {0, 741}, {0, 185}}; +static const int sca3300_accel_scale_map[] = {0, 1, 2, 2}; + +static const int sca3300_avail_modes_map[] = {0, 1, 2, 3}; static const unsigned long sca3300_scan_masks[] = { BIT(SCA3300_ACC_X) | BIT(SCA3300_ACC_Y) | BIT(SCA3300_ACC_Z) | BIT(SCA3300_TEMP), 0 }; +struct sca3300_chip_info { + const unsigned long *scan_masks; + const struct iio_chan_spec *channels; + u8 num_channels; + u8 num_accel_scales; + const int (*accel_scale)[2]; + const int *accel_scale_map; + u8 num_freqs; + const int *freq_table; + const int *freq_map; + const char *name; + const int *avail_modes_table; + u8 num_avail_modes; + u8 chip_id; +}; + /** * struct sca3300_data - device data * @spi: SPI device structure @@ -117,10 +137,28 @@ struct sca3300_data { s16 channels[4]; s64 ts __aligned(sizeof(s64)); } scan; + const struct sca3300_chip_info *chip; u8 txbuf[4] ____cacheline_aligned; u8 rxbuf[4]; }; +static const struct sca3300_chip_info sca3300_chip_tbl[] = { + { .scan_masks = sca3300_scan_masks, + .channels = sca3300_channels, + .num_channels = ARRAY_SIZE(sca3300_channels), + .num_accel_scales = ARRAY_SIZE(sca3300_accel_scale)*2, + .accel_scale = sca3300_accel_scale, + .accel_scale_map = sca3300_accel_scale_map, + .num_freqs = ARRAY_SIZE(sca3300_lp_freq), + .freq_table = sca3300_lp_freq, + .freq_map = sca3300_lp_freq_map, + .name = "sca3300", + .avail_modes_table = sca3300_avail_modes_map, + .num_avail_modes = 4, + .chip_id = SCA3300_WHOAMI_ID, + }, +}; + DECLARE_CRC8_TABLE(sca3300_crc_table); static int sca3300_transfer(struct sca3300_data *sca_data, int *val) @@ -227,36 +265,81 @@ static int sca3300_write_reg(struct sca3300_data *sca_data, u8 reg, int val) return sca3300_error_handler(sca_data); } +static int sca3300_set_op_mode(struct sca3300_data *sca_data, int index) +{ + if ((index < 0) || (index >= sca_data->chip->num_avail_modes)) + return -EINVAL; + + return sca3300_write_reg(sca_data, SCA3300_REG_MODE, + sca_data->chip->avail_modes_table[index]); +} + +static int sca3300_get_op_mode(struct sca3300_data *sca_data, int *index) +{ + int reg_val; + int ret; + int i; + + ret = sca3300_read_reg(sca_data, SCA3300_REG_MODE, ®_val); + if (ret) + return ret; + + for (i = 0; i < sca_data->chip->num_avail_modes; i++) { + if (sca_data->chip->avail_modes_table[i] == reg_val&0x03) + break; + } + + if (i >= sca_data->chip->num_avail_modes) + return -EINVAL; + + *index = i; + return 0; +} + +static int sca3300_set_frequency(struct sca3300_data *data, int val) +{ + const struct sca3300_chip_info *chip = data->chip; + int index; + int i; + + if (sca3300_get_op_mode(data, &index)) + return -EINVAL; + + for (i = 0; i < chip->num_avail_modes; i++) { + if ((val == chip->freq_table[chip->freq_map[i]]) && + (chip->accel_scale[chip->accel_scale_map[index]] == + chip->accel_scale[chip->accel_scale_map[i]])) + break; + } + + if (i >= chip->num_avail_modes) + return -EINVAL; + + return sca3300_set_op_mode(data, i); +} + static int sca3300_write_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int val, int val2, long mask) { struct sca3300_data *data = iio_priv(indio_dev); - int reg_val; - int ret; + int index; int i; switch (mask) { case IIO_CHAN_INFO_SCALE: - if (val) + if (chan->type != IIO_ACCEL) return -EINVAL; - - for (i = 0; i < ARRAY_SIZE(sca3300_accel_scale); i++) { - if (val2 == sca3300_accel_scale[i][1]) - return sca3300_write_reg(data, SCA3300_REG_MODE, i); + for (i = 0; i < data->chip->num_avail_modes; i++) { + index = data->chip->accel_scale_map[i]; + if ((val == data->chip->accel_scale[index][0]) && + (val2 == data->chip->accel_scale[index][1])) { + return sca3300_set_op_mode(data, i); + } } return -EINVAL; - case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: - ret = sca3300_read_reg(data, SCA3300_REG_MODE, ®_val); - if (ret) - return ret; - /* freq. change is possible only for mode 3 and 4 */ - if (reg_val == 2 && val == sca3300_lp_freq[3]) - return sca3300_write_reg(data, SCA3300_REG_MODE, 3); - if (reg_val == 3 && val == sca3300_lp_freq[2]) - return sca3300_write_reg(data, SCA3300_REG_MODE, 2); - return -EINVAL; + return sca3300_set_frequency(data, val); default: return -EINVAL; } @@ -267,8 +350,8 @@ static int sca3300_read_raw(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct sca3300_data *data = iio_priv(indio_dev); + int index; int ret; - int reg_val; switch (mask) { case IIO_CHAN_INFO_RAW: @@ -277,17 +360,25 @@ static int sca3300_read_raw(struct iio_dev *indio_dev, return ret; return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: - ret = sca3300_read_reg(data, SCA3300_REG_MODE, ®_val); + ret = sca3300_get_op_mode(data, &index); if (ret) return ret; - *val = 0; - *val2 = sca3300_accel_scale[reg_val][1]; - return IIO_VAL_INT_PLUS_MICRO; + switch (chan->type) { + case IIO_ACCEL: + index = data->chip->accel_scale_map[index]; + *val = data->chip->accel_scale[index][0]; + *val2 = data->chip->accel_scale[index][1]; + return IIO_VAL_INT_PLUS_MICRO; + default: + return -EINVAL; + } case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: - ret = sca3300_read_reg(data, SCA3300_REG_MODE, ®_val); + + ret = sca3300_get_op_mode(data, &index); if (ret) return ret; - *val = sca3300_lp_freq[reg_val]; + index = data->chip->freq_map[index]; + *val = data->chip->freq_table[index]; return IIO_VAL_INT; default: return -EINVAL; @@ -331,6 +422,7 @@ static int sca3300_init(struct sca3300_data *sca_data, { int value = 0; int ret; + int i; ret = sca3300_write_reg(sca_data, SCA3300_REG_MODE, SCA3300_MODE_SW_RESET); @@ -347,12 +439,17 @@ static int sca3300_init(struct sca3300_data *sca_data, if (ret) return ret; - if (value != SCA3300_WHOAMI_ID) { - dev_err(&sca_data->spi->dev, - "device id not expected value, %d != %u\n", - value, SCA3300_WHOAMI_ID); + for (i = 0; i < ARRAY_SIZE(sca3300_chip_tbl); i++) { + if (sca3300_chip_tbl[i].chip_id == value) + break; + } + if (i == ARRAY_SIZE(sca3300_chip_tbl)) { + dev_err(&sca_data->spi->dev, "unknown chip id %x\n", value); return -ENODEV; } + + sca_data->chip = &sca3300_chip_tbl[i]; + return 0; } @@ -384,15 +481,21 @@ static int sca3300_read_avail(struct iio_dev *indio_dev, const int **vals, int *type, int *length, long mask) { + struct sca3300_data *data = iio_priv(indio_dev); switch (mask) { case IIO_CHAN_INFO_SCALE: - *vals = (const int *)sca3300_accel_scale; - *length = ARRAY_SIZE(sca3300_accel_scale) * 2 - 2; - *type = IIO_VAL_INT_PLUS_MICRO; - return IIO_AVAIL_LIST; + switch (chan->type) { + case IIO_ACCEL: + *vals = (const int *)data->chip->accel_scale; + *length = data->chip->num_accel_scales; + *type = IIO_VAL_INT_PLUS_MICRO; + return IIO_AVAIL_LIST; + default: + return -EINVAL; + } case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: - *vals = &sca3300_lp_freq[2]; - *length = 2; + *vals = (const int *)data->chip->freq_table; + *length = data->chip->num_freqs; *type = IIO_VAL_INT; return IIO_AVAIL_LIST; default: @@ -424,11 +527,6 @@ static int sca3300_probe(struct spi_device *spi) crc8_populate_msb(sca3300_crc_table, SCA3300_CRC8_POLYNOMIAL); indio_dev->info = &sca3300_info; - indio_dev->name = SCA3300_ALIAS; - indio_dev->modes = INDIO_DIRECT_MODE; - indio_dev->channels = sca3300_channels; - indio_dev->num_channels = ARRAY_SIZE(sca3300_channels); - indio_dev->available_scan_masks = sca3300_scan_masks; ret = sca3300_init(sca_data, indio_dev); if (ret) { @@ -436,6 +534,12 @@ static int sca3300_probe(struct spi_device *spi) return ret; } + indio_dev->name = sca_data->chip->name; + indio_dev->modes = INDIO_DIRECT_MODE; + indio_dev->channels = sca_data->chip->channels; + indio_dev->num_channels = sca_data->chip->num_channels; + indio_dev->available_scan_masks = sca_data->chip->scan_masks; + ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, iio_pollfunc_store_time, sca3300_trigger_handler, NULL);
The driver supports sca3300 only, there are some other similar chips, for instance, SCL3300. This commit prepares the way for multiple chips and additional channels. Modify the driver to read the device ID and load the corresponding sensor information from the table to support multiple chips. add prepares for the addition of extra channels. Add prepares for handling the operation modes for multiple chips. Signed-off-by: LI Qingwu <Qing-wu.Li@leica-geosystems.com.cn> --- drivers/iio/accel/sca3300.c | 186 ++++++++++++++++++++++++++++-------- 1 file changed, 145 insertions(+), 41 deletions(-)