From: Sudip Mukherjee <sudip.mukherjee@sifive.com>
To: Serge Semin <fancer.lancer@gmail.com>,
Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: jude.onyenegecha@sifive.com, ben.dooks@sifive.com,
jeegar.lakhani@sifive.com, linux-spi@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Sudip Mukherjee <sudip.mukherjee@sifive.com>
Subject: [PATCH v2 06/15] spi: dw: Introduce dual/quad/octal spi
Date: Mon, 12 Dec 2022 18:07:23 +0000 [thread overview]
Message-ID: <20221212180732.79167-7-sudip.mukherjee@sifive.com> (raw)
In-Reply-To: <20221212180732.79167-1-sudip.mukherjee@sifive.com>
If the spi transfer is using dual/quad/octal spi mode, then we need to
update the SPI_CTRLR0 register. The SPI_CTRLR0 register will be updated
in dw_spi_update_config() via the values in dw_spi_cfg.
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@sifive.com>
---
Note: DW_SPI_SPI_CTRLR0_INST_L_INST_L16 will not work yet as
spi_mem_default_supports_op() checks for op->cmd.nbytes != 1.
drivers/spi/spi-dw-core.c | 46 +++++++++++++++++++++++++++++++++++++++
drivers/spi/spi-dw.h | 9 ++++++++
2 files changed, 55 insertions(+)
diff --git a/drivers/spi/spi-dw-core.c b/drivers/spi/spi-dw-core.c
index 89438ae2df17d..06169aa3f37bf 100644
--- a/drivers/spi/spi-dw-core.c
+++ b/drivers/spi/spi-dw-core.c
@@ -836,10 +836,56 @@ static int dw_spi_exec_enh_mem_op(struct spi_mem *mem, const struct spi_mem_op *
{
struct spi_controller *ctlr = mem->spi->controller;
struct dw_spi *dws = spi_controller_get_devdata(ctlr);
+ struct dw_spi_cfg cfg;
+
+ switch (op->data.buswidth) {
+ case 2:
+ cfg.spi_frf = DW_SPI_CTRLR0_SPI_FRF_DUAL_SPI;
+ break;
+ case 4:
+ cfg.spi_frf = DW_SPI_CTRLR0_SPI_FRF_QUAD_SPI;
+ break;
+ case 8:
+ cfg.spi_frf = DW_SPI_CTRLR0_SPI_FRF_OCT_SPI;
+ break;
+ default:
+ return dw_spi_exec_mem_op(mem, op);
+ }
/* Collect cmd and addr into a single buffer */
dw_spi_init_enh_mem_buf(dws, op);
+ cfg.dfs = 8;
+ cfg.freq = clamp(mem->spi->max_speed_hz, 0U, dws->max_mem_freq);
+ cfg.ndf = op->data.nbytes;
+ if (op->data.dir == SPI_MEM_DATA_IN)
+ cfg.tmode = DW_SPI_CTRLR0_TMOD_RO;
+ else
+ cfg.tmode = DW_SPI_CTRLR0_TMOD_TO;
+ if (op->data.buswidth == op->addr.buswidth &&
+ op->data.buswidth == op->cmd.buswidth)
+ cfg.trans_t = DW_SPI_SPI_CTRLR0_TRANS_TYPE_TT2;
+ else if (op->data.buswidth == op->addr.buswidth)
+ cfg.trans_t = DW_SPI_SPI_CTRLR0_TRANS_TYPE_TT1;
+ else
+ cfg.trans_t = DW_SPI_SPI_CTRLR0_TRANS_TYPE_TT0;
+
+ cfg.addr_l = clamp(op->addr.nbytes * 2, 0, 0xf);
+ if (op->cmd.nbytes > 1)
+ cfg.inst_l = DW_SPI_SPI_CTRLR0_INST_L_INST_L16;
+ else if (op->cmd.nbytes == 1)
+ cfg.inst_l = DW_SPI_SPI_CTRLR0_INST_L_INST_L8;
+ else
+ cfg.inst_l = DW_SPI_SPI_CTRLR0_INST_L_INST_L0;
+
+ cfg.wait_c = (op->dummy.nbytes * (BITS_PER_BYTE / op->dummy.buswidth));
+
+ dw_spi_enable_chip(dws, 0);
+
+ dw_spi_update_config(dws, mem->spi, &cfg);
+
+ dw_spi_enable_chip(dws, 1);
+
return 0;
}
diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h
index 327d037bdb10e..494b830ad1026 100644
--- a/drivers/spi/spi-dw.h
+++ b/drivers/spi/spi-dw.h
@@ -101,6 +101,9 @@
#define DW_HSSI_CTRLR0_SPI_FRF_MASK GENMASK(23, 22)
#define DW_PSSI_CTRLR0_SPI_FRF_MASK GENMASK(22, 21)
#define DW_SPI_CTRLR0_SPI_FRF_STD_SPI 0x0
+#define DW_SPI_CTRLR0_SPI_FRF_DUAL_SPI 0x1
+#define DW_SPI_CTRLR0_SPI_FRF_QUAD_SPI 0x2
+#define DW_SPI_CTRLR0_SPI_FRF_OCT_SPI 0x3
/* Bit fields in CTRLR1 */
#define DW_SPI_NDF_MASK GENMASK(15, 0)
@@ -132,7 +135,13 @@
#define DW_SPI_SPI_CTRLR0_CLK_STRETCH_EN BIT(30)
#define DW_SPI_SPI_CTRLR0_WAIT_CYCLE_MASK GENMASK(15, 11)
#define DW_SPI_SPI_CTRLR0_INST_L_MASK GENMASK(9, 8)
+#define DW_SPI_SPI_CTRLR0_INST_L_INST_L0 0x0
+#define DW_SPI_SPI_CTRLR0_INST_L_INST_L8 0x2
+#define DW_SPI_SPI_CTRLR0_INST_L_INST_L16 0x3
#define DW_SPI_SPI_CTRLR0_ADDR_L_MASK GENMASK(5, 2)
+#define DW_SPI_SPI_CTRLR0_TRANS_TYPE_TT0 0x0
+#define DW_SPI_SPI_CTRLR0_TRANS_TYPE_TT1 0x1
+#define DW_SPI_SPI_CTRLR0_TRANS_TYPE_TT2 0x2
/* Mem/DMA operations helpers */
#define DW_SPI_WAIT_RETRIES 5
--
2.30.2
next prev parent reply other threads:[~2022-12-12 18:09 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-12 18:07 [PATCH v2 00/15] Add support for enhanced SPI for Designware SPI controllers Sudip Mukherjee
2022-12-12 18:07 ` [PATCH v2 01/15] spi: dw: Introduce spi_frf and STD_SPI Sudip Mukherjee
2023-01-09 16:43 ` Serge Semin
2022-12-12 18:07 ` [PATCH v2 02/15] spi: dw: update NDF while using enhanced spi mode Sudip Mukherjee
2023-01-09 16:52 ` Serge Semin
2022-12-12 18:07 ` [PATCH v2 03/15] spi: dw: update SPI_CTRLR0 register Sudip Mukherjee
2023-01-09 17:06 ` Serge Semin
2022-12-12 18:07 ` [PATCH v2 04/15] spi: dw: add check for support of enhanced spi Sudip Mukherjee
2023-01-09 17:34 ` Serge Semin
2022-12-12 18:07 ` [PATCH v2 05/15] spi: dw: Introduce enhanced mem_op Sudip Mukherjee
2023-01-10 11:10 ` Serge Semin
2022-12-12 18:07 ` Sudip Mukherjee [this message]
2023-01-10 11:40 ` [PATCH v2 06/15] spi: dw: Introduce dual/quad/octal spi Serge Semin
2022-12-12 18:07 ` [PATCH v2 07/15] spi: dw: send cmd and addr to start the spi transfer Sudip Mukherjee
2023-01-10 11:42 ` Serge Semin
2022-12-12 18:07 ` [PATCH v2 08/15] spi: dw: update irq setup to use multiple handler Sudip Mukherjee
2023-01-10 11:46 ` Serge Semin
2022-12-12 18:07 ` [PATCH v2 09/15] spi: dw: use irq handler for enhanced spi Sudip Mukherjee
2023-01-10 12:08 ` Serge Semin
2022-12-12 18:07 ` [PATCH v2 10/15] spi: dw: Calculate Receive FIFO Threshold Level Sudip Mukherjee
2022-12-12 18:07 ` [PATCH v2 11/15] spi: dw: adjust size of mem_op Sudip Mukherjee
2022-12-12 18:07 ` [PATCH v2 12/15] spi: dw: Add retry for enhanced spi mode Sudip Mukherjee
2023-01-10 12:10 ` Serge Semin
2022-12-12 18:07 ` [PATCH v2 13/15] spi: dw: detect " Sudip Mukherjee
2023-01-10 12:20 ` Serge Semin
2022-12-12 18:07 ` [PATCH v2 14/15] spi: dt-bindings: snps,dw-ahb-ssi: Add generic dw-ahb-ssi version Sudip Mukherjee
2022-12-13 16:32 ` Rob Herring
2022-12-13 16:59 ` Mark Brown
2022-12-13 17:47 ` Sudip Mukherjee
2022-12-13 18:29 ` Serge Semin
2022-12-12 18:07 ` [PATCH v2 15/15] spi: dw: initialize dwc-ssi controller Sudip Mukherjee
2022-12-18 17:45 ` [PATCH v2 00/15] Add support for enhanced SPI for Designware SPI controllers Serge Semin
2023-01-04 22:20 ` Serge Semin
2023-01-09 16:25 ` Serge Semin
2023-01-19 16:26 ` Sudip Mukherjee
2023-01-19 16:37 ` Serge Semin
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=20221212180732.79167-7-sudip.mukherjee@sifive.com \
--to=sudip.mukherjee@sifive.com \
--cc=ben.dooks@sifive.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=fancer.lancer@gmail.com \
--cc=jeegar.lakhani@sifive.com \
--cc=jude.onyenegecha@sifive.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--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).