Skip to contentSkip to conversation

Nand and OneNand for ARM Nomadik

PATCH Superseded Alessandro Rubini 3 participants 12 messages Jul 24, 2009 – Aug 9, 2009 1 message not in the archive

Subsystems (5)

v5 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v5 cover Nand and OneNand for ARM Nomadik

Version 5. Use soft ecc routines for NAND, as they give the same result as the ones I wrote. Additionally, this fixes the defconfig for the machine, since the one I posted already included configuration for NAND and OneNand.

Rebased on today's rmk's devel tree, where nomadik base support is already included (even though rmk tells not to base on that branch, which is volatile, I think rebasing before posting is correct).

Alessandro Rubini (2):
Nand driver for Nomadik 8815 SoC (on NHK8815 board) OneNand support for Nomadik 8815 SoC (on NHK8815 board)

 arch/arm/configs/nhk8815_defconfig        |    2 +-
 arch/arm/mach-nomadik/board-nhk8815.c     |  155 ++++++++++++++++++
 arch/arm/mach-nomadik/include/mach/fsmc.h |   29 ++++
 arch/arm/mach-nomadik/include/mach/nand.h |   16 ++
 drivers/mtd/nand/Kconfig                  |    6 +
 drivers/mtd/nand/Makefile                 |    1 +
 drivers/mtd/nand/nomadik_nand.c           |  249 +++++++++++++++++++++++++++++
 7 files changed, 457 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h
 create mode 100644 arch/arm/mach-nomadik/include/mach/nand.h
 create mode 100644 drivers/mtd/nand/nomadik_nand.c
#1 lore raw

PATCH v5 1/2 Nand driver for Nomadik 8815 SoC (on NHK8815 board)

From: Alessandro Rubini <[email protected]>

---

[sorry for reposting to the Cc: people, I mistyped mtd address]

 arch/arm/configs/nhk8815_defconfig        |    2 +-
 arch/arm/mach-nomadik/board-nhk8815.c     |   92 +++++++++++
 arch/arm/mach-nomadik/include/mach/fsmc.h |   29 ++++
 arch/arm/mach-nomadik/include/mach/nand.h |   16 ++
 drivers/mtd/nand/Kconfig                  |    6 +
 drivers/mtd/nand/Makefile                 |    1 +
 drivers/mtd/nand/nomadik_nand.c           |  249 +++++++++++++++++++++++++++++
 7 files changed, 394 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h
 create mode 100644 arch/arm/mach-nomadik/include/mach/nand.h
 create mode 100644 drivers/mtd/nand/nomadik_nand.c
arch/arm/configs/nhk8815_defconfig +1 -1
index 9bb45b9..600cb27 100644
@@ -498,7 +498,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_VERIFY_WRITE=y
-# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND_ECC_SMC=y
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_GPIO is not set
 CONFIG_MTD_NAND_IDS=y
arch/arm/mach-nomadik/board-nhk8815.c +92 -0

110 lines not on this page · raw message

arch/arm/mach-nomadik/include/mach/fsmc.h new file +29 -0
new file mode 100644
index 0000000..8c2c051
@@ -0,0 +1,29 @@
+
+/* Definitions for the Nomadik FSMC "Flexible Static Memory controller" */
+
+#ifndef __ASM_ARCH_FSMC_H
+#define __ASM_ARCH_FSMC_H
+
+#include <mach/hardware.h>
+/*
+ * Register list
+ */
+
+/* bus control reg. and bus timing reg. for CS0..CS3 */
+#define FSMC_BCR(x)     (NOMADIK_FSMC_VA + (x << 3))
+#define FSMC_BTR(x)     (NOMADIK_FSMC_VA + (x << 3) + 0x04)
+
+/* PC-card and NAND:
+ * PCR = control register
+ * PMEM = memory timing
+ * PATT = attribute timing
+ * PIO = I/O timing
+ * PECCR = ECC result
+ */
+#define FSMC_PCR(x)     (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x00)
+#define FSMC_PMEM(x)    (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x08)
+#define FSMC_PATT(x)    (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x0c)
+#define FSMC_PIO(x)     (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x10)
+#define FSMC_PECCR(x)   (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x14)
+
+#endif /* __ASM_ARCH_FSMC_H */
arch/arm/mach-nomadik/include/mach/nand.h new file +16 -0
new file mode 100644
index 0000000..c3c8254
@@ -0,0 +1,16 @@
+#ifndef __ASM_ARCH_NAND_H
+#define __ASM_ARCH_NAND_H
+
+struct nomadik_nand_platform_data {
+	struct mtd_partition *parts;
+	int nparts;
+	int options;
+	int (*init) (void);
+	int (*exit) (void);
+};
+
+#define NAND_IO_DATA	0x40000000
+#define NAND_IO_CMD	0x40800000
+#define NAND_IO_ADDR	0x41000000
+
+#endif				/* __ASM_ARCH_NAND_H */
drivers/mtd/nand/Kconfig +6 -0
index ce96c09..b9fa465 100644
@@ -426,6 +426,12 @@ config MTD_NAND_MXC
 	  This enables the driver for the NAND flash controller on the
 	  MXC processors.
 
+config MTD_NAND_NOMADIK
+	tristate "ST Nomadik 8815 NAND support"
+	depends on ARCH_NOMADIK
+	help
+	  Driver for the NAND flash controller on the Nomadik, with ECC.
+
 config MTD_NAND_SH_FLCTL
 	tristate "Support for NAND on Renesas SuperH FLCTL"
 	depends on MTD_NAND && SUPERH && CPU_SUBTYPE_SH7723
drivers/mtd/nand/Makefile +1 -0
index f3a786b..0fe9a0c 100644
@@ -40,5 +40,6 @@ obj-$(CONFIG_MTD_NAND_SH_FLCTL)		+= sh_flctl.o
 obj-$(CONFIG_MTD_NAND_MXC)		+= mxc_nand.o
 obj-$(CONFIG_MTD_NAND_SOCRATES)		+= socrates_nand.o
 obj-$(CONFIG_MTD_NAND_TXX9NDFMC)	+= txx9ndfmc.o
+obj-$(CONFIG_MTD_NAND_NOMADIK)		+= nomadik_nand.o
 
 nand-objs := nand_base.o nand_bbt.o
drivers/mtd/nand/nomadik_nand.c new file +249 -0

249 lines not on this page · raw message

Signature · 1 line
1.5.6.5
#2 lore raw

PATCH v5 1/2 Nand driver for Nomadik 8815 SoC (on NHK8815 board)

In reply to Alessandro Rubini

From: Alessandro Rubini <[email protected]>

---

[sorry for reposting to the Cc: people, I mistyped mtd address]

 arch/arm/configs/nhk8815_defconfig        |    2 +-
 arch/arm/mach-nomadik/board-nhk8815.c     |   92 +++++++++++
 arch/arm/mach-nomadik/include/mach/fsmc.h |   29 ++++
 arch/arm/mach-nomadik/include/mach/nand.h |   16 ++
 drivers/mtd/nand/Kconfig                  |    6 +
 drivers/mtd/nand/Makefile                 |    1 +
 drivers/mtd/nand/nomadik_nand.c           |  249 +++++++++++++++++++++++++++++
 7 files changed, 394 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h
 create mode 100644 arch/arm/mach-nomadik/include/mach/nand.h
 create mode 100644 drivers/mtd/nand/nomadik_nand.c
arch/arm/configs/nhk8815_defconfig +1 -1
index 9bb45b9..600cb27 100644
@@ -498,7 +498,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_VERIFY_WRITE=y
-# CONFIG_MTD_NAND_ECC_SMC is not set
+CONFIG_MTD_NAND_ECC_SMC=y
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_GPIO is not set
 CONFIG_MTD_NAND_IDS=y
arch/arm/mach-nomadik/board-nhk8815.c +92 -0

110 lines not on this page · raw message

arch/arm/mach-nomadik/include/mach/fsmc.h new file +29 -0
new file mode 100644
index 0000000..8c2c051
@@ -0,0 +1,29 @@
+
+/* Definitions for the Nomadik FSMC "Flexible Static Memory controller" */
+
+#ifndef __ASM_ARCH_FSMC_H
+#define __ASM_ARCH_FSMC_H
+
+#include <mach/hardware.h>
+/*
+ * Register list
+ */
+
+/* bus control reg. and bus timing reg. for CS0..CS3 */
+#define FSMC_BCR(x)     (NOMADIK_FSMC_VA + (x << 3))
+#define FSMC_BTR(x)     (NOMADIK_FSMC_VA + (x << 3) + 0x04)
+
+/* PC-card and NAND:
+ * PCR = control register
+ * PMEM = memory timing
+ * PATT = attribute timing
+ * PIO = I/O timing
+ * PECCR = ECC result
+ */
+#define FSMC_PCR(x)     (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x00)
+#define FSMC_PMEM(x)    (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x08)
+#define FSMC_PATT(x)    (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x0c)
+#define FSMC_PIO(x)     (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x10)
+#define FSMC_PECCR(x)   (NOMADIK_FSMC_VA + ((2 + x) << 5) + 0x14)
+
+#endif /* __ASM_ARCH_FSMC_H */
arch/arm/mach-nomadik/include/mach/nand.h new file +16 -0
new file mode 100644
index 0000000..c3c8254
@@ -0,0 +1,16 @@
+#ifndef __ASM_ARCH_NAND_H
+#define __ASM_ARCH_NAND_H
+
+struct nomadik_nand_platform_data {
+	struct mtd_partition *parts;
+	int nparts;
+	int options;
+	int (*init) (void);
+	int (*exit) (void);
+};
+
+#define NAND_IO_DATA	0x40000000
+#define NAND_IO_CMD	0x40800000
+#define NAND_IO_ADDR	0x41000000
+
+#endif				/* __ASM_ARCH_NAND_H */
drivers/mtd/nand/Kconfig +6 -0
index ce96c09..b9fa465 100644
@@ -426,6 +426,12 @@ config MTD_NAND_MXC
 	  This enables the driver for the NAND flash controller on the
 	  MXC processors.
 
+config MTD_NAND_NOMADIK
+	tristate "ST Nomadik 8815 NAND support"
+	depends on ARCH_NOMADIK
+	help
+	  Driver for the NAND flash controller on the Nomadik, with ECC.
+
 config MTD_NAND_SH_FLCTL
 	tristate "Support for NAND on Renesas SuperH FLCTL"
 	depends on MTD_NAND && SUPERH && CPU_SUBTYPE_SH7723
drivers/mtd/nand/Makefile +1 -0
index f3a786b..0fe9a0c 100644
@@ -40,5 +40,6 @@ obj-$(CONFIG_MTD_NAND_SH_FLCTL)		+= sh_flctl.o
 obj-$(CONFIG_MTD_NAND_MXC)		+= mxc_nand.o
 obj-$(CONFIG_MTD_NAND_SOCRATES)		+= socrates_nand.o
 obj-$(CONFIG_MTD_NAND_TXX9NDFMC)	+= txx9ndfmc.o
+obj-$(CONFIG_MTD_NAND_NOMADIK)		+= nomadik_nand.o
 
 nand-objs := nand_base.o nand_bbt.o
drivers/mtd/nand/nomadik_nand.c new file +249 -0

249 lines not on this page · raw message

Signature · 1 line
1.5.6.5
#3 lore raw

PATCH v5 2/2 OneNand support for Nomadik 8815 SoC (on NHK8815 board)

In reply to Alessandro Rubini

From: Alessandro Rubini <[email protected]>

---
 arch/arm/mach-nomadik/board-nhk8815.c |   63 +++++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 0 deletions(-)
arch/arm/mach-nomadik/board-nhk8815.c +63 -0
index 3fde972..0ad6bba 100644
@@ -24,6 +24,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/irq.h>
+#include <asm/mach/flash.h>
 #include <mach/setup.h>
 #include <mach/nand.h>
 #include <mach/fsmc.h>
@@ -112,6 +113,66 @@ static struct platform_device nhk8815_nand_device = {
 	.num_resources	= ARRAY_SIZE(nhk8815_nand_resources),
 };
 
+/* These are the partitions for the OneNand device, different from above */
+static struct mtd_partition nhk8815_onenand_partitions[] = {
+	{
+		.name	= "X-Loader(OneNAND)",
+		.offset = 0,
+		.size	= SZ_256K,
+	}, {
+		.name	= "MemInit(OneNAND)",
+		.offset	= MTDPART_OFS_APPEND,
+		.size	= SZ_256K,
+	}, {
+		.name	= "BootLoader(OneNAND)",
+		.offset	= MTDPART_OFS_APPEND,
+		.size	= SZ_2M-SZ_256K,
+	}, {
+		.name	= "SysImage(OneNAND)",
+		.offset	= MTDPART_OFS_APPEND,
+		.size	= 4 * SZ_1M,
+	}, {
+		.name	= "Root Filesystem(OneNAND)",
+		.offset	= MTDPART_OFS_APPEND,
+		.size	= 22 * SZ_1M,
+	}, {
+		.name	= "User Filesystem(OneNAND)",
+		.offset	= MTDPART_OFS_APPEND,
+		.size	= MTDPART_SIZ_FULL,
+	}
+};
+
+static struct flash_platform_data nhk8815_onenand_data = {
+	.parts		= nhk8815_onenand_partitions,
+	.nr_parts	= ARRAY_SIZE(nhk8815_onenand_partitions),
+};
+
+static struct resource nhk8815_onenand_resource[] = {
+	{
+		.start		= 0x30000000,
+		.end		= 0x30000000 + SZ_128K - 1,
+		.flags		= IORESOURCE_MEM,
+	},
+};
+
+static struct platform_device nhk8815_onenand_device = {
+	.name		= "onenand",
+	.id		= -1,
+	.dev		= {
+		.platform_data	= &nhk8815_onenand_data,
+	},
+	.resource	= nhk8815_onenand_resource,
+	.num_resources	= ARRAY_SIZE(nhk8815_onenand_resource),
+};
+
+static void __init nhk8815_onenand_init(void)
+{
+#ifdef CONFIG_ONENAND
+       /* Set up SMCS0 for OneNand */
+       writel(0x000030db, FSMC_BCR0);
+       writel(0x02100551, FSMC_BTR0);
+#endif
+}
 
 #define __MEM_4K_RESOURCE(x) \
 	.res = {.start = (x), .end = (x) + SZ_4K - 1, .flags = IORESOURCE_MEM}
@@ -173,6 +234,7 @@ device_initcall(nhk8815_eth_init);
 
 static struct platform_device *nhk8815_platform_devices[] __initdata = {
 	&nhk8815_nand_device,
+	&nhk8815_onenand_device,
 	&nhk8815_eth_device,
 	/* will add more devices */
 };
@@ -182,6 +244,7 @@ static void __init nhk8815_platform_init(void)
 	int i;
 
 	cpu8815_platform_init();
+	nhk8815_onenand_init();
 	platform_add_devices(nhk8815_platform_devices,
 			     ARRAY_SIZE(nhk8815_platform_devices));
 
Signature · 1 line
1.5.6.5
#4 lore raw

PATCH v5 2/2 OneNand support for Nomadik 8815 SoC (on NHK8815 board)

In reply to Alessandro Rubini

From: Alessandro Rubini <[email protected]>

---
 arch/arm/mach-nomadik/board-nhk8815.c |   63 +++++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 0 deletions(-)
arch/arm/mach-nomadik/board-nhk8815.c +63 -0
index 3fde972..0ad6bba 100644
@@ -24,6 +24,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/irq.h>
+#include <asm/mach/flash.h>
 #include <mach/setup.h>
 #include <mach/nand.h>
 #include <mach/fsmc.h>
@@ -112,6 +113,66 @@ static struct platform_device nhk8815_nand_device = {
 	.num_resources	= ARRAY_SIZE(nhk8815_nand_resources),
 };
 
+/* These are the partitions for the OneNand device, different from above */
+static struct mtd_partition nhk8815_onenand_partitions[] = {
+	{
+		.name	= "X-Loader(OneNAND)",
+		.offset = 0,
+		.size	= SZ_256K,
+	}, {
+		.name	= "MemInit(OneNAND)",
+		.offset	= MTDPART_OFS_APPEND,
+		.size	= SZ_256K,
+	}, {
+		.name	= "BootLoader(OneNAND)",
+		.offset	= MTDPART_OFS_APPEND,
+		.size	= SZ_2M-SZ_256K,
+	}, {
+		.name	= "SysImage(OneNAND)",
+		.offset	= MTDPART_OFS_APPEND,
+		.size	= 4 * SZ_1M,
+	}, {
+		.name	= "Root Filesystem(OneNAND)",
+		.offset	= MTDPART_OFS_APPEND,
+		.size	= 22 * SZ_1M,
+	}, {
+		.name	= "User Filesystem(OneNAND)",
+		.offset	= MTDPART_OFS_APPEND,
+		.size	= MTDPART_SIZ_FULL,
+	}
+};
+
+static struct flash_platform_data nhk8815_onenand_data = {
+	.parts		= nhk8815_onenand_partitions,
+	.nr_parts	= ARRAY_SIZE(nhk8815_onenand_partitions),
+};
+
+static struct resource nhk8815_onenand_resource[] = {
+	{
+		.start		= 0x30000000,
+		.end		= 0x30000000 + SZ_128K - 1,
+		.flags		= IORESOURCE_MEM,
+	},
+};
+
+static struct platform_device nhk8815_onenand_device = {
+	.name		= "onenand",
+	.id		= -1,
+	.dev		= {
+		.platform_data	= &nhk8815_onenand_data,
+	},
+	.resource	= nhk8815_onenand_resource,
+	.num_resources	= ARRAY_SIZE(nhk8815_onenand_resource),
+};
+
+static void __init nhk8815_onenand_init(void)
+{
+#ifdef CONFIG_ONENAND
+       /* Set up SMCS0 for OneNand */
+       writel(0x000030db, FSMC_BCR0);
+       writel(0x02100551, FSMC_BTR0);
+#endif
+}
 
 #define __MEM_4K_RESOURCE(x) \
 	.res = {.start = (x), .end = (x) + SZ_4K - 1, .flags = IORESOURCE_MEM}
@@ -173,6 +234,7 @@ device_initcall(nhk8815_eth_init);
 
 static struct platform_device *nhk8815_platform_devices[] __initdata = {
 	&nhk8815_nand_device,
+	&nhk8815_onenand_device,
 	&nhk8815_eth_device,
 	/* will add more devices */
 };
@@ -182,6 +244,7 @@ static void __init nhk8815_platform_init(void)
 	int i;
 
 	cpu8815_platform_init();
+	nhk8815_onenand_init();
 	platform_add_devices(nhk8815_platform_devices,
 			     ARRAY_SIZE(nhk8815_platform_devices));
 
Signature · 1 line
1.5.6.5

A message that is not in the archive (sent off-list or not yet received): 50ed4996479c95b93714ac814608d5f0db85238d.1248434636.git.rubini@unipv.it

#6 lore raw

Re: [PATCH V5 1/2] Nand driver for Nomadik 8815 SoC (on NHK8815 board)

Hi,

Please run ''checkpatch.pl' for this patch and try to fix the errors.

Few more comments below:

Quoted 6 lines · Alessandro Rubini

From: Alessandro Rubini <[email protected]>

---

---sinp---

Review

Quoted 7 lines
(quoted diff) +7 -0
+static inline int parity(int b) /* uses low 8 bits: returns 0 or all-1 */
+{
+       b = b ^ (b >> 4);
+       b = b ^ (b >> 2);
+       return (b ^ (b >> 1)) & 1
+               ? ~0 : 0;
+}

This function is not required anymore, can be removed.

Quoted 39 lines
(quoted diff) +39 -0
+
+static struct nand_ecclayout nomadik_ecc_layout = {
+       .eccbytes = 3 * 4,
+       .eccpos = { /* each subpage has 16 bytes: pos 2,3,4 hosts ECC */
+               0x02, 0x03, 0x04,
+               0x12, 0x13, 0x14,
+               0x22, 0x23, 0x24,
+               0x32, 0x33, 0x34},
+       /* let's keep bytes 5,6,7 for us, just in case we change ECC algo */
+       .oobfree = { {0x08, 0x08}, {0x18, 0x08}, {0x28, 0x08}, {0x38, 0x08} },
+};
+
+static void nomadik_ecc_control(struct mtd_info *mtd, int mode)
+{
+       /* No need to enable hw ecc, it's on by default */
+}
+
+static void nomadik_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+{
+       struct nand_chip *nand = mtd->priv;
+       struct nomadik_nand_host *host = nand->priv;
+
+       if (cmd == NAND_CMD_NONE)
+               return;
+
+       if (ctrl & NAND_CLE)
+               writeb(cmd, host->cmd_va);
+       else
+               writeb(cmd, host->addr_va);
+}
+
+static int nomadik_nand_probe(struct platform_device *pdev)
+{
+       struct nomadik_nand_platform_data *pdata = pdev->dev.platform_data;
+       struct nomadik_nand_host *host;
+       struct mtd_info *mtd;
+       struct nand_chip *nand;
+       struct resource *res;
+       int ret = 0;

Review

Quoted 10 lines
(quoted diff) +10 -0
+
+       /* Allocate memory for the device structure (and zero it) */
+       host = kzalloc(sizeof(struct nomadik_nand_host), GFP_KERNEL);
+       if (!host) {
+               dev_err(&pdev->dev, "Failed to allocate device structure.\n");
+               return -ENOMEM;
+       }
+
+       /* Call the client's init function, if any */
+       if (pdata->init && (ret = pdata->init()) < 0) {

'checkpatch.pl' here... (do not use assignment in if condition)

Quoted 6 lines

+               dev_err(&pdev->dev, "Init function failed\n");
+               goto err;
+       }

(quoted diff) +3 -0
+
+       /* ioremap three regions */
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_addr");

Review

Quoted 10 lines
(quoted diff) +10 -0
+       if (!res) {ret = -EIO; goto err_unmap; }
+       host->addr_va = ioremap(res->start, res->end - res->start + 1);
+
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_data");
+       if (!res) {ret = -EIO; goto err_unmap; }
+       host->data_va = ioremap(res->start, res->end - res->start + 1);
+
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_cmd");
+       if (!res) {ret = -EIO; goto err_unmap; }
+       host->cmd_va = ioremap(res->start, res->end - res->start + 1);

'checkpatch.pl' here... (trailing statements should be on next line)

Quoted 13 lines
(quoted diff) +13 -0
+
+       if (!host->addr_va || !host->data_va || !host->cmd_va) {
+               ret = -ENOMEM;
+               goto err_unmap;
+       }
+
+       /* Link all private pointers */
+       mtd = &host->mtd;
+       nand = &host->nand;
+       mtd->priv = nand;
+       nand->priv = host;
+
+       host->mtd.owner = THIS_MODULE;

Review

Quoted 10 lines
(quoted diff) +10 -0
+       nand->IO_ADDR_R = host->data_va;
+       nand->IO_ADDR_W = host->data_va;
+       nand->cmd_ctrl = nomadik_cmd_ctrl;
+
+       /*
+        * This stanza declares ECC_HW but uses soft routines. It's because
+        * HW claims to make the calculation but not the correction. However,
+        * I haven't managed to get the desired data out of it until now.
+        */
+       nand->ecc.mode = NAND_ECC_HW;

this can be 'NAND_ECC_SOFT' here... then

Quoted 2 lines

+       nand->ecc.calculate = nand_calculate_ecc;
+       nand->ecc.correct = nand_correct_data;

you need not to do these here.

Quoted 18 lines

+       nand->ecc.hwctl = nomadik_ecc_control;
+       nand->ecc.size = 512;
+       nand->ecc.bytes = 3;

(quoted diff) +15 -0
+
+       nand->options = pdata->options;
+
+       /*
+        * Scan to find existance of the device
+        */
+       if (nand_scan(&host->mtd, 1)) {
+               ret = -ENXIO;
+               goto err_unmap;
+       }
+
+#ifdef CONFIG_MTD_PARTITIONS
+       add_mtd_partitions(&host->mtd, pdata->parts, pdata->nparts);
+#else
+       pr_info("Registering %s as whole device\n", mtd->name);

Review

Quoted 10 lines
(quoted diff) +10 -0
+       add_mtd_device(mtd);
+#endif
+
+       platform_set_drvdata(pdev, host);
+       return 0;
+
+ err_unmap:
+       if (host->cmd_va) iounmap(host->cmd_va);
+       if (host->data_va) iounmap(host->data_va);
+       if (host->addr_va) iounmap(host->addr_va);

'checkpatch.pl' here... (trailing statements should be on next line)

-vimal

#7 lore raw

Re: [PATCH V5 1/2] Nand driver for Nomadik 8815 SoC (on NHK8815 board)

Quoted 1 line

Please run ''checkpatch.pl' for this patch and try to fix the errors.

Ok, will do. Although I don't agree with everything checkpatch is saying (I've heard checkpatch is meant as suggestions, to be considered but not applied blindly, so I behaved accordingly).

Quoted 1 line

this can be 'NAND_ECC_SOFT' here... then

As explained in the comments above, there is the hardware in there, only I've not been able to use it yet. So I prefer to stay HW and then change as little as possible. But, unless you confirm I can do that, I'll write SOFT in there as requested.

Will repost on monday, I'm off for the weekend.

/alessandro

#8 lore raw

Re: [PATCH V5 1/2] Nand driver for Nomadik 8815 SoC (on NHK8815 board)

Quoted 6 lines · Alessandro Rubini
Quoted 1 line

Please run ''checkpatch.pl' for this patch and try to fix the errors.

Ok, will do. Although I don't agree with everything checkpatch is saying (I've heard checkpatch is meant as suggestions, to be considered but not applied blindly, so I behaved accordingly).

Quoted 6 lines
Quoted 1 line

this can be 'NAND_ECC_SOFT' here... then

As explained in the comments above, there is the hardware in there, only I've not been able to use it yet. So I prefer to stay HW and then change as little as possible.  But, unless you confirm I can do that, I'll write SOFT in there as requested.

As of now, I think you can make it 'NAND_ECC_SOFT'. And then once you are able to use HW ECC, you can change it back.
Currently making it HW confuses with wrong API being used in 'nand_base.c' (uses nand_'read/write'_page_hwecc rather than nand_read/write_page_swecc routines), although it does not make much difference in functionality.

Regards,
vimal

Quoted 5 lines

Will repost on monday, I'm off for the weekend.

/alessandro

#9 lore raw

Re: [PATCH V5 1/2] Nand driver for Nomadik 8815 SoC (on NHK8815 board)

Quoted 14 lines · vimal singh
Quoted 6 lines · Alessandro Rubini
Quoted 1 line

Please run ''checkpatch.pl' for this patch and try to fix the errors.

Ok, will do. Although I don't agree with everything checkpatch is saying (I've heard checkpatch is meant as suggestions, to be considered but not applied blindly, so I behaved accordingly).

Quoted 6 lines
Quoted 1 line

this can be 'NAND_ECC_SOFT' here... then

As explained in the comments above, there is the hardware in there, only I've not been able to use it yet. So I prefer to stay HW and then change as little as possible.  But, unless you confirm I can do that, I'll write SOFT in there as requested.

Quoted 7 lines

As of now, I think you can make it 'NAND_ECC_SOFT'. And then once you are able to use HW ECC, you can change it back.
Currently making it HW confuses with wrong API being used in 'nand_base.c' (uses nand_'read/write'_page_hwecc rather than nand_read/write_page_swecc routines), although it does not make much difference in functionality.

To make it work for 512 bytes sector ECC in SW, below patch is required:

http://patchwork.ozlabs.org/patch/13697/

Which was posted sometime back, but unfortunately did not get merged.

David,

Can we get this patch merged? If required, I will post updated patch after re-basing.

-vimal

Quoted 6 lines
Quoted 5 lines

Will repost on monday, I'm off for the weekend.

/alessandro

Signature · 7 lines
---
Regards,
\/ | |\/| /-\ |_

____      __o
------   -\<,
-----  ( )/ ( )
#10 lore raw

Re: [PATCH V5 1/2] Nand driver for Nomadik 8815 SoC (on NHK8815 board)

Quoted 5 lines · vimal singh

To make it work for 512 bytes sector ECC in SW, below patch is required:

http://patchwork.ozlabs.org/patch/13697/

Which was posted sometime back, but unfortunately did not get merged.

It is in l2-mtd-2.6.git now.

Signature · 2 lines
Best Regards,
Artem Bityutskiy (Артём Битюцкий)
#11 lore raw

Re: [PATCH V5 1/2] Nand driver for Nomadik 8815 SoC (on NHK8815 board)

Quoted 3 lines
Quoted 1 line

http://patchwork.ozlabs.org/patch/13697/

It is in l2-mtd-2.6.git now.

Great!

Now, what are the steps to have Nomadik Nand and OneNand merged?

Are they going to appear in a tree (which one? I think rmk, since it's the only one with Nomadik files in), or should I resubmit to mtd after base arch is merged from rmk?

Thanks
/alessandro

#12 lore raw

Re: [PATCH V5 1/2] Nand driver for Nomadik 8815 SoC (on NHK8815 board)

Quoted 5 lines · Alessandro Rubini
Quoted 3 lines
Quoted 1 line

http://patchwork.ozlabs.org/patch/13697/

It is in l2-mtd-2.6.git now.

Great!

Well, this only means that the MTD maintainer will take it later into the mtd-2.6.git, and merge upstream during the next merge window.

Quoted 1 line

Now, what are the steps to have Nomadik Nand and OneNand merged?

I guess you could send stand-alone patches, and I can put them to my tree as well, and let dwmw2 pick them later.

Quoted 3 lines

Are they going to appear in a tree (which one? I think rmk, since it's the only one with Nomadik files in), or should I resubmit to mtd after base arch is merged from rmk?

It is up to dwmw2 and rmk, they are the corresponding maintainers.

Signature · 2 lines
Best Regards,
Artem Bityutskiy (Артём Битюцкий)