From: Eberhard Stoll <estl@gmx.net>
To: Han Xu <han.xu@nxp.com>,
linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org,
Mark Brown <broonie@kernel.org>
Cc: "Eberhard Stoll" <eberhard.stoll@kontron.de>,
"Frieder Schrempf" <frieder.schrempf@kontron.de>,
"Amit Kumar Mahapatra" <amit.kumar-mahapatra@amd.com>,
"Amit Kumar Mahapatra via Alsa-devel"
<alsa-devel@alsa-project.org>,
"Michal Simek" <michal.simek@amd.com>,
"Rob Herring" <robh@kernel.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Yang Yingliang" <yangyingliang@huawei.com>
Subject: [PATCH 4/4] spi: spi-fsl-qspi: Add support for rx data sample point adjustment
Date: Thu, 26 Oct 2023 17:23:05 +0200 [thread overview]
Message-ID: <20231026152316.2729575-5-estl@gmx.net> (raw)
In-Reply-To: <20231026152316.2729575-1-estl@gmx.net>
From: Eberhard Stoll <eberhard.stoll@kontron.de>
This qspi controller supports shifting the spi rx data sampling point to
compensate line or spi device response delays. It enables fast spi data
transfers even for devices which have a noticeable delay in the rx data
stream.
Add support for the SMPR sampling functionality
Signed-off-by: Eberhard Stoll <eberhard.stoll@kontron.de>
Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
---
drivers/spi/spi-fsl-qspi.c | 80 ++++++++++++++++++++++++++++++++++++++
1 file changed, 80 insertions(+)
diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c
index 79bac30e79af..68801e08f997 100644
--- a/drivers/spi/spi-fsl-qspi.c
+++ b/drivers/spi/spi-fsl-qspi.c
@@ -274,6 +274,12 @@ struct fsl_qspi {
int selected;
};
+struct fsl_qspi_chip_data {
+ u32 rx_sample_delay_ns;
+ unsigned long rate;
+ u32 smpr_sampling;
+};
+
static inline int needs_swap_endian(struct fsl_qspi *q)
{
return q->devtype_data->quirks & QUADSPI_QUIRK_SWAP_ENDIAN;
@@ -522,14 +528,63 @@ static void fsl_qspi_invalidate(struct fsl_qspi *q)
qspi_writel(q, reg, q->iobase + QUADSPI_MCR);
}
+static void fsl_qspi_update_smpr_sampling(struct fsl_qspi *q, u32 smpr)
+{
+ void __iomem *base = q->iobase;
+ u32 reg;
+
+ /* Disable the module */
+ qspi_writel(q, QUADSPI_MCR_MDIS_MASK | QUADSPI_MCR_RESERVED_MASK,
+ base + QUADSPI_MCR);
+
+ reg = qspi_readl(q, base + QUADSPI_SMPR) &
+ ~(QUADSPI_SMPR_FSPHS_MASK | QUADSPI_SMPR_FSDLY_MASK);
+ qspi_writel(q, reg | smpr, base + QUADSPI_SMPR);
+
+ /* Enable the module */
+ qspi_writel(q, QUADSPI_MCR_RESERVED_MASK | QUADSPI_MCR_END_CFG_MASK,
+ base + QUADSPI_MCR);
+}
+
+const char *sampling_mode[] = { "N1", "I1", "N2", "I2"};
+
static void fsl_qspi_select_mem(struct fsl_qspi *q, struct spi_device *spi)
{
unsigned long rate = spi->max_speed_hz;
int ret;
+ struct fsl_qspi_chip_data *chip = spi_get_ctldata(spi);
+ const char *sampling_ident = sampling_mode[0];
+
+ if (chip->rx_sample_delay_ns != spi->rx_sample_delay_ns |
+ chip->rate != rate) {
+ chip->rx_sample_delay_ns = spi->rx_sample_delay_ns;
+ chip->rate = rate;
+
+ chip->smpr_sampling =
+ (2 * spi->rx_sample_delay_ns * (rate >> 10)) / (1000000000 >> 10);
+ dev_dbg(q->dev, "smpr_sampling = %u (delay %u ns)\n",
+ chip->smpr_sampling, spi->rx_sample_delay_ns);
+
+ if (chip->smpr_sampling > 3) {
+ dev_err(q->dev, "rx sample delay for device %s exceeds hw capabilities! Clamp value to maximum setting.\n",
+ dev_name(&spi->dev));
+ chip->smpr_sampling = 3;
+ sampling_ident = "(I2 clamped to max)";
+ } else {
+ sampling_ident = sampling_mode[chip->smpr_sampling];
+ }
+
+ chip->smpr_sampling <<= 5;
+ dev_info(q->dev, "sampling point %s at %lu kHz used for device %s\n",
+ sampling_ident, rate / 1000, dev_name(&spi->dev));
+ fsl_qspi_update_smpr_sampling(q, chip->smpr_sampling);
+ }
if (q->selected == spi_get_chipselect(spi, 0))
return;
+ fsl_qspi_update_smpr_sampling(q, chip->smpr_sampling);
+
if (needs_4x_clock(q))
rate *= 4;
@@ -839,6 +894,28 @@ static const struct spi_controller_mem_ops fsl_qspi_mem_ops = {
.get_name = fsl_qspi_get_name,
};
+static int fsl_qspi_setup(struct spi_device *spi)
+{
+ struct fsl_qspi_chip_data *chip = spi_get_ctldata(spi);
+
+ if (!chip) {
+ chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+ if (!chip)
+ return -ENOMEM;
+ spi_set_ctldata(spi, chip);
+ }
+
+ return 0;
+}
+
+static void fsl_qspi_cleanup(struct spi_device *spi)
+{
+ struct fsl_qspi_chip_data *chip = spi_get_ctldata(spi);
+
+ kfree(chip);
+ spi_set_ctldata(spi, NULL);
+}
+
static int fsl_qspi_probe(struct platform_device *pdev)
{
struct spi_controller *ctlr;
@@ -865,6 +942,9 @@ static int fsl_qspi_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, q);
+ ctlr->setup = fsl_qspi_setup;
+ ctlr->cleanup = fsl_qspi_cleanup;
+
/* find the resources */
q->iobase = devm_platform_ioremap_resource_byname(pdev, "QuadSPI");
if (IS_ERR(q->iobase)) {
--
2.25.1
next prev parent reply other threads:[~2023-10-26 15:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-26 15:23 [PATCH 0/4] Add tCLQV parameter to tweak SPI timings Eberhard Stoll
2023-10-26 15:23 ` [PATCH 1/4] spi: Add parameter for clock to rx delay Eberhard Stoll
2023-10-26 22:56 ` Miquel Raynal
2023-10-27 8:38 ` AW: " Stoll, Eberhard
2023-10-27 11:46 ` Andy Shevchenko
[not found] ` <ZTvbFc+kFMotVUkh@finisterre.sirena.org.uk>
2023-10-30 8:48 ` Andy Shevchenko
2023-10-30 9:28 ` AW: " Stoll, Eberhard
2023-10-26 15:23 ` [PATCH 2/4] mtd: spinand: Add support for clock to rx delay setting Eberhard Stoll
2023-10-26 15:23 ` [PATCH 3/4] mtd: spinand: winbond: Add rx sample delay for W25N02KV Eberhard Stoll
2023-10-26 15:23 ` Eberhard Stoll [this message]
2023-10-26 20:03 ` [PATCH 4/4] spi: spi-fsl-qspi: Add support for rx data sample point adjustment kernel test robot
2023-10-27 6:51 ` Frieder Schrempf
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=20231026152316.2729575-5-estl@gmx.net \
--to=estl@gmx.net \
--cc=alsa-devel@alsa-project.org \
--cc=amit.kumar-mahapatra@amd.com \
--cc=broonie@kernel.org \
--cc=eberhard.stoll@kontron.de \
--cc=frieder.schrempf@kontron.de \
--cc=han.xu@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=michal.simek@amd.com \
--cc=robh@kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
--cc=yangyingliang@huawei.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
all inboxes | Powered by JetHome®