Skip to contentSkip to conversation

spi: Allow to have all native CSs in use along with GPIOs

PATCH Superseded Andy Shevchenko 2 participants 5 messages Apr 20, 2021 SPI

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 spi: Allow to have all native CSs in use along with GPIOs

The commit 7d93aecdb58d ("spi: Add generic support for unused native cs with cs-gpios") excludes the valid case for the controllers that doesn't need to switch native CS in order to perform the transfer, i.e. when

0 native
... ...
<n> - 1 native
<n> GPIO
<n> + 1 GPIO
... ...

where <n> defines maximum of native CSs supported by the controller.

To allow this, bail out from spi_get_gpio_descs() conditionally for the controllers which explicitly marked with SPI_MASTER_GPIO_SS.

Fixes 7d93aecdb58d ("spi: Add generic support for unused native cs with cs-gpios")
---
 drivers/spi/spi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/spi/spi.c +3 -2
index 36c46feab6d4..9c3730a9f7d5 100644
@@ -2610,8 +2610,9 @@ static int spi_get_gpio_descs(struct spi_controller *ctlr)
 	}
 
 	ctlr->unused_native_cs = ffz(native_cs_mask);
-	if (num_cs_gpios && ctlr->max_native_cs &&
-	    ctlr->unused_native_cs >= ctlr->max_native_cs) {
+
+	if ((ctlr->flags & SPI_MASTER_GPIO_SS) && num_cs_gpios &&
+	    ctlr->max_native_cs && ctlr->unused_native_cs >= ctlr->max_native_cs) {
 		dev_err(dev, "No unused native chip select available\n");
 		return -EINVAL;
 	}
Signature · 1 line
2.30.2
#1 lore raw

PATCH 2/2 spi: Avoid potential UB when counting unused native CSs

ffz(), that has been used to count unused native CSs, might produce UB when called against ~0U. To fix that, open code it with ffs(~value) - 1.

Fixes 7d93aecdb58d ("spi: Add generic support for unused native cs with cs-gpios")
---
 drivers/spi/spi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi.c +1 -1
index 9c3730a9f7d5..01f95bee2ac8 100644
@@ -2609,7 +2609,7 @@ static int spi_get_gpio_descs(struct spi_controller *ctlr)
 		native_cs_mask |= BIT(i);
 	}
 
-	ctlr->unused_native_cs = ffz(native_cs_mask);
+	ctlr->unused_native_cs = ffs(~native_cs_mask) - 1;
 
 	if ((ctlr->flags & SPI_MASTER_GPIO_SS) && num_cs_gpios &&
 	    ctlr->max_native_cs && ctlr->unused_native_cs >= ctlr->max_native_cs) {
Signature · 1 line
2.30.2
maintainer
#2 lore raw

Re: [PATCH v1 2/2] spi: Avoid potential UB when counting unused native CSs

Quoted 1 line · Andy Shevchenko

ffz(), that has been used to count unused native CSs, might produce UB

Bit of an IA there...

#3 lore raw

Re: [PATCH v1 2/2] spi: Avoid potential UB when counting unused native CSs

Quoted 4 lines · Mark Brown
Quoted 1 line · Andy Shevchenko

ffz(), that has been used to count unused native CSs, might produce UB

Bit of an IA there...

UB -- undefined behaviour.
I'll decode it. Should I decode CS as well?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#4 lore raw

Re: [PATCH v1 2/2] spi: Avoid potential UB when counting unused native CSs

Quoted 8 lines · Andy Shevchenko
Quoted 4 lines · Mark Brown
Quoted 1 line · Andy Shevchenko

ffz(), that has been used to count unused native CSs, might produce UB

Bit of an IA there...

UB -- undefined behaviour.
I'll decode it. Should I decode CS as well?

CS is fine.