pressure: bmp280: Improve pushing of data to buffer
v3 cover pressure: bmp280: Improve pushing of data to buffer
Changes in v3:
[PATCH v3 1/2]:
- Remove fixes tag
[PATCH v3 2/2]:
- Use internal s32 *chans variable to better visualize what is taking place in the data->sensor_data.
- Use proper size/alignment to the data->sensor_data.
P.S. After this patchseries is applied, I will rebase this [1] and resend it.
[1]: https://lore.kernel.org/linux-iio/[email protected]/
---
v2: https://lore.kernel.org/linux-iio/[email protected]/
v1: https://lore.kernel.org/linux-iio/[email protected]/
Vasileios Amoiridis (2):
iio: pressure: bmp280: Use unsigned type for raw values
iio: pressure: bmp280: Use char instead of s32 for data buffer
drivers/iio/pressure/bmp280-core.c | 69 +++++++++++++++++++----------- drivers/iio/pressure/bmp280.h | 4 +- 2 files changed, 46 insertions(+), 27 deletions(-)
Signature · 1 line
2.25.1
PATCH v3 1/2 iio: pressure: bmp280: Use unsigned type for raw values
The adc values coming directly from the sensor in the BM{E,P}{2,3}xx sensors are unsigned values so treat them as such.
--- drivers/iio/pressure/bmp280-core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/iio/pressure/bmp280-core.c +6 -3
@@ -1023,7 +1023,8 @@ static irqreturn_t bmp280_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct bmp280_data *data =iio_priv (indio_dev); -s32 adc_temp, adc_press, t_fine; +u32 adc_temp, adc_press; +s32 t_fine;int ret;guard (mutex)(&data->lock);
@@ -1137,7 +1138,8 @@ static irqreturn_t bme280_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct bmp280_data *data =iio_priv (indio_dev); -s32 adc_temp, adc_press, adc_humidity, t_fine; +u32 adc_temp, adc_press, adc_humidity; +s32 t_fine;int ret;guard (mutex)(&data->lock);
@@ -1616,7 +1618,8 @@ static irqreturn_t bmp380_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct bmp280_data *data =iio_priv (indio_dev); -s32 adc_temp, adc_press, t_fine; +u32 adc_temp, adc_press; +s32 t_fine;int ret;guard (mutex)(&data->lock);
Signature · 1 line
2.25.1
PATCH v3 2/2 iio: pressure: bmp280: Use char instead of s32 for data buffer
In reply to Vasileios AmoiridisAs it was reported and discussed here [1], storing the sensor data in an endian aware s32 buffer is not optimal. Advertising the timestamp as an addition of 2 s32 variables which is also implied is again not the best practice. For that reason, change the s32 sensor_data buffer to a u8 buffer and align it properly.
[1]: https://lore.kernel.org/linux-iio/[email protected]/
--- drivers/iio/pressure/bmp280-core.c | 72 ++++++++++++++++++------------ drivers/iio/pressure/bmp280.h | 4 +- 2 files changed, 46 insertions(+), 30 deletions(-)
drivers/iio/pressure/bmp280-core.c +43 -29
@@ -1023,8 +1023,9 @@ static irqreturn_t bmp280_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct bmp280_data *data =iio_priv (indio_dev); -u32 adc_temp, adc_press; -s32 t_fine; +u32 adc_temp, adc_press, comp_press; +s32 t_fine, comp_temp; +s32 *chans = (s32 *)data->sensor_data;int ret;guard (mutex)(&data->lock);
@@ -1044,7 +1045,7 @@ static irqreturn_t bmp280_trigger_handler(int irq, void *p) goto out; } - data->sensor_data[1 ] =bmp280_compensate_temp (data, adc_temp); + comp_temp =bmp280_compensate_temp (data, adc_temp);/* Pressure calculations */ adc_press =FIELD_GET (BMP280_MEAS_TRIM_MASK ,get_unaligned_be24 (&data->buf[0 ]));
@@ -1054,10 +1055,12 @@ static irqreturn_t bmp280_trigger_handler(int irq, void *p) } t_fine =bmp280_calc_t_fine (data, adc_temp); + comp_press =bmp280_compensate_press (data, adc_press, t_fine); - data->sensor_data[0 ] =bmp280_compensate_press (data, adc_press, t_fine); + chans[0 ] = comp_press; + chans[1 ] = comp_temp; -iio_push_to_buffers_with_timestamp (indio_dev, &data->sensor_data, +iio_push_to_buffers_with_timestamp (indio_dev, data->sensor_data,iio_get_time_ns (indio_dev)); out:
@@ -1138,8 +1141,9 @@ static irqreturn_t bme280_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct bmp280_data *data =iio_priv (indio_dev); -u32 adc_temp, adc_press, adc_humidity; -s32 t_fine; +u32 adc_temp, adc_press, adc_humidity, comp_press, comp_humidity; +s32 t_fine, comp_temp; +s32 *chans = (s32 *)data->sensor_data;int ret;guard (mutex)(&data->lock);
@@ -1159,7 +1163,7 @@ static irqreturn_t bme280_trigger_handler(int irq, void *p) goto out; } - data->sensor_data[1 ] =bmp280_compensate_temp (data, adc_temp); + comp_temp =bmp280_compensate_temp (data, adc_temp);/* Pressure calculations */ adc_press =FIELD_GET (BMP280_MEAS_TRIM_MASK ,get_unaligned_be24 (&data->buf[0 ]));
@@ -1169,8 +1173,7 @@ static irqreturn_t bme280_trigger_handler(int irq, void *p) } t_fine =bmp280_calc_t_fine (data, adc_temp); - - data->sensor_data[0 ] =bmp280_compensate_press (data, adc_press, t_fine); + comp_press =bmp280_compensate_press (data, adc_press, t_fine);/* Humidity calculations */ adc_humidity =get_unaligned_be16 (&data->buf[6 ]);
@@ -1179,9 +1182,14 @@ static irqreturn_t bme280_trigger_handler(int irq, void *p)dev_err (data->dev,"reading humidity skipped\n" ); goto out; } - data->sensor_data[2 ] =bme280_compensate_humidity (data, adc_humidity, t_fine); -iio_push_to_buffers_with_timestamp (indio_dev, &data->sensor_data, + comp_humidity =bme280_compensate_humidity (data, adc_humidity, t_fine); + + chans[0 ] = comp_press; + chans[1 ] = comp_temp; + chans[2 ] = comp_humidity; + +iio_push_to_buffers_with_timestamp (indio_dev, data->sensor_data,iio_get_time_ns (indio_dev)); out:
@@ -1618,8 +1626,9 @@ static irqreturn_t bmp380_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct bmp280_data *data =iio_priv (indio_dev); -u32 adc_temp, adc_press; -s32 t_fine; +u32 adc_temp, adc_press, comp_press; +s32 t_fine, comp_temp; +s32 *chans = (s32 *)data->sensor_data;int ret;guard (mutex)(&data->lock);
@@ -1639,7 +1648,7 @@ static irqreturn_t bmp380_trigger_handler(int irq, void *p) goto out; } - data->sensor_data[1 ] =bmp380_compensate_temp (data, adc_temp); + comp_temp =bmp380_compensate_temp (data, adc_temp);/* Pressure calculations */ adc_press =get_unaligned_le24 (&data->buf[0 ]);
@@ -1649,10 +1658,12 @@ static irqreturn_t bmp380_trigger_handler(int irq, void *p) } t_fine =bmp380_calc_t_fine (data, adc_temp); + comp_press =bmp380_compensate_press (data, adc_press, t_fine); - data->sensor_data[0 ] =bmp380_compensate_press (data, adc_press, t_fine); + chans[0 ] = comp_press; + chans[1 ] = comp_temp; -iio_push_to_buffers_with_timestamp (indio_dev, &data->sensor_data, +iio_push_to_buffers_with_timestamp (indio_dev, data->sensor_data,iio_get_time_ns (indio_dev)); out:
@@ -2199,7 +2210,7 @@ static irqreturn_t bmp580_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct bmp280_data *data =iio_priv (indio_dev); -int ret; +int ret, offset;guard (mutex)(&data->lock);
@@ -2211,13 +2222,15 @@ static irqreturn_t bmp580_trigger_handler(int irq, void *p) goto out; } -/* Temperature calculations */ -memcpy (&data->sensor_data[1 ], &data->buf[0 ],3 ); -/* Pressure calculations */ -memcpy (&data->sensor_data[0 ], &data->buf[3 ],3 ); +memcpy (&data->sensor_data[offset], &data->buf[3 ],3 ); + + offset +=sizeof (s32); + +/* Temperature calculations */ +memcpy (&data->sensor_data[offset], &data->buf[0 ],3 ); -iio_push_to_buffers_with_timestamp (indio_dev, &data->sensor_data, +iio_push_to_buffers_with_timestamp (indio_dev, data->sensor_data,iio_get_time_ns (indio_dev)); out:
@@ -2523,23 +2536,24 @@ static irqreturn_t bmp180_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct bmp280_data *data =iio_priv (indio_dev); -int ret, chan_value; +int ret, comp_temp, comp_press; +s32 *chans = (s32 *)data->sensor_data;guard (mutex)(&data->lock); - ret =bmp180_read_temp (data, &chan_value); + ret =bmp180_read_temp (data, &comp_temp);if (ret) goto out; - data->sensor_data[1 ] = chan_value; - ret =bmp180_read_press (data, &chan_value); + ret =bmp180_read_press (data, &comp_press);if (ret) goto out; - data->sensor_data[0 ] = chan_value; + chans[0 ] = comp_press; + chans[1 ] = comp_temp; -iio_push_to_buffers_with_timestamp (indio_dev, &data->sensor_data, +iio_push_to_buffers_with_timestamp (indio_dev, data->sensor_data,iio_get_time_ns (indio_dev)); out:
drivers/iio/pressure/bmp280.h +3 -1
@@ -322,6 +322,7 @@ BMP280_NUM_TEMP_BYTES + \ BME280_NUM_HUMIDITY_BYTES) +#define BME280_NUM_MAX_CHANNELS 3/* Core exported structs */ static const char *const bmp280_supply_names[] = {
@@ -419,7 +420,8 @@ struct bmp280_data {* Data to push to userspace triggered buffer. Up to 3 channels and * s64 timestamp, aligned. */ -s32 sensor_data[6 ]__aligned(8) ; +u8 sensor_data[ALIGN (sizeof (s32) *BME280_NUM_MAX_CHANNELS ,sizeof (s64)) + +sizeof (s64)]__aligned(sizeof(s64)) ;/* * DMA (thus cache coherency maintenance) may require the
Signature · 1 line
2.25.1
Re: [PATCH v3 2/2] iio: pressure: bmp280: Use char instead of s32 for data buffer
Op 30-09-2024 om 22:23 schreef Vasileios Amoiridis:
Quoted 24 lines
As it was reported and discussed here [1], storing the sensor data in an endian aware s32 buffer is not optimal. Advertising the timestamp as an addition of 2 s32 variables which is also implied is again not the best practice. For that reason, change the s32
sensor_databuffer to a u8 buffer and align it properly.[1]: https://lore.kernel.org/linux-iio/[email protected]/
Signed-off-by Vasileios Amoiridis <[email protected]>--- drivers/iio/pressure/bmp280-core.c | 72 ++++++++++++++++++------------ drivers/iio/pressure/bmp280.h | 4 +- 2 files changed, 46 insertions(+), 30 deletions(-)[...]
drivers/iio/pressure/bmp280-core.c +1
-1@@ -2199,7 +2210,7 @@ static irqreturn_t bmp580_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct bmp280_data *data =iio_priv (indio_dev); -int ret; +int ret, offset;guard (mutex)(&data->lock);
drivers/iio/pressure/bmp280-core.c static irqreturn_t bmp580_trigger_handler(int irq, void *p) · line 2226
Quoted 9 lines
drivers/iio/pressure/bmp280-core.c +1
-4@@ -2211,13 +2222,15 @@ static irqreturn_t bmp580_trigger_handler(int irq, void *p) goto out; } -/* Temperature calculations */ -memcpy (&data->sensor_data[1 ], &data->buf[0 ],3 ); -/* Pressure calculations */ -memcpy (&data->sensor_data[0 ], &data->buf[3 ],3 ); +memcpy (&data->sensor_data[offset], &data->buf[3 ],3 );
Variable offset is not initialized.
Quoted 12 lines
drivers/iio/pressure/bmp280-core.c +6
-1+ + offset +=sizeof (s32); + +/* Temperature calculations */ +memcpy (&data->sensor_data[offset], &data->buf[0 ],3 ); -iio_push_to_buffers_with_timestamp (indio_dev, &data->sensor_data, +iio_push_to_buffers_with_timestamp (indio_dev, data->sensor_data,iio_get_time_ns (indio_dev)); out:
Jonathan Cameron
maintainerQuoted 5 lines · On Mon, 30 Sep 2024 22:23:51 +0200 Vasileios Amoiridis…
Changes in v3:
[PATCH v3 1/2]:
- Remove fixes tag
Quoted 8 lines
[PATCH v3 2/2]:
- Use internal s32 *chans variable to better visualize what is taking place in thedata->sensor_data.
- Use proper size/alignment to thedata->sensor_data.
P.S. After this patchseries is applied, I will rebase this [1] and resend it.
Applied to the togreg branch of iio.git and pushed out as testing for all the normal boring reasons.
Thanks,
Jonathan
Quoted 13 lines
---
v2: https://lore.kernel.org/linux-iio/[email protected]/
v1: https://lore.kernel.org/linux-iio/[email protected]/Vasileios Amoiridis (2):
iio: pressure: bmp280: Use unsigned type for raw values
iio: pressure: bmp280: Use char instead of s32 for data bufferdrivers/iio/pressure/bmp280-core.c | 69 +++++++++++++++++++----------- drivers/iio/pressure/bmp280.h | 4 +- 2 files changed, 46 insertions(+), 27 deletions(-)
Quoted 13 lines · Jonathan Cameron
Quoted 10 lines · On Mon, 30 Sep 2024 22:23:51 +0200 Vasileios Amoiridis…
Changes in v3:
[PATCH v3 1/2]:
- Remove fixes tag[PATCH v3 2/2]:
- Use internal s32 *chans variable to better visualize what is taking place in thedata->sensor_data.
- Use proper size/alignment to thedata->sensor_data.
Quoted 9 lines
Quoted 3 lines
P.S. After this patchseries is applied, I will rebase this [1] and resend it.Applied to the togreg branch of iio.git and pushed out as testing for all the normal boring reasons.
Thanks,
Jonathan
Hi Jonathan, thanks a lot!
Cheers,
Vasilis
Quoted 14 lines
Quoted 13 lines
---
v2: https://lore.kernel.org/linux-iio/[email protected]/
v1: https://lore.kernel.org/linux-iio/[email protected]/Vasileios Amoiridis (2):
iio: pressure: bmp280: Use unsigned type for raw values
iio: pressure: bmp280: Use char instead of s32 for data bufferdrivers/iio/pressure/bmp280-core.c | 69 +++++++++++++++++++----------- drivers/iio/pressure/bmp280.h | 4 +- 2 files changed, 46 insertions(+), 27 deletions(-)