Linux-SPI Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v2 1/2] spi: Allow to have all native CSs in use along with GPIOs
@ 2021-04-20 16:44 Andy Shevchenko
  2021-04-20 16:44 ` [PATCH v2 2/2] spi: Avoid undefined behaviour when counting unused native CSs Andy Shevchenko
  2021-04-21 19:03 ` [PATCH v2 1/2] spi: Allow to have all native CSs in use along with GPIOs Mark Brown
  0 siblings, 2 replies; 3+ messages in thread
From: Andy Shevchenko @ 2021-04-20 16:44 UTC (permalink / raw)
  To: Mark Brown, linux-spi, linux-kernel; +Cc: Andy Shevchenko

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")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: no changes
 drivers/spi/spi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 36c46feab6d4..9c3730a9f7d5 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -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;
 	}
-- 
2.30.2


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

* [PATCH v2 2/2] spi: Avoid undefined behaviour when counting unused native CSs
  2021-04-20 16:44 [PATCH v2 1/2] spi: Allow to have all native CSs in use along with GPIOs Andy Shevchenko
@ 2021-04-20 16:44 ` Andy Shevchenko
  2021-04-21 19:03 ` [PATCH v2 1/2] spi: Allow to have all native CSs in use along with GPIOs Mark Brown
  1 sibling, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2021-04-20 16:44 UTC (permalink / raw)
  To: Mark Brown, linux-spi, linux-kernel; +Cc: Andy Shevchenko

ffz(), that has been used to count unused native CSs,
might cause undefined behaviour 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")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: decoded UB abbreviation (Mark)
 drivers/spi/spi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 9c3730a9f7d5..01f95bee2ac8 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -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) {
-- 
2.30.2


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

* Re: [PATCH v2 1/2] spi: Allow to have all native CSs in use along with GPIOs
  2021-04-20 16:44 [PATCH v2 1/2] spi: Allow to have all native CSs in use along with GPIOs Andy Shevchenko
  2021-04-20 16:44 ` [PATCH v2 2/2] spi: Avoid undefined behaviour when counting unused native CSs Andy Shevchenko
@ 2021-04-21 19:03 ` Mark Brown
  1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2021-04-21 19:03 UTC (permalink / raw)
  To: linux-spi, linux-kernel, Andy Shevchenko; +Cc: Mark Brown

On Tue, 20 Apr 2021 19:44:24 +0300, Andy Shevchenko wrote:
> 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
>   ...		...
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/2] spi: Allow to have all native CSs in use along with GPIOs
      commit: dbaca8e56ea3f23fa215f48c2d46dd03ede06e02
[2/2] spi: Avoid undefined behaviour when counting unused native CSs
      commit: f60d7270c8a3d2beb1c23ae0da42497afa3584c2

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

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

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-20 16:44 [PATCH v2 1/2] spi: Allow to have all native CSs in use along with GPIOs Andy Shevchenko
2021-04-20 16:44 ` [PATCH v2 2/2] spi: Avoid undefined behaviour when counting unused native CSs Andy Shevchenko
2021-04-21 19:03 ` [PATCH v2 1/2] spi: Allow to have all native CSs in use along with GPIOs Mark Brown

Linux-SPI Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-spi/0 linux-spi/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-spi linux-spi/ https://lore.kernel.org/linux-spi \
		linux-spi@vger.kernel.org
	public-inbox-index linux-spi

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-spi


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git