* [PATCH RFC] spi: core: Use master->max_speed_hz as transfer speed when xfer->speed_hz > master->max_speed_hz
@ 2014-03-17 2:08 Axel Lin
2014-03-17 2:21 ` Guenter Roeck
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Axel Lin @ 2014-03-17 2:08 UTC (permalink / raw)
To: Mark Brown; +Cc: Guenter Roeck, linux-spi-u79uwXL29TY76Z2rM5mHXA
When xfer->speed_hz is greater than master->max_speed_hz, it's generally safe
to use master->max_speed_hz as transfer speed.
Thus use master->max_speed_hz as transfer speed rather than return error when
xfer->speed_hz > master->max_speed_hz.
Signed-off-by: Axel Lin <axel.lin-8E1dMatC8ynQT0dZR+AlfA@public.gmane.org>
---
Hi Guenter,
Does this patch fix the issue you encounter?
Regards,
Axel
drivers/spi/spi.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 454a523..26b331d 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1844,12 +1844,13 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message)
message->frame_length += xfer->len;
if (!xfer->bits_per_word)
xfer->bits_per_word = spi->bits_per_word;
- if (!xfer->speed_hz) {
+
+ if (!xfer->speed_hz)
xfer->speed_hz = spi->max_speed_hz;
- if (master->max_speed_hz &&
- xfer->speed_hz > master->max_speed_hz)
- xfer->speed_hz = master->max_speed_hz;
- }
+
+ if (master->max_speed_hz &&
+ xfer->speed_hz > master->max_speed_hz)
+ xfer->speed_hz = master->max_speed_hz;
if (master->bits_per_word_mask) {
/* Only 32 bits fit in the mask */
@@ -1878,9 +1879,6 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message)
if (xfer->speed_hz && master->min_speed_hz &&
xfer->speed_hz < master->min_speed_hz)
return -EINVAL;
- if (xfer->speed_hz && master->max_speed_hz &&
- xfer->speed_hz > master->max_speed_hz)
- return -EINVAL;
if (xfer->tx_buf && !xfer->tx_nbits)
xfer->tx_nbits = SPI_NBITS_SINGLE;
--
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH RFC] spi: core: Use master->max_speed_hz as transfer speed when xfer->speed_hz > master->max_speed_hz
2014-03-17 2:08 [PATCH RFC] spi: core: Use master->max_speed_hz as transfer speed when xfer->speed_hz > master->max_speed_hz Axel Lin
@ 2014-03-17 2:21 ` Guenter Roeck
2014-03-17 3:54 ` Guenter Roeck
2014-03-17 15:46 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Guenter Roeck @ 2014-03-17 2:21 UTC (permalink / raw)
To: Axel Lin, Mark Brown; +Cc: linux-spi-u79uwXL29TY76Z2rM5mHXA
On 03/16/2014 07:08 PM, Axel Lin wrote:
> When xfer->speed_hz is greater than master->max_speed_hz, it's generally safe
> to use master->max_speed_hz as transfer speed.
> Thus use master->max_speed_hz as transfer speed rather than return error when
> xfer->speed_hz > master->max_speed_hz.
>
> Signed-off-by: Axel Lin <axel.lin-8E1dMatC8ynQT0dZR+AlfA@public.gmane.org>
> ---
> Hi Guenter,
> Does this patch fix the issue you encounter?
> Regards,
> Axel
I'll test it and let you know.
Guenter
> drivers/spi/spi.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
> index 454a523..26b331d 100644
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@ -1844,12 +1844,13 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message)
> message->frame_length += xfer->len;
> if (!xfer->bits_per_word)
> xfer->bits_per_word = spi->bits_per_word;
> - if (!xfer->speed_hz) {
> +
> + if (!xfer->speed_hz)
> xfer->speed_hz = spi->max_speed_hz;
> - if (master->max_speed_hz &&
> - xfer->speed_hz > master->max_speed_hz)
> - xfer->speed_hz = master->max_speed_hz;
> - }
> +
> + if (master->max_speed_hz &&
> + xfer->speed_hz > master->max_speed_hz)
> + xfer->speed_hz = master->max_speed_hz;
>
> if (master->bits_per_word_mask) {
> /* Only 32 bits fit in the mask */
> @@ -1878,9 +1879,6 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message)
> if (xfer->speed_hz && master->min_speed_hz &&
> xfer->speed_hz < master->min_speed_hz)
> return -EINVAL;
> - if (xfer->speed_hz && master->max_speed_hz &&
> - xfer->speed_hz > master->max_speed_hz)
> - return -EINVAL;
>
> if (xfer->tx_buf && !xfer->tx_nbits)
> xfer->tx_nbits = SPI_NBITS_SINGLE;
>
--
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH RFC] spi: core: Use master->max_speed_hz as transfer speed when xfer->speed_hz > master->max_speed_hz
2014-03-17 2:08 [PATCH RFC] spi: core: Use master->max_speed_hz as transfer speed when xfer->speed_hz > master->max_speed_hz Axel Lin
2014-03-17 2:21 ` Guenter Roeck
@ 2014-03-17 3:54 ` Guenter Roeck
2014-03-17 15:46 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Guenter Roeck @ 2014-03-17 3:54 UTC (permalink / raw)
To: Axel Lin, Mark Brown; +Cc: linux-spi-u79uwXL29TY76Z2rM5mHXA
On 03/16/2014 07:08 PM, Axel Lin wrote:
> When xfer->speed_hz is greater than master->max_speed_hz, it's generally safe
> to use master->max_speed_hz as transfer speed.
> Thus use master->max_speed_hz as transfer speed rather than return error when
> xfer->speed_hz > master->max_speed_hz.
>
> Signed-off-by: Axel Lin <axel.lin-8E1dMatC8ynQT0dZR+AlfA@public.gmane.org>
Tested-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
Reviewed-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
Guenter
> ---
> Hi Guenter,
> Does this patch fix the issue you encounter?
> Regards,
> Axel
> drivers/spi/spi.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
> index 454a523..26b331d 100644
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@ -1844,12 +1844,13 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message)
> message->frame_length += xfer->len;
> if (!xfer->bits_per_word)
> xfer->bits_per_word = spi->bits_per_word;
> - if (!xfer->speed_hz) {
> +
> + if (!xfer->speed_hz)
> xfer->speed_hz = spi->max_speed_hz;
> - if (master->max_speed_hz &&
> - xfer->speed_hz > master->max_speed_hz)
> - xfer->speed_hz = master->max_speed_hz;
> - }
> +
> + if (master->max_speed_hz &&
> + xfer->speed_hz > master->max_speed_hz)
> + xfer->speed_hz = master->max_speed_hz;
>
> if (master->bits_per_word_mask) {
> /* Only 32 bits fit in the mask */
> @@ -1878,9 +1879,6 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message)
> if (xfer->speed_hz && master->min_speed_hz &&
> xfer->speed_hz < master->min_speed_hz)
> return -EINVAL;
> - if (xfer->speed_hz && master->max_speed_hz &&
> - xfer->speed_hz > master->max_speed_hz)
> - return -EINVAL;
>
> if (xfer->tx_buf && !xfer->tx_nbits)
> xfer->tx_nbits = SPI_NBITS_SINGLE;
>
--
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH RFC] spi: core: Use master->max_speed_hz as transfer speed when xfer->speed_hz > master->max_speed_hz
2014-03-17 2:08 [PATCH RFC] spi: core: Use master->max_speed_hz as transfer speed when xfer->speed_hz > master->max_speed_hz Axel Lin
2014-03-17 2:21 ` Guenter Roeck
2014-03-17 3:54 ` Guenter Roeck
@ 2014-03-17 15:46 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2014-03-17 15:46 UTC (permalink / raw)
To: Axel Lin; +Cc: Guenter Roeck, linux-spi-u79uwXL29TY76Z2rM5mHXA
[-- Attachment #1: Type: text/plain, Size: 326 bytes --]
On Mon, Mar 17, 2014 at 10:08:12AM +0800, Axel Lin wrote:
> When xfer->speed_hz is greater than master->max_speed_hz, it's generally safe
> to use master->max_speed_hz as transfer speed.
> Thus use master->max_speed_hz as transfer speed rather than return error when
> xfer->speed_hz > master->max_speed_hz.
Applied, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-17 15:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-17 2:08 [PATCH RFC] spi: core: Use master->max_speed_hz as transfer speed when xfer->speed_hz > master->max_speed_hz Axel Lin
2014-03-17 2:21 ` Guenter Roeck
2014-03-17 3:54 ` Guenter Roeck
2014-03-17 15:46 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).