[PATCH] spi: xilinx: Convert to let spi core validate bits_per_word

[PATCH] spi: xilinx: Convert to let spi core validate bits_per_word

[Axel Lin]

Set bits_per_word_mask so spi core will reject transfers that attempt to use
an unsupported bits_per_word value.

spi_bitbang requires custom setup_transfer() to be defined if there is a
custom txrx_bufs(). Thus keep the empty xilinx_spi_setup_transfer() function
in the code.

Signed-off-by: Axel Lin <axel.lin-8E1dMatC8ynQT0dZR+AlfA@public.gmane.org>
---
 drivers/spi/spi-xilinx.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index e6cd111..66dbefc 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -208,26 +208,11 @@ static void xilinx_spi_chipselect(struct spi_device *spi, int is_on)
 }
 
 /* spi_bitbang requires custom setup_transfer() to be defined if there is a
- * custom txrx_bufs(). We have nothing to setup here as the SPI IP block
- * supports 8 or 16 bits per word which cannot be changed in software.
- * SPI clock can't be changed in software either.
- * Check for correct bits per word. Chip select delay calculations could be
- * added here as soon as bitbang_work() can be made aware of the delay value.
+ * custom txrx_bufs().
  */
 static int xilinx_spi_setup_transfer(struct spi_device *spi,
 		struct spi_transfer *t)
 {
-	struct xilinx_spi *xspi = spi_master_get_devdata(spi->master);
-	u8 bits_per_word;
-
-	bits_per_word = (t && t->bits_per_word)
-			 ? t->bits_per_word : spi->bits_per_word;
-	if (bits_per_word != xspi->bits_per_word) {
-		dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
-			__func__, bits_per_word);
-		return -EINVAL;
-	}
-
 	return 0;
 }
 
@@ -406,6 +391,7 @@ static int xilinx_spi_probe(struct platform_device *pdev)
 		xspi->write_fn = xspi_write32_be;
 	}
 
+	master->bits_per_word_mask = SPI_BPW_MASK(bits_per_word);
 	xspi->bits_per_word = bits_per_word;
 	if (xspi->bits_per_word == 8) {
 		xspi->tx_fn = xspi_tx8;
-- 
1.8.1.2



--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] spi: xilinx: Convert to let spi core validate bits_per_word

[Michal Simek]

On 02/14/2014 02:06 PM, Axel Lin wrote:
> Set bits_per_word_mask so spi core will reject transfers that attempt to use
> an unsupported bits_per_word value.
> 
> spi_bitbang requires custom setup_transfer() to be defined if there is a
> custom txrx_bufs(). Thus keep the empty xilinx_spi_setup_transfer() function
> in the code.
> 
> Signed-off-by: Axel Lin <axel.lin-8E1dMatC8ynQT0dZR+AlfA@public.gmane.org>
> ---
>  drivers/spi/spi-xilinx.c | 18 ++----------------
>  1 file changed, 2 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
> index e6cd111..66dbefc 100644
> --- a/drivers/spi/spi-xilinx.c
> +++ b/drivers/spi/spi-xilinx.c
> @@ -208,26 +208,11 @@ static void xilinx_spi_chipselect(struct spi_device *spi, int is_on)
>  }
>  
>  /* spi_bitbang requires custom setup_transfer() to be defined if there is a
> - * custom txrx_bufs(). We have nothing to setup here as the SPI IP block
> - * supports 8 or 16 bits per word which cannot be changed in software.
> - * SPI clock can't be changed in software either.
> - * Check for correct bits per word. Chip select delay calculations could be
> - * added here as soon as bitbang_work() can be made aware of the delay value.
> + * custom txrx_bufs().
>   */
>  static int xilinx_spi_setup_transfer(struct spi_device *spi,
>  		struct spi_transfer *t)
>  {
> -	struct xilinx_spi *xspi = spi_master_get_devdata(spi->master);
> -	u8 bits_per_word;
> -
> -	bits_per_word = (t && t->bits_per_word)
> -			 ? t->bits_per_word : spi->bits_per_word;
> -	if (bits_per_word != xspi->bits_per_word) {
> -		dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
> -			__func__, bits_per_word);
> -		return -EINVAL;
> -	}
> -
>  	return 0;
>  }
>  
> @@ -406,6 +391,7 @@ static int xilinx_spi_probe(struct platform_device *pdev)
>  		xspi->write_fn = xspi_write32_be;
>  	}
>  
> +	master->bits_per_word_mask = SPI_BPW_MASK(bits_per_word);
>  	xspi->bits_per_word = bits_per_word;
>  	if (xspi->bits_per_word == 8) {
>  		xspi->tx_fn = xspi_tx8;
> 

Acked-by: Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>

Thanks,
Michal


--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] spi: xilinx: Convert to let spi core validate bits_per_word

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 193 bytes --]

On Fri, Feb 14, 2014 at 09:06:43PM +0800, Axel Lin wrote:
> Set bits_per_word_mask so spi core will reject transfers that attempt to use
> an unsupported bits_per_word value.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]