From: <b35362@freescale.com> To: <dwmw2@infradead.org>, <linuxppc-dev@linux.freescale.net> Cc: Liu Shuo <b35362@freescale.com>, linuxppc-dev@ozlabs.org, linux-mtd@lists.infradead.org Subject: [PATCH] mtd-utils: fix corrupt cleanmarker with flash_erase -j command Date: Wed, 3 Aug 2011 13:50:38 +0800 [thread overview] Message-ID: <1312350638-25566-1-git-send-email-b35362@freescale.com> (raw) From: Liu Shuo <b35362@freescale.com> Flash_erase -j should fill discrete freeoob areas with required bytes of JFFS2 cleanmarker in jffs2_check_nand_cleanmarker(). Not just fill the first freeoob area. Signed-off-by: Liu Shuo <b35362@freescale.com> Signed-off-by: Li Yang <leoli@freescale.com> --- flash_erase.c | 41 +++++++++++++++++++++++++++++++++++------ 1 files changed, 35 insertions(+), 6 deletions(-) diff --git a/flash_erase.c b/flash_erase.c index fe2eaca..e6747fc 100644 --- a/flash_erase.c +++ b/flash_erase.c @@ -98,6 +98,7 @@ int main(int argc, char *argv[]) int isNAND; int error = 0; uint64_t offset = 0; + void *oob_data = NULL; /* * Process user arguments @@ -197,15 +198,40 @@ int main(int argc, char *argv[]) if (ioctl(fd, MEMGETOOBSEL, &oobinfo) != 0) return sys_errmsg("%s: unable to get NAND oobinfo", mtd_device); + cleanmarker.totlen = cpu_to_je32(8); /* Check for autoplacement */ if (oobinfo.useecc == MTD_NANDECC_AUTOPLACE) { + struct nand_ecclayout_user ecclayout; /* Get the position of the free bytes */ - if (!oobinfo.oobfree[0][1]) + if (ioctl(fd, ECCGETLAYOUT, &ecclayout) != 0) + return sys_errmsg("%s: unable to get NAND ecclayout", mtd_device); + + if (!ecclayout.oobavail) return errmsg(" Eeep. Autoplacement selected and no empty space in oob"); clmpos = oobinfo.oobfree[0][0]; - clmlen = oobinfo.oobfree[0][1]; - if (clmlen > 8) - clmlen = 8; + clmlen = MIN(ecclayout.oobavail, 8); + + if (oobinfo.oobfree[0][1] < 8 && ecclayout.oobavail >= 8) { + int i, left, n, last = 0; + void *cm; + + oob_data = malloc(mtd.oob_size); + if (!oob_data) + return -ENOMEM; + + memset(oob_data, 0xff, mtd.oob_size); + cm = &cleanmarker; + for (i = 0, left = clmlen; left ; i++) { + n = MIN(left, oobinfo.oobfree[i][1]); + memcpy(oob_data + oobinfo.oobfree[i][0], + cm, n); + left -= n; + cm += n; + last = oobinfo.oobfree[i][0] + n; + } + + clmlen = last - clmpos; + } } else { /* Legacy mode */ switch (mtd.oob_size) { @@ -223,7 +249,6 @@ int main(int argc, char *argv[]) break; } } - cleanmarker.totlen = cpu_to_je32(8); } cleanmarker.hdr_crc = cpu_to_je32(mtd_crc32(0, &cleanmarker, sizeof(cleanmarker) - 4)); } @@ -272,7 +297,8 @@ int main(int argc, char *argv[]) /* write cleanmarker */ if (isNAND) { - if (mtd_write_oob(mtd_desc, &mtd, fd, offset + clmpos, clmlen, &cleanmarker) != 0) { + void *data = oob_data ? oob_data + clmpos : &cleanmarker; + if (mtd_write_oob(mtd_desc, &mtd, fd, offset + clmpos, clmlen, data) != 0) { sys_errmsg("%s: MTD writeoob failure", mtd_device); continue; } @@ -291,5 +317,8 @@ int main(int argc, char *argv[]) show_progress(&mtd, offset, eb, eb_start, eb_cnt); bareverbose(!quiet, "\n"); + if (oob_data) + free(oob_data); + return 0; } -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: <b35362@freescale.com> To: <dwmw2@infradead.org>, <linuxppc-dev@linux.freescale.net> Cc: Liu Shuo <b35362@freescale.com>, linuxppc-dev@ozlabs.org, Li Yang <leoli@freescale.com>, linux-mtd@lists.infradead.org Subject: [PATCH] mtd-utils: fix corrupt cleanmarker with flash_erase -j command Date: Wed, 3 Aug 2011 13:50:38 +0800 [thread overview] Message-ID: <1312350638-25566-1-git-send-email-b35362@freescale.com> (raw) From: Liu Shuo <b35362@freescale.com> Flash_erase -j should fill discrete freeoob areas with required bytes of JFFS2 cleanmarker in jffs2_check_nand_cleanmarker(). Not just fill the first freeoob area. Signed-off-by: Liu Shuo <b35362@freescale.com> Signed-off-by: Li Yang <leoli@freescale.com> --- flash_erase.c | 41 +++++++++++++++++++++++++++++++++++------ 1 files changed, 35 insertions(+), 6 deletions(-) diff --git a/flash_erase.c b/flash_erase.c index fe2eaca..e6747fc 100644 --- a/flash_erase.c +++ b/flash_erase.c @@ -98,6 +98,7 @@ int main(int argc, char *argv[]) int isNAND; int error = 0; uint64_t offset = 0; + void *oob_data = NULL; /* * Process user arguments @@ -197,15 +198,40 @@ int main(int argc, char *argv[]) if (ioctl(fd, MEMGETOOBSEL, &oobinfo) != 0) return sys_errmsg("%s: unable to get NAND oobinfo", mtd_device); + cleanmarker.totlen = cpu_to_je32(8); /* Check for autoplacement */ if (oobinfo.useecc == MTD_NANDECC_AUTOPLACE) { + struct nand_ecclayout_user ecclayout; /* Get the position of the free bytes */ - if (!oobinfo.oobfree[0][1]) + if (ioctl(fd, ECCGETLAYOUT, &ecclayout) != 0) + return sys_errmsg("%s: unable to get NAND ecclayout", mtd_device); + + if (!ecclayout.oobavail) return errmsg(" Eeep. Autoplacement selected and no empty space in oob"); clmpos = oobinfo.oobfree[0][0]; - clmlen = oobinfo.oobfree[0][1]; - if (clmlen > 8) - clmlen = 8; + clmlen = MIN(ecclayout.oobavail, 8); + + if (oobinfo.oobfree[0][1] < 8 && ecclayout.oobavail >= 8) { + int i, left, n, last = 0; + void *cm; + + oob_data = malloc(mtd.oob_size); + if (!oob_data) + return -ENOMEM; + + memset(oob_data, 0xff, mtd.oob_size); + cm = &cleanmarker; + for (i = 0, left = clmlen; left ; i++) { + n = MIN(left, oobinfo.oobfree[i][1]); + memcpy(oob_data + oobinfo.oobfree[i][0], + cm, n); + left -= n; + cm += n; + last = oobinfo.oobfree[i][0] + n; + } + + clmlen = last - clmpos; + } } else { /* Legacy mode */ switch (mtd.oob_size) { @@ -223,7 +249,6 @@ int main(int argc, char *argv[]) break; } } - cleanmarker.totlen = cpu_to_je32(8); } cleanmarker.hdr_crc = cpu_to_je32(mtd_crc32(0, &cleanmarker, sizeof(cleanmarker) - 4)); } @@ -272,7 +297,8 @@ int main(int argc, char *argv[]) /* write cleanmarker */ if (isNAND) { - if (mtd_write_oob(mtd_desc, &mtd, fd, offset + clmpos, clmlen, &cleanmarker) != 0) { + void *data = oob_data ? oob_data + clmpos : &cleanmarker; + if (mtd_write_oob(mtd_desc, &mtd, fd, offset + clmpos, clmlen, data) != 0) { sys_errmsg("%s: MTD writeoob failure", mtd_device); continue; } @@ -291,5 +317,8 @@ int main(int argc, char *argv[]) show_progress(&mtd, offset, eb, eb_start, eb_cnt); bareverbose(!quiet, "\n"); + if (oob_data) + free(oob_data); + return 0; } -- 1.7.1
next reply other threads:[~2011-08-03 6:49 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-08-03 5:50 b35362 [this message] 2011-08-03 5:50 ` [PATCH] mtd-utils: fix corrupt cleanmarker with flash_erase -j command b35362 2011-08-16 15:06 ` Artem Bityutskiy 2011-08-16 15:06 ` Artem Bityutskiy 2011-08-16 19:42 ` Brian Norris 2011-08-16 19:42 ` Brian Norris 2011-08-17 7:35 ` LiuShuo 2011-08-17 7:35 ` LiuShuo 2011-08-17 7:39 ` Artem Bityutskiy 2011-08-17 7:39 ` Artem Bityutskiy 2011-08-18 1:20 ` Brian Norris 2011-08-18 1:20 ` Brian Norris 2011-08-08 8:16 b35362
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1312350638-25566-1-git-send-email-b35362@freescale.com \ --to=b35362@freescale.com \ --cc=dwmw2@infradead.org \ --cc=linux-mtd@lists.infradead.org \ --cc=linuxppc-dev@linux.freescale.net \ --cc=linuxppc-dev@ozlabs.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.