code.ossystems Code Review - openembedded-core.git/blob

   1 Upstream-Status: Pending
   2 From patchwork Mon Aug  8 08:16:43 2011
   3 Content-Type: text/plain; charset="utf-8"
   4 MIME-Version: 1.0
   5 Content-Transfer-Encoding: 7bit
   6 Subject: mtd-utils: fix corrupt cleanmarker with flash_erase -j command
   7 Date: Sun, 07 Aug 2011 22:16:43 -0000
   8 From: b35362@freescale.com
   9 X-Patchwork-Id: 108873
  10 Message-Id: <1312791403-13473-1-git-send-email-b35362@freescale.com>
  11 To: <dwmw2@infradead.org>
  12 Cc: Liu Shuo <b35362@freescale.com>, Artem.Bityutskiy@nokia.com,
  13  Li Yang <leoli@freescale.com>, linux-mtd@lists.infradead.org
  14
  15 From: Liu Shuo <b35362@freescale.com>
  16
  17 Flash_erase -j should fill discrete freeoob areas with required bytes
  18 of JFFS2 cleanmarker in jffs2_check_nand_cleanmarker(). Not just fill
  19 the first freeoob area.
  20
  21 The below is the result without this workaround:
  22
  23 JFFS2: Erase block at 0x00000000 is not formatted. It will be erased
  24 JFFS2: Erase block at 0x00004000 is not formatted. It will be erased
  25 JFFS2: Erase block at 0x00008000 is not formatted. It will be erased
  26 JFFS2: Erase block at 0x0000c000 is not formatted. It will be erased
  27 JFFS2: Erase block at 0x00010000 is not formatted. It will be erased
  28 JFFS2: Erase block at 0x00014000 is not formatted. It will be erased
  29 JFFS2: Erase block at 0x00018000 is not formatted. It will be erased
  30 JFFS2: Erase block at 0x0001c000 is not formatted. It will be erased
  31 JFFS2: Erase block at 0x00020000 is not formatted. It will be erased
  32 JFFS2: Erase block at 0x00024000 is not formatted. It will be erased
  33 JFFS2: Erase block at 0x00028000 is not formatted. It will be erased
  34 ...
  35
  36 Signed-off-by: Liu Shuo <b35362@freescale.com>
  37 Signed-off-by: Li Yang <leoli@freescale.com>
  38
  39 ---
  40 v2 : get length of availble freeoob bytes from oobinfo information,
  41       not use the ioctl ECCGETLAYOUT which is being deprecated.
  42
  43  flash_erase.c |   46 +++++++++++++++++++++++++++++++++++++++-------
  44  1 files changed, 39 insertions(+), 7 deletions(-)
  45
  46 diff --git a/flash_erase.c b/flash_erase.c
  47 index fe2eaca..3e94495 100644
  48 --- a/flash_erase.c
  49 +++ b/flash_erase.c
  50 @@ -98,6 +98,7 @@ int main(int argc, char *argv[])
  51         int isNAND;
  52         int error = 0;
  53         uint64_t offset = 0;
  54 +       void *oob_data = NULL;
  55
  56         /*
  57          * Process user arguments
  58 @@ -197,15 +198,43 @@ int main(int argc, char *argv[])
  59                         if (ioctl(fd, MEMGETOOBSEL, &oobinfo) != 0)
  60                                 return sys_errmsg("%s: unable to get NAND oobinfo", mtd_device);
  61
  62 +                       cleanmarker.totlen = cpu_to_je32(8);
  63                         /* Check for autoplacement */
  64                         if (oobinfo.useecc == MTD_NANDECC_AUTOPLACE) {
  65 -                               /* Get the position of the free bytes */
  66 -                               if (!oobinfo.oobfree[0][1])
  67 +                               struct nand_ecclayout_user ecclayout;
  68 +                               int i, oobavail;
  69 +
  70 +                               for (i = 0, oobavail = 0; oobinfo.oobfree[i][1]; i++)
  71 +                                       oobavail += oobinfo.oobfree[i][1];
  72 +
  73 +                               if (!oobavail)
  74                                         return errmsg(" Eeep. Autoplacement selected and no empty space in oob");
  75 +
  76 +                               /* Get the position of the free bytes */
  77                                 clmpos = oobinfo.oobfree[0][0];
  78 -                               clmlen = oobinfo.oobfree[0][1];
  79 -                               if (clmlen > 8)
  80 -                                       clmlen = 8;
  81 +                               clmlen = MIN(oobavail, 8);
  82 +
  83 +                               if (oobinfo.oobfree[0][1] < 8 && oobavail >= 8) {
  84 +                                       int left, n, last = 0;
  85 +                                       void *cm;
  86 +
  87 +                                       oob_data = malloc(mtd.oob_size);
  88 +                                       if (!oob_data)
  89 +                                               return -ENOMEM;
  90 +
  91 +                                       memset(oob_data, 0xff, mtd.oob_size);
  92 +                                       cm = &cleanmarker;
  93 +                                       for (i = 0, left = clmlen; left ; i++) {
  94 +                                               n = MIN(left, oobinfo.oobfree[i][1]);
  95 +                                               memcpy(oob_data + oobinfo.oobfree[i][0],
  96 +                                                               cm, n);
  97 +                                               left -= n;
  98 +                                               cm   += n;
  99 +                                               last = oobinfo.oobfree[i][0] + n;
 100 +                                       }
 101 +
 102 +                                       clmlen = last - clmpos;
 103 +                               }
 104                         } else {
 105                                 /* Legacy mode */
 106                                 switch (mtd.oob_size) {
 107 @@ -223,7 +252,6 @@ int main(int argc, char *argv[])
 108                                                 break;
 109                                 }
 110                         }
 111 -                       cleanmarker.totlen = cpu_to_je32(8);
 112                 }
 113                 cleanmarker.hdr_crc = cpu_to_je32(mtd_crc32(0, &cleanmarker, sizeof(cleanmarker) - 4));
 114         }
 115 @@ -272,7 +300,8 @@ int main(int argc, char *argv[])
 116
 117                 /* write cleanmarker */
 118                 if (isNAND) {
 119 -                       if (mtd_write_oob(mtd_desc, &mtd, fd, offset + clmpos, clmlen, &cleanmarker) != 0) {
 120 +                       void *data = oob_data ? oob_data + clmpos : &cleanmarker;
 121 +                       if (mtd_write_oob(mtd_desc, &mtd, fd, offset + clmpos, clmlen, data) != 0) {
 122                                 sys_errmsg("%s: MTD writeoob failure", mtd_device);
 123                                 continue;
 124                         }
 125 @@ -291,5 +320,8 @@ int main(int argc, char *argv[])
 126         show_progress(&mtd, offset, eb, eb_start, eb_cnt);
 127         bareverbose(!quiet, "\n");
 128
 129 +       if (oob_data)
 130 +               free(oob_data);
 131 +
 132         return 0;
 133  }