[v2,1/2] spi: Allow to have all native CSs in use along with GPIOs
diff mbox series

Message ID 20210420164425.40287-1-andriy.shevchenko@linux.intel.com
State In Next
Commit dbaca8e56ea3f23fa215f48c2d46dd03ede06e02
Headers show
Series
  • [v2,1/2] spi: Allow to have all native CSs in use along with GPIOs
Related show

Commit Message

Andy Shevchenko April 20, 2021, 4:44 p.m. UTC
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(-)

Comments

Mark Brown April 21, 2021, 7:03 p.m. UTC | #1
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

Patch
diff mbox series

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;
 	}