Skip to contentSkip to conversation

drivers: iio: pressure: Fixes BMP38x and BMP390 SPI support

PATCH In review Vasileios Amoiridis 5 participants 12 messages Feb 19, 2024 – Mar 9, 2024 IIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers: iio: pressure: Fixes BMP38x and BMP390 SPI support

According to the datasheet of BMP38x and BMP390 devices, for an SPI read operation the first byte that is returned needs to be dropped, and the rest of the bytes are the actual data returned from the sensor.

Fixes 8d329309184d ("iio: pressure: bmp280: Add support for BMP380 sensor family")
---
 drivers/iio/pressure/bmp280-spi.c | 49 ++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)
drivers/iio/pressure/bmp280-spi.c +48 -1
index e8a5fed07e88..1972014dca93 100644
@@ -8,6 +8,7 @@
 #include <linux/spi/spi.h>
 #include <linux/err.h>
 #include <linux/regmap.h>
+#include <linux/bits.h>
 
 #include "bmp280.h"
 
@@ -35,6 +36,33 @@ static int bmp280_regmap_spi_read(void *context, const void *reg,
 	return spi_write_then_read(spi, reg, reg_size, val, val_size);
 }
 
+static int bmp380_regmap_spi_read(void *context, const void *reg,
+				  size_t reg_size, void *val, size_t val_size)
+{
+	struct spi_device *spi = to_spi_device(context);
+	u8 rx_buf[4];
+	ssize_t status;
+
+	/*
+	 * Maximum number of consecutive bytes read for a temperature or
+	 * pressure measurement is 3.
+	 */
+	if (val_size > 3)
+		return -EINVAL;
+	/*
+	 * According to the BMP3xx datasheets, for a basic SPI read opertion,
+	 * the first byte needs to be dropped and the rest are the requested
+	 * data.
+	 */
+	status = spi_write_then_read(spi, reg, 1, rx_buf, val_size + 1);
+	if (status)
+		return status;
+
+	memcpy(val, rx_buf + 1, val_size);
+
+	return 0;
+}
+
 static struct regmap_bus bmp280_regmap_bus = {
 	.write = bmp280_regmap_spi_write,
 	.read = bmp280_regmap_spi_read,
@@ -42,10 +70,19 @@ static struct regmap_bus bmp280_regmap_bus = {
 	.val_format_endian_default = REGMAP_ENDIAN_BIG,
 };
 
+static struct regmap_bus bmp380_regmap_bus = {
+	.write = bmp280_regmap_spi_write,
+	.read = bmp380_regmap_spi_read,
+	.read_flag_mask = BIT(7),
+	.reg_format_endian_default = REGMAP_ENDIAN_BIG,
+	.val_format_endian_default = REGMAP_ENDIAN_BIG,
+};
+
 static int bmp280_spi_probe(struct spi_device *spi)
 {
 	const struct spi_device_id *id = spi_get_device_id(spi);
 	const struct bmp280_chip_info *chip_info;
+	struct regmap_bus *bmp_regmap_bus;
 	struct regmap *regmap;
 	int ret;
 
@@ -58,8 +95,18 @@ static int bmp280_spi_probe(struct spi_device *spi)
 
 	chip_info = spi_get_device_match_data(spi);
 
+	switch (chip_info->chip_id[0]) {
+	case BMP380_CHIP_ID:
+	case BMP390_CHIP_ID:
+		bmp_regmap_bus = &bmp380_regmap_bus;
+		break;
+	default:
+		bmp_regmap_bus = &bmp280_regmap_bus;
+		break;
+	}
+
 	regmap = devm_regmap_init(&spi->dev,
-				  &bmp280_regmap_bus,
+				  bmp_regmap_bus,
 				  &spi->dev,
 				  chip_info->regmap_config);
 	if (IS_ERR(regmap)) {
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 6 lines · On Mon, 19 Feb 2024 20:13:59 +0100 Vasileios Amoiridis…

According to the datasheet of BMP38x and BMP390 devices, for an SPI read operation the first byte that is returned needs to be dropped, and the rest of the bytes are the actual data returned from the sensor.

Fixes 8d329309184d ("iio: pressure: bmp280: Add support for BMP380 sensor family")

No line break. The fixes tag is part of the main tag block. I can fix that whilst applying.
Otherwise this looks fine to me.

I'll leave it on list a little longer though as both Linus and Angel are still about and might have time to also take a look at this.

Quoted 92 lines
---
 drivers/iio/pressure/bmp280-spi.c | 49 ++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)
drivers/iio/pressure/bmp280-spi.c +48 -1
index e8a5fed07e88..1972014dca93 100644
@@ -8,6 +8,7 @@
 #include <linux/spi/spi.h>
 #include <linux/err.h>
 #include <linux/regmap.h>
+#include <linux/bits.h>
 
 #include "bmp280.h"
 
@@ -35,6 +36,33 @@ static int bmp280_regmap_spi_read(void *context, const void *reg,
 	return spi_write_then_read(spi, reg, reg_size, val, val_size);
 }
 
+static int bmp380_regmap_spi_read(void *context, const void *reg,
+				  size_t reg_size, void *val, size_t val_size)
+{
+	struct spi_device *spi = to_spi_device(context);
+	u8 rx_buf[4];
+	ssize_t status;
+
+	/*
+	 * Maximum number of consecutive bytes read for a temperature or
+	 * pressure measurement is 3.
+	 */
+	if (val_size > 3)
+		return -EINVAL;
+	/*
+	 * According to the BMP3xx datasheets, for a basic SPI read opertion,
+	 * the first byte needs to be dropped and the rest are the requested
+	 * data.
+	 */
+	status = spi_write_then_read(spi, reg, 1, rx_buf, val_size + 1);
+	if (status)
+		return status;
+
+	memcpy(val, rx_buf + 1, val_size);
+
+	return 0;
+}
+
 static struct regmap_bus bmp280_regmap_bus = {
 	.write = bmp280_regmap_spi_write,
 	.read = bmp280_regmap_spi_read,
@@ -42,10 +70,19 @@ static struct regmap_bus bmp280_regmap_bus = {
 	.val_format_endian_default = REGMAP_ENDIAN_BIG,
 };
 
+static struct regmap_bus bmp380_regmap_bus = {
+	.write = bmp280_regmap_spi_write,
+	.read = bmp380_regmap_spi_read,
+	.read_flag_mask = BIT(7),
+	.reg_format_endian_default = REGMAP_ENDIAN_BIG,
+	.val_format_endian_default = REGMAP_ENDIAN_BIG,
+};
+
 static int bmp280_spi_probe(struct spi_device *spi)
 {
 	const struct spi_device_id *id = spi_get_device_id(spi);
 	const struct bmp280_chip_info *chip_info;
+	struct regmap_bus *bmp_regmap_bus;
 	struct regmap *regmap;
 	int ret;
 
@@ -58,8 +95,18 @@ static int bmp280_spi_probe(struct spi_device *spi)
 
 	chip_info = spi_get_device_match_data(spi);
 
+	switch (chip_info->chip_id[0]) {
+	case BMP380_CHIP_ID:
+	case BMP390_CHIP_ID:
+		bmp_regmap_bus = &bmp380_regmap_bus;
+		break;
+	default:
+		bmp_regmap_bus = &bmp280_regmap_bus;
+		break;
+	}
+
 	regmap = devm_regmap_init(&spi->dev,
-				  &bmp280_regmap_bus,
+				  bmp_regmap_bus,
 				  &spi->dev,
 				  chip_info->regmap_config);
 	if (IS_ERR(regmap)) {
#2 lore raw
Quoted 8 lines · Jonathan Cameron
Quoted 5 lines · On Mon, 19 Feb 2024 20:13:59 +0100 Vasileios Amoiridis…

According to the datasheet of BMP38x and BMP390 devices, for an SPI read operation the first byte that is returned needs to be dropped, and the rest of the bytes are the actual data returned from the sensor.

Quoted 8 lines
Quoted 1 line
Fixes 8d329309184d ("iio: pressure: bmp280: Add support for BMP380 sensor family")

No line break. The fixes tag is part of the main tag block. I can fix that whilst applying.
Otherwise this looks fine to me.

I'll leave it on list a little longer though as both Linus and Angel are still about and might have time to also take a look at this.

Thank you very much again for the quick answer. Since you can fix it while applying, I should not annoy the mailing list with more e-mails. Just for future reference, when you mean no line break you mean between the main block and the "Fixes" line or between the "Fixes" line and the "Signed-off-by: ...." ?

Quoted 76 lines
Quoted 76 lines
---
 drivers/iio/pressure/bmp280-spi.c | 49 ++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)
drivers/iio/pressure/bmp280-spi.c +37 -0
index e8a5fed07e88..1972014dca93 100644
@@ -8,6 +8,7 @@
 #include <linux/spi/spi.h>
 #include <linux/err.h>
 #include <linux/regmap.h>
+#include <linux/bits.h>
 
 #include "bmp280.h"
 
@@ -35,6 +36,33 @@ static int bmp280_regmap_spi_read(void *context, const void *reg,
 	return spi_write_then_read(spi, reg, reg_size, val, val_size);
 }
 
+static int bmp380_regmap_spi_read(void *context, const void *reg,
+				  size_t reg_size, void *val, size_t val_size)
+{
+	struct spi_device *spi = to_spi_device(context);
+	u8 rx_buf[4];
+	ssize_t status;
+
+	/*
+	 * Maximum number of consecutive bytes read for a temperature or
+	 * pressure measurement is 3.
+	 */
+	if (val_size > 3)
+		return -EINVAL;
+	/*
+	 * According to the BMP3xx datasheets, for a basic SPI read opertion,
+	 * the first byte needs to be dropped and the rest are the requested
+	 * data.
+	 */
+	status = spi_write_then_read(spi, reg, 1, rx_buf, val_size + 1);
+	if (status)
+		return status;
+
+	memcpy(val, rx_buf + 1, val_size);
+
+	return 0;
+}
+
 static struct regmap_bus bmp280_regmap_bus = {
 	.write = bmp280_regmap_spi_write,
 	.read = bmp280_regmap_spi_read,
@@ -42,10 +70,19 @@ static struct regmap_bus bmp280_regmap_bus = {
 	.val_format_endian_default = REGMAP_ENDIAN_BIG,
 };
 
+static struct regmap_bus bmp380_regmap_bus = {
+	.write = bmp280_regmap_spi_write,
+	.read = bmp380_regmap_spi_read,
+	.read_flag_mask = BIT(7),
+	.reg_format_endian_default = REGMAP_ENDIAN_BIG,
+	.val_format_endian_default = REGMAP_ENDIAN_BIG,
+};
+
 static int bmp280_spi_probe(struct spi_device *spi)
 {
 	const struct spi_device_id *id = spi_get_device_id(spi);
 	const struct bmp280_chip_info *chip_info;
+	struct regmap_bus *bmp_regmap_bus;
 	struct regmap *regmap;
 	int ret;
 
@@ -58,8 +95,18 @@ static int bmp280_spi_probe(struct spi_device *spi)
 
 	chip_info = spi_get_device_match_data(spi);
 
Quoted 17 lines
Quoted 6 lines
drivers/iio/pressure/bmp280-spi.c +6 -0
+	switch (chip_info->chip_id[0]) {
+	case BMP380_CHIP_ID:
+	case BMP390_CHIP_ID:
+		bmp_regmap_bus = &bmp380_regmap_bus;
+		break;
+	default:

drivers/iio/pressure/bmp280-spi.c static int bmp280_spi_probe(struct spi_device *spi) · line 112

Quoted 10 lines
drivers/iio/pressure/bmp280-spi.c +5 -1
+		bmp_regmap_bus = &bmp280_regmap_bus;
+		break;
+	}
+
 	regmap = devm_regmap_init(&spi->dev,
-				  &bmp280_regmap_bus,
+				  bmp_regmap_bus,
 				  &spi->dev,
 				  chip_info->regmap_config);
 	if (IS_ERR(regmap)) {

Best regards,
Vasileios Amoiridis

#3 lore raw
Quoted 14 lines · Vasileios Amoiridis
Quoted 13 lines · Jonathan Cameron
Quoted 6 lines · On Mon, 19 Feb 2024 20:13:59 +0100 Vasileios Amoiridis…

According to the datasheet of BMP38x and BMP390 devices, for an SPI read operation the first byte that is returned needs to be dropped, and the rest of the bytes are the actual data returned from the sensor.

Fixes 8d329309184d ("iio: pressure: bmp280: Add support for BMP380 sensor family")

No line break. The fixes tag is part of the main tag block. I can fix that whilst applying.
Otherwise this looks fine to me.

Quoted 10 lines
Quoted 3 lines

I'll leave it on list a little longer though as both Linus and Angel are still about and might have time to also take a look at this.

Thank you very much again for the quick answer. Since you can fix it while applying, I should not annoy the mailing list with more e-mails. Just for future reference, when you mean no line break you mean between the main block and the "Fixes" line or between the "Fixes" line and the "Signed-off-by: ...." ?

Quoted 2 lines
Quoted 2 lines

The standard pattern for the patch (as it is seen in the git log):

---8<---

iio: ...Subject line, summary of the change...
BLANK LINE
...Multi-line description, may contain blank lines... BLANK LINE
...Tag block: SoB, Rb, etc. tags (may NOT contain blank lines)...

---8<---

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#5 lore raw
In reply to Vasileios Amoiridis
Quoted 4 lines · Vasileios Amoiridis

According to the datasheet of BMP38x and BMP390 devices, for an SPI read operation the first byte that is returned needs to be dropped, and the rest of the bytes are the actual data returned from the sensor.

...

Quoted 4 lines

#include <linux/spi/spi.h>
#include <linux/err.h>
#include <linux/regmap.h>
+#include <linux/bits.h>

I see that it's unsorted, but try to squeeze a new header to the better place where more will be kept sorted. With given context, it should go before all others, but it might be even better location.

...

Quoted 13 lines
drivers/iio/pressure/bmp280-spi.c +13 -0
+static int bmp380_regmap_spi_read(void *context, const void *reg,
+				  size_t reg_size, void *val, size_t val_size)
+{
+	struct spi_device *spi = to_spi_device(context);
+	u8 rx_buf[4];
+	ssize_t status;
+
+	/*
+	 * Maximum number of consecutive bytes read for a temperature or
+	 * pressure measurement is 3.
+	 */
+	if (val_size > 3)
+		return -EINVAL;

drivers/iio/pressure/bmp280-spi.c static int bmp280_regmap_spi_read(void *context, const void *reg, · line 61

Quoted 10 lines
drivers/iio/pressure/bmp280-spi.c +9 -0
+	/*
+	 * According to the BMP3xx datasheets, for a basic SPI read opertion,
+	 * the first byte needs to be dropped and the rest are the requested
+	 * data.
+	 */
+	status = spi_write_then_read(spi, reg, 1, rx_buf, val_size + 1);
+	if (status)
+		return status;
 
+	memcpy(val, rx_buf + 1, val_size);

Okay, endianess is defined in the regmap_bus below...

Quoted 2 lines
drivers/iio/pressure/bmp280-spi.c +2 -0
+	return 0;
+}
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#6 lore raw
Quoted 13 lines · Andy Shevchenko
Quoted 4 lines · Vasileios Amoiridis

According to the datasheet of BMP38x and BMP390 devices, for an SPI read operation the first byte that is returned needs to be dropped, and the rest of the bytes are the actual data returned from the sensor.

...

Quoted 4 lines

#include <linux/spi/spi.h>
#include <linux/err.h>
#include <linux/regmap.h>
+#include <linux/bits.h>

Quoted 6 lines

I see that it's unsorted, but try to squeeze a new header to the better place where more will be kept sorted. With given context, it should go before all others, but it might be even better location.

...

So you would suggest a re-ordering of the headers with a reverse christmas-tree? I don't see it used in the other drivers of the IIO subsystem but I can do it as well

Quoted 34 lines
Quoted 13 lines
drivers/iio/pressure/bmp280-spi.c +13 -0
+static int bmp380_regmap_spi_read(void *context, const void *reg,
+				  size_t reg_size, void *val, size_t val_size)
+{
+	struct spi_device *spi = to_spi_device(context);
+	u8 rx_buf[4];
+	ssize_t status;
+
+	/*
+	 * Maximum number of consecutive bytes read for a temperature or
+	 * pressure measurement is 3.
+	 */
+	if (val_size > 3)
+		return -EINVAL;

drivers/iio/pressure/bmp280-spi.c static int bmp280_regmap_spi_read(void *context, const void *reg, · line 61

Quoted 10 lines
drivers/iio/pressure/bmp280-spi.c +9 -0
+	/*
+	 * According to the BMP3xx datasheets, for a basic SPI read opertion,
+	 * the first byte needs to be dropped and the rest are the requested
+	 * data.
+	 */
+	status = spi_write_then_read(spi, reg, 1, rx_buf, val_size + 1);
+	if (status)
+		return status;
 
+	memcpy(val, rx_buf + 1, val_size);

Okay, endianess is defined in the regmap_bus below...

Quoted 2 lines
drivers/iio/pressure/bmp280-spi.c +2 -0
+	return 0;
+}
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#7 lore raw
Quoted 2 lines · Vasileios Amoiridis
Quoted 1 line · Andy Shevchenko

On Mon, Feb 19, 2024 at 08:13:59PM +0100, Vasileios Amoiridis wrote:

...

Quoted 11 lines
Quoted 8 lines
Quoted 4 lines

#include <linux/spi/spi.h>
#include <linux/err.h>
#include <linux/regmap.h>
+#include <linux/bits.h>

I see that it's unsorted, but try to squeeze a new header to the better place where more will be kept sorted. With given context, it should go before all others, but it might be even better location.

So you would suggest a re-ordering of the headers with a reverse christmas-tree?

No. Alphabetically.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#8 lore raw
In reply to Vasileios Amoiridis
Quoted 18 lines · On Tue, 20 Feb 2024 18:46:24 +0100 Vasileios Amoiridis…
Quoted 17 lines · Andy Shevchenko
Quoted 4 lines · Vasileios Amoiridis

According to the datasheet of BMP38x and BMP390 devices, for an SPI read operation the first byte that is returned needs to be dropped, and the rest of the bytes are the actual data returned from the sensor.

...

Quoted 4 lines

#include <linux/spi/spi.h>
#include <linux/err.h>
#include <linux/regmap.h>
+#include <linux/bits.h>

I see that it's unsorted, but try to squeeze a new header to the better place where more will be kept sorted. With given context, it should go before all others, but it might be even better location.

Quoted 6 lines
Quoted 2 lines

...

So you would suggest a re-ordering of the headers with a reverse christmas-tree? I don't see it used in the other drivers of the IIO subsystem but I can do it as well

Separate patch + alphabetical but in blocks.

linux/*
then
linux/iio/*
then
asm/*

First 2 can be combined though if you prefer that. Any asm definitely separate.

Quoted 36 lines
Quoted 35 lines
Quoted 14 lines
drivers/iio/pressure/bmp280-spi.c +13 -0
+static int bmp380_regmap_spi_read(void *context, const void *reg,
+				  size_t reg_size, void *val, size_t val_size)
+{
+	struct spi_device *spi = to_spi_device(context);
+	u8 rx_buf[4];
+	ssize_t status;
+
+	/*
+	 * Maximum number of consecutive bytes read for a temperature or
+	 * pressure measurement is 3.
+	 */
+	if (val_size > 3)
+		return -EINVAL;

drivers/iio/pressure/bmp280-spi.c static int bmp280_regmap_spi_read(void *context, const void *reg, · line 61

Quoted 10 lines
drivers/iio/pressure/bmp280-spi.c +9 -0
+	/*
+	 * According to the BMP3xx datasheets, for a basic SPI read opertion,
+	 * the first byte needs to be dropped and the rest are the requested
+	 * data.
+	 */
+	status = spi_write_then_read(spi, reg, 1, rx_buf, val_size + 1);
+	if (status)
+		return status;  
 
+	memcpy(val, rx_buf + 1, val_size);  

Okay, endianess is defined in the regmap_bus below...

Quoted 2 lines
drivers/iio/pressure/bmp280-spi.c +2 -0
+	return 0;
+}  
Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#9 lore raw
In reply to Vasileios Amoiridis
Quoted 8 lines · On Mon, 19 Feb 2024 20:13:59 +0100 Vasileios Amoiridis…

According to the datasheet of BMP38x and BMP390 devices, for an SPI read operation the first byte that is returned needs to be dropped, and the rest of the bytes are the actual data returned from the sensor.

Fixes 8d329309184d ("iio: pressure: bmp280: Add support for BMP380 sensor family")

Applied and marked for stable - with tweaks to header order and the space above as per discussion.

Quoted 90 lines
---
 drivers/iio/pressure/bmp280-spi.c | 49 ++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)
drivers/iio/pressure/bmp280-spi.c +48 -1
index e8a5fed07e88..1972014dca93 100644
@@ -8,6 +8,7 @@
 #include <linux/spi/spi.h>
 #include <linux/err.h>
 #include <linux/regmap.h>
+#include <linux/bits.h>
 
 #include "bmp280.h"
 
@@ -35,6 +36,33 @@ static int bmp280_regmap_spi_read(void *context, const void *reg,
 	return spi_write_then_read(spi, reg, reg_size, val, val_size);
 }
 
+static int bmp380_regmap_spi_read(void *context, const void *reg,
+				  size_t reg_size, void *val, size_t val_size)
+{
+	struct spi_device *spi = to_spi_device(context);
+	u8 rx_buf[4];
+	ssize_t status;
+
+	/*
+	 * Maximum number of consecutive bytes read for a temperature or
+	 * pressure measurement is 3.
+	 */
+	if (val_size > 3)
+		return -EINVAL;
+	/*
+	 * According to the BMP3xx datasheets, for a basic SPI read opertion,
+	 * the first byte needs to be dropped and the rest are the requested
+	 * data.
+	 */
+	status = spi_write_then_read(spi, reg, 1, rx_buf, val_size + 1);
+	if (status)
+		return status;
+
+	memcpy(val, rx_buf + 1, val_size);
+
+	return 0;
+}
+
 static struct regmap_bus bmp280_regmap_bus = {
 	.write = bmp280_regmap_spi_write,
 	.read = bmp280_regmap_spi_read,
@@ -42,10 +70,19 @@ static struct regmap_bus bmp280_regmap_bus = {
 	.val_format_endian_default = REGMAP_ENDIAN_BIG,
 };
 
+static struct regmap_bus bmp380_regmap_bus = {
+	.write = bmp280_regmap_spi_write,
+	.read = bmp380_regmap_spi_read,
+	.read_flag_mask = BIT(7),
+	.reg_format_endian_default = REGMAP_ENDIAN_BIG,
+	.val_format_endian_default = REGMAP_ENDIAN_BIG,
+};
+
 static int bmp280_spi_probe(struct spi_device *spi)
 {
 	const struct spi_device_id *id = spi_get_device_id(spi);
 	const struct bmp280_chip_info *chip_info;
+	struct regmap_bus *bmp_regmap_bus;
 	struct regmap *regmap;
 	int ret;
 
@@ -58,8 +95,18 @@ static int bmp280_spi_probe(struct spi_device *spi)
 
 	chip_info = spi_get_device_match_data(spi);
 
+	switch (chip_info->chip_id[0]) {
+	case BMP380_CHIP_ID:
+	case BMP390_CHIP_ID:
+		bmp_regmap_bus = &bmp380_regmap_bus;
+		break;
+	default:
+		bmp_regmap_bus = &bmp280_regmap_bus;
+		break;
+	}
+
 	regmap = devm_regmap_init(&spi->dev,
-				  &bmp280_regmap_bus,
+				  bmp_regmap_bus,
 				  &spi->dev,
 				  chip_info->regmap_config);
 	if (IS_ERR(regmap)) {
#10 lore raw
Quoted 8 lines · Jonathan Cameron
Quoted 5 lines · On Mon, 19 Feb 2024 20:13:59 +0100 Vasileios Amoiridis…

According to the datasheet of BMP38x and BMP390 devices, for an SPI read operation the first byte that is returned needs to be dropped, and the rest of the bytes are the actual data returned from the sensor.

Quoted 6 lines
Quoted 3 lines
Fixes 8d329309184d ("iio: pressure: bmp280: Add support for BMP380 sensor family")

Applied and marked for stable - with tweaks to header order and the space above as per discussion.

Hi Jonathan,

I just got my hands on a BME280 humidity sensor and I realized that this commit, even though it fixes the SPI support for the BMP38x and BMP390 devices, it breaks the SPI support for BME280 and BMP58x. The problem is descirbed below, inline.

Quoted 70 lines
Quoted 70 lines
---
 drivers/iio/pressure/bmp280-spi.c | 49 ++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)
drivers/iio/pressure/bmp280-spi.c +37 -0
index e8a5fed07e88..1972014dca93 100644
@@ -8,6 +8,7 @@
 #include <linux/spi/spi.h>
 #include <linux/err.h>
 #include <linux/regmap.h>
+#include <linux/bits.h>
 
 #include "bmp280.h"
 
@@ -35,6 +36,33 @@ static int bmp280_regmap_spi_read(void *context, const void *reg,
 	return spi_write_then_read(spi, reg, reg_size, val, val_size);
 }
 
+static int bmp380_regmap_spi_read(void *context, const void *reg,
+				  size_t reg_size, void *val, size_t val_size)
+{
+	struct spi_device *spi = to_spi_device(context);
+	u8 rx_buf[4];
+	ssize_t status;
+
+	/*
+	 * Maximum number of consecutive bytes read for a temperature or
+	 * pressure measurement is 3.
+	 */
+	if (val_size > 3)
+		return -EINVAL;
+	/*
+	 * According to the BMP3xx datasheets, for a basic SPI read opertion,
+	 * the first byte needs to be dropped and the rest are the requested
+	 * data.
+	 */
+	status = spi_write_then_read(spi, reg, 1, rx_buf, val_size + 1);
+	if (status)
+		return status;
+
+	memcpy(val, rx_buf + 1, val_size);
+
+	return 0;
+}
+
 static struct regmap_bus bmp280_regmap_bus = {
 	.write = bmp280_regmap_spi_write,
 	.read = bmp280_regmap_spi_read,
@@ -42,10 +70,19 @@ static struct regmap_bus bmp280_regmap_bus = {
 	.val_format_endian_default = REGMAP_ENDIAN_BIG,
 };
 
+static struct regmap_bus bmp380_regmap_bus = {
+	.write = bmp280_regmap_spi_write,
+	.read = bmp380_regmap_spi_read,
+	.read_flag_mask = BIT(7),
+	.reg_format_endian_default = REGMAP_ENDIAN_BIG,
+	.val_format_endian_default = REGMAP_ENDIAN_BIG,
+};
+
 static int bmp280_spi_probe(struct spi_device *spi)
 {
 	const struct spi_device_id *id = spi_get_device_id(spi);
 	const struct bmp280_chip_info *chip_info;
+	struct regmap_bus *bmp_regmap_bus;
 	struct regmap *regmap;
 	int ret;
 
Quoted 7 lines

drivers/iio/pressure/bmp280-spi.c static int bmp280_spi_probe(struct spi_device *spi) · line 100

Quoted 7 lines
drivers/iio/pressure/bmp280-spi.c +3 -0
@@ -58,8 +95,18 @@ static int bmp280_spi_probe(struct spi_device *spi)
 
 	chip_info = spi_get_device_match_data(spi);
 
+	switch (chip_info->chip_id[0]) {
+	case BMP380_CHIP_ID:
+	case BMP390_CHIP_ID:

These chip IDs, even though they are IDs, they are not unique and they are shared among sensors (see bmp280.h line 290). This means that this cases are true also for BME280 and BMP58x devices which of course should not happen because their regmap bus is the bmp280_* and not the bmp380_*.

It can easily be solved by removing the switch-case statement and adding an if(!(strcmp(id->name,"bmp380")) which checks the name which is indeed unique. I guess that this patch should be reverted, how should I proceed?

Quoted 14 lines
Quoted 13 lines
drivers/iio/pressure/bmp280-spi.c +8 -1
+		bmp_regmap_bus = &bmp380_regmap_bus;
+		break;
+	default:
+		bmp_regmap_bus = &bmp280_regmap_bus;
+		break;
+	}
+
 	regmap = devm_regmap_init(&spi->dev,
-				  &bmp280_regmap_bus,
+				  bmp_regmap_bus,
 				  &spi->dev,
 				  chip_info->regmap_config);
 	if (IS_ERR(regmap)) {
maintainer
#11 lore raw
Quoted 96 lines · On Wed, 6 Mar 2024 19:08:29 +0100 Vasileios Amoiridis <[email protected]>…
Quoted 8 lines · Jonathan Cameron
Quoted 5 lines · On Mon, 19 Feb 2024 20:13:59 +0100 Vasileios Amoiridis…

According to the datasheet of BMP38x and BMP390 devices, for an SPI read operation the first byte that is returned needs to be dropped, and the rest of the bytes are the actual data returned from the sensor.

Quoted 6 lines
Quoted 3 lines
Fixes 8d329309184d ("iio: pressure: bmp280: Add support for BMP380 sensor family")

Applied and marked for stable - with tweaks to header order and the space above as per discussion.

Hi Jonathan,

I just got my hands on a BME280 humidity sensor and I realized that this commit, even though it fixes the SPI support for the BMP38x and BMP390 devices, it breaks the SPI support for BME280 and BMP58x. The problem is descirbed below, inline.

Quoted 74 lines
Quoted 74 lines
---
 drivers/iio/pressure/bmp280-spi.c | 49 ++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)
drivers/iio/pressure/bmp280-spi.c +37 -0
index e8a5fed07e88..1972014dca93 100644
@@ -8,6 +8,7 @@
 #include <linux/spi/spi.h>
 #include <linux/err.h>
 #include <linux/regmap.h>
+#include <linux/bits.h>
 
 #include "bmp280.h"
 
@@ -35,6 +36,33 @@ static int bmp280_regmap_spi_read(void *context, const void *reg,
 	return spi_write_then_read(spi, reg, reg_size, val, val_size);
 }
 
+static int bmp380_regmap_spi_read(void *context, const void *reg,
+				  size_t reg_size, void *val, size_t val_size)
+{
+	struct spi_device *spi = to_spi_device(context);
+	u8 rx_buf[4];
+	ssize_t status;
+
+	/*
+	 * Maximum number of consecutive bytes read for a temperature or
+	 * pressure measurement is 3.
+	 */
+	if (val_size > 3)
+		return -EINVAL;
+	/*
+	 * According to the BMP3xx datasheets, for a basic SPI read opertion,
+	 * the first byte needs to be dropped and the rest are the requested
+	 * data.
+	 */
+	status = spi_write_then_read(spi, reg, 1, rx_buf, val_size + 1);
+	if (status)
+		return status;
+
+	memcpy(val, rx_buf + 1, val_size);
+
+	return 0;
+}
+
 static struct regmap_bus bmp280_regmap_bus = {
 	.write = bmp280_regmap_spi_write,
 	.read = bmp280_regmap_spi_read,
@@ -42,10 +70,19 @@ static struct regmap_bus bmp280_regmap_bus = {
 	.val_format_endian_default = REGMAP_ENDIAN_BIG,
 };
 
+static struct regmap_bus bmp380_regmap_bus = {
+	.write = bmp280_regmap_spi_write,
+	.read = bmp380_regmap_spi_read,
+	.read_flag_mask = BIT(7),
+	.reg_format_endian_default = REGMAP_ENDIAN_BIG,
+	.val_format_endian_default = REGMAP_ENDIAN_BIG,
+};
+
 static int bmp280_spi_probe(struct spi_device *spi)
 {
 	const struct spi_device_id *id = spi_get_device_id(spi);
 	const struct bmp280_chip_info *chip_info;
+	struct regmap_bus *bmp_regmap_bus;
 	struct regmap *regmap;
 	int ret;
 
@@ -58,8 +95,18 @@ static int bmp280_spi_probe(struct spi_device *spi)
 
 	chip_info = spi_get_device_match_data(spi);
 
Quoted 8 lines
Quoted 3 lines

drivers/iio/pressure/bmp280-spi.c static int bmp280_spi_probe(struct spi_device *spi) · line 100

Quoted 3 lines
drivers/iio/pressure/bmp280-spi.c +3 -0
+	switch (chip_info->chip_id[0]) {
+	case BMP380_CHIP_ID:
+	case BMP390_CHIP_ID:  

These chip IDs, even though they are IDs, they are not unique and they are shared among sensors (see bmp280.h line 290). This means that this cases are true also for BME280 and BMP58x devices which of course should not happen because their regmap bus is the bmp280_* and not the bmp380_*.

Gah. Anyone who can go say very rude things to bosch please do so. There is no point in having an ID register if you don't make it change for incompatible parts!

Quoted 4 lines

It can easily be solved by removing the switch-case statement and adding an if(!(strcmp(id->name,"bmp380")) which checks the name which is indeed unique. I guess that this patch should be reverted, how should I proceed?

Add a flag to the chip_info structure that says whether the extra byte is needed for a given part. Then use that to pick the regmap. Alternative would be a pointer to the right regmap, but that is probably messier to do.

If the fix is simple, stack it as a fix for the fix. If not we can revert it. Unfortunately it already hit mainline before I saw your message. Make sure you include a short rant about who bad the hardware is.

Jonathan

Quoted 15 lines
Quoted 15 lines
Quoted 14 lines
drivers/iio/pressure/bmp280-spi.c +8 -1
+		bmp_regmap_bus = &bmp380_regmap_bus;
+		break;
+	default:
+		bmp_regmap_bus = &bmp280_regmap_bus;
+		break;
+	}
+
 	regmap = devm_regmap_init(&spi->dev,
-				  &bmp280_regmap_bus,
+				  bmp_regmap_bus,
 				  &spi->dev,
 				  chip_info->regmap_config);
 	if (IS_ERR(regmap)) {