public inbox for linux-iio@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] iio: pressure: bmp280: fix bmp580 temp read
@ 2024-06-02 20:12 Adam Rizkalla
  2024-06-04 19:01 ` Jonathan Cameron
  0 siblings, 1 reply; 6+ messages in thread
From: Adam Rizkalla @ 2024-06-02 20:12 UTC (permalink / raw)
  To: Jonathan Cameron; +Cc: Vasileios Amoiridis, linux-iio, Adam Rizkalla

Fix overflow when storing bmp580 temperature reading and preserve sign.

This patch re-applies the fix in [1] after the merge conflict resolution
mentioned in [2].

[1] https://lore.kernel.org/all/Zin2udkXRD0+GrML@adam-asahi.lan/
[2] https://lore.kernel.org/linux-kernel/20240531140621.264f0848@canb.auug.org.au/

Signed-off-by: Adam Rizkalla <ajarizzo@gmail.com>
---
 drivers/iio/pressure/bmp280-core.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index 95c88b0e1c49..3a003843c79c 100644
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -1752,6 +1752,8 @@ static int bmp580_read_temp(struct bmp280_data *data, s32 *raw_temp)
 		dev_err(data->dev, "reading temperature skipped\n");
 		return -EIO;
 	}
+	*raw_temp = sign_extend32(*raw_temp, 23);
+	*raw_temp = ((s64)*raw_temp * 1000) / (1 << 16);
 
 	return 0;
 }
@@ -2154,7 +2156,7 @@ static irqreturn_t bmp580_buffer_handler(int irq, void *p)
 
 static const int bmp580_oversampling_avail[] = { 1, 2, 4, 8, 16, 32, 64, 128 };
 static const u8 bmp580_chip_ids[] = { BMP580_CHIP_ID, BMP580_CHIP_ID_ALT };
-static const int bmp580_temp_coeffs[] = { 1000, 16 };
+static const int bmp580_temp_coeffs[] = { 1, 0 };
 static const int bmp580_press_coeffs[] = { 1, 64000};
 
 const struct bmp280_chip_info bmp580_chip_info = {
@@ -2184,7 +2186,7 @@ const struct bmp280_chip_info bmp580_chip_info = {
 	.iir_filter_coeff_default = 2,
 
 	.temp_coeffs = bmp580_temp_coeffs,
-	.temp_coeffs_type = IIO_VAL_FRACTIONAL_LOG2,
+	.temp_coeffs_type = IIO_VAL_INT,
 	.press_coeffs = bmp580_press_coeffs,
 	.press_coeffs_type = IIO_VAL_FRACTIONAL,
 
-- 
2.40.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-06-17 23:23 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-02 20:12 [PATCH] iio: pressure: bmp280: fix bmp580 temp read Adam Rizkalla
2024-06-04 19:01 ` Jonathan Cameron
2024-06-04 19:19   ` Vasileios Amoiridis
2024-06-17 19:57     ` Jonathan Cameron
2024-06-17 20:30       ` Vasileios Amoiridis
2024-06-17 23:23         ` Vasileios Amoiridis

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox