Message-ID: <20240506134638.297cfbfd@jic23-huawei>
Date: Mon, 6 May 2024 13:46:38 +0100
From: Jonathan Cameron <jic23@...nel.org>
To: Vasileios Amoiridis <vassilisamir@...il.com>
Cc: lars@...afoo.de, andriy.shevchenko@...ux.intel.com,
 ang.iglesiasg@...il.com, mazziesaccount@...il.com, ak@...klinger.de,
 petre.rodan@...dimension.ro, phil@...pberrypi.com, 579lpy@...il.com,
 linus.walleij@...aro.org, semen.protsenko@...aro.org,
 linux-iio@...r.kernel.org, linux-kernel@...r.kernel.org, Jonathan Cameron
 <Jonathan.Cameron@...wei.com>
Subject: Re: [PATCH v5 06/10] iio: pressure: bmp280: Refactorize reading
 functions

On Mon, 6 May 2024 01:47:51 +0200
Vasileios Amoiridis <vassilisamir@...il.com> wrote:

> On Sun, May 05, 2024 at 08:21:06PM +0100, Jonathan Cameron wrote:
> > On Mon, 29 Apr 2024 21:00:42 +0200
> > Vasileios Amoiridis <vassilisamir@...il.com> wrote:
> >   
> > > For BMP18x, BMP28x, BME280, BMP38x the reading of the pressure
> > > value requires an update of the t_fine variable which happens
> > > through reading the temperature value.
> > > 
> > > So all the bmpxxx_read_press() functions of the above sensors
> > > are internally calling the equivalent bmpxxx_read_temp() function
> > > in order to update the t_fine value. By just looking at the code
> > > this functionality is a bit hidden and is not easy to understand
> > > why those channels are not independent.
> > > 
> > > This commit tries to clear these things a bit by splitting the
> > > bmpxxx_{read/compensate}_{temp/press/humid}() to the following:
> > > 
> > > i. bmpxxx_read_{temp/press/humid}_adc(): read the raw value from
> > > the sensor.
> > > 
> > > ii. bmpxx_calc_t_fine(): calculate the t_fine variable.
> > > 
> > > iii. bmpxxx_get_t_fine(): get the t_fine variable.
> > > 
> > > iv. bmpxxx_compensate_{temp/press/humid}(): compensate the adc
> > > values and return the calculated value.
> > > 
> > > v. bmpxxx_read_{temp/press/humid}(): combine calls of the
> > > aforementioned functions to return the requested value.
> > > 
> > > Suggested-by: Jonathan Cameron <Jonathan.Cameron@...wei.com>
> > > Signed-off-by: Vasileios Amoiridis <vassilisamir@...il.com>  
> > In general looks good, but a few details to consider inline.
> > 
> > Jonathan
> >   
> > > ---
> > >  drivers/iio/pressure/bmp280-core.c | 351 ++++++++++++++++++-----------
> > >  drivers/iio/pressure/bmp280.h      |   6 -
> > >  2 files changed, 221 insertions(+), 136 deletions(-)
> > > 
> > > diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
> > > index 8290028824e9..5ebce38e99f6 100644
> > > --- a/drivers/iio/pressure/bmp280-core.c
> > > +++ b/drivers/iio/pressure/bmp280-core.c
> > > @@ -288,13 +288,33 @@ static int bme280_read_calib(struct bmp280_data *data)
> > >   *
> > >   * Taken from BME280 datasheet, Section 4.2.3, "Compensation formula".
> > >   */
> > > +static int bme280_read_humid_adc(struct bmp280_data *data, s32 *adc_humidity)  
> > 
> > It's an u16, so why use an s32?   I can see using a signed value avoids a cast later,
> > but it makes this more confusing to read, so I'd push that cast up to the user.
> >   
> 
> Bosch in general has messed up a bit with the signs on their raw values on all
> of those sensors that we use in this driver. I totally agree with you, that this
> value does not make any sense to be anything else apart from u16 but in the
> datasheet [1] in pages 25-26 you can clearly see that they use an s32 for this
> value...
> 
> [1]: https://www.mouser.com/datasheet/2/783/BST-BME280-DS002-1509607.pdf
I would be tempted to ignore that and use the more appropriate size, but be
careful that any necessary casts are in place when you use the value.

> 
> > > +{
> > > +	int ret;
> > > +
> > > +	ret = regmap_bulk_read(data->regmap, BME280_REG_HUMIDITY_MSB,
> > > +			       &data->be16, sizeof(data->be16));
> > > +	if (ret < 0) {
> > > +		dev_err(data->dev, "failed to read humidity\n");
> > > +		return ret;
> > > +	}
> > > +
> > > +	*adc_humidity = be16_to_cpu(data->be16);  
> > 
> > Trivial, but on error return we normally aim for side effect free.
> > To do that here use an internal variable first.  
> 
> I am sorry, but in this part, I cannot fully understand what you mean
> by side effect free. I can understand the issue of storing a u16 to an
> s32 might make accidentally the sign to matter but how is this thing
> that you proposed no side effect free? You also made this comment
> in various other places in this patch (because the same principle
> with the SKIPPED is used) and in the other places the values are
> 20-bit and 24-bit long which confuses me a bit more on what you mean
> exactly.
If you get an error, e.g. if (*adc_humidty == BMP280_HUMIDITY_SKIPPED) then you 
should not set *adc_humidity.  Setting it is the side effect. Normal aim
is that a function that returns an error should ensure it leave no other
effects in data it can access.
This make reasoning about error paths much simpler because you only
have to deal with the return values.
Hence the code example I included though I make it more confusing by
commenting on the types in the middle of the code.

Key is I don't want *adc_humidity to be modified if we aren't going to
return 0.

> 
> > 	s16 value;
> > 
> > ...
> > 
> > 	value = be16_to_cpu(data->be16)
> > 
> > 	if (value == BMP280_HUMIDITY_SKIPPED) {
> > 		dev_err(data->dev, "...
> > 		return -EIO;
> > 	}
> > This is the odd bit due to using an s32 to store a u16.
> > Have to rely on that size mismatch to avoid the sign accidentally mattering.
> > Which is ugly!
> > 
> > 	*adc_humidity = value;
> > 
> > 	return 0;
> > 
> >   
> > > +	if (*adc_humidity == BMP280_HUMIDITY_SKIPPED) {
> > > +		dev_err(data->dev, "reading humidity skipped\n");
> > > +		return -EIO;
> > > +	}
> > > +
> > > +	return 0;
> > > +}
> > > +
> > >  static u32 bme280_compensate_humidity(struct bmp280_data *data,
> > > -				      s32 adc_humidity)
> > > +				      s32 adc_humidity, s32 t_fine)
> > >  {
> > >  	struct bmp280_calib *calib = &data->calib.bmp280;
> > >  	s32 var;
> > >  
> > > -	var = ((s32)data->t_fine) - (s32)76800;
> > > +	var = ((s32)t_fine) - (s32)76800;  
> > 
> > Casting an s32 to an s32.  For the const it shouldn't matter as it'll be at least
> > 32 bits and we don't care about the sign.
> >   
> 
> In general, I kept the casting for the t_fine because it was used from before,
> but I don't see the point since it is already an s32 value. The casting in front
> of the const, I see it is used in the datasheet [1] in pages 25-26 so maybe they
> kept it for this reason. Since it will be again a 32 bit value, I don't see the
> point of casting it but I still kept it as it was, there originally.
> 
> [1]: https://www.mouser.com/datasheet/2/783/BST-BME280-DS002-1509607.pdf

As you are tidying up the code, drop the unnecessary cast. Good to mention it
in the patch description though.

> 
> > >  	var = ((((adc_humidity << 14) - (calib->H4 << 20) - (calib->H5 * var))
> > >  		+ (s32)16384) >> 15) * (((((((var * calib->H6) >> 10)
> > >  		* (((var * (s32)calib->H3) >> 11) + (s32)32768)) >> 10)
> > > @@ -313,8 +333,27 @@ static u32 bme280_compensate_humidity(struct bmp280_data *data,
> > >   *
> > >   * Taken from datasheet, Section 3.11.3, "Compensation formula".
> > >   */
> > > -static s32 bmp280_compensate_temp(struct bmp280_data *data,
> > > -				  s32 adc_temp)
> > > +static int bmp280_read_temp_adc(struct bmp280_data *data, s32 *adc_temp)  
> > 
> > As before, sign of the extra variable is confusing. It's not signed
> > as it's a raw ADC value. So I'd use a u32 for it.
> >   
> 
> Again, as I said before, Bosch has messed this up. I agree (again) with you
> that this should have been a u16 but according to the datasheet [2] in pages
> 45-46 it is an s32...
> 
> [2]: https://cdn-shop.adafruit.com/datasheets/BST-BMP280-DS001-11.pdf
> 
What they have is not incorrect, but it is relaxed in a rather lazy fashion!

..

> > > @@ -430,30 +481,21 @@ static int bmp280_read_press(struct bmp280_data *data,
> > >  
> > >  static int bme280_read_humid(struct bmp280_data *data, int *val, int *val2)
> > >  {
> > > +	s32 adc_humidity, t_fine;
> > >  	u32 comp_humidity;
> > > -	s32 adc_humidity;
> > >  	int ret;
> > >  
> > > -	/* Read and compensate temperature so we get a reading of t_fine. */
> > > -	ret = bmp280_read_temp(data, NULL, NULL);
> > > +	ret = bmp280_get_t_fine(data, &t_fine);
> > >  	if (ret < 0)
> > >  		return ret;
> > >  
> > > -	ret = regmap_bulk_read(data->regmap, BME280_REG_HUMIDITY_MSB,
> > > -			       &data->be16, sizeof(data->be16));
> > > -	if (ret < 0) {
> > > -		dev_err(data->dev, "failed to read humidity\n");
> > > +	ret = bme280_read_humid_adc(data, &adc_humidity);
> > > +	if (ret < 0)
> > >  		return ret;
> > > -	}
> > >  
> > > -	adc_humidity = be16_to_cpu(data->be16);
> > > -	if (adc_humidity == BMP280_HUMIDITY_SKIPPED) {
> > > -		/* reading was skipped */
> > > -		dev_err(data->dev, "reading humidity skipped\n");
> > > -		return -EIO;
> > > -	}
> > > -	comp_humidity = bme280_compensate_humidity(data, adc_humidity);
> > > +	comp_humidity = bme280_compensate_humidity(data, adc_humidity, t_fine);
> > >  
> > > +	/* IIO units are in 1000 * % */
> > >  	*val = comp_humidity * 1000 / 1024;
> > >  
> > >  	return IIO_VAL_INT;
> > > @@ -930,9 +972,29 @@ static int bmp380_cmd(struct bmp280_data *data, u8 cmd)
> > >   * Taken from datasheet, Section Appendix 9, "Compensation formula" and repo
> > >   * https://github.com/BoschSensortec/BMP3-Sensor-API.
> > >   */
> > > -static s32 bmp380_compensate_temp(struct bmp280_data *data, u32 adc_temp)
> > > +static int bmp380_read_temp_adc(struct bmp280_data *data, u32 *adc_temp)  
> > 
> > Interesting this one is unsigned.
> >   
> 
> Yes, and it is also mentioned in the datasheet [3] in page 26.
> 
> [3]: https://www.mouser.com/pdfdocs/BST-BMP388-DS001-01.pdf

I'd take the datasheet maths as 'an implementation' rather than something
we have to match.   So go for types that make sense, not what they used!

Jonathan

> 
> Cheers,
> Vasilis

Powered by blists - more mailing lists