[PATCH RESEND v2 1/2] dt-bindings: spi: Realtek RTL838x/RTL839x SPI controller

[PATCH RESEND v2 1/2] dt-bindings: spi: Realtek RTL838x/RTL839x SPI controller

[Bert Vermeulen]

Signed-off-by: Bert Vermeulen <bert@biot.com>
---
(resent due to mail trouble)

 .../devicetree/bindings/spi/realtek,spi.yaml  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/spi/realtek,spi.yaml

diff --git a/Documentation/devicetree/bindings/spi/realtek,spi.yaml b/Documentation/devicetree/bindings/spi/realtek,spi.yaml
new file mode 100644
index 000000000000..9831df6dc40d
--- /dev/null
+++ b/Documentation/devicetree/bindings/spi/realtek,spi.yaml
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/spi/realtek,spi.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Realtek RTL838x/RTL839x SPI controller
+
+maintainers:
+  - Bert Vermeulen <bert@biot.com>
+  - Birger Koblitz <mail@birger-koblitz.de>
+
+allOf:
+  - $ref: "spi-controller.yaml#"
+
+properties:
+  compatible:
+    const: realtek,spi
+
+  reg:
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+
+unevaluatedProperties: false
+
+examples:
+  - |
+    spi: spi@1200 {
+        compatible = "realtek,spi";
+        reg = <0x1200 0x100>;
+        #address-cells = <1>;
+        #size-cells = <0>;
+    };
-- 
2.25.1

[PATCH RESEND v2 2/2] Add support for Realtek RTL838x/RTL839x SoC SPI controllers

[Bert Vermeulen]

This driver likely also supports earlier (RTL8196) and later (RTL93xx)
SoCs.

The SPI hardware in these SoCs is specifically intended for connecting NOR
bootflash chips, and only used for that in dozens of examined devices.
However boiled down to basics, it's really just a half-duplex SPI
controller.

The hardware appears to have a vestigial second chip-select control, but
it hasn't been seen in the wild and is thus not supported.

Signed-off-by: Bert Vermeulen <bert@biot.com>
---
(resent due to mail trouble)
Notes:
    v2: rewrote from spi-nor driver to regular spi driver, implementing only
        set_cs() and transfer_one() (Thanks Chuanhong Guo!)

 MAINTAINERS               |   6 ++
 drivers/spi/Kconfig       |   7 ++
 drivers/spi/Makefile      |   1 +
 drivers/spi/spi-realtek.c | 215 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 229 insertions(+)
 create mode 100644 drivers/spi/spi-realtek.c

diff --git a/MAINTAINERS b/MAINTAINERS
index ad0e34bf8453..311e5413b1dd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15048,6 +15048,12 @@ F:	Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
 F:	drivers/net/dsa/realtek-smi*
 F:	drivers/net/dsa/rtl83*
 
+REALTEK RTL83XX SPI DRIVER
+M:	Bert Vermeulen <bert@biot.com>
+M:	Birger Koblitz <mail@birger-koblitz.de>
+S:	Maintained
+F:	drivers/spi/spi-realtek.c
+
 REALTEK WIRELESS DRIVER (rtlwifi family)
 M:	Ping-Ke Shih <pkshih@realtek.com>
 L:	linux-wireless@vger.kernel.org
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index aadaea052f51..058ed1b19bc6 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -646,6 +646,13 @@ config SPI_RB4XX
 	help
 	  SPI controller driver for the Mikrotik RB4xx series boards.
 
+config SPI_REALTEK
+	bool "Realtek SPI controller"
+	depends on MACH_REALTEK
+	help
+	  This driver supports the SPI controller used for the bootflash
+	  in the Realtek RTL83xx series SoCs.
+
 config SPI_RPCIF
 	tristate "Renesas RPC-IF SPI driver"
 	depends on RENESAS_RPCIF
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 6fea5821662e..6e9612b70555 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -94,6 +94,7 @@ obj-$(CONFIG_SPI_QCOM_QSPI)		+= spi-qcom-qspi.o
 obj-$(CONFIG_SPI_QUP)			+= spi-qup.o
 obj-$(CONFIG_SPI_ROCKCHIP)		+= spi-rockchip.o
 obj-$(CONFIG_SPI_RB4XX)			+= spi-rb4xx.o
+obj-$(CONFIG_SPI_REALTEK)		+= spi-realtek.o
 obj-$(CONFIG_SPI_RPCIF)			+= spi-rpc-if.o
 obj-$(CONFIG_SPI_RSPI)			+= spi-rspi.o
 obj-$(CONFIG_SPI_S3C24XX)		+= spi-s3c24xx-hw.o
diff --git a/drivers/spi/spi-realtek.c b/drivers/spi/spi-realtek.c
new file mode 100644
index 000000000000..d425d36f022f
--- /dev/null
+++ b/drivers/spi/spi-realtek.c
@@ -0,0 +1,215 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/mod_devicetable.h>
+#include <linux/spi/spi.h>
+
+struct rtspi {
+	void __iomem *base;
+};
+
+/* SPI Flash Configuration Register */
+#define RTL8380_SPI_SFCR		0x00
+#define RTL8380_SPI_SFCR_RBO		BIT(28)
+#define RTL8380_SPI_SFCR_WBO		BIT(27)
+
+/* SPI Flash Control and Status Register */
+#define RTL8380_SPI_SFCSR		0x08
+#define RTL8380_SPI_SFCSR_CSB0		BIT(31)
+#define RTL8380_SPI_SFCSR_CSB1		BIT(30)
+#define RTL8380_SPI_SFCSR_RDY		BIT(27)
+#define RTL8380_SPI_SFCSR_CS		BIT(24)
+#define RTL8380_SPI_SFCSR_LEN_MASK	~(0x03 << 28)
+#define RTL8380_SPI_SFCSR_LEN1		(0x00 << 28)
+#define RTL8380_SPI_SFCSR_LEN4		(0x03 << 28)
+
+/* SPI Flash Data Registers */
+#define RTL8380_SPI_SFDR		0x0c
+
+#define REG(x)		(rtspi->base + x)
+
+
+static void rt_set_cs(struct spi_device *spi, bool active)
+{
+	struct rtspi *rtspi = spi_controller_get_devdata(spi->controller);
+	u32 value;
+
+	/* CS0 bit is active low */
+	value = readl(REG(RTL8380_SPI_SFCSR));
+	if (active)
+		value |= RTL8380_SPI_SFCSR_CSB0;
+	else
+		value &= ~RTL8380_SPI_SFCSR_CSB0;
+	writel(value, REG(RTL8380_SPI_SFCSR));
+}
+
+static void set_size(struct rtspi *rtspi, int size)
+{
+	u32 value;
+
+	value = readl(REG(RTL8380_SPI_SFCSR));
+	value &= RTL8380_SPI_SFCSR_LEN_MASK;
+	if (size == 4)
+		value |= RTL8380_SPI_SFCSR_LEN4;
+	else if (size == 1)
+		value |= RTL8380_SPI_SFCSR_LEN1;
+	writel(value, REG(RTL8380_SPI_SFCSR));
+}
+
+static inline void wait_ready(struct rtspi *rtspi)
+{
+	while (!(readl(REG(RTL8380_SPI_SFCSR)) & RTL8380_SPI_SFCSR_RDY))
+		;
+}
+static void send4(struct rtspi *rtspi, const u32 *buf)
+{
+	wait_ready(rtspi);
+	set_size(rtspi, 4);
+	writel(*buf, REG(RTL8380_SPI_SFDR));
+}
+
+static void send1(struct rtspi *rtspi, const u8 *buf)
+{
+	wait_ready(rtspi);
+	set_size(rtspi, 1);
+	writel(buf[0] << 24, REG(RTL8380_SPI_SFDR));
+}
+
+static void rcv4(struct rtspi *rtspi, u32 *buf)
+{
+	wait_ready(rtspi);
+	set_size(rtspi, 4);
+	*buf = readl(REG(RTL8380_SPI_SFDR));
+}
+
+static void rcv1(struct rtspi *rtspi, u8 *buf)
+{
+	wait_ready(rtspi);
+	set_size(rtspi, 1);
+	*buf = readl(REG(RTL8380_SPI_SFDR)) >> 24;
+}
+
+static int transfer_one(struct spi_controller *ctrl, struct spi_device *spi,
+			struct spi_transfer *xfer)
+{
+	struct rtspi *rtspi = spi_controller_get_devdata(ctrl);
+	void *rx_buf;
+	const void *tx_buf;
+	int cnt;
+
+	tx_buf = xfer->tx_buf;
+	rx_buf = xfer->rx_buf;
+	cnt = xfer->len;
+	if (tx_buf) {
+		while (cnt >= 4) {
+			send4(rtspi, tx_buf);
+			tx_buf += 4;
+			cnt -= 4;
+		}
+		while (cnt) {
+			send1(rtspi, tx_buf);
+			tx_buf++;
+			cnt--;
+		}
+	} else if (rx_buf) {
+		while (cnt >= 4) {
+			rcv4(rtspi, rx_buf);
+			rx_buf += 4;
+			cnt -= 4;
+		}
+		while (cnt) {
+			rcv1(rtspi, rx_buf);
+			rx_buf++;
+			cnt--;
+		}
+	}
+
+	spi_finalize_current_transfer(ctrl);
+
+	return 0;
+}
+
+static void init_hw(struct rtspi *rtspi)
+{
+	u32 value;
+
+	/* Turn on big-endian byte ordering */
+	value = readl(REG(RTL8380_SPI_SFCR));
+	value |= RTL8380_SPI_SFCR_RBO | RTL8380_SPI_SFCR_WBO;
+	writel(value, REG(RTL8380_SPI_SFCR));
+
+	value = readl(REG(RTL8380_SPI_SFCSR));
+	/* Permanently disable CS1, since it's never used */
+	value |= RTL8380_SPI_SFCSR_CSB1;
+	/* Select CS0 for use */
+	value &= RTL8380_SPI_SFCSR_CS;
+	writel(value, REG(RTL8380_SPI_SFCSR));
+}
+
+static int realtek_spi_probe(struct platform_device *pdev)
+{
+	struct spi_controller *ctrl;
+	struct rtspi *rtspi;
+	int err;
+
+	ctrl = devm_spi_alloc_master(&pdev->dev, sizeof(*rtspi));
+	if (!ctrl) {
+		dev_err(&pdev->dev, "Error allocating SPI controller\n");
+		return -ENOMEM;
+	}
+	platform_set_drvdata(pdev, ctrl);
+	rtspi = spi_controller_get_devdata(ctrl);
+
+	rtspi->base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
+	if (IS_ERR(rtspi->base)) {
+		dev_err(&pdev->dev, "Could not map SPI register address");
+		return -ENOMEM;
+	}
+
+	init_hw(rtspi);
+
+	ctrl->dev.of_node = pdev->dev.of_node;
+	ctrl->flags = SPI_CONTROLLER_HALF_DUPLEX;
+	ctrl->set_cs = rt_set_cs;
+	ctrl->transfer_one = transfer_one;
+
+	err = devm_spi_register_controller(&pdev->dev, ctrl);
+	if (err) {
+		dev_err(&pdev->dev, "Could not register SPI controller\n");
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+static int realtek_spi_remove(struct platform_device *pdev)
+{
+	struct spi_controller *ctrl = platform_get_drvdata(pdev);
+
+	spi_unregister_controller(ctrl);
+
+	return 0;
+}
+
+
+static const struct of_device_id realtek_spi_of_ids[] = {
+	{ .compatible = "realtek,spi" },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, realtek_spi_of_ids);
+
+static struct platform_driver realtek_spi_driver = {
+	.probe = realtek_spi_probe,
+	.remove = realtek_spi_remove,
+	.driver = {
+		.name = "spi-realtek",
+		.of_match_table = realtek_spi_of_ids,
+	},
+};
+
+module_platform_driver(realtek_spi_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Bert Vermeulen <bert@biot.com>");
+MODULE_DESCRIPTION("Realtek SPI driver");
-- 
2.25.1

Re: [PATCH RESEND v2 1/2] dt-bindings: spi: Realtek RTL838x/RTL839x SPI controller

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 649 bytes --]

On Wed, Dec 30, 2020 at 12:19:03AM +0100, Bert Vermeulen wrote:

> +properties:
> +  compatible:
> +    const: realtek,spi

It is possibled Realtek might make other SPI controllers, there should
be some more specific name such as a compatible for each SoC that the
controller appears in or an IP name if one is known.

Please submit patches using subject lines reflecting the style for the
subsystem, this makes it easier for people to identify relevant patches.
Look at what existing commits in the area you're changing are doing and
make sure your subject lines visually resemble what they're doing.
There's no need to resubmit to fix this alone.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH RESEND v2 1/2] dt-bindings: spi: Realtek RTL838x/RTL839x SPI controller

[Bert Vermeulen]

On 12/30/20 2:51 PM, Mark Brown wrote:
> On Wed, Dec 30, 2020 at 12:19:03AM +0100, Bert Vermeulen wrote:
> 
>> +properties:
>> +  compatible:
>> +    const: realtek,spi
> 
> It is possibled Realtek might make other SPI controllers, there should
> be some more specific name such as a compatible for each SoC that the
> controller appears in or an IP name if one is known.

Mark,

Good call. We're changing all the Realtek RTL838x/RTL839x stuff to some
variation of "realtek-rtl", in this case "realtek,rtl-spi". The "rtl"
prefix to Realtek SoCs fits the bill. Will resubmit.


-- 
Bert Vermeulen
bert@biot.com

Re: [PATCH RESEND v2 2/2] Add support for Realtek RTL838x/RTL839x SoC SPI controllers

[Lukas Wunner]

On Wed, Dec 30, 2020 at 12:19:04AM +0100, Bert Vermeulen wrote:
> +static inline void wait_ready(struct rtspi *rtspi)
> +{
> +	while (!(readl(REG(RTL8380_SPI_SFCSR)) & RTL8380_SPI_SFCSR_RDY))
> +		;
> +}

I'd suggest calling cpu_relax() in the loop's body.


> +	err = devm_spi_register_controller(&pdev->dev, ctrl);

Since you're invoking devm_spi_register_controller() on probe,
the controller must not be unregistered explicitly on remove.
So the ->remove hook can be dropped altogether:

> +static int realtek_spi_remove(struct platform_device *pdev)
> +{
> +	struct spi_controller *ctrl = platform_get_drvdata(pdev);
> +
> +	spi_unregister_controller(ctrl);
> +
> +	return 0;
> +}
[...]
> +	.remove = realtek_spi_remove,

The ->probe hook otherwise LGTM.

Thanks,

Lukas

Re: [PATCH RESEND v2 2/2] Add support for Realtek RTL838x/RTL839x SoC SPI controllers

[Bert Vermeulen]

On 12/31/20 3:23 PM, Lukas Wunner wrote:
> On Wed, Dec 30, 2020 at 12:19:04AM +0100, Bert Vermeulen wrote:
>> +static inline void wait_ready(struct rtspi *rtspi)
>> +{
>> +	while (!(readl(REG(RTL8380_SPI_SFCSR)) & RTL8380_SPI_SFCSR_RDY))
>> +		;
>> +}
> 
> I'd suggest calling cpu_relax() in the loop's body.
> 
> 
>> +	err = devm_spi_register_controller(&pdev->dev, ctrl);
> 
> Since you're invoking devm_spi_register_controller() on probe,
> the controller must not be unregistered explicitly on remove.
> So the ->remove hook can be dropped altogether:
> 
>> +static int realtek_spi_remove(struct platform_device *pdev)
>> +{
>> +	struct spi_controller *ctrl = platform_get_drvdata(pdev);
>> +
>> +	spi_unregister_controller(ctrl);
>> +
>> +	return 0;
>> +}
> [...]
>> +	.remove = realtek_spi_remove,
> 
> The ->probe hook otherwise LGTM.

Thanks Lukas, will fix those issues.


-- 
Bert Vermeulen
bert@biot.com