From: Sergey Suloev <ssuloev@orpaltech.com>
To: Mark Brown <broonie@kernel.org>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Chen-Yu Tsai <wens@csie.org>
Cc: linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Sergey Suloev <ssuloev@orpaltech.com>
Subject: [PATCH 1/6] spi: core: handle timeout error from transfer_one()
Date: Thu, 29 Mar 2018 21:59:02 +0300 [thread overview]
Message-ID: <20180329185907.27281-2-ssuloev@orpaltech.com> (raw)
In-Reply-To: <20180329185907.27281-1-ssuloev@orpaltech.com>
As long as sun4i/sun6i SPI drivers have overriden the default
"wait for completion" procedure then we need to properly
handle -ETIMEDOUT error from transfer_one().
Signed-off-by: Sergey Suloev <ssuloev@orpaltech.com>
---
drivers/spi/spi.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index b33a727..2dcd4f6 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1028,7 +1028,7 @@ static int spi_transfer_one_message(struct spi_controller *ctlr,
reinit_completion(&ctlr->xfer_completion);
ret = ctlr->transfer_one(ctlr, msg->spi, xfer);
- if (ret < 0) {
+ if (ret < 0 && ret != -ETIMEDOUT) {
SPI_STATISTICS_INCREMENT_FIELD(statm,
errors);
SPI_STATISTICS_INCREMENT_FIELD(stats,
@@ -1051,7 +1051,7 @@ static int spi_transfer_one_message(struct spi_controller *ctlr,
msecs_to_jiffies(ms));
}
- if (ms == 0) {
+ if (ms == 0 || ret == -ETIMEDOUT) {
SPI_STATISTICS_INCREMENT_FIELD(statm,
timedout);
SPI_STATISTICS_INCREMENT_FIELD(stats,
@@ -1059,6 +1059,7 @@ static int spi_transfer_one_message(struct spi_controller *ctlr,
dev_err(&msg->spi->dev,
"SPI transfer timed out\n");
msg->status = -ETIMEDOUT;
+ ret = 0;
}
} else {
if (xfer->len)
--
2.16.2
next prev parent reply other threads:[~2018-03-29 18:59 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-29 18:59 [PATCH 0/6] spi: Add support for DMA transfers in sun4i SPI driver Sergey Suloev
2018-03-29 18:59 ` Sergey Suloev [this message]
2018-03-29 18:59 ` [PATCH 2/6] spi: sun4i: restrict transfer length in PIO-mode Sergey Suloev
2018-04-03 8:10 ` Maxime Ripard
2018-04-03 10:26 ` Sergey Suloev
2018-04-03 11:08 ` Sergey Suloev
2018-04-03 11:40 ` Maxime Ripard
2018-04-03 12:12 ` Sergey Suloev
2018-03-29 18:59 ` [PATCH 3/6] spi: sun4i: coding style/readability improvements Sergey Suloev
2018-03-29 18:59 ` [PATCH 4/6] spi: sun4i: use completion provided by SPI core driver Sergey Suloev
2018-03-29 18:59 ` [PATCH 5/6] spi: sun4i: introduce register set/unset helpers Sergey Suloev
2018-04-03 8:14 ` Maxime Ripard
2018-04-03 10:27 ` Sergey Suloev
2018-03-29 18:59 ` [PATCH 6/6] spi: sun4i: add DMA transfers support Sergey Suloev
2018-04-03 8:17 ` Maxime Ripard
2018-04-03 13:03 ` Sergey Suloev
2018-04-04 6:27 ` 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=20180329185907.27281-2-ssuloev@orpaltech.com \
--to=ssuloev@orpaltech.com \
--cc=broonie@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=maxime.ripard@bootlin.com \
--cc=wens@csie.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).