Skip to contentSkip to conversation

MXS nand fixes in SPL

PATCH Superseded Michael Trimarchi 2 participants 5 messages Apr 23, 2022 – Apr 26, 2022

Subsystems (3)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

cover MXS nand fixes in SPL

Those patches come after some testing of failing in factory on some unit. We found out that the bootrom imx loader was not able to handling badblock. This can be a limit of the implementation right now in imx8mn. Anyway not all the imx platform has the support of this loader. I found some problems on the implementation so I have fixed it up according the experience of Sitara. I tested only using a Fit Image as a flash container

Michael Trimarchi (2):
nand: raw: mxs_nand: Fix specific hook registration
mtd: nand: mxs_nand_spl: Fix bad block skipping

 drivers/mtd/nand/raw/mxs_nand.c     | 32 +++++-----
 drivers/mtd/nand/raw/mxs_nand_spl.c | 90 ++++++++++++++++-------------
 2 files changed, 65 insertions(+), 57 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/2 nand: raw: mxs_nand: Fix specific hook registration

Move the hook after nand_scan_tail is called. The hook must be replaced to the mxs specific one but those must to be assignment later in the probe function.

With this fix markbad is working

---
 drivers/mtd/nand/raw/mxs_nand.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/mtd/nand/raw/mxs_nand.c +16 -16
index ee5d7fde9c..53f24b9c4b 100644
@@ -1246,22 +1246,6 @@ int mxs_nand_setup_ecc(struct mtd_info *mtd)
 	/* Enable BCH complete interrupt */
 	writel(BCH_CTRL_COMPLETE_IRQ_EN, &bch_regs->hw_bch_ctrl_set);
 
-	/* Hook some operations at the MTD level. */
-	if (mtd->_read_oob != mxs_nand_hook_read_oob) {
-		nand_info->hooked_read_oob = mtd->_read_oob;
-		mtd->_read_oob = mxs_nand_hook_read_oob;
-	}
-
-	if (mtd->_write_oob != mxs_nand_hook_write_oob) {
-		nand_info->hooked_write_oob = mtd->_write_oob;
-		mtd->_write_oob = mxs_nand_hook_write_oob;
-	}
-
-	if (mtd->_block_markbad != mxs_nand_hook_block_markbad) {
-		nand_info->hooked_block_markbad = mtd->_block_markbad;
-		mtd->_block_markbad = mxs_nand_hook_block_markbad;
-	}
-
 	return 0;
 }
 
@@ -1467,6 +1451,22 @@ int mxs_nand_init_ctrl(struct mxs_nand_info *nand_info)
 	if (err)
 		goto err_free_buffers;
 
+	/* Hook some operations at the MTD level. */
+	if (mtd->_read_oob != mxs_nand_hook_read_oob) {
+		nand_info->hooked_read_oob = mtd->_read_oob;
+		mtd->_read_oob = mxs_nand_hook_read_oob;
+	}
+
+	if (mtd->_write_oob != mxs_nand_hook_write_oob) {
+		nand_info->hooked_write_oob = mtd->_write_oob;
+		mtd->_write_oob = mxs_nand_hook_write_oob;
+	}
+
+	if (mtd->_block_markbad != mxs_nand_hook_block_markbad) {
+		nand_info->hooked_block_markbad = mtd->_block_markbad;
+		mtd->_block_markbad = mxs_nand_hook_block_markbad;
+	}
+
 	err = nand_register(0, mtd);
 	if (err)
 		goto err_free_buffers;
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/2 mtd: nand: mxs_nand_spl: Fix bad block skipping

In reply to Michael Trimarchi

The file was fill of problems and bugs. The bad block are marked beginning of erase block. The first erase block was never checked and the specific function to skip bad block in fit image was never implemented. The imx8mn bootrom seems that not handle the bad block as expected so this needed later to switch from boot rom loader to uboot spl one

---
 drivers/mtd/nand/raw/mxs_nand_spl.c | 90 ++++++++++++++++-------------
 1 file changed, 49 insertions(+), 41 deletions(-)
drivers/mtd/nand/raw/mxs_nand_spl.c +49 -41
index 59a67ee414..c1a833d6c8 100644
@@ -218,14 +218,14 @@ void nand_init(void)
 	mxs_nand_setup_ecc(mtd);
 }
 
-int nand_spl_load_image(uint32_t offs, unsigned int size, void *buf)
+int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
 {
-	struct nand_chip *chip;
-	unsigned int page;
+	unsigned int sz;
+	unsigned int block, lastblock;
+	unsigned int page, page_offset;
 	unsigned int nand_page_per_block;
-	unsigned int sz = 0;
+	struct nand_chip *chip;
 	u8 *page_buf = NULL;
-	u32 page_off;
 
 	chip = mtd_to_nand(mtd);
 	if (!chip->numchips)
@@ -235,47 +235,42 @@ int nand_spl_load_image(uint32_t offs, unsigned int size, void *buf)
 	if (!page_buf)
 		return -ENOMEM;
 
-	page = offs >> chip->page_shift;
-	page_off = offs & (mtd->writesize - 1);
+	/* offs has to be aligned to a page address! */
+	block = offs / mtd->erasesize;
+	lastblock = (offs + size - 1) / mtd->erasesize;
+	page = (offs % mtd->erasesize) / mtd->writesize;
+	page_offset = offs % mtd->writesize;
 	nand_page_per_block = mtd->erasesize / mtd->writesize;
 
-	debug("%s offset:0x%08x len:%d page:%x\n", __func__, offs, size, page);
-
-	while (size) {
-		if (mxs_read_page_ecc(mtd, page_buf, page) < 0)
-			return -1;
-
-		if (size > (mtd->writesize - page_off))
-			sz = (mtd->writesize - page_off);
-		else
-			sz = size;
-
-		memcpy(buf, page_buf + page_off, sz);
-
-		offs += mtd->writesize;
-		page++;
-		buf += (mtd->writesize - page_off);
-		page_off = 0;
-		size -= sz;
-
-		/*
-		 * Check if we have crossed a block boundary, and if so
-		 * check for bad block.
-		 */
-		if (!(page % nand_page_per_block)) {
-			/*
-			 * Yes, new block. See if this block is good. If not,
-			 * loop until we find a good block.
-			 */
-			while (is_badblock(mtd, offs, 1)) {
-				page = page + nand_page_per_block;
-				/* Check i we've reached the end of flash. */
-				if (page >= mtd->size >> chip->page_shift) {
+	while (block <= lastblock && size >= 0) {
+		if (!is_badblock(mtd, mtd->erasesize * block, 1)) {
+			/* Skip bad blocks */
+			while (page < nand_page_per_block) {
+				int curr_page = nand_page_per_block * block + page;
+
+				if (mxs_read_page_ecc(mtd, page_buf, curr_page) < 0) {
 					free(page_buf);
-					return -ENOMEM;
+					return -EIO;
 				}
+
+				if (size > (mtd->writesize - page_offset))
+					sz = (mtd->writesize - page_offset);
+				else
+					sz = size;
+
+				memcpy(dst, page_buf + page_offset, sz);
+				dst += sz;
+				size -= sz;
+				page_offset = 0;
+				page++;
 			}
+
+			page = 0;
+		} else {
+			lastblock++;
 		}
+
+		block++;
 	}
 
 	free(page_buf);
@@ -294,6 +289,19 @@ void nand_deselect(void)
 
 u32 nand_spl_adjust_offset(u32 sector, u32 offs)
 {
-	/* Handle the offset adjust in nand_spl_load_image,*/
+	unsigned int block, lastblock;
+
+	block = sector / mtd->erasesize;
+	lastblock = (sector + offs) / mtd->erasesize;
+
+	while (block <= lastblock) {
+		if (is_badblock(mtd, block * mtd->erasesize, 1)) {
+			offs += mtd->erasesize;
+			lastblock++;
+		}
+
+		block++;
+	}
+
 	return offs;
 }
Signature · 1 line
2.25.1
#3 lore raw

Re: [PATCH 2/2] mtd: nand: mxs_nand_spl: Fix bad block skipping

Hi

+cc Stefano Babic

We have right now a while (1) if we find a badblock

Quoted 139 lines · Michael Trimarchi

The file was fill of problems and bugs. The bad block are marked beginning of erase block. The first erase block was never checked and the specific function to skip bad block in fit image was never implemented. The imx8mn bootrom seems that not handle the bad block as expected so this needed later to switch from boot rom loader to uboot spl one

---
 drivers/mtd/nand/raw/mxs_nand_spl.c | 90 ++++++++++++++++-------------
 1 file changed, 49 insertions(+), 41 deletions(-)
drivers/mtd/nand/raw/mxs_nand_spl.c +49 -42
index 59a67ee414..c1a833d6c8 100644
@@ -218,14 +218,14 @@ void nand_init(void)
        mxs_nand_setup_ecc(mtd);
 }
 
-int nand_spl_load_image(uint32_t offs, unsigned int size, void *buf)
+int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
 {
-       struct nand_chip *chip;
-       unsigned int page;
+       unsigned int sz;
+       unsigned int block, lastblock;
+       unsigned int page, page_offset;
        unsigned int nand_page_per_block;
-       unsigned int sz = 0;
+       struct nand_chip *chip;
        u8 *page_buf = NULL;
-       u32 page_off;
 
        chip = mtd_to_nand(mtd);
        if (!chip->numchips)
@@ -235,47 +235,42 @@ int nand_spl_load_image(uint32_t offs, unsigned int size, void *buf)
        if (!page_buf)
                return -ENOMEM;
 
-       page = offs >> chip->page_shift;
-       page_off = offs & (mtd->writesize - 1);
+       /* offs has to be aligned to a page address! */
+       block = offs / mtd->erasesize;
+       lastblock = (offs + size - 1) / mtd->erasesize;
+       page = (offs % mtd->erasesize) / mtd->writesize;
+       page_offset = offs % mtd->writesize;
        nand_page_per_block = mtd->erasesize / mtd->writesize;
 
-       debug("%s offset:0x%08x len:%d page:%x\n", __func__, offs, size, page);
-
-       while (size) {
-               if (mxs_read_page_ecc(mtd, page_buf, page) < 0)
-                       return -1;
-
-               if (size > (mtd->writesize - page_off))
-                       sz = (mtd->writesize - page_off);
-               else
-                       sz = size;
-
-               memcpy(buf, page_buf + page_off, sz);
-
-               offs += mtd->writesize;
-               page++;
-               buf += (mtd->writesize - page_off);
-               page_off = 0;
-               size -= sz;
-
-               /*
-                * Check if we have crossed a block boundary, and if so
-                * check for bad block.
-                */
-               if (!(page % nand_page_per_block)) {
-                       /*
-                        * Yes, new block. See if this block is good. If not,
-                        * loop until we find a good block.
-                        */
-                       while (is_badblock(mtd, offs, 1)) {
-                               page = page + nand_page_per_block;
-                               /* Check i we've reached the end of flash. */
-                               if (page >= mtd->size >> chip->page_shift) {
+       while (block <= lastblock && size >= 0) {
+               if (!is_badblock(mtd, mtd->erasesize * block, 1)) {
+                       /* Skip bad blocks */
+                       while (page < nand_page_per_block) {
+                               int curr_page = nand_page_per_block * block + page;
+
+                               if (mxs_read_page_ecc(mtd, page_buf, curr_page) < 0) {
                                        free(page_buf);
-                                       return -ENOMEM;
+                                       return -EIO;
                                }
+
+                               if (size > (mtd->writesize - page_offset))
+                                       sz = (mtd->writesize - page_offset);
+                               else
+                                       sz = size;
+
+                               memcpy(dst, page_buf + page_offset, sz);
+                               dst += sz;
+                               size -= sz;
+                               page_offset = 0;
+                               page++;
                        }
+
+                       page = 0;
+               } else {
+                       lastblock++;
                }
+
+               block++;
        }
 
        free(page_buf);
@@ -294,6 +289,19 @@ void nand_deselect(void)
 
 u32 nand_spl_adjust_offset(u32 sector, u32 offs)
 {
-       /* Handle the offset adjust in nand_spl_load_image,*/
+       unsigned int block, lastblock;
+
+       block = sector / mtd->erasesize;
+       lastblock = (sector + offs) / mtd->erasesize;
+
+       while (block <= lastblock) {
+               if (is_badblock(mtd, block * mtd->erasesize, 1)) {
+                       offs += mtd->erasesize;
+                       lastblock++;
+               }
+
+               block++;
+       }
+
        return offs;
 }
--

2.25.1

Signature · 11 lines
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
[email protected]
__________________________________

Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
[email protected]
www.amarulasolutions.com
reviewer
#4 lore raw

Re: [PATCH 2/2] mtd: nand: mxs_nand_spl: Fix bad block skipping

Adding Han Xu.

Quoted 162 lines · Michael Nazzareno Trimarchi

Hi

+cc Stefano Babic

We have right now a while (1) if we find a badblock

Quoted 137 lines · Michael Trimarchi

The file was fill of problems and bugs. The bad block are marked beginning of erase block. The first erase block was never checked and the specific function to skip bad block in fit image was never implemented. The imx8mn bootrom seems that not handle the bad block as expected so this needed later to switch from boot rom loader to uboot spl one

---
 drivers/mtd/nand/raw/mxs_nand_spl.c | 90 ++++++++++++++++-------------
 1 file changed, 49 insertions(+), 41 deletions(-)
drivers/mtd/nand/raw/mxs_nand_spl.c +49 -42
index 59a67ee414..c1a833d6c8 100644
@@ -218,14 +218,14 @@ void nand_init(void)
        mxs_nand_setup_ecc(mtd);
 }
 
-int nand_spl_load_image(uint32_t offs, unsigned int size, void *buf)
+int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst)
 {
-       struct nand_chip *chip;
-       unsigned int page;
+       unsigned int sz;
+       unsigned int block, lastblock;
+       unsigned int page, page_offset;
        unsigned int nand_page_per_block;
-       unsigned int sz = 0;
+       struct nand_chip *chip;
        u8 *page_buf = NULL;
-       u32 page_off;
 
        chip = mtd_to_nand(mtd);
        if (!chip->numchips)
@@ -235,47 +235,42 @@ int nand_spl_load_image(uint32_t offs, unsigned int size, void *buf)
        if (!page_buf)
                return -ENOMEM;
 
-       page = offs >> chip->page_shift;
-       page_off = offs & (mtd->writesize - 1);
+       /* offs has to be aligned to a page address! */
+       block = offs / mtd->erasesize;
+       lastblock = (offs + size - 1) / mtd->erasesize;
+       page = (offs % mtd->erasesize) / mtd->writesize;
+       page_offset = offs % mtd->writesize;
        nand_page_per_block = mtd->erasesize / mtd->writesize;
 
-       debug("%s offset:0x%08x len:%d page:%x\n", __func__, offs, size, page);
-
-       while (size) {
-               if (mxs_read_page_ecc(mtd, page_buf, page) < 0)
-                       return -1;
-
-               if (size > (mtd->writesize - page_off))
-                       sz = (mtd->writesize - page_off);
-               else
-                       sz = size;
-
-               memcpy(buf, page_buf + page_off, sz);
-
-               offs += mtd->writesize;
-               page++;
-               buf += (mtd->writesize - page_off);
-               page_off = 0;
-               size -= sz;
-
-               /*
-                * Check if we have crossed a block boundary, and if so
-                * check for bad block.
-                */
-               if (!(page % nand_page_per_block)) {
-                       /*
-                        * Yes, new block. See if this block is good. If not,
-                        * loop until we find a good block.
-                        */
-                       while (is_badblock(mtd, offs, 1)) {
-                               page = page + nand_page_per_block;
-                               /* Check i we've reached the end of flash. */
-                               if (page >= mtd->size >> chip->page_shift) {
+       while (block <= lastblock && size >= 0) {
+               if (!is_badblock(mtd, mtd->erasesize * block, 1)) {
+                       /* Skip bad blocks */
+                       while (page < nand_page_per_block) {
+                               int curr_page = nand_page_per_block * block + page;
+
+                               if (mxs_read_page_ecc(mtd, page_buf, curr_page) < 0) {
                                        free(page_buf);
-                                       return -ENOMEM;
+                                       return -EIO;
                                }
+
+                               if (size > (mtd->writesize - page_offset))
+                                       sz = (mtd->writesize - page_offset);
+                               else
+                                       sz = size;
+
+                               memcpy(dst, page_buf + page_offset, sz);
+                               dst += sz;
+                               size -= sz;
+                               page_offset = 0;
+                               page++;
                        }
+
+                       page = 0;
+               } else {
+                       lastblock++;
                }
+
+               block++;
        }
 
        free(page_buf);
@@ -294,6 +289,19 @@ void nand_deselect(void)
 
 u32 nand_spl_adjust_offset(u32 sector, u32 offs)
 {
-       /* Handle the offset adjust in nand_spl_load_image,*/
+       unsigned int block, lastblock;
+
+       block = sector / mtd->erasesize;
+       lastblock = (sector + offs) / mtd->erasesize;
+
+       while (block <= lastblock) {
+               if (is_badblock(mtd, block * mtd->erasesize, 1)) {
+                       offs += mtd->erasesize;
+                       lastblock++;
+               }
+
+               block++;
+       }
+
        return offs;
 }
--
Quoted 2 lines

2.25.1

--
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
[email protected]
__________________________________

Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
[email protected]
www.amarulasolutions.com