Skip to contentSkip to conversation

Add support for the Mercury+ AA1 module

PATCH Superseded Paweł Anikiel 5 participants 11 messages Sep 20, 2021 – Oct 5, 2021 1 message not in the archive

Subsystems (5)

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

cover Add support for the Mercury+ AA1 module

The following patches add support for the Mercury+ AA1 with an Arria 10 SoCFPGA, namely a device tree, and a fix regarding the Arria 10 reset manager driver.

Paweł Anikiel (3):
dt-bindings: mtd: spi-nor: add n25q00 schema
dts: socfpga: Add Mercury+ AA1 devicetree
reset: socfpga: add empty driver allowing consumers to probe

 .../bindings/mtd/jedec,spi-nor.yaml           |   2 +-
 arch/arm/boot/dts/Makefile                    |   1 +
 .../boot/dts/socfpga_arria10_mercury_aa1.dts  | 127 ++++++++++++++++++
 drivers/reset/reset-socfpga.c                 |  26 ++++
 4 files changed, 155 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/3 dt-bindings: mtd: spi-nor: add n25q00 schema

Add schema for the n25q00 NOR flash memory.

---
 Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml +1 -1
index ed590d7c6e37..efb3c5e05c5a 100644
@@ -18,7 +18,7 @@ properties:
       - items:
           - pattern: "^((((micron|spansion|st),)?\
               (m25p(40|80|16|32|64|128)|\
-              n25q(32b|064|128a11|128a13|256a|512a|164k)))|\
+              n25q(00|32b|064|128a11|128a13|256a|512a|164k)))|\
               atmel,at25df(321a|641|081a)|\
               everspin,mr25h(10|40|128|256)|\
               (mxicy|macronix),mx25l(4005a|1606e|6405d|8005|12805d|25635e)|\
Signature · 1 line
2.25.1
Nacked-by on v1 1/3 NAK
#3 lore raw

Re: [PATCH 1/3] dt-bindings: mtd: spi-nor: add n25q00 schema

In reply to Paweł Anikiel

+Tudor

Quoted 12 lines · Paweł Anikiel

Add schema for the n25q00 NOR flash memory.

---
 Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml +0 -0
index ed590d7c6e37..efb3c5e05c5a 100644

Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml properties: · line 21

Quoted 5 lines
Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml +1 -1
@@ -18,7 +18,7 @@ properties:
       - items:
           - pattern: "^((((micron|spansion|st),)?\
               (m25p(40|80|16|32|64|128)|\
-              n25q(32b|064|128a11|128a13|256a|512a|164k)))|\
+              n25q(00|32b|064|128a11|128a13|256a|512a|164k)))|\

IIUC this is supposed to only be for legacy/old flashes that started out using flash-specific compatibles. Any new flashes should simply use jedec,spi-nor unless there is a legitimate reason to do so.

Until you justify that reason,

Quoted 5 lines
Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml +0 -0
               atmel,at25df(321a|641|081a)|\
               everspin,mr25h(10|40|128|256)|\
               (mxicy|macronix),mx25l(4005a|1606e|6405d|8005|12805d|25635e)|\
Signature · 1 line
2.25.1
Signature · 3 lines
Regards,
Pratyush Yadav
Texas Instruments Inc.
#4 lore raw

Re: [PATCH 1/3] dt-bindings: mtd: spi-nor: add n25q00 schema

Quoted 12 lines · Pratyush Yadav

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

+Tudor

Quoted 7 lines · Paweł Anikiel

Add schema for the n25q00 NOR flash memory.

---
 Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 14 lines

Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml properties: · line 21

Quoted 10 lines
Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml +1 -1
index ed590d7c6e37..efb3c5e05c5a 100644
@@ -18,7 +18,7 @@ properties:
       - items:
           - pattern: "^((((micron|spansion|st),)?\
               (m25p(40|80|16|32|64|128)|\
-              n25q(32b|064|128a11|128a13|256a|512a|164k)))|\
+              n25q(00|32b|064|128a11|128a13|256a|512a|164k)))|\

IIUC this is supposed to only be for legacy/old flashes that started out using flash-specific compatibles. Any new flashes should simply use jedec,spi-nor unless there is a legitimate reason to do so.

that's correct, the generic compatible should suffice for these flashes.

Quoted 4 lines

Until you justify that reason,

I agree.

Cheers,
ta

#5 lore raw

PATCH 2/3 dts: socfpga: Add Mercury+ AA1 devicetree

In reply to Paweł Anikiel

Add support for the Mercury+ AA1 module for Arria 10 SoC FPGA.

---
 arch/arm/boot/dts/Makefile                    |   1 +
 .../boot/dts/socfpga_arria10_mercury_aa1.dts  | 127 ++++++++++++++++++
 2 files changed, 128 insertions(+)
 create mode 100644 arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts
arch/arm/boot/dts/Makefile +1 -0
index 7e0934180724..0a7809eb3795 100644
@@ -1078,6 +1078,7 @@ dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \
 	socfpga_arria10_socdk_nand.dtb \
 	socfpga_arria10_socdk_qspi.dtb \
 	socfpga_arria10_socdk_sdmmc.dtb \
+	socfpga_arria10_mercury_aa1.dtb \
 	socfpga_cyclone5_chameleon96.dtb \
 	socfpga_cyclone5_mcvevk.dtb \
 	socfpga_cyclone5_socdk.dtb \
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +127 -0

127 lines not on this page · raw message

Signature · 1 line
2.25.1
#6 lore raw

PATCH 3/3 reset: socfpga: add empty driver allowing consumers to probe

In reply to Paweł Anikiel

The early reset driver doesn't ever probe, which causes consuming devices to be unable to probe. Add an empty driver to set this device as available, allowing consumers to probe.

---
 drivers/reset/reset-socfpga.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
drivers/reset/reset-socfpga.c +26 -0
index 2a72f861f798..8c6492e5693c 100644
@@ -92,3 +92,29 @@ void __init socfpga_reset_init(void)
 	for_each_matching_node(np, socfpga_early_reset_dt_ids)
 		a10_reset_init(np);
 }
+
+/*
+ * The early driver is problematic, because it doesn't register
+ * itself as a driver. This causes certain device links to prevent
+ * consumer devices from probing. The hacky solution is to register
+ * an empty driver, whose only job is to attach itself to the reset
+ * manager and call probe.
+ */
+static const struct of_device_id socfpga_reset_dt_ids[] = {
+	{ .compatible = "altr,rst-mgr", },
+	{ /* sentinel */ },
+};
+
+static int reset_simple_probe(struct platform_device *pdev)
+{
+	return 0;
+}
+
+static struct platform_driver reset_socfpga_driver = {
+	.probe	= reset_simple_probe,
+	.driver = {
+		.name		= "socfpga-reset",
+		.of_match_table	= socfpga_reset_dt_ids,
+	},
+};
+builtin_platform_driver(reset_socfpga_driver);
Signature · 1 line
2.25.1
maintainer
#7 lore raw

Re: [PATCH 3/3] reset: socfpga: add empty driver allowing consumers to probe

Hi Paweł,

Quoted 33 lines · Paweł Anikiel

The early reset driver doesn't ever probe, which causes consuming devices to be unable to probe. Add an empty driver to set this device as available, allowing consumers to probe.

---
 drivers/reset/reset-socfpga.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
drivers/reset/reset-socfpga.c +16 -0
index 2a72f861f798..8c6492e5693c 100644
@@ -92,3 +92,29 @@ void __init socfpga_reset_init(void)
 	for_each_matching_node(np, socfpga_early_reset_dt_ids)
 		a10_reset_init(np);
 }
+
+/*
+ * The early driver is problematic, because it doesn't register
+ * itself as a driver. This causes certain device links to prevent
+ * consumer devices from probing. The hacky solution is to register
+ * an empty driver, whose only job is to attach itself to the reset
+ * manager and call probe.
+ */
+static const struct of_device_id socfpga_reset_dt_ids[] = {
+	{ .compatible = "altr,rst-mgr", },
+	{ /* sentinel */ },
+};
+
+static int reset_simple_probe(struct platform_device *pdev)
+{
+	return 0;

drivers/reset/reset-socfpga.c void __init socfpga_reset_init(void) · line 120

Quoted 10 lines
drivers/reset/reset-socfpga.c +10 -0
+}
+
+static struct platform_driver reset_socfpga_driver = {
+	.probe	= reset_simple_probe,
+	.driver = {
+		.name		= "socfpga-reset",
+		.of_match_table	= socfpga_reset_dt_ids,
+	},
+};
+builtin_platform_driver(reset_socfpga_driver);

If we can just let devlink delay all consumers until the empty driver is probed, does the reset controller have to be registered early at all?

regards
Philipp

#8 lore raw

Re: [PATCH 3/3] reset: socfpga: add empty driver allowing consumers to probe

Quoted 51 lines · Philipp Zabel

Hi Paweł,

Quoted 33 lines · Paweł Anikiel

The early reset driver doesn't ever probe, which causes consuming devices to be unable to probe. Add an empty driver to set this device as available, allowing consumers to probe.

---
 drivers/reset/reset-socfpga.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
drivers/reset/reset-socfpga.c +16 -0
index 2a72f861f798..8c6492e5693c 100644
@@ -92,3 +92,29 @@ void __init socfpga_reset_init(void)
      for_each_matching_node(np, socfpga_early_reset_dt_ids)
              a10_reset_init(np);
 }
+
+/*
+ * The early driver is problematic, because it doesn't register
+ * itself as a driver. This causes certain device links to prevent
+ * consumer devices from probing. The hacky solution is to register
+ * an empty driver, whose only job is to attach itself to the reset
+ * manager and call probe.
+ */
+static const struct of_device_id socfpga_reset_dt_ids[] = {
+     { .compatible = "altr,rst-mgr", },
+     { /* sentinel */ },
+};
+
+static int reset_simple_probe(struct platform_device *pdev)
+{
+     return 0;

drivers/reset/reset-socfpga.c void __init socfpga_reset_init(void) · line 120

Quoted 10 lines
drivers/reset/reset-socfpga.c +10 -0
+}
+
+static struct platform_driver reset_socfpga_driver = {
+     .probe  = reset_simple_probe,
+     .driver = {
+             .name           = "socfpga-reset",
+             .of_match_table = socfpga_reset_dt_ids,
+     },
+};
+builtin_platform_driver(reset_socfpga_driver);

If we can just let devlink delay all consumers until the empty driver is probed, does the reset controller have to be registered early at all?

Quoted 2 lines

regards
Philipp

I asked Dinh if the reset controller code needs to be called early:

Quoted 25 lines

That's correct. It's for one of the SP timers.

Quoted 22 lines · Paweł Anikiel

Hi,

I would like to ask you about the following commit:

Quoted 11 lines

commit b3ca9888f35fa6919569cf27c929dc0ac49e9716

Author: Dinh Nguyen <[email protected]>
Date:   Tue Nov 13 12:50:48 2018 -0600

reset: socfpga: add an early reset driver for SoCFPGA

Create a separate reset driver that uses the reset operations in reset-simple. The reset driver for the SoCFPGA platform needs to register early in order to be able bring online timers that needed early in the kernel bootup.
[...]

Which online timers is this commit message referring to? I couldn't find any information about this. Without this patch the kernel seems to work fine on an Arria 10 (with Mercury AA1 module). What's the exact reason a regular platform driver isn't sufficient?

Best regards,
Paweł

maintainer
#9 lore raw

Re: [PATCH 3/3] reset: socfpga: add empty driver allowing consumers to probe

Quoted 51 lines · Paweł Anikiel
Quoted 50 lines · Philipp Zabel

Hi Paweł,

Quoted 33 lines · Paweł Anikiel

The early reset driver doesn't ever probe, which causes consuming devices to be unable to probe. Add an empty driver to set this device as available, allowing consumers to probe.

---
 drivers/reset/reset-socfpga.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
drivers/reset/reset-socfpga.c +16 -0
index 2a72f861f798..8c6492e5693c 100644
@@ -92,3 +92,29 @@ void __init socfpga_reset_init(void)
      for_each_matching_node(np, socfpga_early_reset_dt_ids)
              a10_reset_init(np);
 }
+
+/*
+ * The early driver is problematic, because it doesn't register
+ * itself as a driver. This causes certain device links to prevent
+ * consumer devices from probing. The hacky solution is to register
+ * an empty driver, whose only job is to attach itself to the reset
+ * manager and call probe.
+ */
+static const struct of_device_id socfpga_reset_dt_ids[] = {
+     { .compatible = "altr,rst-mgr", },
+     { /* sentinel */ },
+};
+
+static int reset_simple_probe(struct platform_device *pdev)
+{
+     return 0;

drivers/reset/reset-socfpga.c void __init socfpga_reset_init(void) · line 120

Quoted 10 lines
drivers/reset/reset-socfpga.c +10 -0
+}
+
+static struct platform_driver reset_socfpga_driver = {
+     .probe  = reset_simple_probe,
+     .driver = {
+             .name           = "socfpga-reset",
+             .of_match_table = socfpga_reset_dt_ids,
+     },
+};
+builtin_platform_driver(reset_socfpga_driver);

If we can just let devlink delay all consumers until the empty driver is probed, does the reset controller have to be registered early at all?

Quoted 6 lines
Quoted 2 lines

regards
Philipp

I asked Dinh if the reset controller code needs to be called early:

Quoted 1 line

That's correct. It's for one of the SP timers.

Ah, right, those call of_reset_control_get() from TIMER_OF_DECLARE(). Thank you, I'll apply this to reset/fixes.

regards
Philipp

A message that is not in the archive (sent off-list or not yet received): 20210920124140.u56dOOGofORjfYeTSsKGqD2HNw-7gu5UqvN2ocHwr-g@z

maintainer
#11 lore raw

Re: [PATCH 2/3] dts: socfpga: Add Mercury+ AA1 devicetree

Quoted 37 lines · Paweł Anikiel

Add support for the Mercury+ AA1 module for Arria 10 SoC FPGA.

---
 arch/arm/boot/dts/Makefile                    |   1 +
 .../boot/dts/socfpga_arria10_mercury_aa1.dts  | 127 ++++++++++++++++++
 2 files changed, 128 insertions(+)
 create mode 100644 arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts
arch/arm/boot/dts/Makefile +1 -0
index 7e0934180724..0a7809eb3795 100644
@@ -1078,6 +1078,7 @@ dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += \
 	socfpga_arria10_socdk_nand.dtb \
 	socfpga_arria10_socdk_qspi.dtb \
 	socfpga_arria10_socdk_sdmmc.dtb \
+	socfpga_arria10_mercury_aa1.dtb \
 	socfpga_cyclone5_chameleon96.dtb \
 	socfpga_cyclone5_mcvevk.dtb \
 	socfpga_cyclone5_socdk.dtb \
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +6 -0
new file mode 100644
index 000000000000..c13f16afa72f
@@ -0,0 +1,127 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "socfpga_arria10.dtsi"
+
+/ {

arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts line 16

Quoted 10 lines
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +10 -0
+
+	model = "Enclustra Mercury AA1";
+	compatible = "altr,socfpga-arria10", "altr,socfpga";
+
+	aliases {
+		ethernet0 = &gmac0;
+		serial1 = &uart1;
+	};
+
+	memory {

memory@0

Quoted 39 lines
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +39 -0
+		name = "memory";
+		device_type = "memory";
+		reg = <0x0 0x80000000>; /* 2GB */
+	};
+
+	chosen {
+		stdout-path = "serial1:115200n8";
+	};
+};
+
+&osc1 {
+	clock-frequency = <33330000>;
+};
+
+&usb0 {
+	status = "okay";
+	dr_mode = "host";
+};
+
+/* Following mappings are taken from arria10 socdk dts */
+&mmc {
+	status = "okay";
+	cap-sd-highspeed;
+	broken-cd;
+	bus-width = <4>;
+};
+
+&eccmgr {
+	sdmmca-ecc@ff8c2c00 {
+		compatible = "altr,socfpga-sdmmc-ecc";
+		reg = <0xff8c2c00 0x400>;
+		altr,ecc-parent = <&mmc>;
+		interrupts = <15 IRQ_TYPE_LEVEL_HIGH>,
+			     <47 IRQ_TYPE_LEVEL_HIGH>,
+			     <16 IRQ_TYPE_LEVEL_HIGH>,
+			     <48 IRQ_TYPE_LEVEL_HIGH>;
+	};
+};
+

arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts line 65

Quoted 10 lines
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +10 -0
+&gmac0 {
+	phy-mode = "rgmii";
+	phy-addr = <0xffffffff>; /* probe for phy addr */
+
+	max-frame-size = <3800>;
+	status = "okay";
+
+	phy-handle = <&phy3>;
+
+	mdio0 {

'mdio' doesn't work?

Quoted 28 lines
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +28 -0
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "snps,dwmac-mdio";
+		phy3: ethernet-phy@3 {
+			txd0-skew-ps = <0>; /* -420ps */
+			txd1-skew-ps = <0>; /* -420ps */
+			txd2-skew-ps = <0>; /* -420ps */
+			txd3-skew-ps = <0>; /* -420ps */
+			rxd0-skew-ps = <420>; /* 0ps */
+			rxd1-skew-ps = <420>; /* 0ps */
+			rxd2-skew-ps = <420>; /* 0ps */
+			rxd3-skew-ps = <420>; /* 0ps */
+			txen-skew-ps = <0>; /* -420ps */
+			txc-skew-ps = <1860>; /* 960ps */
+			rxdv-skew-ps = <420>; /* 0ps */
+			rxc-skew-ps = <1680>; /* 780ps */
+			reg = <3>;
+		};
+	};
+};
+
+&i2c1 {
+	status = "okay";
+	isl12022: isl12022@6f {
+		status = "okay";
+		compatible = "isil,isl12022";
+		reg = <0x6f>;
+	};

arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts line 103

Quoted 10 lines
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +10 -0
+};
+
+&uart1 {
+	status = "okay";
+};
+
+&qspi {
+	status = "disabled";
+
+	flash0: n25q00@0 {

flash@0

Quoted 5 lines
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +5 -0
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "n25q00";
+		reg = <0>;
+		spi-max-frequency = <50000000>;

arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts line 118

Quoted 10 lines
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +10 -0
+		cdns,page-size = <256>;
+		cdns,block-size = <16>;
+		m25p,fast-read;
+		cdns,read-delay = <4>;
+		cdns,tshsl-ns = <200>;
+		cdns,tsd2d-ns = <255>;
+		cdns,tchsh-ns = <20>;
+		cdns,tslch-ns = <20>;
+
+		part0: qspi-boot@0 {

Put these under a 'partitions' node.

Quoted 16 lines
arch/arm/boot/dts/socfpga_arria10_mercury_aa1.dts new file +9 -0
+			label = "Flash 0 Raw Data";
+			reg = <0x0 0x01340000>;
+		};
+		part1: qspi-rootfs@1320000 {
+			label = "Flash 1 jffs2 Filesystem";
+			reg = <0x01340000 0x2cc0000>;
+		};
+	};
+};
Signature · 6 lines
2.25.1


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/