From: maxime.ripard@free-electrons.com (Maxime Ripard)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/5] spi: sun4i: fix FIFO limit
Date: Mon, 30 May 2016 10:37:00 +0200 [thread overview]
Message-ID: <20160530083700.GF4247@lukather> (raw)
In-Reply-To: <e315008b5e9dc3f1490507508fd2f6e94767dfbb.1464130597.git.hramrach@gmail.com>
Hi,
On Thu, May 26, 2016 at 07:25:24PM -0000, Michal Suchanek wrote:
> When testing SPI without DMA I noticed that filling the FIFO on the
> spi controller causes timeout.
>
> Always leave room for one byte in the FIFO.
>
> Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Sending it to stable would be great (with a fixes tag too).
>
> ---
> v2:
> use EMSGSIZE instead of EINVAL
> ---
> drivers/spi/spi-sun4i.c | 8 ++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/spi/spi-sun4i.c b/drivers/spi/spi-sun4i.c
> index fe63bbd..04f1b77 100644
> --- a/drivers/spi/spi-sun4i.c
> +++ b/drivers/spi/spi-sun4i.c
> @@ -180,7 +180,9 @@ static int sun4i_spi_transfer_one(struct spi_master *master,
>
> /* We don't support transfer larger than the FIFO */
> if (tfr->len > SUN4I_FIFO_DEPTH)
> - return -EINVAL;
> + return -EMSGSIZE;
One new line here.
> + if (tfr->tx_buf && tfr->len >= SUN4I_FIFO_DEPTH)
> + return -EMSGSIZE;
>
> reinit_completion(&sspi->done);
> sspi->tx_buf = tfr->tx_buf;
> @@ -271,7 +273,9 @@ static int sun4i_spi_transfer_one(struct spi_master *master,
> sun4i_spi_write(sspi, SUN4I_XMIT_CNT_REG, SUN4I_XMIT_CNT(tx_len));
>
> /* Fill the TX FIFO */
> - sun4i_spi_fill_fifo(sspi, SUN4I_FIFO_DEPTH);
> + /* Filling the FIFO fully causes timeout for some reason
> + * at least on spi2 on A10s */
This is not the proper comment style and generate a warning with
checkpatch, please fix that (and merge the comment with the previous
comment).
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160530/70e12939/attachment.sig>
next prev parent reply other threads:[~2016-05-30 8:37 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-24 22:56 [PATCH 0/5] sunxi spi fixes Michal Suchanek
2016-05-26 19:25 ` [PATCH 1/5] spi: sunxi: fix transfer timeout Michal Suchanek
2016-05-27 2:05 ` [linux-sunxi] " Julian Calaby
2016-05-27 5:05 ` Michal Suchanek
2016-05-27 5:10 ` Julian Calaby
2016-05-30 11:23 ` Mark Brown
2016-05-31 11:52 ` Michal Suchanek
2016-06-01 18:20 ` Maxime Ripard
2016-05-30 9:44 ` Maxime Ripard
2016-05-26 19:25 ` [PATCH 3/5] spi: sunxi: expose maximum transfer size limit Michal Suchanek
2016-05-30 8:37 ` Maxime Ripard
2016-05-30 8:57 ` Michal Suchanek
2016-06-01 18:14 ` Maxime Ripard
2016-05-26 19:25 ` [PATCH 2/5] spi: sun4i: fix FIFO limit Michal Suchanek
2016-05-30 8:37 ` Maxime Ripard [this message]
2016-05-26 19:25 ` [PATCH 5/5] RFC spi: sun4i: add DMA support Michal Suchanek
2016-05-30 11:26 ` Mark Brown
2016-05-30 12:11 ` Geert Uytterhoeven
2016-05-30 15:03 ` Mark Brown
2016-05-30 15:28 ` Michal Suchanek
2016-05-30 15:50 ` Mark Brown
2016-05-31 10:44 ` Michal Suchanek
2016-05-31 13:27 ` Mark Brown
2016-05-31 14:19 ` Michal Suchanek
2016-06-02 8:18 ` Maxime Ripard
2016-06-01 18:00 ` Maxime Ripard
2016-06-02 4:42 ` [linux-sunxi] " Priit Laes
2016-06-02 9:18 ` Mark Brown
2016-06-02 12:14 ` Michal Suchanek
2016-06-02 14:26 ` Mark Brown
2016-06-05 11:27 ` Michal Suchanek
2016-06-06 11:36 ` Mark Brown
2016-05-26 19:25 ` [PATCH 4/5] spi: sunxi: set maximum and minimum speed of SPI master Michal Suchanek
2016-05-30 9:17 ` Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160530083700.GF4247@lukather \
--to=maxime.ripard@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).