From: Lubomir Rintel <lkundrak@v3.sk>
To: Mark Brown <broonie@kernel.org>,
Geert Uytterhoeven <geert+renesas@glider.be>
Cc: James Cameron <quozl@laptop.org>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Eric Miao <eric.y.miao@gmail.com>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Daniel Mack <daniel@zonque.org>,
Robert Jarzmik <robert.jarzmik@free.fr>,
linux-spi@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Lubomir Rintel <lkundrak@v3.sk>
Subject: [PATCH v3 2/6] spi: Deal with slaves that return from transfer_one() unfinished
Date: Tue, 13 Nov 2018 11:22:24 +0100 [thread overview]
Message-ID: <20181113102228.820214-3-lkundrak@v3.sk> (raw)
In-Reply-To: <20181113102228.820214-1-lkundrak@v3.sk>
Some drivers, such as spi-pxa2xx return from the transfer_one callback
immediately, idicating that the transfer will be finished asynchronously.
Normally, spi_transfer_one_message() synchronously waits for the
transfer to finish with wait_for_completion_timeout(). For slaves, we
don't want the transaction to time out as it can complete in a long time
in future. Use wait_for_completion_interruptible() instead.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Acked-by: Pavel Machek <pavel@ucw.cz>
---
Changed since v2:
- Corrected the spi_transfer_wait() return value handling to avoid early
bail out without the necessary cleanup (thanks Geert Uytterhoeven)
drivers/spi/spi.c | 62 +++++++++++++++++++++++++++++------------------
1 file changed, 39 insertions(+), 23 deletions(-)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 6ca59406b0b7..498d3b9bf3ae 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1037,6 +1037,42 @@ static int spi_map_msg(struct spi_controller *ctlr, struct spi_message *msg)
return __spi_map_msg(ctlr, msg);
}
+static int spi_transfer_wait(struct spi_controller *ctlr,
+ struct spi_message *msg,
+ struct spi_transfer *xfer)
+{
+ struct spi_statistics *statm = &ctlr->statistics;
+ struct spi_statistics *stats = &msg->spi->statistics;
+ unsigned long long ms = 1;
+
+ if (spi_controller_is_slave(ctlr)) {
+ if (wait_for_completion_interruptible(&ctlr->xfer_completion)) {
+ dev_dbg(&msg->spi->dev, "SPI transfer interrupted\n");
+ return -EINTR;
+ }
+ } else {
+ ms = 8LL * 1000LL * xfer->len;
+ do_div(ms, xfer->speed_hz);
+ ms += ms + 200; /* some tolerance */
+
+ if (ms > UINT_MAX)
+ ms = UINT_MAX;
+
+ ms = wait_for_completion_timeout(&ctlr->xfer_completion,
+ msecs_to_jiffies(ms));
+
+ if (ms == 0) {
+ SPI_STATISTICS_INCREMENT_FIELD(statm, timedout);
+ SPI_STATISTICS_INCREMENT_FIELD(stats, timedout);
+ dev_err(&msg->spi->dev,
+ "SPI transfer timed out\n");
+ return -ETIMEDOUT;
+ }
+ }
+
+ return 0;
+}
+
/*
* spi_transfer_one_message - Default implementation of transfer_one_message()
*
@@ -1050,7 +1086,6 @@ static int spi_transfer_one_message(struct spi_controller *ctlr,
struct spi_transfer *xfer;
bool keep_cs = false;
int ret = 0;
- unsigned long long ms = 1;
struct spi_statistics *statm = &ctlr->statistics;
struct spi_statistics *stats = &msg->spi->statistics;
@@ -1079,28 +1114,9 @@ static int spi_transfer_one_message(struct spi_controller *ctlr,
goto out;
}
- if (ret > 0) {
- ret = 0;
- ms = 8LL * 1000LL * xfer->len;
- do_div(ms, xfer->speed_hz);
- ms += ms + 200; /* some tolerance */
-
- if (ms > UINT_MAX)
- ms = UINT_MAX;
-
- ms = wait_for_completion_timeout(&ctlr->xfer_completion,
- msecs_to_jiffies(ms));
- }
-
- if (ms == 0) {
- SPI_STATISTICS_INCREMENT_FIELD(statm,
- timedout);
- SPI_STATISTICS_INCREMENT_FIELD(stats,
- timedout);
- dev_err(&msg->spi->dev,
- "SPI transfer timed out\n");
- msg->status = -ETIMEDOUT;
- }
+ ret = spi_transfer_wait(ctlr, msg, xfer);
+ if (ret < 0)
+ msg->status = ret;
} else {
if (xfer->len)
dev_err(&msg->spi->dev,
--
2.19.1
next prev parent reply other threads:[~2018-11-13 10:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-13 10:22 [PATCH v3 0/6] spi: pxa2xx: add slave mode support Lubomir Rintel
2018-11-13 10:22 ` [PATCH v3 1/6] spi: pxa2xx: dt-bindings: Add spi-slave property Lubomir Rintel
2018-11-13 10:28 ` Geert Uytterhoeven
2018-11-13 10:22 ` Lubomir Rintel [this message]
2018-11-13 10:33 ` [PATCH v3 2/6] spi: Deal with slaves that return from transfer_one() unfinished Geert Uytterhoeven
2018-11-13 18:35 ` Applied "spi: Deal with slaves that return from transfer_one() unfinished" to the spi tree Mark Brown
2018-11-13 10:22 ` [PATCH v3 3/6] spi: pxa2xx: Add slave mode support Lubomir Rintel
2018-11-13 10:22 ` [PATCH v3 4/6] spi: pxa2xx: dt-bindings: Add ready GPIO signal Lubomir Rintel
2018-11-13 10:29 ` Geert Uytterhoeven
2018-11-13 18:34 ` Applied "spi: pxa2xx: dt-bindings: Add ready GPIO signal" to the spi tree Mark Brown
2018-11-13 10:22 ` [PATCH v3 5/6] spi: pxa2xx: Add ready signal Lubomir Rintel
2018-11-13 10:31 ` Geert Uytterhoeven
2018-11-13 18:34 ` Applied "spi: pxa2xx: Add ready signal" to the spi tree Mark Brown
2018-11-13 10:22 ` [PATCH v3 6/6] spi: pxa2xx: Deal with the leftover garbage in TXFIFO Lubomir Rintel
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=20181113102228.820214-3-lkundrak@v3.sk \
--to=lkundrak@v3.sk \
--cc=broonie@kernel.org \
--cc=daniel@zonque.org \
--cc=devicetree@vger.kernel.org \
--cc=eric.y.miao@gmail.com \
--cc=geert+renesas@glider.be \
--cc=haojian.zhuang@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=quozl@laptop.org \
--cc=robert.jarzmik@free.fr \
--cc=robh+dt@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).