mtd/gpmi : add gpmi support for mx6q

add gpmi support to mx6q.

Signed-off-by Huang Shijie <[email protected]>

Please, let me know how I can compile-test this. This diver depends on imx23 or imx28 and I cannot find a defconfig for these. When I select MXS platform the compilation fails. Could you please describe some way to generate a compilable configuration which would include this driver as well, or send me the defconfig file.

I can't tell about MX6, but the defconfig for mx23/28 is called mxs_defconfig.

Please, let me know how I can compile-test this. This diver depends on imx23 or imx28 and I cannot find a defconfig for these. When I select MXS platform the compilation fails. Could you please describe some way to generate a compilable configuration which would include this driver as well, or send me the defconfig file.

Hi Artem:

Quoted 5 lines

Please, let me know how I can compile-test this. This diver depends on imx23 or imx28 and I cannot find a defconfig for these. When I select MXS platform the compilation fails. Could you please describe some way to generate a compilable configuration which would include this driver as well, or send me the defconfig file.

use make mxs_defconfig to make the .config.
and select the gpmi-nand driver. then you can compile it.

This patch is just part of the patches for mx6q, another two patches are the mxs-dma patches. So in the mx6q, I do not enable the gpmi-nand driver. you can compile-test it just on mxs_defconfig.

scripts/kconfig/conf --savedefconfig=defconfig Kconfig
warning: (MTD_NAND_GPMI_NAND) selects MTD_CMDLINE_PARTS which has unmet direct dependencies (MTD=y)

Would mxs people send a fix?

Hi,

Quoted 4 lines

scripts/kconfig/conf --savedefconfig=defconfig Kconfig
warning: (MTD_NAND_GPMI_NAND) selects MTD_CMDLINE_PARTS which has unmet direct dependencies (MTD=y)

Would mxs people send a fix?

Do you mean i have to remove the "select MTD_CMD_LINE_PARTS" for gpmi-nand?

Hi Artem:

Quoted 5 lines

Please, let me know how I can compile-test this. This diver depends on imx23 or imx28 and I cannot find a defconfig for these. When I select MXS platform the compilation fails. Could you please describe some way to generate a compilable configuration which would include this driver as well, or send me the defconfig file.

use make mxs_defconfig to make the .config.
and select the gpmi-nand driver. then you can compile it.

This patch is just part of the patches for mx6q, another two patches are the mxs-dma patches. So in the mx6q, I do not enable the gpmi-nand driver. you can compile-test it just on mxs_defconfig.

add gpmi support to mx6q.

Signed-off-by Huang Shijie <[email protected]>

---
 drivers/mtd/nand/gpmi-nand/bch-regs.h  |   42 ++++++++++++++++++++++++-------
 drivers/mtd/nand/gpmi-nand/gpmi-lib.c  |   14 ++++++----
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c |    3 ++
 drivers/mtd/nand/gpmi-nand/gpmi-nand.h |    2 +
 4 files changed, 45 insertions(+), 16 deletions(-)

drivers/mtd/nand/gpmi-nand/bch-regs.h +32 -10

index 4effb8c..a092451 100644
@@ -51,15 +51,26 @@
 
 #define BP_BCH_FLASH0LAYOUT0_ECC0		12
 #define BM_BCH_FLASH0LAYOUT0_ECC0	(0xf << BP_BCH_FLASH0LAYOUT0_ECC0)
-#define BF_BCH_FLASH0LAYOUT0_ECC0(v)		\
-	(((v) << BP_BCH_FLASH0LAYOUT0_ECC0) & BM_BCH_FLASH0LAYOUT0_ECC0)
+#define MX6Q_BP_BCH_FLASH0LAYOUT0_ECC0		11
+#define MX6Q_BM_BCH_FLASH0LAYOUT0_ECC0	(0x1f << MX6Q_BP_BCH_FLASH0LAYOUT0_ECC0)
+#define BF_BCH_FLASH0LAYOUT0_ECC0(v, x)				\
+	(GPMI_IS_MX6Q(x)					\
+		? (((v) << MX6Q_BP_BCH_FLASH0LAYOUT0_ECC0)	\
+			& MX6Q_BM_BCH_FLASH0LAYOUT0_ECC0)	\
+		: (((v) << BP_BCH_FLASH0LAYOUT0_ECC0)		\
+			& BM_BCH_FLASH0LAYOUT0_ECC0)		\
+	)
 
 #define BP_BCH_FLASH0LAYOUT0_DATA0_SIZE		0
 #define BM_BCH_FLASH0LAYOUT0_DATA0_SIZE		\
 			(0xfff << BP_BCH_FLASH0LAYOUT0_DATA0_SIZE)
-#define BF_BCH_FLASH0LAYOUT0_DATA0_SIZE(v)	\
-	(((v) << BP_BCH_FLASH0LAYOUT0_DATA0_SIZE)\
-					 & BM_BCH_FLASH0LAYOUT0_DATA0_SIZE)
+#define MX6Q_BM_BCH_FLASH0LAYOUT0_DATA0_SIZE	\
+			(0x3ff << BP_BCH_FLASH0LAYOUT0_DATA0_SIZE)
+#define BF_BCH_FLASH0LAYOUT0_DATA0_SIZE(v, x)				\
+	(GPMI_IS_MX6Q(x)						\
+		? (((v) >> 2) & MX6Q_BM_BCH_FLASH0LAYOUT0_DATA0_SIZE)	\
+		: ((v) & BM_BCH_FLASH0LAYOUT0_DATA0_SIZE)		\
+	)
 
 #define HW_BCH_FLASH0LAYOUT1			0x00000090
 

@@ -72,13 +83,24 @@
 
 #define BP_BCH_FLASH0LAYOUT1_ECCN		12
 #define BM_BCH_FLASH0LAYOUT1_ECCN	(0xf << BP_BCH_FLASH0LAYOUT1_ECCN)
-#define BF_BCH_FLASH0LAYOUT1_ECCN(v)		\
-	(((v) << BP_BCH_FLASH0LAYOUT1_ECCN) & BM_BCH_FLASH0LAYOUT1_ECCN)
+#define MX6Q_BP_BCH_FLASH0LAYOUT1_ECCN		11
+#define MX6Q_BM_BCH_FLASH0LAYOUT1_ECCN	(0x1f << MX6Q_BP_BCH_FLASH0LAYOUT1_ECCN)
+#define BF_BCH_FLASH0LAYOUT1_ECCN(v, x)				\
+	(GPMI_IS_MX6Q(x)					\
+		? (((v) << MX6Q_BP_BCH_FLASH0LAYOUT1_ECCN)	\
+			& MX6Q_BM_BCH_FLASH0LAYOUT1_ECCN)	\
+		: (((v) << BP_BCH_FLASH0LAYOUT1_ECCN)		\
+			& BM_BCH_FLASH0LAYOUT1_ECCN)		\
+	)
 
 #define BP_BCH_FLASH0LAYOUT1_DATAN_SIZE		0
 #define BM_BCH_FLASH0LAYOUT1_DATAN_SIZE		\
 			(0xfff << BP_BCH_FLASH0LAYOUT1_DATAN_SIZE)
-#define BF_BCH_FLASH0LAYOUT1_DATAN_SIZE(v)	\
-	(((v) << BP_BCH_FLASH0LAYOUT1_DATAN_SIZE) \
-					 & BM_BCH_FLASH0LAYOUT1_DATAN_SIZE)
+#define MX6Q_BM_BCH_FLASH0LAYOUT1_DATAN_SIZE	\
+			(0x3ff << BP_BCH_FLASH0LAYOUT1_DATAN_SIZE)
+#define BF_BCH_FLASH0LAYOUT1_DATAN_SIZE(v, x)				\
+	(GPMI_IS_MX6Q(x)						\
+		? (((v) >> 2) & MX6Q_BM_BCH_FLASH0LAYOUT1_DATAN_SIZE)	\
+		: ((v) & BM_BCH_FLASH0LAYOUT1_DATAN_SIZE)		\
+	)
 #endif

drivers/mtd/nand/gpmi-nand/gpmi-lib.c +8 -6

index 28f8df0..fd39350 100644
@@ -223,13 +223,13 @@ int bch_set_geometry(struct gpmi_nand_data *this)
 	/* Configure layout 0. */
 	writel(BF_BCH_FLASH0LAYOUT0_NBLOCKS(block_count)
 			| BF_BCH_FLASH0LAYOUT0_META_SIZE(metadata_size)
-			| BF_BCH_FLASH0LAYOUT0_ECC0(ecc_strength)
-			| BF_BCH_FLASH0LAYOUT0_DATA0_SIZE(block_size),
+			| BF_BCH_FLASH0LAYOUT0_ECC0(ecc_strength, this)
+			| BF_BCH_FLASH0LAYOUT0_DATA0_SIZE(block_size, this),
 			r->bch_regs + HW_BCH_FLASH0LAYOUT0);
 
 	writel(BF_BCH_FLASH0LAYOUT1_PAGE_SIZE(page_size)
-			| BF_BCH_FLASH0LAYOUT1_ECCN(ecc_strength)
-			| BF_BCH_FLASH0LAYOUT1_DATAN_SIZE(block_size),
+			| BF_BCH_FLASH0LAYOUT1_ECCN(ecc_strength, this)
+			| BF_BCH_FLASH0LAYOUT1_DATAN_SIZE(block_size, this),
 			r->bch_regs + HW_BCH_FLASH0LAYOUT1);
 
 	/* Set *all* chip selects to use layout 0. */

@@ -803,7 +803,8 @@ int gpmi_is_ready(struct gpmi_nand_data *this, unsigned chip)
 	if (GPMI_IS_MX23(this)) {
 		mask = MX23_BM_GPMI_DEBUG_READY0 << chip;
 		reg = readl(r->gpmi_regs + HW_GPMI_DEBUG);
-	} else if (GPMI_IS_MX28(this)) {
+	} else if (GPMI_IS_MX28(this) || GPMI_IS_MX6Q(this)) {
+		/* MX28 shares the same R/B register as MX6Q. */
 		mask = MX28_BF_GPMI_STAT_READY_BUSY(1 << chip);
 		reg = readl(r->gpmi_regs + HW_GPMI_STAT);
 	} else

@@ -1066,8 +1067,9 @@ int gpmi_read_page(struct gpmi_nand_data *this,
 		| BF_GPMI_CTRL0_ADDRESS(address)
 		| BF_GPMI_CTRL0_XFER_COUNT(geo->page_size);
 	pio[1] = 0;
+	pio[2] = 0; /* set GPMI_HW_GPMI_ECCCTRL, disable the BCH. */
 	desc = channel->device->device_prep_slave_sg(channel,
-				(struct scatterlist *)pio, 2,
+				(struct scatterlist *)pio, 3,
 				DMA_TRANS_NONE,
 				DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
 	if (!desc) {

drivers/mtd/nand/gpmi-nand/gpmi-nand.c +0 -0

index 493ec2f..90545e2 100644

drivers/mtd/nand/gpmi-nand/gpmi-nand.h +2 -0

index 1c7fdbb..a302dd1 100644
@@ -268,6 +268,8 @@ extern int gpmi_read_page(struct gpmi_nand_data *,
 /* Use the platform_id to distinguish different Archs. */
 #define IS_MX23			0x1
 #define IS_MX28			0x2
+#define IS_MX6Q			0x8
 #define GPMI_IS_MX23(x)		((x)->pdev->id_entry->driver_data == IS_MX23)
 #define GPMI_IS_MX28(x)		((x)->pdev->id_entry->driver_data == IS_MX28)
+#define GPMI_IS_MX6Q(x)		((x)->pdev->id_entry->driver_data == IS_MX6Q)
 #endif

Signature · 1 line

1.7.0.4

The imx6q only supports DT boot, but I do not see you are adding DT probe for the driver, so I'm wondering how you tested the driver on imx6q.

Hi,

Quoted 4 lines

The imx6q only supports DT boot, but I do not see you are adding DT probe for the driver, so I'm wondering how you tested the driver on imx6q.

This patch is just the first patch for mx6q. My following patches will add DT to the gpmi nand driver for mx6q. Due to the dependency issue, I will send the patches
in the following order:
[1] mtd/gpmi: add gpmi support for mx6q.
[2] [PATCH v5] patch set about the MXS-DMA
[3] add DT support to gpmi for mx6q.

I tested this patch based on our bsp code.

Quoted 5 lines

Hi,

Quoted 4 lines

The imx6q only supports DT boot, but I do not see you are adding DT probe for the driver, so I'm wondering how you tested the driver on imx6q.

Quoted 8 lines

This patch is just the first patch for mx6q. My following patches will add DT to the gpmi nand driver for mx6q. Due to the dependency issue, I will send the patches
in the following order:
[1] mtd/gpmi: add gpmi support for mx6q.
[2] [PATCH v5] patch set about the MXS-DMA
[3] add DT support to gpmi for mx6q.

It should be:

1. MXS-DMA series
2. Add imx6q support with DT probe

Quoted 2 lines

I tested this patch based on our bsp code.

This is wrong approach. You are submitting patches to mainline, so you should test your patches on mainline tree.

Hi,

Quoted 14 lines · Huang Shijie

Quoted 13 lines

Hi,

Quoted 4 lines

The imx6q only supports DT boot, but I do not see you are adding DT probe for the driver, so I'm wondering how you tested the driver on imx6q.

This patch is just the first patch for mx6q. My following patches will add DT to the gpmi nand driver for mx6q. Due to the dependency issue, I will send the patches
in the following order:
[1] mtd/gpmi: add gpmi support for mx6q.
[2] [PATCH v5] patch set about the MXS-DMA
[3] add DT support to gpmi for mx6q.

Quoted 5 lines

It should be:

1. MXS-DMA series
2. Add imx6q support with DT probe

I ever did so in this order. But the mxs-dma series delayed for long time( I missed the CCs).
But Artem's tree is faster to merge patch.

Quoted 5 lines

Quoted 2 lines

I tested this patch based on our bsp code.

This is wrong approach. You are submitting patches to mainline, so you should test your patches on mainline tree.

Beside the DT, the gpmi nand driver is the same.

Is the mainline tree ready now? How can i to set the pinmux for gpmi?

You can not change the order because of that. The fact is imx6q gpmi support depends on the mxs-dma change.