1 From patchwork Fri Nov 13 07:55:08 2015
2 Content-Type: text/plain; charset="utf-8"
4 Content-Transfer-Encoding: 7bit
5 Subject: [OpenWrt-Devel,RFC] A patch for mt7621 nand controler. Revision 2.
6 From: Kirill Berezin <fyiwdt@gmail.com>
8 Message-Id: <CAOFwh=DZieEa4ZA0ex6G3OR2OgEeP6Fh+SSw=Zg-L0wWm1QRTA@mail.gmail.com>
9 To: openwrt-devel@lists.openwrt.org
10 Date: Fri, 13 Nov 2015 10:55:08 +0300
14 It turned out that mtk_nand driver uses some sophisticated accounting and a
15 general nand code must be patched.
17 This patch adds required read and erase calls to a general nand code. I
18 used a code for re6500 released by Linksys as a reference.
20 All required operations (erase, write and read) are usable. However I found
21 that jffs2 filesystem can be created only on top of a ubi volume. I tried
22 to create jffs2 directly on mtd device but pages with clean markers are
25 This patch also includes changes that I sent earlier.
30 Signed-off-by: Kirill Berezin (fyiwdt@gmail.com)
32 diff -urNb a/drivers/mtd/nand/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c
33 --- a/drivers/mtd/nand/mtk_nand.c 2015-11-06 16:44:31.000000000 +0400
34 +++ b/drivers/mtd/nand/mtk_nand.c 2015-11-12 10:06:20.080430855 +0400
39 +/* this constant was taken from linux/nand/nand.h v 3.14
40 + * in later versions it seems it was removed in order to save a bit of space
42 +#define NAND_MAX_OOBSIZE 774
43 static u8 local_oob_buf[NAND_MAX_OOBSIZE];
45 static u8 nand_badblock_offset = 0;
47 if (0xF == u4ErrNum) {
48 mtd->ecc_stats.failed++;
50 - //printk(KERN_ERR"UnCorrectable at PageAddr=%d\n", u4PageAddr);
51 + printk(KERN_ERR"mtk_nand: UnCorrectable at PageAddr=%d\n", u4PageAddr);
53 for (i = 0; i < ((u4ErrNum + 1) >> 1); ++i) {
54 au4ErrBitLoc[i] = DRV_Reg32(ECC_DECEL0_REG32 + i);
57 struct nand_chip *chip = (struct nand_chip *)mtd->priv;
59 - chip->erase_cmd(mtd, page);
60 + chip->erase(mtd, page);
62 return chip->waitfunc(mtd, chip);
65 nand_chip->write_page = mtk_nand_write_page;
66 nand_chip->ecc.write_oob = mtk_nand_write_oob;
67 nand_chip->block_markbad = mtk_nand_block_markbad; // need to add nand_get_device()/nand_release_device().
68 - // nand_chip->erase = mtk_nand_erase;
69 - // nand_chip->read_page = mtk_nand_read_page;
70 + nand_chip->erase_mtk = mtk_nand_erase;
71 + nand_chip->read_page = mtk_nand_read_page;
72 nand_chip->ecc.read_oob = mtk_nand_read_oob;
73 nand_chip->block_bad = mtk_nand_block_bad;
75 @@ -2175,6 +2179,21 @@
76 nand_chip->pagemask = (nand_chip->chipsize >> nand_chip->page_shift) - 1;
77 nand_chip->phys_erase_shift = ffs(mtd->erasesize) - 1;
78 nand_chip->chip_shift = ffs(nand_chip->chipsize) - 1;//0x1C;//ffs(nand_chip->chipsize) - 1;
80 + /* allocate buffers or call select_chip here or a bit earlier*/
82 + struct nand_buffers *nbuf = kzalloc(sizeof(*nbuf) + mtd->writesize + mtd->oobsize * 3, GFP_KERNEL);
86 + nbuf->ecccalc = (uint8_t *)(nbuf + 1);
87 + nbuf->ecccode = nbuf->ecccalc + mtd->oobsize;
88 + nbuf->databuf = nbuf->ecccode + mtd->oobsize;
90 + nand_chip->buffers = nbuf;
91 + nand_chip->options |= NAND_OWN_BUFFERS;
94 nand_chip->oob_poi = nand_chip->buffers->databuf + mtd->writesize;
95 nand_chip->badblockpos = 0;
98 MSG(INIT, "[NFI] mtk_nand_probe fail, err = %d!\n", err);
100 platform_set_drvdata(pdev, NULL);
101 + if ( NULL != nand_chip->buffers) {
102 + kfree(nand_chip->buffers);
105 nand_disable_clock();
107 @@ -2261,8 +2283,12 @@
109 struct mtk_nand_host *host = platform_get_drvdata(pdev);
110 struct mtd_info *mtd = &host->mtd;
111 + struct nand_chip *nand_chip = &host->nand_chip;
114 + if ( NULL != nand_chip->buffers) {
115 + kfree(nand_chip->buffers);
118 nand_disable_clock();
120 diff -urNb a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
121 --- a/drivers/mtd/nand/nand_base.c 2015-11-06 16:44:31.000000000 +0400
122 +++ b/drivers/mtd/nand/nand_base.c 2015-11-09 10:24:52.931720862 +0400
123 @@ -1575,6 +1575,9 @@
127 +#ifdef CONFIG_MTK_MTD_NAND
128 + ret = chip->read_page(mtd, chip, bufpoi, page);
130 chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page);
133 @@ -1593,6 +1596,7 @@
135 ret = chip->ecc.read_page(mtd, chip, bufpoi,
137 +#endif /* CONFIG_MTK_MTD_NAND */
140 /* Invalidate page cache */
141 @@ -2770,8 +2774,11 @@
142 if (page <= chip->pagebuf && chip->pagebuf <
143 (page + pages_per_block))
146 +#ifdef CONFIG_MTK_MTD_NAND
147 + status = chip->erase_mtk(mtd, page & chip->pagemask);
149 status = chip->erase(mtd, page & chip->pagemask);
150 +#endif /* CONFIG_MTK_MTD_NAND */
153 * See if operation failed and additional status checks are
154 diff -urNb a/drivers/mtd/nand/nand_device_list.h b/drivers/mtd/nand/nand_device_list.h
155 --- a/drivers/mtd/nand/nand_device_list.h 2015-11-06 16:44:31.000000000 +0400
156 +++ b/drivers/mtd/nand/nand_device_list.h 2015-11-06 11:13:26.000000000 +0400
158 {0xADBC, 0x905554, 5, 16, 512, 128, 2048, 64, 0x10801011, "H9DA4GH4JJAMC", 0},
159 {0x01F1, 0x801D01, 4, 8, 128, 128, 2048, 64, 0x30C77fff, "S34ML01G100TF", 0},
160 {0x92F1, 0x8095FF, 4, 8, 128, 128, 2048, 64, 0x30C77fff, "F59L1G81A", 0},
161 + {0xC8DA, 0x909544, 5, 8, 256, 128, 2048, 64, 0x30C77fff, "F59L2G81A", 0},
162 + {0xC8DC, 0x909554, 5, 8, 512, 128, 2048, 64, 0x30C77fff, "F59L4G81A", 0},
163 {0xECD3, 0x519558, 5, 8, 1024, 128, 2048, 64, 0x44333, "K9K8G8000", 0},
164 {0xC2F1, 0x801DC2, 4, 8, 128, 128, 2048, 64, 0x30C77fff, "MX30LF1G08AA", 0},
165 {0x98D3, 0x902676, 5, 8, 1024, 256, 4096, 224, 0x00C25332, "TC58NVG3S0F", 0},
166 diff -urNb a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
167 --- a/include/linux/mtd/nand.h 2015-11-06 16:44:30.000000000 +0400
168 +++ b/include/linux/mtd/nand.h 2015-11-09 10:18:55.704701886 +0400
170 int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
171 uint32_t offset, int data_len, const uint8_t *buf,
172 int oob_required, int page, int cached, int raw);
173 +#ifdef CONFIG_MTK_MTD_NAND
174 + int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip, u8 *buf, int page);
175 + int (*erase_mtk)(struct mtd_info *mtd, int page);
176 +#endif /* CONFIG_MTK_MTD_NAND */
177 int (*onfi_set_features)(struct mtd_info *mtd, struct nand_chip *chip,
178 int feature_addr, uint8_t *subfeature_para);
179 int (*onfi_get_features)(struct mtd_info *mtd, struct nand_chip *chip,