From: Jon Lin <jon.lin@rock-chips.com>
To: broonie@kernel.org
Cc: kernel@esmil.dk, linux-kernel@vger.kernel.org,
linux-spi@vger.kernel.org, linux-rockchip@lists.infradead.org,
Jon Lin <jon.lin@rock-chips.com>,
linux-arm-kernel@lists.infradead.org, heiko@sntech.de
Subject: [PATCH v3 3/3] spi: rockchip: Fix error in SPI slave pio read
Date: Thu, 23 Jul 2020 08:43:56 +0800 [thread overview]
Message-ID: <20200723004356.6390-3-jon.lin@rock-chips.com> (raw)
In-Reply-To: <20200723004356.6390-1-jon.lin@rock-chips.com>
The RXFLR is possible larger than rx_left in Rockchip SPI, fix it.
Fixes: 01b59ce5dac8 ("spi: rockchip: use irq rather than polling")
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Emil Renner Berthing <kernel@esmil.dk>
Tested-by: Emil Renner Berthing <kernel@esmil.dk>
---
drivers/spi/spi-rockchip.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index a451dacab5cf..75a8a9428ff8 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -291,7 +291,7 @@ static void rockchip_spi_pio_writer(struct rockchip_spi *rs)
static void rockchip_spi_pio_reader(struct rockchip_spi *rs)
{
u32 words = readl_relaxed(rs->regs + ROCKCHIP_SPI_RXFLR);
- u32 rx_left = rs->rx_left - words;
+ u32 rx_left = (rs->rx_left > words) ? rs->rx_left - words : 0;
/* the hardware doesn't allow us to change fifo threshold
* level while spi is enabled, so instead make sure to leave
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-07-23 0:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-23 0:43 [PATCH v3 1/3] spi: rockchip: Config spi rx dma burst size depend on xfer length Jon Lin
2020-07-23 0:43 ` [PATCH v3 2/3] spi: rockchip: Support 64-location deep FIFOs Jon Lin
2020-07-23 0:43 ` Jon Lin [this message]
2020-07-28 16:31 ` [PATCH v3 1/3] spi: rockchip: Config spi rx dma burst size depend on xfer length Mark Brown
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=20200723004356.6390-3-jon.lin@rock-chips.com \
--to=jon.lin@rock-chips.com \
--cc=broonie@kernel.org \
--cc=heiko@sntech.de \
--cc=kernel@esmil.dk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-spi@vger.kernel.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).