From: kernel@martin.sperl.org
To: Mark Brown <broonie@kernel.org>, Eric Anholt <eric@anholt.net>,
Stefan Wahren <stefan.wahren@i2se.com>,
Hubert Denkmair <h.denkmair@intence.de>,
linux-spi@vger.kernel.org, linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Cc: Martin Sperl <kernel@martin.sperl.org>
Subject: [PATCH V3 3/9] spi: bcm2835aux: fix corruptions for longer spi transfers
Date: Sat, 30 Mar 2019 09:31:00 +0000 [thread overview]
Message-ID: <20190330093106.20723-4-kernel@martin.sperl.org> (raw)
In-Reply-To: <20190330093106.20723-1-kernel@martin.sperl.org>
From: Martin Sperl <kernel@martin.sperl.org>
On long running tests with a mcp2517fd can controller it showed that
on rare occations the data read shows corruptions for longer spi transfers.
Example of a 22 byte transfer:
expected (as captured on logic analyzer):
FF FF 78 00 00 00 08 06 00 00 91 20 77 56 84 85 86 87 88 89 8a 8b
read by the driver:
FF FF 78 00 00 00 08 06 00 00 91 20 77 56 84 88 89 8a 00 00 8b 9b
To fix this use BCM2835_AUX_SPI_STAT_RX_LVL to determine when we may
read data from the fifo reliably without any corruption.
Surprisingly the only values ever empirically read in
BCM2835_AUX_SPI_STAT_RX_LVL are 0x00, 0x10, 0x20 and 0x30.
So whenever the mask is not 0 we can read from the fifo in a safe manner.
The patch has now been tested intensively and we are no longer
able to reproduce the "RX" issue any longer.
Fixes: 1ea29b39f4c812ec ("spi: bcm2835aux: add bcm2835 auxiliary spi device...")
Reported-by: Hubert Denkmair <h.denkmair@intence.de>
Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
---
drivers/spi/spi-bcm2835aux.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c
index 0838dbda57c7..d9e62f717a45 100644
--- a/drivers/spi/spi-bcm2835aux.c
+++ b/drivers/spi/spi-bcm2835aux.c
@@ -180,12 +180,12 @@ static void bcm2835aux_spi_reset_hw(struct bcm2835aux_spi *bs)
static void bcm2835aux_spi_transfer_helper(struct bcm2835aux_spi *bs)
{
+ u32 stat = bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT);
+
/* check if we have data to read */
- while (bs->rx_len &&
- (!(bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT) &
- BCM2835_AUX_SPI_STAT_RX_EMPTY))) {
+ for (; bs->rx_len && (stat & BCM2835_AUX_SPI_STAT_RX_LVL);
+ stat = bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT))
bcm2835aux_rd_fifo(bs);
- }
/* check if we have data to write */
while (bs->tx_len &&
--
2.11.0
_______________________________________________
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:[~2019-03-30 9:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-30 9:30 [PATCH V3 0/9] spi: bcm2835aux: bug fixes and improvements kernel
2019-03-30 9:30 ` [PATCH V3 1/9] spi: bcm2835aux: unifying code between polling and interrupt driven code kernel
2019-03-30 9:30 ` [PATCH V3 2/9] spi: bcm2835aux: remove dangerous uncontrolled read of fifo kernel
2019-03-30 9:31 ` kernel [this message]
2019-03-30 9:31 ` [PATCH V3 4/9] spi: bcm2835aux: remove dead code kernel
2019-03-30 9:31 ` [PATCH V3 5/9] spi: bcm2835aux: fix driver to not allow 65535 (=-1) cs-gpios kernel
2019-04-03 4:32 ` Mark Brown
2019-03-30 9:31 ` [PATCH V3 6/9] spi: bcm2835aux: warn in dmesg that native cs is not really supported kernel
2019-03-30 9:31 ` [PATCH V3 7/9] spi: bcm2835aux: setup gpio-cs to output and correct level during setup kernel
2019-03-30 9:31 ` [PATCH V3 9/9] spi: bcm2835aux: make the polling duration limits configurable kernel
2019-03-30 10:13 ` [PATCH V3 8/9] spi: bcm2835aux: add driver stats to debugfs kernel
2019-04-02 17:03 ` [PATCH V3 0/9] spi: bcm2835aux: bug fixes and improvements Stefan Wahren
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=20190330093106.20723-4-kernel@martin.sperl.org \
--to=kernel@martin.sperl.org \
--cc=broonie@kernel.org \
--cc=eric@anholt.net \
--cc=h.denkmair@intence.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-spi@vger.kernel.org \
--cc=stefan.wahren@i2se.com \
/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).