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 07/11] spi: Deal with slaves that return from transfer_one() unfinished Date: Wed, 10 Oct 2018 19:09:32 +0200 [thread overview] Message-ID: <20181010170936.316862-8-lkundrak@v3.sk> (raw) In-Reply-To: <20181010170936.316862-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> --- drivers/spi/spi.c | 64 +++++++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 9da0bc5a036c..079214a31d2c 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -993,6 +993,44 @@ 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"); + msg->status = -ETIMEDOUT; + } + } + + return 0; +} + /* * spi_transfer_one_message - Default implementation of transfer_one_message() * @@ -1006,7 +1044,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; @@ -1035,28 +1072,11 @@ 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; + if (ret > 0) + ret = spi_transfer_wait(ctlr, msg, xfer); - 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; - } + if (ret < 0) + return ret; } else { if (xfer->len) dev_err(&msg->spi->dev, -- 2.19.0
WARNING: multiple messages have this Message-ID (diff)
From: lkundrak@v3.sk (Lubomir Rintel) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 07/11] spi: Deal with slaves that return from transfer_one() unfinished Date: Wed, 10 Oct 2018 19:09:32 +0200 [thread overview] Message-ID: <20181010170936.316862-8-lkundrak@v3.sk> (raw) In-Reply-To: <20181010170936.316862-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> --- drivers/spi/spi.c | 64 +++++++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 9da0bc5a036c..079214a31d2c 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -993,6 +993,44 @@ 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"); + msg->status = -ETIMEDOUT; + } + } + + return 0; +} + /* * spi_transfer_one_message - Default implementation of transfer_one_message() * @@ -1006,7 +1044,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; @@ -1035,28 +1072,11 @@ 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; + if (ret > 0) + ret = spi_transfer_wait(ctlr, msg, xfer); - 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; - } + if (ret < 0) + return ret; } else { if (xfer->len) dev_err(&msg->spi->dev, -- 2.19.0
next prev parent reply other threads:[~2018-10-10 17:10 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-10 17:09 [PATCH 0/11] spi: pxa2xx: add DT and slave mode support Lubomir Rintel 2018-10-10 17:09 ` Lubomir Rintel 2018-10-10 17:09 ` [PATCH v2 01/11] dt-bindings: spi/spi-pxa2xx: add PXA2xx SSP SPI Controller Lubomir Rintel 2018-10-10 17:09 ` Lubomir Rintel 2018-10-11 14:27 ` Mark Brown 2018-10-11 14:27 ` Mark Brown 2018-10-11 17:59 ` Lubomir Rintel 2018-10-11 17:59 ` Lubomir Rintel 2018-10-12 17:00 ` Mark Brown 2018-10-12 17:00 ` Mark Brown 2018-10-17 19:32 ` Rob Herring 2018-10-17 19:32 ` Rob Herring 2018-11-04 12:00 ` Pavel Machek 2018-11-04 12:00 ` Pavel Machek 2018-10-10 17:09 ` [PATCH v2 02/11] PCI: Provide pci_match_id() with CONFIG_PCI=n Lubomir Rintel 2018-10-10 17:09 ` Lubomir Rintel 2018-11-04 12:02 ` Pavel Machek 2018-11-04 12:02 ` Pavel Machek 2018-10-10 17:09 ` [PATCH 03/11] spi: pxa2xx: Use an enum for type Lubomir Rintel 2018-10-10 17:09 ` Lubomir Rintel 2018-11-04 12:03 ` Pavel Machek 2018-11-04 12:03 ` Pavel Machek 2018-10-10 17:09 ` [PATCH 04/11] spi: pxa2xx: Add devicetree support Lubomir Rintel 2018-10-10 17:09 ` Lubomir Rintel 2018-11-04 12:04 ` Pavel Machek 2018-11-04 12:04 ` Pavel Machek 2018-10-10 17:09 ` [PATCH 05/11] DT: marvell,mmp2: Add SSP1 and SSP3 Lubomir Rintel 2018-10-10 17:09 ` Lubomir Rintel 2018-10-29 5:35 ` James Cameron 2018-10-29 5:35 ` James Cameron 2018-11-04 12:06 ` Pavel Machek 2018-11-04 12:06 ` Pavel Machek 2018-10-10 17:09 ` [PATCH 06/11] dt-bindings: spi/spi-pxa2xx: Add spi-slave property Lubomir Rintel 2018-10-10 17:09 ` Lubomir Rintel 2018-10-17 19:33 ` Rob Herring 2018-10-17 19:33 ` Rob Herring 2018-11-04 12:07 ` Pavel Machek 2018-11-04 12:07 ` Pavel Machek 2018-10-10 17:09 ` Lubomir Rintel [this message] 2018-10-10 17:09 ` [PATCH 07/11] spi: Deal with slaves that return from transfer_one() unfinished Lubomir Rintel 2018-10-11 7:23 ` Geert Uytterhoeven 2018-10-11 7:23 ` Geert Uytterhoeven 2018-10-11 7:23 ` Geert Uytterhoeven 2018-11-04 12:09 ` Pavel Machek 2018-11-04 12:09 ` Pavel Machek 2018-10-10 17:09 ` [PATCH 08/11] spi: pxa2xx: Add slave mode support Lubomir Rintel 2018-10-10 17:09 ` Lubomir Rintel 2018-11-04 12:12 ` Pavel Machek 2018-11-04 12:12 ` Pavel Machek 2018-10-10 17:09 ` [PATCH 09/11] dt-bindings: spi/spi-pxa2xx: Add ready GPIO signal Lubomir Rintel 2018-10-10 17:09 ` Lubomir Rintel 2018-10-11 7:26 ` Geert Uytterhoeven 2018-10-11 7:26 ` Geert Uytterhoeven 2018-10-11 7:26 ` Geert Uytterhoeven 2018-11-04 12:13 ` Pavel Machek 2018-11-04 12:13 ` Pavel Machek 2018-10-10 17:09 ` [PATCH 10/11] spi: pxa2xx: Add ready signal Lubomir Rintel 2018-10-10 17:09 ` Lubomir Rintel 2018-10-11 7:28 ` Geert Uytterhoeven 2018-10-11 7:28 ` Geert Uytterhoeven 2018-10-11 7:28 ` Geert Uytterhoeven 2018-10-11 16:13 ` Lubomir Rintel 2018-10-11 16:13 ` Lubomir Rintel 2018-10-11 16:13 ` Lubomir Rintel 2018-11-04 12:16 ` Pavel Machek 2018-11-04 12:16 ` Pavel Machek 2018-10-10 17:09 ` [PATCH 11/11] spi: pxa2xx: Deal with the leftover garbage in TXFIFO Lubomir Rintel 2018-10-10 17:09 ` Lubomir Rintel 2018-11-04 12:19 ` Pavel Machek 2018-11-04 12:19 ` Pavel Machek
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=20181010170936.316862-8-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.