From: Alexandru Ardelean <alexandru.ardelean@analog.com>
To: <bcm-kernel-feedback-list@broadcom.com>,
<linux-iio@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-spi@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-tegra@vger.kernel.org>
Cc: <jic23@kernel.org>, <broonie@kernel.org>, <f.fainelli@gmail.com>,
<linus.walleij@linaro.org>, <orsonzhai@gmail.com>,
<baolin.wang@linaro.org>, <zhang.lyra@gmail.com>,
Alexandru Ardelean <alexandru.ardelean@analog.com>
Subject: [PATCH v4 16/19] spi: spi-fsl-espi: convert transfer delay to `spi_delay` format
Date: Thu, 26 Sep 2019 13:51:44 +0300 [thread overview]
Message-ID: <20190926105147.7839-17-alexandru.ardelean@analog.com> (raw)
In-Reply-To: <20190926105147.7839-1-alexandru.ardelean@analog.com>
The way the max delay is computed for this controller, it looks like it is
searching for the max delay from an SPI message a using that.
No idea if this is valid. But this change should support both `delay_usecs`
and the new `delay` data which is of `spi_delay` type.
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
drivers/spi/spi-fsl-espi.c | 16 +++++++++++++---
drivers/spi/spi.c | 9 +++++----
include/linux/spi/spi.h | 1 +
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 732bf3195917..e60581283a24 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -436,6 +436,7 @@ static int fsl_espi_do_one_msg(struct spi_master *master,
struct spi_message *m)
{
unsigned int delay_usecs = 0, rx_nbits = 0;
+ unsigned int delay_nsecs = 0, delay_nsecs1 = 0;
struct spi_transfer *t, trans = {};
int ret;
@@ -444,8 +445,16 @@ static int fsl_espi_do_one_msg(struct spi_master *master,
goto out;
list_for_each_entry(t, &m->transfers, transfer_list) {
- if (t->delay_usecs > delay_usecs)
- delay_usecs = t->delay_usecs;
+ if (t->delay_usecs) {
+ if (t->delay_usecs > delay_usecs) {
+ delay_usecs = t->delay_usecs;
+ delay_nsecs = delay_usecs * 1000;
+ }
+ } else {
+ delay_nsecs1 = spi_delay_to_ns(&t->delay, t);
+ if (delay_nsecs1 > delay_nsecs)
+ delay_nsecs = delay_nsecs1;
+ }
if (t->rx_nbits > rx_nbits)
rx_nbits = t->rx_nbits;
}
@@ -456,7 +465,8 @@ static int fsl_espi_do_one_msg(struct spi_master *master,
trans.len = m->frame_length;
trans.speed_hz = t->speed_hz;
trans.bits_per_word = t->bits_per_word;
- trans.delay_usecs = delay_usecs;
+ trans.delay.value = delay_nsecs;
+ trans.delay.unit = SPI_DELAY_UNIT_NSECS;
trans.rx_nbits = rx_nbits;
if (trans.len)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 61ef286f954a..1f0b55c9e2e8 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1120,7 +1120,7 @@ static void _spi_transfer_delay_ns(u32 ns)
}
}
-static int _spi_delay_to_ns(struct spi_delay *_delay, struct spi_transfer *xfer)
+int spi_delay_to_ns(struct spi_delay *_delay, struct spi_transfer *xfer)
{
u32 delay = _delay->value;
u32 unit = _delay->unit;
@@ -1153,6 +1153,7 @@ static int _spi_delay_to_ns(struct spi_delay *_delay, struct spi_transfer *xfer)
return delay;
}
+EXPORT_SYMBOL_GPL(spi_delay_to_ns);
int spi_delay_exec(struct spi_delay *_delay, struct spi_transfer *xfer)
{
@@ -1161,7 +1162,7 @@ int spi_delay_exec(struct spi_delay *_delay, struct spi_transfer *xfer)
if (!_delay)
return -EINVAL;
- delay = _spi_delay_to_ns(_delay, xfer);
+ delay = spi_delay_to_ns(_delay, xfer);
if (delay < 0)
return delay;
@@ -3211,11 +3212,11 @@ static int _spi_xfer_word_delay_update(struct spi_transfer *xfer,
{
int delay1, delay2;
- delay1 = _spi_delay_to_ns(&xfer->word_delay, xfer);
+ delay1 = spi_delay_to_ns(&xfer->word_delay, xfer);
if (delay1 < 0)
return delay1;
- delay2 = _spi_delay_to_ns(&spi->word_delay, xfer);
+ delay2 = spi_delay_to_ns(&spi->word_delay, xfer);
if (delay2 < 0)
return delay2;
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 66031c8d0093..3bc5912fca36 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -102,6 +102,7 @@ struct spi_delay {
u8 unit;
};
+extern int spi_delay_to_ns(struct spi_delay *_delay, struct spi_transfer *xfer);
extern int spi_delay_exec(struct spi_delay *_delay, struct spi_transfer *xfer);
/**
--
2.20.1
next prev parent reply other threads:[~2019-09-26 10:53 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-26 10:51 [PATCH v4 00/19] spi: introduce `struct spi_delay` data-type Alexandru Ardelean
2019-09-26 10:51 ` [PATCH v4 01/19] spi: move `cs_change_delay` backwards compat logic outside switch Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: move `cs_change_delay` backwards compat logic outside switch" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 02/19] spi: introduce spi_delay struct as "value + unit" & spi_delay_exec() Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: introduce spi_delay struct as "value + unit" & spi_delay_exec()" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 03/19] spi: make `cs_change_delay` the first user of the `spi_delay` logic Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: make `cs_change_delay` the first user of the `spi_delay` logic" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 04/19] spi: sprd: convert transfer word delay to spi_delay struct Alexandru Ardelean
2019-10-15 11:11 ` Mark Brown
2019-10-15 11:12 ` Applied "spi: sprd: convert transfer word delay to spi_delay struct" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 05/19] spi: orion: use new `word_delay` field for SPI transfers Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: orion: use new `word_delay` field for SPI transfers" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 06/19] spi: spidev: use new `word_delay` field for spi transfers Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: spidev: use new `word_delay` field for spi transfers" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 07/19] spi: core,atmel: convert `word_delay_usecs` -> `word_delay` for spi_device Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: core,atmel: convert `word_delay_usecs` -> `word_delay` for spi_device" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 08/19] spi: introduce `delay` field for `spi_transfer` + spi_transfer_delay_exec() Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: introduce `delay` field for `spi_transfer` + spi_transfer_delay_exec()" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 09/19] spi: use new `spi_transfer_delay_exec` helper where straightforward Alexandru Ardelean
2019-09-26 10:51 ` [PATCH v4 10/19] spi: tegra114: use `spi_transfer_delay_exec` helper Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: tegra114: use `spi_transfer_delay_exec` helper" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 11/19] spi: tegra20-sflash: use to new `spi_transfer_delay_exec` Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: tegra20-sflash: use to new `spi_transfer_delay_exec`" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 12/19] spi: spi-loopback-test: use new `delay` field Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: spi-loopback-test: use new `delay` field" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 13/19] spi: spidev: use new `delay` field for spi transfers Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: spidev: use new `delay` field for spi transfers" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 14/19] spi: tegra114: change format for `spi_set_cs_timing()` function Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: tegra114: change format for `spi_set_cs_timing()` function" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 15/19] spi: implement SW control for CS times Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: implement SW control for CS times" to the spi tree Mark Brown
2019-09-26 10:51 ` Alexandru Ardelean [this message]
2019-10-15 11:12 ` Applied "spi: spi-fsl-espi: convert transfer delay to `spi_delay` format" " Mark Brown
2019-09-26 10:51 ` [PATCH v4 17/19] spi: spi-falcon: extend warning to `delay` as well Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: spi-falcon: extend warning to `delay` as well" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 18/19] spi: bcm63xx: extend error condition to `delay` as well Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: bcm63xx: extend error condition to `delay` as well" to the spi tree Mark Brown
2019-09-26 10:51 ` [PATCH v4 19/19] spi: spi-axi: extend support for the `delay` field Alexandru Ardelean
2019-10-15 11:12 ` Applied "spi: spi-axi: extend support for the `delay` field" to the spi tree 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=20190926105147.7839-17-alexandru.ardelean@analog.com \
--to=alexandru.ardelean@analog.com \
--cc=baolin.wang@linaro.org \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=broonie@kernel.org \
--cc=f.fainelli@gmail.com \
--cc=jic23@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=orsonzhai@gmail.com \
--cc=zhang.lyra@gmail.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).