From: Sean Anderson <sean.anderson@linux.dev>
To: Mark Brown <broonie@kernel.org>,
Michal Simek <michal.simek@amd.com>,
linux-spi@vger.kernel.org
Cc: Jinjie Ruan <ruanjinjie@huawei.com>,
linux-arm-kernel@lists.infradead.org,
Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com>,
linux-kernel@vger.kernel.org,
Miquel Raynal <miquel.raynal@bootlin.com>,
Sean Anderson <sean.anderson@linux.dev>
Subject: [PATCH 6/7] spi: zynqmp-gqspi: Support GPIO chip selects
Date: Thu, 16 Jan 2025 18:21:16 -0500 [thread overview]
Message-ID: <20250116232118.2694169-7-sean.anderson@linux.dev> (raw)
In-Reply-To: <20250116232118.2694169-1-sean.anderson@linux.dev>
GPIO chipselects use the traditional SPU API instead of the SPIMEM API.
Implement it with transfer_one and set_cs (for non-GPIO chipselects). At
the moment we only support half-duplex transfers, which is good enough
to access SPI flashes.
Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
---
drivers/spi/spi-zynqmp-gqspi.c | 83 ++++++++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c
index 9823d710c4d6..efd01e06b77a 100644
--- a/drivers/spi/spi-zynqmp-gqspi.c
+++ b/drivers/spi/spi-zynqmp-gqspi.c
@@ -528,6 +528,15 @@ static void zynqmp_qspi_chipselect(struct spi_device *qspi, bool is_high)
dev_err(xqspi->dev, "Chip select timed out\n");
}
+static void zynqmp_qspi_set_cs(struct spi_device *qspi, bool is_high)
+{
+ struct zynqmp_qspi *xqspi = spi_controller_get_devdata(qspi->controller);
+
+ mutex_lock(&xqspi->op_lock);
+ zynqmp_qspi_chipselect(qspi, is_high);
+ mutex_unlock(&xqspi->op_lock);
+}
+
/**
* zynqmp_qspi_selectspimode - Selects SPI mode - x1 or x2 or x4.
* @xqspi: xqspi is a pointer to the GQSPI instance
@@ -1271,6 +1280,75 @@ static int zynqmp_qspi_exec_op(struct spi_mem *mem,
return err;
}
+static int zynqmp_qspi_transfer_one(struct spi_controller *ctlr,
+ struct spi_device *spi,
+ struct spi_transfer *transfer)
+{
+ struct zynqmp_qspi *xqspi = spi_controller_get_devdata(ctlr);
+ unsigned long timeout;
+ u32 genfifoentry;
+ u32 mask = 0;
+ int ret;
+
+ dev_dbg(xqspi->dev, "xfer %u/%u %u\n", transfer->tx_nbits,
+ transfer->rx_nbits, transfer->len);
+
+ if (transfer->tx_nbits && transfer->rx_nbits)
+ return -EOPNOTSUPP;
+
+ guard(mutex)(&xqspi->op_lock);
+ zynqmp_qspi_config_op(xqspi, transfer->speed_hz, spi->mode);
+ if (spi_get_csgpiod(spi, 0)) {
+ if (ctlr == xqspi->lower) {
+ xqspi->genfifobus = GQSPI_GENFIFO_BUS_LOWER;
+ } else {
+ WARN_ON_ONCE(ctlr != xqspi->upper);
+ xqspi->genfifobus = GQSPI_GENFIFO_BUS_UPPER;
+ }
+ xqspi->genfifocs = 0;
+ }
+ genfifoentry = xqspi->genfifocs | xqspi->genfifobus;
+
+ reinit_completion(&xqspi->data_completion);
+ if (transfer->tx_nbits) {
+ xqspi->txbuf = transfer->tx_buf;
+ xqspi->rxbuf = NULL;
+ xqspi->bytes_to_transfer = transfer->len;
+ xqspi->bytes_to_receive = 0;
+ zynqmp_qspi_write_op(xqspi, transfer->tx_nbits, genfifoentry);
+ mask = GQSPI_IER_TXEMPTY_MASK | GQSPI_IER_GENFIFOEMPTY_MASK |
+ GQSPI_IER_TXNOT_FULL_MASK;
+ timeout = zynqmp_qspi_timeout(xqspi, transfer->tx_nbits,
+ transfer->len);
+ } else {
+ xqspi->txbuf = NULL;
+ xqspi->rxbuf = transfer->rx_buf;
+ xqspi->bytes_to_transfer = 0;
+ xqspi->bytes_to_receive = transfer->len;
+ ret = zynqmp_qspi_read_op(xqspi, transfer->rx_nbits,
+ genfifoentry);
+ if (ret)
+ return ret;
+
+ if (xqspi->mode != GQSPI_MODE_DMA)
+ mask = GQSPI_IER_GENFIFOEMPTY_MASK |
+ GQSPI_IER_RXNEMPTY_MASK | GQSPI_IER_RXEMPTY_MASK;
+ timeout = zynqmp_qspi_timeout(xqspi, transfer->rx_nbits,
+ transfer->len);
+ }
+
+ zynqmp_gqspi_write(xqspi, GQSPI_CONFIG_OFST,
+ zynqmp_gqspi_read(xqspi, GQSPI_CONFIG_OFST) |
+ GQSPI_CFG_START_GEN_FIFO_MASK);
+ if (mask)
+ zynqmp_gqspi_write(xqspi, GQSPI_IER_OFST, mask);
+ else
+ zynqmp_gqspi_write(xqspi, GQSPI_QSPIDMA_DST_I_EN_OFST,
+ GQSPI_QSPIDMA_DST_I_EN_DONE_MASK);
+
+ return zynqmp_qspi_wait(xqspi, timeout);
+}
+
static const struct dev_pm_ops zynqmp_qspi_dev_pm_ops = {
SET_RUNTIME_PM_OPS(zynqmp_runtime_suspend,
zynqmp_runtime_resume, NULL)
@@ -1318,6 +1396,7 @@ zynqmp_qspi_alloc_split(struct zynqmp_qspi *xqspi, const char *name)
return ERR_PTR(-ENOMEM);
ctlr->dev.of_node = np;
+ ctlr->max_native_cs = 1;
if (of_property_read_u32(np, "num-cs", &num_cs))
ctlr->num_chipselect = GQSPI_DEFAULT_NUM_CS;
else
@@ -1337,11 +1416,15 @@ static int zynqmp_qspi_register_ctlr(struct zynqmp_qspi *xqspi,
spi_controller_set_devdata(ctlr, xqspi);
ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_RX_DUAL | SPI_RX_QUAD |
SPI_TX_DUAL | SPI_TX_QUAD;
+ ctlr->flags = SPI_CONTROLLER_HALF_DUPLEX;
ctlr->max_speed_hz = xqspi->speed_hz;
ctlr->bits_per_word_mask = SPI_BPW_MASK(8);
ctlr->mem_ops = &zynqmp_qspi_mem_ops;
ctlr->setup = zynqmp_qspi_setup_op;
+ ctlr->set_cs = zynqmp_qspi_set_cs;
+ ctlr->transfer_one = zynqmp_qspi_transfer_one;
ctlr->auto_runtime_pm = true;
+ ctlr->use_gpio_descriptors = true;
ret = devm_spi_register_controller(xqspi->dev, ctlr);
if (ret)
--
2.35.1.1320.gc452695387.dirty
next prev parent reply other threads:[~2025-01-16 23:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-16 23:21 [PATCH 0/7] spi: zynqmp-gqspi: Split the bus and add GPIO support Sean Anderson
2025-01-16 23:21 ` [PATCH 1/7] dt-bindings: spi: zynqmp-qspi: Split the bus Sean Anderson
2025-01-22 0:16 ` David Lechner
2025-01-23 16:24 ` Sean Anderson
2025-01-23 21:59 ` David Lechner
2025-01-23 22:37 ` Sean Anderson
2025-01-24 13:35 ` Mark Brown
2025-06-12 23:44 ` Sean Anderson
2025-06-13 14:20 ` David Lechner
2025-06-13 15:57 ` Sean Anderson
2025-06-13 16:44 ` Sean Anderson
2025-06-13 16:53 ` David Lechner
2025-01-16 23:21 ` [PATCH 2/7] spi: zynqmp-gqspi: Pass speed/mode directly to config_op Sean Anderson
2025-01-16 23:21 ` [PATCH 3/7] spi: zynqmp-gqspi: Configure SPI mode dynamically Sean Anderson
2025-01-16 23:21 ` [PATCH 4/7] spi: zynqmp-gqspi: Refactor out controller initialization Sean Anderson
2025-01-16 23:21 ` [PATCH 5/7] spi: zynqmp-gqspi: Split the bus Sean Anderson
2025-01-21 13:19 ` Mahapatra, Amit Kumar
2025-01-21 15:53 ` Sean Anderson
2025-01-21 16:01 ` Mark Brown
2025-01-21 16:17 ` Sean Anderson
2025-01-16 23:21 ` Sean Anderson [this message]
2025-01-16 23:21 ` [PATCH 7/7] ARM64: xilinx: zynqmp: Convert to split QSPI bus Sean Anderson
2025-01-16 23:24 ` [PATCH 0/7] spi: zynqmp-gqspi: Split the bus and add GPIO support Sean Anderson
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=20250116232118.2694169-7-sean.anderson@linux.dev \
--to=sean.anderson@linux.dev \
--cc=amit.kumar-mahapatra@amd.com \
--cc=broonie@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=michal.simek@amd.com \
--cc=miquel.raynal@bootlin.com \
--cc=ruanjinjie@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 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.