* [PATCH 1/4] spi: Port SiFive SPI controller driver
@ 2022-03-19 7:24 Ahmad Fatoum
2022-03-19 7:24 ` [PATCH 2/4] mci: mci_spi: extend driver for device tree probing Ahmad Fatoum
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Ahmad Fatoum @ 2022-03-19 7:24 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
Import the U-Boot v2022.04-rc2 driver to enable access to SPI flash and
SD over SPI on the HiFive Unleashed. Tested with QEMU.
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
drivers/spi/Kconfig | 6 +
drivers/spi/Makefile | 1 +
drivers/spi/spi-sifive.c | 576 +++++++++++++++++++++++++++++++++++++++
3 files changed, 583 insertions(+)
create mode 100644 drivers/spi/spi-sifive.c
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 7df7561718c2..8935feb97b99 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -124,6 +124,12 @@ config SPI_NXP_FLEXSPI
This controller does not support generic SPI messages and only
supports the high-level SPI memory interface.
+config SPI_SIFIVE
+ tristate "SiFive SPI controller"
+ depends on SOC_SIFIVE || COMPILE_TEST
+ help
+ This exposes the SPI controller IP from SiFive.
+
endif
endmenu
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 64c8e2645a94..3455eea86988 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -17,3 +17,4 @@ obj-$(CONFIG_DRIVER_SPI_DSPI) += dspi_spi.o
obj-$(CONFIG_SPI_ZYNQ_QSPI) += zynq_qspi.o
obj-$(CONFIG_SPI_NXP_FLEXSPI) += spi-nxp-fspi.o
obj-$(CONFIG_DRIVER_SPI_STM32) += stm32_spi.o
+obj-$(CONFIG_SPI_SIFIVE) += spi-sifive.o
diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
new file mode 100644
index 000000000000..3cb613285603
--- /dev/null
+++ b/drivers/spi/spi-sifive.c
@@ -0,0 +1,576 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2018 SiFive, Inc.
+ * Copyright 2019 Bhargav Shah <bhargavshah1988@gmail.com>
+ *
+ * SiFive SPI controller driver (master mode only)
+ */
+
+#include <common.h>
+#include <linux/clk.h>
+#include <driver.h>
+#include <init.h>
+#include <errno.h>
+#include <linux/reset.h>
+#include <spi/spi.h>
+#include <linux/spi/spi-mem.h>
+#include <linux/bitops.h>
+#include <clock.h>
+#include <gpio.h>
+#include <of_gpio.h>
+#include <linux/bitfield.h>
+#include <linux/iopoll.h>
+#include <linux/log2.h>
+
+#define SIFIVE_SPI_MAX_CS 32
+
+#define SIFIVE_SPI_DEFAULT_DEPTH 8
+#define SIFIVE_SPI_DEFAULT_BITS 8
+
+/* register offsets */
+#define SIFIVE_SPI_REG_SCKDIV 0x00 /* Serial clock divisor */
+#define SIFIVE_SPI_REG_SCKMODE 0x04 /* Serial clock mode */
+#define SIFIVE_SPI_REG_CSID 0x10 /* Chip select ID */
+#define SIFIVE_SPI_REG_CSDEF 0x14 /* Chip select default */
+#define SIFIVE_SPI_REG_CSMODE 0x18 /* Chip select mode */
+#define SIFIVE_SPI_REG_DELAY0 0x28 /* Delay control 0 */
+#define SIFIVE_SPI_REG_DELAY1 0x2c /* Delay control 1 */
+#define SIFIVE_SPI_REG_FMT 0x40 /* Frame format */
+#define SIFIVE_SPI_REG_TXDATA 0x48 /* Tx FIFO data */
+#define SIFIVE_SPI_REG_RXDATA 0x4c /* Rx FIFO data */
+#define SIFIVE_SPI_REG_TXMARK 0x50 /* Tx FIFO watermark */
+#define SIFIVE_SPI_REG_RXMARK 0x54 /* Rx FIFO watermark */
+#define SIFIVE_SPI_REG_FCTRL 0x60 /* SPI flash interface control */
+#define SIFIVE_SPI_REG_FFMT 0x64 /* SPI flash instruction format */
+#define SIFIVE_SPI_REG_IE 0x70 /* Interrupt Enable Register */
+#define SIFIVE_SPI_REG_IP 0x74 /* Interrupt Pendings Register */
+
+/* sckdiv bits */
+#define SIFIVE_SPI_SCKDIV_DIV_MASK 0xfffU
+
+/* sckmode bits */
+#define SIFIVE_SPI_SCKMODE_PHA BIT(0)
+#define SIFIVE_SPI_SCKMODE_POL BIT(1)
+#define SIFIVE_SPI_SCKMODE_MODE_MASK (SIFIVE_SPI_SCKMODE_PHA | \
+ SIFIVE_SPI_SCKMODE_POL)
+
+/* csmode bits */
+#define SIFIVE_SPI_CSMODE_MODE_AUTO 0U
+#define SIFIVE_SPI_CSMODE_MODE_HOLD 2U
+#define SIFIVE_SPI_CSMODE_MODE_OFF 3U
+
+/* delay0 bits */
+#define SIFIVE_SPI_DELAY0_CSSCK(x) ((u32)(x))
+#define SIFIVE_SPI_DELAY0_CSSCK_MASK 0xffU
+#define SIFIVE_SPI_DELAY0_SCKCS(x) ((u32)(x) << 16)
+#define SIFIVE_SPI_DELAY0_SCKCS_MASK (0xffU << 16)
+
+/* delay1 bits */
+#define SIFIVE_SPI_DELAY1_INTERCS(x) ((u32)(x))
+#define SIFIVE_SPI_DELAY1_INTERCS_MASK 0xffU
+#define SIFIVE_SPI_DELAY1_INTERXFR(x) ((u32)(x) << 16)
+#define SIFIVE_SPI_DELAY1_INTERXFR_MASK (0xffU << 16)
+
+/* fmt bits */
+#define SIFIVE_SPI_FMT_PROTO_SINGLE 0U
+#define SIFIVE_SPI_FMT_PROTO_DUAL 1U
+#define SIFIVE_SPI_FMT_PROTO_QUAD 2U
+#define SIFIVE_SPI_FMT_PROTO_MASK 3U
+#define SIFIVE_SPI_FMT_ENDIAN BIT(2)
+#define SIFIVE_SPI_FMT_DIR BIT(3)
+#define SIFIVE_SPI_FMT_LEN(x) ((u32)(x) << 16)
+#define SIFIVE_SPI_FMT_LEN_MASK (0xfU << 16)
+
+/* txdata bits */
+#define SIFIVE_SPI_TXDATA_DATA_MASK 0xffU
+#define SIFIVE_SPI_TXDATA_FULL BIT(31)
+
+/* rxdata bits */
+#define SIFIVE_SPI_RXDATA_DATA_MASK 0xffU
+#define SIFIVE_SPI_RXDATA_EMPTY BIT(31)
+
+/* ie and ip bits */
+#define SIFIVE_SPI_IP_TXWM BIT(0)
+#define SIFIVE_SPI_IP_RXWM BIT(1)
+
+/* format protocol */
+#define SIFIVE_SPI_PROTO_QUAD 4 /* 4 lines I/O protocol transfer */
+#define SIFIVE_SPI_PROTO_DUAL 2 /* 2 lines I/O protocol transfer */
+#define SIFIVE_SPI_PROTO_SINGLE 1 /* 1 line I/O protocol transfer */
+
+#define SPI_XFER_BEGIN 0x01 /* Assert CS before transfer */
+#define SPI_XFER_END 0x02 /* Deassert CS after transfer */
+
+struct sifive_spi {
+ struct spi_controller ctlr;
+ void __iomem *regs; /* base address of the registers */
+ u32 fifo_depth;
+ u32 bits_per_word;
+ u32 cs_inactive; /* Level of the CS pins when inactive*/
+ u32 freq;
+ u8 fmt_proto;
+};
+
+static inline struct sifive_spi *to_sifive_spi(struct spi_controller *ctlr)
+{
+ return container_of(ctlr, struct sifive_spi, ctlr);
+}
+
+static void sifive_spi_prep_device(struct sifive_spi *spi,
+ struct spi_device *spi_dev)
+{
+ /* Update the chip select polarity */
+ if (spi_dev->mode & SPI_CS_HIGH)
+ spi->cs_inactive &= ~BIT(spi_dev->chip_select);
+ else
+ spi->cs_inactive |= BIT(spi_dev->chip_select);
+ writel(spi->cs_inactive, spi->regs + SIFIVE_SPI_REG_CSDEF);
+
+ /* Select the correct device */
+ writel(spi_dev->chip_select, spi->regs + SIFIVE_SPI_REG_CSID);
+}
+
+static void sifive_spi_set_cs(struct sifive_spi *spi,
+ struct spi_device *spi_dev)
+{
+ u32 cs_mode = SIFIVE_SPI_CSMODE_MODE_HOLD;
+
+ if (spi_dev->mode & SPI_CS_HIGH)
+ cs_mode = SIFIVE_SPI_CSMODE_MODE_AUTO;
+
+ writel(cs_mode, spi->regs + SIFIVE_SPI_REG_CSMODE);
+}
+
+static void sifive_spi_clear_cs(struct sifive_spi *spi)
+{
+ writel(SIFIVE_SPI_CSMODE_MODE_AUTO, spi->regs + SIFIVE_SPI_REG_CSMODE);
+}
+
+static void sifive_spi_prep_transfer(struct sifive_spi *spi,
+ struct spi_device *spi_dev,
+ u8 *rx_ptr)
+{
+ u32 cr;
+
+ /* Modify the SPI protocol mode */
+ cr = readl(spi->regs + SIFIVE_SPI_REG_FMT);
+
+ /* Bits per word ? */
+ cr &= ~SIFIVE_SPI_FMT_LEN_MASK;
+ cr |= SIFIVE_SPI_FMT_LEN(spi->bits_per_word);
+
+ /* LSB first? */
+ cr &= ~SIFIVE_SPI_FMT_ENDIAN;
+ if (spi_dev->mode & SPI_LSB_FIRST)
+ cr |= SIFIVE_SPI_FMT_ENDIAN;
+
+ /* Number of wires ? */
+ cr &= ~SIFIVE_SPI_FMT_PROTO_MASK;
+ switch (spi->fmt_proto) {
+ case SIFIVE_SPI_PROTO_QUAD:
+ cr |= SIFIVE_SPI_FMT_PROTO_QUAD;
+ break;
+ case SIFIVE_SPI_PROTO_DUAL:
+ cr |= SIFIVE_SPI_FMT_PROTO_DUAL;
+ break;
+ default:
+ cr |= SIFIVE_SPI_FMT_PROTO_SINGLE;
+ break;
+ }
+
+ /* SPI direction in/out ? */
+ cr &= ~SIFIVE_SPI_FMT_DIR;
+ if (!rx_ptr)
+ cr |= SIFIVE_SPI_FMT_DIR;
+
+ writel(cr, spi->regs + SIFIVE_SPI_REG_FMT);
+}
+
+static void sifive_spi_rx(struct sifive_spi *spi, u8 *rx_ptr)
+{
+ u32 data;
+
+ do {
+ data = readl(spi->regs + SIFIVE_SPI_REG_RXDATA);
+ } while (data & SIFIVE_SPI_RXDATA_EMPTY);
+
+ if (rx_ptr)
+ *rx_ptr = data & SIFIVE_SPI_RXDATA_DATA_MASK;
+}
+
+static void sifive_spi_tx(struct sifive_spi *spi, const u8 *tx_ptr)
+{
+ u32 data;
+ u8 tx_data = (tx_ptr) ? *tx_ptr & SIFIVE_SPI_TXDATA_DATA_MASK :
+ SIFIVE_SPI_TXDATA_DATA_MASK;
+
+ do {
+ data = readl(spi->regs + SIFIVE_SPI_REG_TXDATA);
+ } while (data & SIFIVE_SPI_TXDATA_FULL);
+
+ writel(tx_data, spi->regs + SIFIVE_SPI_REG_TXDATA);
+}
+
+static int sifive_spi_wait(struct sifive_spi *spi, u32 mask)
+{
+ u32 val;
+
+ return readl_poll_timeout(spi->regs + SIFIVE_SPI_REG_IP, val,
+ (val & mask) == mask, 100 * USEC_PER_MSEC);
+}
+
+#define BUILD_WAIT_FOR_BIT(sfx, type, read) \
+ \
+static inline int wait_for_bit_##sfx(const void *reg, \
+ const type mask, \
+ const bool set, \
+ const unsigned int timeout_ms, \
+ const bool breakable) \
+{ \
+ type val; \
+ unsigned long start = get_timer(0); \
+ \
+ while (1) { \
+ val = read(reg); \
+ \
+ if (!set) \
+ val = ~val; \
+ \
+ if ((val & mask) == mask) \
+ return 0; \
+ \
+ if (get_timer(start) > timeout_ms) \
+ break; \
+ \
+ if (breakable && ctrlc()) { \
+ puts("Abort\n"); \
+ return -EINTR; \
+ } \
+ \
+ udelay(1); \
+ WATCHDOG_RESET(); \
+ } \
+ \
+ debug("%s: Timeout (reg=%p mask=%x wait_set=%i)\n", __func__, \
+ reg, mask, set); \
+ \
+ return -ETIMEDOUT; \
+}
+
+static int sifive_spi_transfer_one(struct spi_device *spi_dev, unsigned int bitlen,
+ const void *dout, void *din, unsigned long flags)
+{
+ struct sifive_spi *spi = to_sifive_spi(spi_dev->controller);
+ const u8 *tx_ptr = dout;
+ u8 *rx_ptr = din;
+ u32 remaining_len;
+ int ret;
+
+ if (flags & SPI_XFER_BEGIN) {
+ sifive_spi_prep_device(spi, spi_dev);
+ sifive_spi_set_cs(spi, spi_dev);
+ }
+
+ sifive_spi_prep_transfer(spi, spi_dev, rx_ptr);
+
+ remaining_len = bitlen / 8;
+
+ while (remaining_len) {
+ unsigned int n_words = min(remaining_len, spi->fifo_depth);
+ unsigned int tx_words, rx_words;
+
+ /* Enqueue n_words for transmission */
+ for (tx_words = 0; tx_words < n_words; tx_words++) {
+ if (!tx_ptr)
+ sifive_spi_tx(spi, NULL);
+ else
+ sifive_spi_tx(spi, tx_ptr++);
+ }
+
+ if (rx_ptr) {
+ /* Wait for transmission + reception to complete */
+ writel(n_words - 1, spi->regs + SIFIVE_SPI_REG_RXMARK);
+ ret = sifive_spi_wait(spi, SIFIVE_SPI_IP_RXWM);
+ if (ret)
+ return ret;
+
+ /* Read out all the data from the RX FIFO */
+ for (rx_words = 0; rx_words < n_words; rx_words++)
+ sifive_spi_rx(spi, rx_ptr++);
+ } else {
+ /* Wait for transmission to complete */
+ ret = sifive_spi_wait(spi, SIFIVE_SPI_IP_TXWM);
+ if (ret)
+ return ret;
+ }
+
+ remaining_len -= n_words;
+ }
+
+ if (flags & SPI_XFER_END)
+ sifive_spi_clear_cs(spi);
+
+ return 0;
+}
+
+static int sifive_spi_transfer(struct spi_device *spi_dev, struct spi_message *msg)
+{
+ struct spi_controller *ctlr = spi_dev->controller;
+ struct spi_transfer *t, *t_first, *t_last = NULL;
+ unsigned long flags;
+ int ret = 0;
+
+ if (list_empty(&msg->transfers))
+ return 0;
+
+ t_first = list_first_entry(&msg->transfers, struct spi_transfer, transfer_list);
+ t_last = list_last_entry(&msg->transfers, struct spi_transfer, transfer_list);
+
+ msg->actual_length = 0;
+
+ dev_dbg(ctlr->dev, "transfer start actual_length=%i\n", msg->actual_length);
+ list_for_each_entry(t, &msg->transfers, transfer_list) {
+ dev_dbg(ctlr->dev,
+ " xfer %p: len %u tx %p rx %p\n",
+ t, t->len, t->tx_buf, t->rx_buf);
+ flags = 0;
+ if (t == t_first)
+ flags |= SPI_XFER_BEGIN;
+ if (t == t_last)
+ flags |= SPI_XFER_END;
+ ret = sifive_spi_transfer_one(spi_dev, t->len * 8,
+ t->tx_buf, t->rx_buf, flags);
+ if (ret < 0)
+ return ret;
+ msg->actual_length += t->len;
+ }
+ dev_dbg(ctlr->dev, "transfer done actual_length=%i\n", msg->actual_length);
+
+ return ret;
+}
+
+static int sifive_spi_exec_op(struct spi_mem *mem,
+ const struct spi_mem_op *op)
+{
+ struct spi_device *spi_dev = mem->spi;
+ struct device_d *dev = &spi_dev->dev;
+ struct sifive_spi *spi = spi_controller_get_devdata(spi_dev->controller);
+ unsigned long flags = SPI_XFER_BEGIN;
+ u8 opcode = op->cmd.opcode;
+ unsigned int pos = 0;
+ const void *tx_buf = NULL;
+ void *rx_buf = NULL;
+ int op_len, i;
+ u8 *op_buf;
+ int ret;
+
+ if (!op->addr.nbytes && !op->dummy.nbytes && !op->data.nbytes)
+ flags |= SPI_XFER_END;
+
+ spi->fmt_proto = op->cmd.buswidth;
+
+ /* send the opcode */
+ ret = sifive_spi_transfer_one(spi_dev, 8, (void *)&opcode, NULL, flags);
+ if (ret < 0) {
+ dev_err(dev, "failed to xfer opcode\n");
+ return ret;
+ }
+
+ op_len = op->addr.nbytes + op->dummy.nbytes;
+
+ op_buf = malloc(op_len);
+ if (!op_buf)
+ return -ENOMEM;
+
+ /* send the addr + dummy */
+ if (op->addr.nbytes) {
+ /* fill address */
+ for (i = 0; i < op->addr.nbytes; i++)
+ op_buf[pos + i] = op->addr.val >>
+ (8 * (op->addr.nbytes - i - 1));
+
+ pos += op->addr.nbytes;
+
+ /* fill dummy */
+ if (op->dummy.nbytes)
+ memset(op_buf + pos, 0xff, op->dummy.nbytes);
+
+ /* make sure to set end flag, if no data bytes */
+ if (!op->data.nbytes)
+ flags |= SPI_XFER_END;
+
+ spi->fmt_proto = op->addr.buswidth;
+
+ ret = sifive_spi_transfer_one(spi_dev, op_len * 8, op_buf, NULL, flags);
+ if (ret < 0) {
+ dev_err(dev, "failed to xfer addr + dummy\n");
+ goto out;
+ }
+ }
+
+ /* send/received the data */
+ if (op->data.nbytes) {
+ if (op->data.dir == SPI_MEM_DATA_IN)
+ rx_buf = op->data.buf.in;
+ else
+ tx_buf = op->data.buf.out;
+
+ spi->fmt_proto = op->data.buswidth;
+
+ ret = sifive_spi_transfer_one(spi_dev, op->data.nbytes * 8,
+ tx_buf, rx_buf, SPI_XFER_END);
+ if (ret) {
+ dev_err(dev, "failed to xfer data\n");
+ goto out;
+ }
+ }
+
+out:
+ free(op_buf);
+ return ret;
+}
+
+static void sifive_spi_set_speed(struct sifive_spi *spi, uint speed)
+{
+ u32 scale;
+
+ if (speed > spi->freq)
+ speed = spi->freq;
+
+ /* Cofigure max speed */
+ scale = (DIV_ROUND_UP(spi->freq >> 1, speed) - 1)
+ & SIFIVE_SPI_SCKDIV_DIV_MASK;
+ writel(scale, spi->regs + SIFIVE_SPI_REG_SCKDIV);
+}
+
+static void sifive_spi_set_mode(struct sifive_spi *spi, uint mode)
+{
+ u32 cr;
+
+ /* Switch clock mode bits */
+ cr = readl(spi->regs + SIFIVE_SPI_REG_SCKMODE) &
+ ~SIFIVE_SPI_SCKMODE_MODE_MASK;
+ if (mode & SPI_CPHA)
+ cr |= SIFIVE_SPI_SCKMODE_PHA;
+ if (mode & SPI_CPOL)
+ cr |= SIFIVE_SPI_SCKMODE_POL;
+
+ writel(cr, spi->regs + SIFIVE_SPI_REG_SCKMODE);
+}
+
+static int sifive_spi_setup(struct spi_device *spi_dev)
+{
+ struct sifive_spi *spi = to_sifive_spi(spi_dev->controller);
+
+ sifive_spi_set_mode(spi, spi_dev->mode);
+ sifive_spi_set_speed(spi, spi_dev->max_speed_hz);
+
+ return 0;
+}
+
+static void sifive_spi_init_hw(struct sifive_spi *spi)
+{
+ struct device_d *dev = spi->ctlr.dev;
+ u32 cs_bits;
+
+ /* probe the number of CS lines */
+ spi->cs_inactive = readl(spi->regs + SIFIVE_SPI_REG_CSDEF);
+ writel(0xffffffffU, spi->regs + SIFIVE_SPI_REG_CSDEF);
+ cs_bits = readl(spi->regs + SIFIVE_SPI_REG_CSDEF);
+ writel(spi->cs_inactive, spi->regs + SIFIVE_SPI_REG_CSDEF);
+ if (!cs_bits) {
+ dev_warn(dev, "Could not auto probe CS lines\n");
+ return;
+ }
+
+ spi->ctlr.num_chipselect = ilog2(cs_bits) + 1;
+ if (spi->ctlr.num_chipselect > SIFIVE_SPI_MAX_CS) {
+ dev_warn(dev, "Invalid number of spi slaves\n");
+ return;
+ }
+
+ /* Watermark interrupts are disabled by default */
+ writel(0, spi->regs + SIFIVE_SPI_REG_IE);
+
+ /* Default watermark FIFO threshold values */
+ writel(1, spi->regs + SIFIVE_SPI_REG_TXMARK);
+ writel(0, spi->regs + SIFIVE_SPI_REG_RXMARK);
+
+ /* Set CS/SCK Delays and Inactive Time to defaults */
+ writel(SIFIVE_SPI_DELAY0_CSSCK(1) | SIFIVE_SPI_DELAY0_SCKCS(1),
+ spi->regs + SIFIVE_SPI_REG_DELAY0);
+ writel(SIFIVE_SPI_DELAY1_INTERCS(1) | SIFIVE_SPI_DELAY1_INTERXFR(0),
+ spi->regs + SIFIVE_SPI_REG_DELAY1);
+
+ /* Exit specialized memory-mapped SPI flash mode */
+ writel(0, spi->regs + SIFIVE_SPI_REG_FCTRL);
+}
+
+static const struct spi_controller_mem_ops sifive_spi_mem_ops = {
+ .exec_op = sifive_spi_exec_op,
+};
+
+static void sifive_spi_dt_probe(struct sifive_spi *spi)
+{
+ struct device_node *node = spi->ctlr.dev->device_node;
+
+ spi->fifo_depth = SIFIVE_SPI_DEFAULT_DEPTH;
+ of_property_read_u32(node, "sifive,fifo-depth", &spi->fifo_depth);
+
+ spi->bits_per_word = SIFIVE_SPI_DEFAULT_BITS;
+ of_property_read_u32(node, "sifive,max-bits-per-word", &spi->bits_per_word);
+}
+
+static int sifive_spi_probe(struct device_d *dev)
+{
+ struct sifive_spi *spi;
+ struct resource *iores;
+ struct spi_controller *ctlr;
+ struct clk *clkdev;
+
+ iores = dev_request_mem_resource(dev, 0);
+ if (IS_ERR(iores))
+ return PTR_ERR(iores);
+
+ spi = xzalloc(sizeof(*spi));
+
+ spi->regs = IOMEM(iores->start);
+ if (!spi->regs)
+ return -ENODEV;
+
+ ctlr = &spi->ctlr;
+ ctlr->dev = dev;
+
+ ctlr->setup = sifive_spi_setup;
+ ctlr->transfer = sifive_spi_transfer;
+ ctlr->mem_ops = &sifive_spi_mem_ops;
+
+ ctlr->bus_num = -1;
+
+ spi_controller_set_devdata(ctlr, spi);
+
+ sifive_spi_dt_probe(spi);
+
+ clkdev = clk_get(dev, NULL);
+ if (IS_ERR(clkdev))
+ return PTR_ERR(clkdev);
+
+ spi->freq = clk_get_rate(clkdev);
+
+ /* init the sifive spi hw */
+ sifive_spi_init_hw(spi);
+
+ return spi_register_master(ctlr);
+}
+
+static const struct of_device_id sifive_spi_ids[] = {
+ { .compatible = "sifive,spi0" },
+ { /* sentinel */ }
+};
+
+static struct driver_d sifive_spi_driver = {
+ .name = "sifive_spi",
+ .probe = sifive_spi_probe,
+ .of_compatible = sifive_spi_ids,
+};
+coredevice_platform_driver(sifive_spi_driver);
--
2.34.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 2/4] mci: mci_spi: extend driver for device tree probing
2022-03-19 7:24 [PATCH 1/4] spi: Port SiFive SPI controller driver Ahmad Fatoum
@ 2022-03-19 7:24 ` Ahmad Fatoum
2022-03-28 9:44 ` Sascha Hauer
2022-03-19 7:24 ` [PATCH 3/4] mtd: spi-nor: add support for ISSI IS25WP256 Ahmad Fatoum
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Ahmad Fatoum @ 2022-03-19 7:24 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
Driver has been matched by name only so far, add optional support for
the device tree binding.
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
drivers/mci/mci_spi.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/drivers/mci/mci_spi.c b/drivers/mci/mci_spi.c
index ed3ddf890f7f..6ae2824eddc8 100644
--- a/drivers/mci/mci_spi.c
+++ b/drivers/mci/mci_spi.c
@@ -18,6 +18,8 @@
#include <mci.h>
#include <crc.h>
#include <crc7.h>
+#include <of.h>
+#include <gpiod.h>
#define to_spi_host(mci) container_of(mci, struct mmc_spi_host, mci)
#define spi_setup(spi) spi->master->setup(spi)
@@ -47,6 +49,7 @@ struct mmc_spi_host {
struct mci_host mci;
struct spi_device *spi;
struct device_d *dev;
+ int detect_pin;
/* for bulk data transfers */
struct spi_transfer t_tx;
@@ -351,8 +354,23 @@ static int mmc_spi_init(struct mci_host *mci, struct device_d *mci_dev)
return 0;
}
+static int spi_mci_card_present(struct mci_host *mci)
+{
+ struct mmc_spi_host *host = to_spi_host(mci);
+ int ret;
+
+ /* No gpio, assume card is present */
+ if (!gpio_is_valid(host->detect_pin))
+ return 1;
+
+ ret = gpio_get_value(host->detect_pin);
+
+ return ret == 0 ? 1 : 0;
+}
+
static int spi_mci_probe(struct device_d *dev)
{
+ struct device_node *np = dev_of_node(dev);
struct spi_device *spi = (struct spi_device *)dev->type_data;
struct mmc_spi_host *host;
void *ones;
@@ -362,6 +380,7 @@ static int spi_mci_probe(struct device_d *dev)
host->mci.send_cmd = mmc_spi_request;
host->mci.set_ios = mmc_spi_set_ios;
host->mci.init = mmc_spi_init;
+ host->mci.card_present = spi_mci_card_present;
host->mci.hw_dev = dev;
/* MMC and SD specs only seem to care that sampling is on the
@@ -415,14 +434,26 @@ static int spi_mci_probe(struct device_d *dev)
host->mci.voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
host->mci.host_caps = MMC_CAP_SPI;
+ host->detect_pin = -EINVAL;
+
+ if (np) {
+ host->mci.devname = xstrdup(of_alias_get(np));
+ host->detect_pin = gpiod_get(dev, NULL, GPIOD_IN);
+ }
mci_register(&host->mci);
return 0;
}
+static __maybe_unused struct of_device_id spi_mci_compatible[] = {
+ { .compatible = "mmc-spi-slot" },
+ { /* sentinel */ }
+};
+
static struct driver_d spi_mci_driver = {
.name = "spi_mci",
.probe = spi_mci_probe,
+ .of_compatible = DRV_OF_COMPAT(spi_mci_compatible),
};
device_spi_driver(spi_mci_driver);
--
2.34.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 2/4] mci: mci_spi: extend driver for device tree probing
2022-03-19 7:24 ` [PATCH 2/4] mci: mci_spi: extend driver for device tree probing Ahmad Fatoum
@ 2022-03-28 9:44 ` Sascha Hauer
2022-03-28 9:48 ` Ahmad Fatoum
0 siblings, 1 reply; 7+ messages in thread
From: Sascha Hauer @ 2022-03-28 9:44 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: barebox
On Sat, Mar 19, 2022 at 08:24:08AM +0100, Ahmad Fatoum wrote:
> Driver has been matched by name only so far, add optional support for
> the device tree binding.
>
> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
> ---
> drivers/mci/mci_spi.c | 31 +++++++++++++++++++++++++++++++
> 1 file changed, 31 insertions(+)
Applied 2-4, thanks
Sascha
>
> diff --git a/drivers/mci/mci_spi.c b/drivers/mci/mci_spi.c
> index ed3ddf890f7f..6ae2824eddc8 100644
> --- a/drivers/mci/mci_spi.c
> +++ b/drivers/mci/mci_spi.c
> @@ -18,6 +18,8 @@
> #include <mci.h>
> #include <crc.h>
> #include <crc7.h>
> +#include <of.h>
> +#include <gpiod.h>
>
> #define to_spi_host(mci) container_of(mci, struct mmc_spi_host, mci)
> #define spi_setup(spi) spi->master->setup(spi)
> @@ -47,6 +49,7 @@ struct mmc_spi_host {
> struct mci_host mci;
> struct spi_device *spi;
> struct device_d *dev;
> + int detect_pin;
>
> /* for bulk data transfers */
> struct spi_transfer t_tx;
> @@ -351,8 +354,23 @@ static int mmc_spi_init(struct mci_host *mci, struct device_d *mci_dev)
> return 0;
> }
>
> +static int spi_mci_card_present(struct mci_host *mci)
> +{
> + struct mmc_spi_host *host = to_spi_host(mci);
> + int ret;
> +
> + /* No gpio, assume card is present */
> + if (!gpio_is_valid(host->detect_pin))
> + return 1;
> +
> + ret = gpio_get_value(host->detect_pin);
> +
> + return ret == 0 ? 1 : 0;
> +}
> +
> static int spi_mci_probe(struct device_d *dev)
> {
> + struct device_node *np = dev_of_node(dev);
> struct spi_device *spi = (struct spi_device *)dev->type_data;
> struct mmc_spi_host *host;
> void *ones;
> @@ -362,6 +380,7 @@ static int spi_mci_probe(struct device_d *dev)
> host->mci.send_cmd = mmc_spi_request;
> host->mci.set_ios = mmc_spi_set_ios;
> host->mci.init = mmc_spi_init;
> + host->mci.card_present = spi_mci_card_present;
> host->mci.hw_dev = dev;
>
> /* MMC and SD specs only seem to care that sampling is on the
> @@ -415,14 +434,26 @@ static int spi_mci_probe(struct device_d *dev)
>
> host->mci.voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
> host->mci.host_caps = MMC_CAP_SPI;
> + host->detect_pin = -EINVAL;
> +
> + if (np) {
> + host->mci.devname = xstrdup(of_alias_get(np));
> + host->detect_pin = gpiod_get(dev, NULL, GPIOD_IN);
> + }
>
> mci_register(&host->mci);
>
> return 0;
> }
>
> +static __maybe_unused struct of_device_id spi_mci_compatible[] = {
> + { .compatible = "mmc-spi-slot" },
> + { /* sentinel */ }
> +};
> +
> static struct driver_d spi_mci_driver = {
> .name = "spi_mci",
> .probe = spi_mci_probe,
> + .of_compatible = DRV_OF_COMPAT(spi_mci_compatible),
> };
> device_spi_driver(spi_mci_driver);
> --
> 2.34.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 2/4] mci: mci_spi: extend driver for device tree probing
2022-03-28 9:44 ` Sascha Hauer
@ 2022-03-28 9:48 ` Ahmad Fatoum
0 siblings, 0 replies; 7+ messages in thread
From: Ahmad Fatoum @ 2022-03-28 9:48 UTC (permalink / raw)
To: Sascha Hauer, Ahmad Fatoum; +Cc: barebox
Hello Sascha,
On 28.03.22 11:44, Sascha Hauer wrote:
> On Sat, Mar 19, 2022 at 08:24:08AM +0100, Ahmad Fatoum wrote:
>> Driver has been matched by name only so far, add optional support for
>> the device tree binding.
>>
>> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
>> ---
>> drivers/mci/mci_spi.c | 31 +++++++++++++++++++++++++++++++
>> 1 file changed, 31 insertions(+)
>
> Applied 2-4, thanks
Please drop patch 4 too as it would introduce a non-existent symbol
into the defconfig. I will resend both together after incorporating
your feedback.
Thanks for the review,
Ahmad
>
> Sascha
>
>>
>> diff --git a/drivers/mci/mci_spi.c b/drivers/mci/mci_spi.c
>> index ed3ddf890f7f..6ae2824eddc8 100644
>> --- a/drivers/mci/mci_spi.c
>> +++ b/drivers/mci/mci_spi.c
>> @@ -18,6 +18,8 @@
>> #include <mci.h>
>> #include <crc.h>
>> #include <crc7.h>
>> +#include <of.h>
>> +#include <gpiod.h>
>>
>> #define to_spi_host(mci) container_of(mci, struct mmc_spi_host, mci)
>> #define spi_setup(spi) spi->master->setup(spi)
>> @@ -47,6 +49,7 @@ struct mmc_spi_host {
>> struct mci_host mci;
>> struct spi_device *spi;
>> struct device_d *dev;
>> + int detect_pin;
>>
>> /* for bulk data transfers */
>> struct spi_transfer t_tx;
>> @@ -351,8 +354,23 @@ static int mmc_spi_init(struct mci_host *mci, struct device_d *mci_dev)
>> return 0;
>> }
>>
>> +static int spi_mci_card_present(struct mci_host *mci)
>> +{
>> + struct mmc_spi_host *host = to_spi_host(mci);
>> + int ret;
>> +
>> + /* No gpio, assume card is present */
>> + if (!gpio_is_valid(host->detect_pin))
>> + return 1;
>> +
>> + ret = gpio_get_value(host->detect_pin);
>> +
>> + return ret == 0 ? 1 : 0;
>> +}
>> +
>> static int spi_mci_probe(struct device_d *dev)
>> {
>> + struct device_node *np = dev_of_node(dev);
>> struct spi_device *spi = (struct spi_device *)dev->type_data;
>> struct mmc_spi_host *host;
>> void *ones;
>> @@ -362,6 +380,7 @@ static int spi_mci_probe(struct device_d *dev)
>> host->mci.send_cmd = mmc_spi_request;
>> host->mci.set_ios = mmc_spi_set_ios;
>> host->mci.init = mmc_spi_init;
>> + host->mci.card_present = spi_mci_card_present;
>> host->mci.hw_dev = dev;
>>
>> /* MMC and SD specs only seem to care that sampling is on the
>> @@ -415,14 +434,26 @@ static int spi_mci_probe(struct device_d *dev)
>>
>> host->mci.voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
>> host->mci.host_caps = MMC_CAP_SPI;
>> + host->detect_pin = -EINVAL;
>> +
>> + if (np) {
>> + host->mci.devname = xstrdup(of_alias_get(np));
>> + host->detect_pin = gpiod_get(dev, NULL, GPIOD_IN);
>> + }
>>
>> mci_register(&host->mci);
>>
>> return 0;
>> }
>>
>> +static __maybe_unused struct of_device_id spi_mci_compatible[] = {
>> + { .compatible = "mmc-spi-slot" },
>> + { /* sentinel */ }
>> +};
>> +
>> static struct driver_d spi_mci_driver = {
>> .name = "spi_mci",
>> .probe = spi_mci_probe,
>> + .of_compatible = DRV_OF_COMPAT(spi_mci_compatible),
>> };
>> device_spi_driver(spi_mci_driver);
>> --
>> 2.34.1
>>
>>
>> _______________________________________________
>> barebox mailing list
>> barebox@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/barebox
>>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/4] mtd: spi-nor: add support for ISSI IS25WP256
2022-03-19 7:24 [PATCH 1/4] spi: Port SiFive SPI controller driver Ahmad Fatoum
2022-03-19 7:24 ` [PATCH 2/4] mci: mci_spi: extend driver for device tree probing Ahmad Fatoum
@ 2022-03-19 7:24 ` Ahmad Fatoum
2022-03-19 7:24 ` [PATCH 4/4] RISC-V: sifive: enable SPI Flash and SD in config Ahmad Fatoum
2022-03-28 9:43 ` [PATCH 1/4] spi: Port SiFive SPI controller driver Sascha Hauer
3 siblings, 0 replies; 7+ messages in thread
From: Ahmad Fatoum @ 2022-03-19 7:24 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
This flash chip is emulated by QEMU for the HiFive Unleashed.
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
drivers/mtd/spi-nor/spi-nor.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index cf532b13999b..0ed7fd3d048d 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -697,6 +697,8 @@ static const struct spi_device_id spi_nor_ids[] = {
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ "is25wp128", INFO(0x9d7018, 0, 64 * 1024, 256,
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+ { "is25wp256", INFO(0x9d7019, 0, 64 * 1024, 512,
+ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ "is25lq128", INFO(0x9d6018, 0, 64 * 1024, 256, 0) },
/* Macronix */
--
2.34.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 4/4] RISC-V: sifive: enable SPI Flash and SD in config
2022-03-19 7:24 [PATCH 1/4] spi: Port SiFive SPI controller driver Ahmad Fatoum
2022-03-19 7:24 ` [PATCH 2/4] mci: mci_spi: extend driver for device tree probing Ahmad Fatoum
2022-03-19 7:24 ` [PATCH 3/4] mtd: spi-nor: add support for ISSI IS25WP256 Ahmad Fatoum
@ 2022-03-19 7:24 ` Ahmad Fatoum
2022-03-28 9:43 ` [PATCH 1/4] spi: Port SiFive SPI controller driver Sascha Hauer
3 siblings, 0 replies; 7+ messages in thread
From: Ahmad Fatoum @ 2022-03-19 7:24 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
To test SD-Card:
./test/emulate.pl sifive_defconfig -- -drive file=image.sdcard,if=sd
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
arch/riscv/configs/sifive_defconfig | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/riscv/configs/sifive_defconfig b/arch/riscv/configs/sifive_defconfig
index 59cfebf194df..6ebe6eaf3785 100644
--- a/arch/riscv/configs/sifive_defconfig
+++ b/arch/riscv/configs/sifive_defconfig
@@ -13,13 +13,10 @@ CONFIG_HUSH_FANCY_PROMPT=y
CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
CONFIG_MENU=y
-CONFIG_IMD_TARGET=y
CONFIG_CONSOLE_ALLOW_COLOR=y
CONFIG_PBL_CONSOLE=y
CONFIG_PARTITION_DISK_EFI=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_BAREBOXENV_TARGET=y
-CONFIG_BAREBOXCRC32_TARGET=y
CONFIG_STATE=y
CONFIG_STATE_CRYPTO=y
CONFIG_BOOTCHOOSER=y
@@ -85,20 +82,21 @@ CONFIG_VIRTIO_CONSOLE=y
CONFIG_SERIAL_SIFIVE=y
CONFIG_DRIVER_NET_MACB=y
CONFIG_DRIVER_SPI_GPIO=y
+CONFIG_SPI_SIFIVE=y
CONFIG_I2C=y
CONFIG_I2C_GPIO=y
CONFIG_MTD=y
-# CONFIG_MTD_OOB_DEVICE is not set
+CONFIG_MTD_RAW_DEVICE=y
CONFIG_MTD_CONCAT=y
CONFIG_MTD_M25P80=y
CONFIG_DRIVER_CFI=y
CONFIG_DRIVER_CFI_BANK_WIDTH_8=y
-CONFIG_DISK=y
-CONFIG_DISK_WRITE=y
CONFIG_VIRTIO_BLK=y
CONFIG_VIDEO=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_DRIVER_VIDEO_SIMPLEFB_CLIENT=y
+CONFIG_MCI=y
+CONFIG_MCI_SPI=y
CONFIG_CLOCKSOURCE_DUMMY_RATE=60000
CONFIG_EEPROM_AT24=y
CONFIG_HWRNG=y
@@ -126,3 +124,6 @@ CONFIG_ZSTD_DECOMPRESS=y
CONFIG_XZ_DECOMPRESS=y
CONFIG_BASE64=y
CONFIG_DIGEST_CRC32_GENERIC=y
+CONFIG_IMD_TARGET=y
+CONFIG_BAREBOXENV_TARGET=y
+CONFIG_BAREBOXCRC32_TARGET=y
--
2.34.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/4] spi: Port SiFive SPI controller driver
2022-03-19 7:24 [PATCH 1/4] spi: Port SiFive SPI controller driver Ahmad Fatoum
` (2 preceding siblings ...)
2022-03-19 7:24 ` [PATCH 4/4] RISC-V: sifive: enable SPI Flash and SD in config Ahmad Fatoum
@ 2022-03-28 9:43 ` Sascha Hauer
3 siblings, 0 replies; 7+ messages in thread
From: Sascha Hauer @ 2022-03-28 9:43 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: barebox
On Sat, Mar 19, 2022 at 08:24:07AM +0100, Ahmad Fatoum wrote:
> Import the U-Boot v2022.04-rc2 driver to enable access to SPI flash and
> SD over SPI on the HiFive Unleashed. Tested with QEMU.
>
> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
> ---
> drivers/spi/Kconfig | 6 +
> drivers/spi/Makefile | 1 +
> drivers/spi/spi-sifive.c | 576 +++++++++++++++++++++++++++++++++++++++
> 3 files changed, 583 insertions(+)
> create mode 100644 drivers/spi/spi-sifive.c
>
> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> index 7df7561718c2..8935feb97b99 100644
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@ -124,6 +124,12 @@ config SPI_NXP_FLEXSPI
> This controller does not support generic SPI messages and only
> supports the high-level SPI memory interface.
>
> +config SPI_SIFIVE
> + tristate "SiFive SPI controller"
> + depends on SOC_SIFIVE || COMPILE_TEST
> + help
> + This exposes the SPI controller IP from SiFive.
> +
> endif
>
> endmenu
> diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
> index 64c8e2645a94..3455eea86988 100644
> --- a/drivers/spi/Makefile
> +++ b/drivers/spi/Makefile
> @@ -17,3 +17,4 @@ obj-$(CONFIG_DRIVER_SPI_DSPI) += dspi_spi.o
> obj-$(CONFIG_SPI_ZYNQ_QSPI) += zynq_qspi.o
> obj-$(CONFIG_SPI_NXP_FLEXSPI) += spi-nxp-fspi.o
> obj-$(CONFIG_DRIVER_SPI_STM32) += stm32_spi.o
> +obj-$(CONFIG_SPI_SIFIVE) += spi-sifive.o
> diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c
> new file mode 100644
> index 000000000000..3cb613285603
> --- /dev/null
> +++ b/drivers/spi/spi-sifive.c
> @@ -0,0 +1,576 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright 2018 SiFive, Inc.
> + * Copyright 2019 Bhargav Shah <bhargavshah1988@gmail.com>
> + *
> + * SiFive SPI controller driver (master mode only)
> + */
> +
> +#include <common.h>
> +#include <linux/clk.h>
> +#include <driver.h>
> +#include <init.h>
> +#include <errno.h>
> +#include <linux/reset.h>
> +#include <spi/spi.h>
> +#include <linux/spi/spi-mem.h>
> +#include <linux/bitops.h>
> +#include <clock.h>
> +#include <gpio.h>
> +#include <of_gpio.h>
> +#include <linux/bitfield.h>
> +#include <linux/iopoll.h>
> +#include <linux/log2.h>
> +
> +#define SIFIVE_SPI_MAX_CS 32
> +
> +#define SIFIVE_SPI_DEFAULT_DEPTH 8
> +#define SIFIVE_SPI_DEFAULT_BITS 8
> +
> +/* register offsets */
> +#define SIFIVE_SPI_REG_SCKDIV 0x00 /* Serial clock divisor */
> +#define SIFIVE_SPI_REG_SCKMODE 0x04 /* Serial clock mode */
> +#define SIFIVE_SPI_REG_CSID 0x10 /* Chip select ID */
> +#define SIFIVE_SPI_REG_CSDEF 0x14 /* Chip select default */
> +#define SIFIVE_SPI_REG_CSMODE 0x18 /* Chip select mode */
> +#define SIFIVE_SPI_REG_DELAY0 0x28 /* Delay control 0 */
> +#define SIFIVE_SPI_REG_DELAY1 0x2c /* Delay control 1 */
> +#define SIFIVE_SPI_REG_FMT 0x40 /* Frame format */
> +#define SIFIVE_SPI_REG_TXDATA 0x48 /* Tx FIFO data */
> +#define SIFIVE_SPI_REG_RXDATA 0x4c /* Rx FIFO data */
> +#define SIFIVE_SPI_REG_TXMARK 0x50 /* Tx FIFO watermark */
> +#define SIFIVE_SPI_REG_RXMARK 0x54 /* Rx FIFO watermark */
> +#define SIFIVE_SPI_REG_FCTRL 0x60 /* SPI flash interface control */
> +#define SIFIVE_SPI_REG_FFMT 0x64 /* SPI flash instruction format */
> +#define SIFIVE_SPI_REG_IE 0x70 /* Interrupt Enable Register */
> +#define SIFIVE_SPI_REG_IP 0x74 /* Interrupt Pendings Register */
> +
> +/* sckdiv bits */
> +#define SIFIVE_SPI_SCKDIV_DIV_MASK 0xfffU
> +
> +/* sckmode bits */
> +#define SIFIVE_SPI_SCKMODE_PHA BIT(0)
> +#define SIFIVE_SPI_SCKMODE_POL BIT(1)
> +#define SIFIVE_SPI_SCKMODE_MODE_MASK (SIFIVE_SPI_SCKMODE_PHA | \
> + SIFIVE_SPI_SCKMODE_POL)
> +
> +/* csmode bits */
> +#define SIFIVE_SPI_CSMODE_MODE_AUTO 0U
> +#define SIFIVE_SPI_CSMODE_MODE_HOLD 2U
> +#define SIFIVE_SPI_CSMODE_MODE_OFF 3U
> +
> +/* delay0 bits */
> +#define SIFIVE_SPI_DELAY0_CSSCK(x) ((u32)(x))
> +#define SIFIVE_SPI_DELAY0_CSSCK_MASK 0xffU
> +#define SIFIVE_SPI_DELAY0_SCKCS(x) ((u32)(x) << 16)
> +#define SIFIVE_SPI_DELAY0_SCKCS_MASK (0xffU << 16)
> +
> +/* delay1 bits */
> +#define SIFIVE_SPI_DELAY1_INTERCS(x) ((u32)(x))
> +#define SIFIVE_SPI_DELAY1_INTERCS_MASK 0xffU
> +#define SIFIVE_SPI_DELAY1_INTERXFR(x) ((u32)(x) << 16)
> +#define SIFIVE_SPI_DELAY1_INTERXFR_MASK (0xffU << 16)
> +
> +/* fmt bits */
> +#define SIFIVE_SPI_FMT_PROTO_SINGLE 0U
> +#define SIFIVE_SPI_FMT_PROTO_DUAL 1U
> +#define SIFIVE_SPI_FMT_PROTO_QUAD 2U
> +#define SIFIVE_SPI_FMT_PROTO_MASK 3U
> +#define SIFIVE_SPI_FMT_ENDIAN BIT(2)
> +#define SIFIVE_SPI_FMT_DIR BIT(3)
> +#define SIFIVE_SPI_FMT_LEN(x) ((u32)(x) << 16)
> +#define SIFIVE_SPI_FMT_LEN_MASK (0xfU << 16)
> +
> +/* txdata bits */
> +#define SIFIVE_SPI_TXDATA_DATA_MASK 0xffU
> +#define SIFIVE_SPI_TXDATA_FULL BIT(31)
> +
> +/* rxdata bits */
> +#define SIFIVE_SPI_RXDATA_DATA_MASK 0xffU
> +#define SIFIVE_SPI_RXDATA_EMPTY BIT(31)
> +
> +/* ie and ip bits */
> +#define SIFIVE_SPI_IP_TXWM BIT(0)
> +#define SIFIVE_SPI_IP_RXWM BIT(1)
> +
> +/* format protocol */
> +#define SIFIVE_SPI_PROTO_QUAD 4 /* 4 lines I/O protocol transfer */
> +#define SIFIVE_SPI_PROTO_DUAL 2 /* 2 lines I/O protocol transfer */
> +#define SIFIVE_SPI_PROTO_SINGLE 1 /* 1 line I/O protocol transfer */
> +
> +#define SPI_XFER_BEGIN 0x01 /* Assert CS before transfer */
> +#define SPI_XFER_END 0x02 /* Deassert CS after transfer */
> +
> +struct sifive_spi {
> + struct spi_controller ctlr;
> + void __iomem *regs; /* base address of the registers */
> + u32 fifo_depth;
> + u32 bits_per_word;
> + u32 cs_inactive; /* Level of the CS pins when inactive*/
> + u32 freq;
> + u8 fmt_proto;
> +};
> +
> +static inline struct sifive_spi *to_sifive_spi(struct spi_controller *ctlr)
> +{
> + return container_of(ctlr, struct sifive_spi, ctlr);
> +}
> +
> +static void sifive_spi_prep_device(struct sifive_spi *spi,
> + struct spi_device *spi_dev)
> +{
> + /* Update the chip select polarity */
> + if (spi_dev->mode & SPI_CS_HIGH)
> + spi->cs_inactive &= ~BIT(spi_dev->chip_select);
> + else
> + spi->cs_inactive |= BIT(spi_dev->chip_select);
> + writel(spi->cs_inactive, spi->regs + SIFIVE_SPI_REG_CSDEF);
> +
> + /* Select the correct device */
> + writel(spi_dev->chip_select, spi->regs + SIFIVE_SPI_REG_CSID);
> +}
> +
> +static void sifive_spi_set_cs(struct sifive_spi *spi,
> + struct spi_device *spi_dev)
> +{
> + u32 cs_mode = SIFIVE_SPI_CSMODE_MODE_HOLD;
> +
> + if (spi_dev->mode & SPI_CS_HIGH)
> + cs_mode = SIFIVE_SPI_CSMODE_MODE_AUTO;
> +
> + writel(cs_mode, spi->regs + SIFIVE_SPI_REG_CSMODE);
> +}
> +
> +static void sifive_spi_clear_cs(struct sifive_spi *spi)
> +{
> + writel(SIFIVE_SPI_CSMODE_MODE_AUTO, spi->regs + SIFIVE_SPI_REG_CSMODE);
> +}
> +
> +static void sifive_spi_prep_transfer(struct sifive_spi *spi,
> + struct spi_device *spi_dev,
> + u8 *rx_ptr)
> +{
> + u32 cr;
> +
> + /* Modify the SPI protocol mode */
> + cr = readl(spi->regs + SIFIVE_SPI_REG_FMT);
> +
> + /* Bits per word ? */
> + cr &= ~SIFIVE_SPI_FMT_LEN_MASK;
> + cr |= SIFIVE_SPI_FMT_LEN(spi->bits_per_word);
> +
> + /* LSB first? */
> + cr &= ~SIFIVE_SPI_FMT_ENDIAN;
> + if (spi_dev->mode & SPI_LSB_FIRST)
> + cr |= SIFIVE_SPI_FMT_ENDIAN;
> +
> + /* Number of wires ? */
> + cr &= ~SIFIVE_SPI_FMT_PROTO_MASK;
> + switch (spi->fmt_proto) {
> + case SIFIVE_SPI_PROTO_QUAD:
> + cr |= SIFIVE_SPI_FMT_PROTO_QUAD;
> + break;
> + case SIFIVE_SPI_PROTO_DUAL:
> + cr |= SIFIVE_SPI_FMT_PROTO_DUAL;
> + break;
> + default:
> + cr |= SIFIVE_SPI_FMT_PROTO_SINGLE;
> + break;
> + }
> +
> + /* SPI direction in/out ? */
> + cr &= ~SIFIVE_SPI_FMT_DIR;
> + if (!rx_ptr)
> + cr |= SIFIVE_SPI_FMT_DIR;
> +
> + writel(cr, spi->regs + SIFIVE_SPI_REG_FMT);
> +}
> +
> +static void sifive_spi_rx(struct sifive_spi *spi, u8 *rx_ptr)
> +{
> + u32 data;
> +
> + do {
> + data = readl(spi->regs + SIFIVE_SPI_REG_RXDATA);
> + } while (data & SIFIVE_SPI_RXDATA_EMPTY);
> +
> + if (rx_ptr)
> + *rx_ptr = data & SIFIVE_SPI_RXDATA_DATA_MASK;
> +}
> +
> +static void sifive_spi_tx(struct sifive_spi *spi, const u8 *tx_ptr)
> +{
> + u32 data;
> + u8 tx_data = (tx_ptr) ? *tx_ptr & SIFIVE_SPI_TXDATA_DATA_MASK :
> + SIFIVE_SPI_TXDATA_DATA_MASK;
> +
> + do {
> + data = readl(spi->regs + SIFIVE_SPI_REG_TXDATA);
> + } while (data & SIFIVE_SPI_TXDATA_FULL);
> +
> + writel(tx_data, spi->regs + SIFIVE_SPI_REG_TXDATA);
> +}
> +
> +static int sifive_spi_wait(struct sifive_spi *spi, u32 mask)
> +{
> + u32 val;
> +
> + return readl_poll_timeout(spi->regs + SIFIVE_SPI_REG_IP, val,
> + (val & mask) == mask, 100 * USEC_PER_MSEC);
> +}
> +
> +#define BUILD_WAIT_FOR_BIT(sfx, type, read) \
> + \
> +static inline int wait_for_bit_##sfx(const void *reg, \
> + const type mask, \
> + const bool set, \
> + const unsigned int timeout_ms, \
> + const bool breakable) \
> +{ \
> + type val; \
> + unsigned long start = get_timer(0); \
> + \
> + while (1) { \
> + val = read(reg); \
> + \
> + if (!set) \
> + val = ~val; \
> + \
> + if ((val & mask) == mask) \
> + return 0; \
> + \
> + if (get_timer(start) > timeout_ms) \
> + break; \
> + \
> + if (breakable && ctrlc()) { \
> + puts("Abort\n"); \
> + return -EINTR; \
> + } \
> + \
> + udelay(1); \
> + WATCHDOG_RESET(); \
> + } \
> + \
> + debug("%s: Timeout (reg=%p mask=%x wait_set=%i)\n", __func__, \
> + reg, mask, set); \
> + \
> + return -ETIMEDOUT; \
> +}
This is unused and would not be usable in barebox.
> +
> +static int sifive_spi_transfer_one(struct spi_device *spi_dev, unsigned int bitlen,
> + const void *dout, void *din, unsigned long flags)
> +{
> + struct sifive_spi *spi = to_sifive_spi(spi_dev->controller);
> + const u8 *tx_ptr = dout;
> + u8 *rx_ptr = din;
> + u32 remaining_len;
> + int ret;
> +
> + if (flags & SPI_XFER_BEGIN) {
> + sifive_spi_prep_device(spi, spi_dev);
> + sifive_spi_set_cs(spi, spi_dev);
> + }
It would be easier to move preparation and cs handling out of this
function and let the callers handle it.
> +
> + sifive_spi_prep_transfer(spi, spi_dev, rx_ptr);
> +
> + remaining_len = bitlen / 8;
All callers call sifive_spi_transfer_one() with nbytes * 8, given that
we need the length in bytes here we could pass that directly.
> +
> + while (remaining_len) {
> + unsigned int n_words = min(remaining_len, spi->fifo_depth);
> + unsigned int tx_words, rx_words;
> +
> + /* Enqueue n_words for transmission */
> + for (tx_words = 0; tx_words < n_words; tx_words++) {
> + if (!tx_ptr)
> + sifive_spi_tx(spi, NULL);
> + else
> + sifive_spi_tx(spi, tx_ptr++);
> + }
> +
> + if (rx_ptr) {
> + /* Wait for transmission + reception to complete */
> + writel(n_words - 1, spi->regs + SIFIVE_SPI_REG_RXMARK);
> + ret = sifive_spi_wait(spi, SIFIVE_SPI_IP_RXWM);
> + if (ret)
> + return ret;
> +
> + /* Read out all the data from the RX FIFO */
> + for (rx_words = 0; rx_words < n_words; rx_words++)
> + sifive_spi_rx(spi, rx_ptr++);
> + } else {
> + /* Wait for transmission to complete */
> + ret = sifive_spi_wait(spi, SIFIVE_SPI_IP_TXWM);
> + if (ret)
> + return ret;
> + }
> +
> + remaining_len -= n_words;
> + }
> +
> + if (flags & SPI_XFER_END)
> + sifive_spi_clear_cs(spi);
> +
> + return 0;
> +}
> +
> +static int sifive_spi_transfer(struct spi_device *spi_dev, struct spi_message *msg)
> +{
> + struct spi_controller *ctlr = spi_dev->controller;
> + struct spi_transfer *t, *t_first, *t_last = NULL;
> + unsigned long flags;
> + int ret = 0;
> +
> + if (list_empty(&msg->transfers))
> + return 0;
> +
> + t_first = list_first_entry(&msg->transfers, struct spi_transfer, transfer_list);
> + t_last = list_last_entry(&msg->transfers, struct spi_transfer, transfer_list);
> +
> + msg->actual_length = 0;
> +
> + dev_dbg(ctlr->dev, "transfer start actual_length=%i\n", msg->actual_length);
> + list_for_each_entry(t, &msg->transfers, transfer_list) {
> + dev_dbg(ctlr->dev,
> + " xfer %p: len %u tx %p rx %p\n",
> + t, t->len, t->tx_buf, t->rx_buf);
> + flags = 0;
> + if (t == t_first)
> + flags |= SPI_XFER_BEGIN;
> + if (t == t_last)
> + flags |= SPI_XFER_END;
> + ret = sifive_spi_transfer_one(spi_dev, t->len * 8,
> + t->tx_buf, t->rx_buf, flags);
> + if (ret < 0)
> + return ret;
> + msg->actual_length += t->len;
> + }
> + dev_dbg(ctlr->dev, "transfer done actual_length=%i\n", msg->actual_length);
> +
> + return ret;
> +}
> +
> +static int sifive_spi_exec_op(struct spi_mem *mem,
> + const struct spi_mem_op *op)
> +{
> + struct spi_device *spi_dev = mem->spi;
> + struct device_d *dev = &spi_dev->dev;
> + struct sifive_spi *spi = spi_controller_get_devdata(spi_dev->controller);
> + unsigned long flags = SPI_XFER_BEGIN;
> + u8 opcode = op->cmd.opcode;
> + unsigned int pos = 0;
> + const void *tx_buf = NULL;
> + void *rx_buf = NULL;
> + int op_len, i;
> + u8 *op_buf;
> + int ret;
> +
> + if (!op->addr.nbytes && !op->dummy.nbytes && !op->data.nbytes)
> + flags |= SPI_XFER_END;
> +
> + spi->fmt_proto = op->cmd.buswidth;
> +
> + /* send the opcode */
> + ret = sifive_spi_transfer_one(spi_dev, 8, (void *)&opcode, NULL, flags);
> + if (ret < 0) {
> + dev_err(dev, "failed to xfer opcode\n");
> + return ret;
> + }
> +
> + op_len = op->addr.nbytes + op->dummy.nbytes;
> +
> + op_buf = malloc(op_len);
> + if (!op_buf)
> + return -ENOMEM;
> +
> + /* send the addr + dummy */
> + if (op->addr.nbytes) {
> + /* fill address */
> + for (i = 0; i < op->addr.nbytes; i++)
> + op_buf[pos + i] = op->addr.val >>
> + (8 * (op->addr.nbytes - i - 1));
> +
> + pos += op->addr.nbytes;
pos was 0 before, so now pos is op->addr.nbytes. You could use
op->addr.nbytes directly and drop pos altogether.
Sascha
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-03-28 9:50 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-19 7:24 [PATCH 1/4] spi: Port SiFive SPI controller driver Ahmad Fatoum
2022-03-19 7:24 ` [PATCH 2/4] mci: mci_spi: extend driver for device tree probing Ahmad Fatoum
2022-03-28 9:44 ` Sascha Hauer
2022-03-28 9:48 ` Ahmad Fatoum
2022-03-19 7:24 ` [PATCH 3/4] mtd: spi-nor: add support for ISSI IS25WP256 Ahmad Fatoum
2022-03-19 7:24 ` [PATCH 4/4] RISC-V: sifive: enable SPI Flash and SD in config Ahmad Fatoum
2022-03-28 9:43 ` [PATCH 1/4] spi: Port SiFive SPI controller driver Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox