Skip to contentSkip to conversation

mtd: pxa3xx_nand: add support for Armada 8k

PATCH Superseded Baruch Siach 4 participants 16 messages Oct 18, 2020 – Oct 28, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover mtd: pxa3xx_nand: add support for Armada 8k

This series adds NAND flash support to Aramda 8k systems. Patches make the necessary changes to the pxa3xx_nand driver and DT files.

v2:
Rebase on current master. Fixes conflict with commit 661c98121d4 ("mtd: nand:
pxa3xx: Fix not calling dev_xxx with a device")

Baruch Siach (2):
arm: dts: armada-cp110-master: update nand-controller
mtd: pxa3xx_nand: remove dead code

Shmuel Hazan (3):
arm: dts: armada-cp110-slave: add missing cps_nand
mtd: pxa3xx_nand: port to use driver model
mtd: nand: pxa3xx: enable NAND controller if the SoC needs it

 arch/arm/dts/armada-cp110-master.dtsi |  15 ++-
 arch/arm/dts/armada-cp110-slave.dtsi  |  16 +++
 drivers/mtd/nand/raw/Kconfig          |   2 +
 drivers/mtd/nand/raw/pxa3xx_nand.c    | 179 ++++++++++++++------------
 4 files changed, 124 insertions(+), 88 deletions(-)
Signature · 1 line
2.28.0
#1 lore raw

PATCH v2 1/5 arm: dts: armada-cp110-slave: add missing cps_nand

From: Shmuel Hazan <[email protected]>

Align node properties to kernel dts node.

Keep U-Boot specific nand-enable-arbiter, and num-cs for compatibility with the current driver.

---
 arch/arm/dts/armada-cp110-slave.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/dts/armada-cp110-slave.dtsi +16 -0
index b426a4eb6910..6cf217783709 100644
@@ -267,6 +267,22 @@
 				utmi-port = <UTMI_PHY_TO_USB3_HOST0>;
 				status = "disabled";
 			};
+
+			cps_nand: nand at 720000 {
+				compatible = "marvell,armada-8k-nand-controller",
+					"marvell,armada370-nand-controller";
+				reg = <0x720000 0x54>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
+				clock-names = "core", "reg";
+				clocks = <&cps_syscon0 1 2>,
+					 <&cps_syscon0 1 17>;
+				marvell,system-controller = <&cps_syscon0>;
+				nand-enable-arbiter;
+				num-cs = <1>;
+				status = "disabled";
+			};
 		};
 
 		cps_pcie0: pcie at f4600000 {
Signature · 1 line
2.28.0
#2 lore raw

PATCH v2 1/5 arm: dts: armada-cp110-slave: add missing cps_nand

Quoted 9 lines · Baruch Siach

From: Shmuel Hazan <[email protected]>

Align node properties to kernel dts node.

Keep U-Boot specific nand-enable-arbiter, and num-cs for compatibility with the current driver.

Thanks,
Stefan

Quoted 22 lines
---
  arch/arm/dts/armada-cp110-slave.dtsi | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)
arch/arm/dts/armada-cp110-slave.dtsi +9 -0
index b426a4eb6910..6cf217783709 100644
@@ -267,6 +267,22 @@
  				utmi-port = <UTMI_PHY_TO_USB3_HOST0>;
  				status = "disabled";
  			};
+
+			cps_nand: nand at 720000 {
+				compatible = "marvell,armada-8k-nand-controller",
+					"marvell,armada370-nand-controller";
+				reg = <0x720000 0x54>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
+				clock-names = "core", "reg";

arch/arm/dts/armada-cp110-slave.dtsi line 288

Quoted 10 lines
arch/arm/dts/armada-cp110-slave.dtsi +7 -0
+				clocks = <&cps_syscon0 1 2>,
+					 <&cps_syscon0 1 17>;
+				marvell,system-controller = <&cps_syscon0>;
+				nand-enable-arbiter;
+				num-cs = <1>;
+				status = "disabled";
+			};
  		};
 
  		cps_pcie0: pcie at f4600000 {

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#3 lore raw

PATCH v2 2/5 arm: dts: armada-cp110-master: update nand-controller

In reply to Baruch Siach

Align node properties to kernel dts node.

The change of compatible property does not affect any currently supported board.

Keep U-Boot specific nand-enable-arbiter, and num-cs for compatibility with the current driver.

---
 arch/arm/dts/armada-cp110-master.dtsi | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
arch/arm/dts/armada-cp110-master.dtsi +9 -6
index cd5c974482e6..7d0d31da306d 100644
@@ -285,15 +285,18 @@
 			};
 
 			cpm_nand: nand at 720000 {
-				compatible = "marvell,mvebu-pxa3xx-nand";
-				reg = <0x720000 0x100>;
+				compatible = "marvell,armada-8k-nand-controller",
+					"marvell,armada370-nand-controller";
+				reg = <0x720000 0x54>;
 				#address-cells = <1>;
-
-				clocks = <&cpm_syscon0 1 2>;
+				#size-cells = <0>;
+				interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
+				clock-names = "core", "reg";
+				clocks = <&cpm_syscon0 1 2>,
+					 <&cpm_syscon0 1 17>;
+				marvell,system-controller = <&cpm_syscon0>;
 				nand-enable-arbiter;
 				num-cs = <1>;
-				nand-ecc-strength = <4>;
-				nand-ecc-step-size = <512>;
 				status = "disabled";
 			};
 
Signature · 1 line
2.28.0
#4 lore raw

PATCH v2 2/5 arm: dts: armada-cp110-master: update nand-controller

Quoted 9 lines · Baruch Siach

Align node properties to kernel dts node.

The change of compatible property does not affect any currently supported board.

Keep U-Boot specific nand-enable-arbiter, and num-cs for compatibility with the current driver.

Thanks,
Stefan

Quoted 24 lines
---
  arch/arm/dts/armada-cp110-master.dtsi | 15 +++++++++------
  1 file changed, 9 insertions(+), 6 deletions(-)
arch/arm/dts/armada-cp110-master.dtsi +6 -4
index cd5c974482e6..7d0d31da306d 100644
@@ -285,15 +285,18 @@
  			};
 
  			cpm_nand: nand at 720000 {
-				compatible = "marvell,mvebu-pxa3xx-nand";
-				reg = <0x720000 0x100>;
+				compatible = "marvell,armada-8k-nand-controller",
+					"marvell,armada370-nand-controller";
+				reg = <0x720000 0x54>;
  				#address-cells = <1>;
-
-				clocks = <&cpm_syscon0 1 2>;
+				#size-cells = <0>;
+				interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
+				clock-names = "core", "reg";

arch/arm/dts/armada-cp110-master.dtsi line 302

Quoted 10 lines
arch/arm/dts/armada-cp110-master.dtsi +3 -2
+				clocks = <&cpm_syscon0 1 2>,
+					 <&cpm_syscon0 1 17>;
+				marvell,system-controller = <&cpm_syscon0>;
  				nand-enable-arbiter;
  				num-cs = <1>;
-				nand-ecc-strength = <4>;
-				nand-ecc-step-size = <512>;
  				status = "disabled";
  			};
 

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#5 lore raw

PATCH v2 3/5 mtd: pxa3xx_nand: port to use driver model

In reply to Baruch Siach

From: Shmuel Hazan <[email protected]>

---
 drivers/mtd/nand/raw/Kconfig       |   2 +
 drivers/mtd/nand/raw/pxa3xx_nand.c | 117 +++++++++++++----------------
 2 files changed, 55 insertions(+), 64 deletions(-)
drivers/mtd/nand/raw/Kconfig +2 -0
index cd7e598aa8a7..08df12a3daf9 100644
@@ -195,6 +195,8 @@ endif
 config NAND_PXA3XX
 	bool "Support for NAND on PXA3xx and Armada 370/XP/38x"
 	select SYS_NAND_SELF_INIT
+	select DM_MTD
+	select SYSCON
 	imply CMD_NAND
 	help
 	  This enables the driver for the NAND flash device found on
drivers/mtd/nand/raw/pxa3xx_nand.c +53 -64

169 lines not on this page · raw message

Signature · 1 line
2.28.0
#6 lore raw

PATCH v2 3/5 mtd: pxa3xx_nand: port to use driver model

Quoted 2 lines · Baruch Siach

From: Shmuel Hazan <[email protected]>

Please add at least a minimal commit text here.

Quoted 186 lines
---
  drivers/mtd/nand/raw/Kconfig       |   2 +
  drivers/mtd/nand/raw/pxa3xx_nand.c | 117 +++++++++++++----------------
  2 files changed, 55 insertions(+), 64 deletions(-)
drivers/mtd/nand/raw/Kconfig +2 -0
index cd7e598aa8a7..08df12a3daf9 100644
@@ -195,6 +195,8 @@ endif
  config NAND_PXA3XX
  	bool "Support for NAND on PXA3xx and Armada 370/XP/38x"
  	select SYS_NAND_SELF_INIT
+	select DM_MTD
+	select SYSCON
  	imply CMD_NAND
  	help
  	  This enables the driver for the NAND flash device found on
drivers/mtd/nand/raw/pxa3xx_nand.c +48 -59
index 5fb3081c8390..6f66db065357 100644
@@ -22,6 +22,8 @@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/rawnand.h>
  #include <linux/types.h>
+#include <dm/uclass.h>
+#include <dm/read.h>
 
  #include "pxa3xx_nand.h"
 
@@ -417,6 +419,14 @@ static struct nand_ecclayout ecc_layout_8KB_bch8bit = {
  /* convert nano-seconds to nand flash controller clock cycles */
  #define ns2cycle(ns, clk)	(int)((ns) * (clk / 1000000) / 1000)
 
+static const struct udevice_id pxa3xx_nand_dt_ids[] = {
+	{
+		.compatible = "marvell,mvebu-pxa3xx-nand",
+		.data = PXA3XX_NAND_VARIANT_ARMADA370,
+	},
+	{}
+};
+
  static enum pxa3xx_nand_variant pxa3xx_nand_get_variant(void)
  {
  	/* We only support the Armada 370/XP/38x for now */
@@ -1809,82 +1819,60 @@ fail_disable_clk:
  	return ret;
  }
 
-static int pxa3xx_nand_probe_dt(struct pxa3xx_nand_info *info)
+static int pxa3xx_nand_probe_dt(struct udevice *dev, struct pxa3xx_nand_info *info)
  {
  	struct pxa3xx_nand_platform_data *pdata;
-	const void *blob = gd->fdt_blob;
-	int node = -1;
 
  	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
  	if (!pdata)
  		return -ENOMEM;
 
-	/* Get address decoding nodes from the FDT blob */
-	do {
-		node = fdt_node_offset_by_compatible(blob, node,
-						     "marvell,mvebu-pxa3xx-nand");
-		if (node < 0)
-			break;
-
-		/* Bypass disabeld nodes */
-		if (!fdtdec_get_is_enabled(blob, node))
-			continue;
-
-		/* Get the first enabled NAND controler base address */
-		info->mmio_base =
-			(void __iomem *)fdtdec_get_addr_size_auto_noparent(
-					blob, node, "reg", 0, NULL, true);
+	info->mmio_base = dev_read_addr_ptr(dev);
 
-		pdata->num_cs = fdtdec_get_int(blob, node, "num-cs", 1);
-		if (pdata->num_cs != 1) {
-			pr_err("pxa3xx driver supports single CS only\n");
-			break;
-		}
-
-		if (fdtdec_get_bool(blob, node, "nand-enable-arbiter"))
-			pdata->enable_arbiter = 1;
+	pdata->num_cs = dev_read_u32_default(dev, "num-cs", 1);
+	if (pdata->num_cs != 1) {
+		pr_err("pxa3xx driver supports single CS only\n");
+		return -EINVAL;
+	}
 
-		if (fdtdec_get_bool(blob, node, "nand-keep-config"))
-			pdata->keep_config = 1;
+	if (dev_read_bool(dev, "nand-enable-arbiter"))
+		pdata->enable_arbiter = 1;
 
-		/*
-		 * ECC parameters.
-		 * If these are not set, they will be selected according
-		 * to the detected flash type.
-		 */
-		/* ECC strength */
-		pdata->ecc_strength = fdtdec_get_int(blob, node,
-						     "nand-ecc-strength", 0);
+	if (dev_read_bool(dev, "nand-keep-config"))
+		pdata->keep_config = 1;
 
-		/* ECC step size */
-		pdata->ecc_step_size = fdtdec_get_int(blob, node,
-						      "nand-ecc-step-size", 0);
-
-		info->pdata = pdata;
+	/*
+	 * ECC parameters.
+	 * If these are not set, they will be selected according
+	 * to the detected flash type.
+	 */
+	/* ECC strength */
+	pdata->ecc_strength = dev_read_u32_default(dev, "nand-ecc-strength", 0);
 
-		/* Currently support only a single NAND controller */
-		return 0;
+	/* ECC step size */
+	pdata->ecc_step_size = dev_read_u32_default(dev, "nand-ecc-step-size",
+			0);
 
-	} while (node >= 0);
+	info->pdata = pdata;
 
-	return -EINVAL;
+	return 0;
  }
 
-static int pxa3xx_nand_probe(struct pxa3xx_nand_info *info)
+static int pxa3xx_nand_probe(struct udevice *dev)
  {
-	struct mtd_info *mtd = &info->controller.active->mtd;
  	struct pxa3xx_nand_platform_data *pdata;
  	int ret, cs, probe_success;
+	struct pxa3xx_nand_info *info = dev_get_priv(dev);
 
-	ret = pxa3xx_nand_probe_dt(info);
+	ret = pxa3xx_nand_probe_dt(dev, info);
  	if (ret)
  		return ret;
 
  	pdata = info->pdata;
 
-	ret = alloc_nand_resource(info);
+	ret = alloc_nand_resource(dev, info);
  	if (ret) {
-		dev_err(mtd->dev, "alloc nand resource failed\n");
+		dev_err(dev, "alloc nand resource failed\n");
  		return ret;
  	}
 
@@ -1918,22 +1906,23 @@ static int pxa3xx_nand_probe(struct pxa3xx_nand_info *info)
  	return 0;
  }
 
-/*
- * Main initialization routine
- */
+U_BOOT_DRIVER(pxa3xx_nand) = {
+	.name = "pxa3xx-nand",
+	.id = UCLASS_MTD,
+	.of_match = pxa3xx_nand_dt_ids,
+	.probe = pxa3xx_nand_probe,
+	.priv_auto_alloc_size = sizeof(struct pxa3xx_nand_info) +
+		sizeof(struct pxa3xx_nand_host) * CONFIG_SYS_MAX_NAND_DEVICE,
+};
+
  void board_nand_init(void)
  {
-	struct pxa3xx_nand_info *info;
-	struct pxa3xx_nand_host *host;
+	struct udevice *dev;
  	int ret;
 
-	info = kzalloc(sizeof(*info) +
-		       sizeof(*host) * CONFIG_SYS_MAX_NAND_DEVICE,
-		       GFP_KERNEL);
-	if (!info)

drivers/mtd/nand/raw/pxa3xx_nand.c static int pxa3xx_nand_probe(struct pxa3xx_nand_info *info) · line 1927

Quoted 10 lines
drivers/mtd/nand/raw/pxa3xx_nand.c +5 -5
-		return;
-
-	ret = pxa3xx_nand_probe(info);
-	if (ret)
-		return;
+	ret = uclass_get_device_by_driver(UCLASS_MTD,
+			DM_GET_DRIVER(pxa3xx_nand), &dev);
+	if (ret && ret != -ENODEV)
+		pr_err("Failed to initialize %s. (error %d)\n", dev->name,
+			   ret);

Nitpicking: Use parenthesis for multi-line statements (even if its only one line broken into 2 lines).

Thanks,
Stefan

#7 lore raw

PATCH v2 4/5 mtd: pxa3xx_nand: remove dead code

In reply to Baruch Siach

The kfree() call is unreachable, and is not needed. Remove this call and the fail_disable_clk label.

---
 drivers/mtd/nand/raw/pxa3xx_nand.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/mtd/nand/raw/pxa3xx_nand.c +3 -9
index 6f66db065357..635794b1691a 100644
@@ -1768,7 +1768,7 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info)
 	struct pxa3xx_nand_host *host;
 	struct nand_chip *chip = NULL;
 	struct mtd_info *mtd;
-	int ret, cs;
+	int cs;
 
 	pdata = info->pdata;
 	if (pdata->num_cs <= 0)
@@ -1804,19 +1804,13 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info)
 	/* Allocate a buffer to allow flash detection */
 	info->buf_size = INIT_BUFFER_SIZE;
 	info->data_buff = kmalloc(info->buf_size, GFP_KERNEL);
-	if (info->data_buff == NULL) {
-		ret = -ENOMEM;
-		goto fail_disable_clk;
-	}
+	if (info->data_buff == NULL)
+		return -ENOMEM;
 
 	/* initialize all interrupts to be disabled */
 	disable_int(info, NDSR_MASK);
 
 	return 0;
-
-	kfree(info->data_buff);
-fail_disable_clk:
-	return ret;
 }
 
 static int pxa3xx_nand_probe_dt(struct udevice *dev, struct pxa3xx_nand_info *info)
Signature · 1 line
2.28.0
#8 lore raw

PATCH v2 4/5 mtd: pxa3xx_nand: remove dead code

Quoted 4 lines · Baruch Siach

The kfree() call is unreachable, and is not needed. Remove this call and the fail_disable_clk label.

Thanks,
Stefan

Quoted 30 lines
---
  drivers/mtd/nand/raw/pxa3xx_nand.c | 12 +++---------
  1 file changed, 3 insertions(+), 9 deletions(-)
drivers/mtd/nand/raw/pxa3xx_nand.c +3 -5
index 6f66db065357..635794b1691a 100644
@@ -1768,7 +1768,7 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info)
  	struct pxa3xx_nand_host *host;
  	struct nand_chip *chip = NULL;
  	struct mtd_info *mtd;
-	int ret, cs;
+	int cs;
 
  	pdata = info->pdata;
  	if (pdata->num_cs <= 0)
@@ -1804,19 +1804,13 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info)
  	/* Allocate a buffer to allow flash detection */
  	info->buf_size = INIT_BUFFER_SIZE;
  	info->data_buff = kmalloc(info->buf_size, GFP_KERNEL);
-	if (info->data_buff == NULL) {
-		ret = -ENOMEM;
-		goto fail_disable_clk;
-	}
+	if (info->data_buff == NULL)
+		return -ENOMEM;
 
  	/* initialize all interrupts to be disabled */

drivers/mtd/nand/raw/pxa3xx_nand.c static int alloc_nand_resource(struct pxa3xx_nand_info *info) · line 1816

Quoted 10 lines
drivers/mtd/nand/raw/pxa3xx_nand.c +0 -4
  	disable_int(info, NDSR_MASK);
 
  	return 0;
-
-	kfree(info->data_buff);
-fail_disable_clk:
-	return ret;
  }
 
  static int pxa3xx_nand_probe_dt(struct udevice *dev, struct pxa3xx_nand_info *info)

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#9 lore raw

PATCH v2 5/5 mtd: nand: pxa3xx: enable NAND controller if the SoC needs it

In reply to Baruch Siach

From: Shmuel Hazan <[email protected]>

Based on Linux kernel commit fc256f5789cb ("mtd: nand: pxa3xx: enable NAND controller if the SoC needs it"). This commit adds support for the Armada 8040 nand controller.

The kernel commit says this:

Marvell recent SoCs like A7k/A8k do not boot with NAND flash controller activated by default. Enabling the controller is a matter of writing in a system controller register that may also be used for other NAND related choices.

---
 drivers/mtd/nand/raw/pxa3xx_nand.c | 50 ++++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 9 deletions(-)
drivers/mtd/nand/raw/pxa3xx_nand.c +41 -9
index 635794b1691a..beaa290f7480 100644
@@ -22,6 +22,8 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/types.h>
+#include <syscon.h>
+#include <regmap.h>
 #include <dm/uclass.h>
 #include <dm/read.h>
 
@@ -119,6 +121,10 @@ DECLARE_GLOBAL_DATA_PTR;
 #define EXT_CMD_TYPE_LAST_RW	1 /* Last naked read/write */
 #define EXT_CMD_TYPE_MONO	0 /* Monolithic read/write */
 
+/* System control register and bit to enable NAND on some SoCs */
+#define GENCONF_SOC_DEVICE_MUX	0x208
+#define GENCONF_SOC_DEVICE_MUX_NFC_EN BIT(0)
+
 /*
  * This should be large enough to read 'ONFI' and 'JEDEC'.
  * Let's use 7 bytes, which is the maximum ID count supported
@@ -159,6 +165,7 @@ enum {
 enum pxa3xx_nand_variant {
 	PXA3XX_NAND_VARIANT_PXA,
 	PXA3XX_NAND_VARIANT_ARMADA370,
+	PXA3XX_NAND_VARIANT_ARMADA_8K,
 };
 
 struct pxa3xx_nand_host {
@@ -424,13 +431,16 @@ static const struct udevice_id pxa3xx_nand_dt_ids[] = {
 		.compatible = "marvell,mvebu-pxa3xx-nand",
 		.data = PXA3XX_NAND_VARIANT_ARMADA370,
 	},
+	{
+		.compatible = "marvell,armada-8k-nand-controller",
+		.data = PXA3XX_NAND_VARIANT_ARMADA_8K,
+	},
 	{}
 };
 
-static enum pxa3xx_nand_variant pxa3xx_nand_get_variant(void)
+static enum pxa3xx_nand_variant pxa3xx_nand_get_variant(struct udevice *dev)
 {
-	/* We only support the Armada 370/XP/38x for now */
-	return PXA3XX_NAND_VARIANT_ARMADA370;
+	return dev_get_driver_data(dev);
 }
 
 static void pxa3xx_nand_set_timing(struct pxa3xx_nand_host *host,
@@ -707,7 +717,8 @@ static irqreturn_t pxa3xx_nand_irq(struct pxa3xx_nand_info *info)
 		info->retcode = ERR_UNCORERR;
 	if (status & NDSR_CORERR) {
 		info->retcode = ERR_CORERR;
-		if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 &&
+		if ((info->variant == PXA3XX_NAND_VARIANT_ARMADA370 ||
+			 info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K) &&
 		    info->ecc_bch)
 			info->ecc_err_cnt = NDSR_ERR_CNT(status);
 		else
@@ -762,7 +773,8 @@ static irqreturn_t pxa3xx_nand_irq(struct pxa3xx_nand_info *info)
 		nand_writel(info, NDCB0, info->ndcb2);
 
 		/* NDCB3 register is available in NFCv2 (Armada 370/XP SoC) */
-		if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370)
+		if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 ||
+			info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K)
 			nand_writel(info, NDCB0, info->ndcb3);
 	}
 
@@ -1676,7 +1688,8 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
 	}
 
 	/* Device detection must be done with ECC disabled */
-	if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370)
+	if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 ||
+		info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K)
 		nand_writel(info, NDECCCTRL, 0x0);
 
 	if (nand_scan_ident(mtd, 1, NULL))
@@ -1726,7 +1739,8 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
 	 * (aka split) command handling,
 	 */
 	if (mtd->writesize > info->chunk_size) {
-		if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370) {
+		if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 ||
+			info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K) {
 			chip->cmdfunc = nand_cmdfunc_extended;
 		} else {
 			dev_err(mtd->dev,
@@ -1762,7 +1776,7 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
 	return nand_scan_tail(mtd);
 }
 
-static int alloc_nand_resource(struct pxa3xx_nand_info *info)
+static int alloc_nand_resource(struct udevice *dev, struct pxa3xx_nand_info *info)
 {
 	struct pxa3xx_nand_platform_data *pdata;
 	struct pxa3xx_nand_host *host;
@@ -1774,7 +1788,7 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info)
 	if (pdata->num_cs <= 0)
 		return -ENODEV;
 
-	info->variant = pxa3xx_nand_get_variant();
+	info->variant = pxa3xx_nand_get_variant(dev);
 	for (cs = 0; cs < pdata->num_cs; cs++) {
 		chip = (struct nand_chip *)
 			((u8 *)&info[1] + sizeof(*host) * cs);
@@ -1810,6 +1824,24 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info)
 	/* initialize all interrupts to be disabled */
 	disable_int(info, NDSR_MASK);
 
+	/*
+	 * Some SoCs like A7k/A8k need to enable manually the NAND
+	 * controller to avoid being bootloader dependent. This is done
+	 * through the use of a single bit in the System Functions registers.
+	 */
+	if (pxa3xx_nand_get_variant(dev) == PXA3XX_NAND_VARIANT_ARMADA_8K) {
+		struct regmap *sysctrl_base = syscon_regmap_lookup_by_phandle(
+				dev, "marvell,system-controller");
+		u32 reg;
+
+		if (IS_ERR(sysctrl_base))
+			return PTR_ERR(sysctrl_base);
+
+		regmap_read(sysctrl_base, GENCONF_SOC_DEVICE_MUX, &reg);
+		reg |= GENCONF_SOC_DEVICE_MUX_NFC_EN;
+		regmap_write(sysctrl_base, GENCONF_SOC_DEVICE_MUX, reg);
+	}
+
 	return 0;
 }
 
Signature · 1 line
2.28.0
#10 lore raw

PATCH v2 5/5 mtd: nand: pxa3xx: enable NAND controller if the SoC needs it

Quoted 8 lines · Baruch Siach

From: Shmuel Hazan <[email protected]>

Based on Linux kernel commit fc256f5789cb ("mtd: nand: pxa3xx: enable NAND controller if the SoC needs it"). This commit adds support for the Armada 8040 nand controller.

The kernel commit says this:

Quoted 7 lines

Marvell recent SoCs like A7k/A8k do not boot with NAND flash controller activated by default. Enabling the controller is a matter of writing in a system controller register that may also be used for other NAND related choices.

Thanks,
Stefan

Quoted 130 lines
---
  drivers/mtd/nand/raw/pxa3xx_nand.c | 50 ++++++++++++++++++++++++------
  1 file changed, 41 insertions(+), 9 deletions(-)
drivers/mtd/nand/raw/pxa3xx_nand.c +34 -9
index 635794b1691a..beaa290f7480 100644
@@ -22,6 +22,8 @@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/rawnand.h>
  #include <linux/types.h>
+#include <syscon.h>
+#include <regmap.h>
  #include <dm/uclass.h>
  #include <dm/read.h>
 
@@ -119,6 +121,10 @@ DECLARE_GLOBAL_DATA_PTR;
  #define EXT_CMD_TYPE_LAST_RW	1 /* Last naked read/write */
  #define EXT_CMD_TYPE_MONO	0 /* Monolithic read/write */
 
+/* System control register and bit to enable NAND on some SoCs */
+#define GENCONF_SOC_DEVICE_MUX	0x208
+#define GENCONF_SOC_DEVICE_MUX_NFC_EN BIT(0)
+
  /*
   * This should be large enough to read 'ONFI' and 'JEDEC'.
   * Let's use 7 bytes, which is the maximum ID count supported
@@ -159,6 +165,7 @@ enum {
  enum pxa3xx_nand_variant {
  	PXA3XX_NAND_VARIANT_PXA,
  	PXA3XX_NAND_VARIANT_ARMADA370,
+	PXA3XX_NAND_VARIANT_ARMADA_8K,
  };
 
  struct pxa3xx_nand_host {
@@ -424,13 +431,16 @@ static const struct udevice_id pxa3xx_nand_dt_ids[] = {
  		.compatible = "marvell,mvebu-pxa3xx-nand",
  		.data = PXA3XX_NAND_VARIANT_ARMADA370,
  	},
+	{
+		.compatible = "marvell,armada-8k-nand-controller",
+		.data = PXA3XX_NAND_VARIANT_ARMADA_8K,
+	},
  	{}
  };
 
-static enum pxa3xx_nand_variant pxa3xx_nand_get_variant(void)
+static enum pxa3xx_nand_variant pxa3xx_nand_get_variant(struct udevice *dev)
  {
-	/* We only support the Armada 370/XP/38x for now */
-	return PXA3XX_NAND_VARIANT_ARMADA370;
+	return dev_get_driver_data(dev);
  }
 
  static void pxa3xx_nand_set_timing(struct pxa3xx_nand_host *host,
@@ -707,7 +717,8 @@ static irqreturn_t pxa3xx_nand_irq(struct pxa3xx_nand_info *info)
  		info->retcode = ERR_UNCORERR;
  	if (status & NDSR_CORERR) {
  		info->retcode = ERR_CORERR;
-		if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 &&
+		if ((info->variant == PXA3XX_NAND_VARIANT_ARMADA370 ||
+			 info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K) &&
  		    info->ecc_bch)
  			info->ecc_err_cnt = NDSR_ERR_CNT(status);
  		else
@@ -762,7 +773,8 @@ static irqreturn_t pxa3xx_nand_irq(struct pxa3xx_nand_info *info)
  		nand_writel(info, NDCB0, info->ndcb2);
 
  		/* NDCB3 register is available in NFCv2 (Armada 370/XP SoC) */
-		if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370)
+		if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 ||
+			info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K)
  			nand_writel(info, NDCB0, info->ndcb3);
  	}
 
@@ -1676,7 +1688,8 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
  	}
 
  	/* Device detection must be done with ECC disabled */
-	if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370)
+	if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 ||
+		info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K)
  		nand_writel(info, NDECCCTRL, 0x0);
 
  	if (nand_scan_ident(mtd, 1, NULL))
@@ -1726,7 +1739,8 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
  	 * (aka split) command handling,
  	 */
  	if (mtd->writesize > info->chunk_size) {
-		if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370) {
+		if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 ||
+			info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K) {
  			chip->cmdfunc = nand_cmdfunc_extended;
  		} else {
  			dev_err(mtd->dev,
@@ -1762,7 +1776,7 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd)
  	return nand_scan_tail(mtd);
  }
 
-static int alloc_nand_resource(struct pxa3xx_nand_info *info)
+static int alloc_nand_resource(struct udevice *dev, struct pxa3xx_nand_info *info)
  {
  	struct pxa3xx_nand_platform_data *pdata;
  	struct pxa3xx_nand_host *host;
@@ -1774,7 +1788,7 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info)
  	if (pdata->num_cs <= 0)
  		return -ENODEV;
 
-	info->variant = pxa3xx_nand_get_variant();
+	info->variant = pxa3xx_nand_get_variant(dev);
  	for (cs = 0; cs < pdata->num_cs; cs++) {
  		chip = (struct nand_chip *)
  			((u8 *)&info[1] + sizeof(*host) * cs);
@@ -1810,6 +1824,24 @@ static int alloc_nand_resource(struct pxa3xx_nand_info *info)
  	/* initialize all interrupts to be disabled */
  	disable_int(info, NDSR_MASK);
 
+	/*
+	 * Some SoCs like A7k/A8k need to enable manually the NAND
+	 * controller to avoid being bootloader dependent. This is done
+	 * through the use of a single bit in the System Functions registers.
+	 */
+	if (pxa3xx_nand_get_variant(dev) == PXA3XX_NAND_VARIANT_ARMADA_8K) {
+		struct regmap *sysctrl_base = syscon_regmap_lookup_by_phandle(
+				dev, "marvell,system-controller");
+		u32 reg;
+
+		if (IS_ERR(sysctrl_base))

drivers/mtd/nand/raw/pxa3xx_nand.c static int alloc_nand_resource(struct pxa3xx_nand_info *info) · line 1847

Quoted 10 lines
drivers/mtd/nand/raw/pxa3xx_nand.c +7 -0
+			return PTR_ERR(sysctrl_base);
+
+		regmap_read(sysctrl_base, GENCONF_SOC_DEVICE_MUX, &reg);
+		reg |= GENCONF_SOC_DEVICE_MUX_NFC_EN;
+		regmap_write(sysctrl_base, GENCONF_SOC_DEVICE_MUX, reg);
+	}
+
  	return 0;
  }
 

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#11 lore raw

v2 cover mtd: pxa3xx_nand: add support for Armada 8k

In reply to Baruch Siach

Hi Baruch,

Quoted 8 lines · Baruch Siach

This series adds NAND flash support to Aramda 8k systems. Patches make the necessary changes to the pxa3xx_nand driver and DT files.

v2:
Rebase on current master. Fixes conflict with commit 661c98121d4 ("mtd: nand:
pxa3xx: Fix not calling dev_xxx with a device")

Is it worth looking at bringing in the newer marvell_nand driver from Linux? I suspect that it will be easier to keep in sync with changes for the Armada 8K. I have considered it in the past but it kind of fell off my radar.

Quoted 18 lines

Baruch Siach (2):
arm: dts: armada-cp110-master: update nand-controller
mtd: pxa3xx_nand: remove dead code

Shmuel Hazan (3):
arm: dts: armada-cp110-slave: add missing cps_nand
mtd: pxa3xx_nand: port to use driver model
mtd: nand: pxa3xx: enable NAND controller if the SoC needs it

 arch/arm/dts/armada-cp110-master.dtsi |  15 ++-
 arch/arm/dts/armada-cp110-slave.dtsi  |  16 +++
 drivers/mtd/nand/raw/Kconfig          |   2 +
 drivers/mtd/nand/raw/pxa3xx_nand.c    | 179 ++++++++++++++------------
 4 files changed, 124 insertions(+), 88 deletions(-)

--
2.28.0

#12 lore raw

v2 cover mtd: pxa3xx_nand: add support for Armada 8k

Hi Chris,

Quoted 5 lines · Chris Packham
Quoted 4 lines · Baruch Siach

This series adds NAND flash support to Aramda 8k systems. Patches make the necessary changes to the pxa3xx_nand driver and DT files.

Quoted 8 lines
Quoted 3 lines

v2:
Rebase on current master. Fixes conflict with commit 661c98121d4 ("mtd: nand:
pxa3xx: Fix not calling dev_xxx with a device")

Is it worth looking at bringing in the newer marvell_nand driver from Linux? I suspect that it will be easier to keep in sync with changes for the Armada 8K. I have considered it in the past but it kind of fell off my radar.

The kernel raw nand API has seen some significant changes recently. It looks like the kernel marvell_nand driver relies on newer API. I'm not sure how easy would be syncing the drivers to a degree that makes porting of changes trivial. It would probably require many other changes in generic U-Boot raw NAND code.

Maybe Miquel can shed some light on that.

Unfortunately, the U-Boot MAINTAINERS NAND FLASH entry is marked "Orphaned (Since 2018-07)".

baruch

Quoted 18 lines
Quoted 18 lines

Baruch Siach (2):
arm: dts: armada-cp110-master: update nand-controller
mtd: pxa3xx_nand: remove dead code

Shmuel Hazan (3):
arm: dts: armada-cp110-slave: add missing cps_nand
mtd: pxa3xx_nand: port to use driver model
mtd: nand: pxa3xx: enable NAND controller if the SoC needs it

 arch/arm/dts/armada-cp110-master.dtsi |  15 ++-
 arch/arm/dts/armada-cp110-slave.dtsi  |  16 +++
 drivers/mtd/nand/raw/Kconfig          |   2 +
 drivers/mtd/nand/raw/pxa3xx_nand.c    | 179 ++++++++++++++------------
 4 files changed, 124 insertions(+), 88 deletions(-)

--
2.28.0

Signature · 3 lines
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#13 lore raw

v2 cover mtd: pxa3xx_nand: add support for Armada 8k

Hi Baruch,
Hi Chris,

Quoted 17 lines · Baruch Siach

Hi Chris,

Quoted 5 lines · Chris Packham
Quoted 4 lines · Baruch Siach

This series adds NAND flash support to Aramda 8k systems. Patches make the necessary changes to the pxa3xx_nand driver and DT files.

Quoted 8 lines
Quoted 3 lines

v2:
Rebase on current master. Fixes conflict with commit 661c98121d4 ("mtd: nand:
pxa3xx: Fix not calling dev_xxx with a device")

Is it worth looking at bringing in the newer marvell_nand driver from Linux? I suspect that it will be easier to keep in sync with changes for the Armada 8K. I have considered it in the past but it kind of fell off my radar.

Quoted 5 lines

The kernel raw nand API has seen some significant changes recently. It looks like the kernel marvell_nand driver relies on newer API. I'm not sure how easy would be syncing the drivers to a degree that makes porting of changes trivial. It would probably require many other changes in generic U-Boot raw NAND code.

I agree that without a re-sync with a more recent Linux MTD (NAND) core code, this task might prove complex and failure prone. And sync'ing the MTD core is also a pretty complex task which needs to be done very carefully, to not break any existing platforms. FWICT, nobody is working on it right now and we can't wait for this to happen and stall the development here. So from my point of view, I'm okay with updates to the current PXA NAND driver. Testing of these patches on other platforms would be very welcome though.

Quoted 4 lines

Maybe Miquel can shed some light on that.

Unfortunately, the U-Boot MAINTAINERS NAND FLASH entry is marked "Orphaned (Since 2018-07)".

Yes, this is unfortunate. Volunteers are always welcome. ;)

Thanks,
Stefan

Quoted 22 lines

baruch

Quoted 18 lines
Quoted 18 lines

Baruch Siach (2):
arm: dts: armada-cp110-master: update nand-controller
mtd: pxa3xx_nand: remove dead code

Shmuel Hazan (3):
arm: dts: armada-cp110-slave: add missing cps_nand
mtd: pxa3xx_nand: port to use driver model
mtd: nand: pxa3xx: enable NAND controller if the SoC needs it

  arch/arm/dts/armada-cp110-master.dtsi |  15 ++-
  arch/arm/dts/armada-cp110-slave.dtsi  |  16 +++
  drivers/mtd/nand/raw/Kconfig          |   2 +
  drivers/mtd/nand/raw/pxa3xx_nand.c    | 179 ++++++++++++++------------
  4 files changed, 124 insertions(+), 88 deletions(-)

--
2.28.0

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#14 lore raw

v2 cover mtd: pxa3xx_nand: add support for Armada 8k

Hi Stefan,

Quoted 22 lines · Stefan Roese
Quoted 15 lines · Baruch Siach
Quoted 5 lines · Chris Packham
Quoted 4 lines · Baruch Siach

This series adds NAND flash support to Aramda 8k systems. Patches make the necessary changes to the pxa3xx_nand driver and DT files.

Quoted 8 lines
Quoted 3 lines

v2:
Rebase on current master. Fixes conflict with commit 661c98121d4 ("mtd: nand:
pxa3xx: Fix not calling dev_xxx with a device")

Is it worth looking at bringing in the newer marvell_nand driver from Linux? I suspect that it will be easier to keep in sync with changes for the Armada 8K. I have considered it in the past but it kind of fell off my radar.

Quoted 5 lines

The kernel raw nand API has seen some significant changes recently. It looks like the kernel marvell_nand driver relies on newer API. I'm not sure how easy would be syncing the drivers to a degree that makes porting of changes trivial. It would probably require many other changes in generic U-Boot raw NAND code.

Quoted 8 lines

I agree that without a re-sync with a more recent Linux MTD (NAND) core code, this task might prove complex and failure prone. And sync'ing the MTD core is also a pretty complex task which needs to be done very carefully, to not break any existing platforms. FWICT, nobody is working on it right now and we can't wait for this to happen and stall the development here. So from my point of view, I'm okay with updates to the current PXA NAND driver. Testing of these patches on other platforms would be very welcome though.

I should note that the same driver with these modifications was tested successfully on Armada 385 systems with NAND flash and UBIFS.

Thanks,
baruch

Quoted 26 lines
Quoted 4 lines

Maybe Miquel can shed some light on that.

Unfortunately, the U-Boot MAINTAINERS NAND FLASH entry is marked "Orphaned (Since 2018-07)".

Yes, this is unfortunate. Volunteers are always welcome. ;)

Thanks,
Stefan

Quoted 16 lines

baruch

Quoted 14 lines
Quoted 14 lines

Baruch Siach (2):
arm: dts: armada-cp110-master: update nand-controller
mtd: pxa3xx_nand: remove dead code

Shmuel Hazan (3):
arm: dts: armada-cp110-slave: add missing cps_nand
mtd: pxa3xx_nand: port to use driver model
mtd: nand: pxa3xx: enable NAND controller if the SoC needs it

  arch/arm/dts/armada-cp110-master.dtsi |  15 ++-
  arch/arm/dts/armada-cp110-slave.dtsi  |  16 +++
  drivers/mtd/nand/raw/Kconfig          |   2 +
  drivers/mtd/nand/raw/pxa3xx_nand.c    | 179 ++++++++++++++------------
  4 files changed, 124 insertions(+), 88 deletions(-)
Signature · 3 lines
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
maintainer
#15 lore raw

v2 cover mtd: pxa3xx_nand: add support for Armada 8k

In reply to Stefan Roese

Hi Stefan,

Stefan Roese <[email protected]> wrote on Tue, 20 Oct 2020 10:29:52 +0200:

Quoted 27 lines

Hi Baruch,
Hi Chris,

Quoted 17 lines · Baruch Siach

Hi Chris,

Quoted 5 lines · Chris Packham
Quoted 4 lines · Baruch Siach

This series adds NAND flash support to Aramda 8k systems. Patches make the necessary changes to the pxa3xx_nand driver and DT files.

Quoted 8 lines
Quoted 3 lines

v2:
Rebase on current master. Fixes conflict with commit 661c98121d4 ("mtd: nand:
pxa3xx: Fix not calling dev_xxx with a device")

Is it worth looking at bringing in the newer marvell_nand driver from Linux? I suspect that it will be easier to keep in sync with changes for the Armada 8K. I have considered it in the past but it kind of fell off my radar.

Quoted 5 lines

The kernel raw nand API has seen some significant changes recently. It looks like the kernel marvell_nand driver relies on newer API. I'm not sure how easy would be syncing the drivers to a degree that makes porting of changes trivial. It would probably require many other changes in generic U-Boot raw NAND code.

Quoted 10 lines

I agree that without a re-sync with a more recent Linux MTD (NAND) core code, this task might prove complex and failure prone. And sync'ing the MTD core is also a pretty complex task which needs to be done very carefully, to not break any existing platforms. FWICT, nobody is working on it right now and we can't wait for this to happen and stall the development here. So from my point of view, I'm okay with updates to the current PXA NAND driver. Testing of these patches on other platforms would be very welcome though.

Quoted 1 line

Maybe Miquel can shed some light on that.

Yes, the "new" marvell_nand.c driver is using the ->exec_op() interface which is the one that must be ported to U-Boot. Many changes have been brought to the raw NAND core but everything has been carefully patched to be easily ported (besides the huge number of potential dependencies that have not been brought to U-Boot already). Bringing-in this new interface does not affect the other controller drivers though, as the ->cmdfunc() and ->cmd_ctrl() interfaces are still functional.

Thanks,
Miqu?l