]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - fs/jffs2/jffs2_1pass.c
karo: tx51: init pad settings for SDRAM and NAND
[karo-tx-uboot.git] / fs / jffs2 / jffs2_1pass.c
index 30a6dba6e00f6c0026adcd3c48b9e8f89f0add24..c856983ef444bfb3292a5aa2efafdd18b489e3e5 100644 (file)
 #include <watchdog.h>
 #include <jffs2/jffs2.h>
 #include <jffs2/jffs2_1pass.h>
+#include <linux/compat.h>
+#include <asm/errno.h>
 
 #include "jffs2_private.h"
 
 # define DEBUGF(fmt,args...)
 #endif
 
+#include "summary.h"
+
 /* keeps pointer to currentlu processed partition */
 static struct part_info *current_part;
 
 #if (defined(CONFIG_JFFS2_NAND) && \
      defined(CONFIG_CMD_NAND) )
-#if defined(CONFIG_NAND_LEGACY)
-#include <linux/mtd/nand_legacy.h>
-#else
 #include <nand.h>
-#endif
 /*
  * Support for jffs2 on top of NAND-flash
  *
@@ -158,12 +158,6 @@ static struct part_info *current_part;
  *
  */
 
-#if defined(CONFIG_NAND_LEGACY)
-/* this one defined in nand_legacy.c */
-int read_jffs2_nand(size_t start, size_t len,
-               size_t * retlen, u_char * buf, int nanddev);
-#endif
-
 #define NAND_PAGE_SIZE 512
 #define NAND_PAGE_SHIFT 9
 #define NAND_PAGE_MASK (~(NAND_PAGE_SIZE-1))
@@ -198,15 +192,6 @@ static int read_nand_cached(u32 off, u32 size, u_char *buf)
                                }
                        }
 
-#if defined(CONFIG_NAND_LEGACY)
-                       if (read_jffs2_nand(nand_cache_off, NAND_CACHE_SIZE,
-                                               &retlen, nand_cache, id->num) < 0 ||
-                                       retlen != NAND_CACHE_SIZE) {
-                               printf("read_nand_cached: error reading nand off %#x size %d bytes\n",
-                                               nand_cache_off, NAND_CACHE_SIZE);
-                               return -1;
-                       }
-#else
                        retlen = NAND_CACHE_SIZE;
                        if (nand_read(&nand_info[id->num], nand_cache_off,
                                                &retlen, nand_cache) != 0 ||
@@ -215,7 +200,6 @@ static int read_nand_cached(u32 off, u32 size, u_char *buf)
                                                nand_cache_off, NAND_CACHE_SIZE);
                                return -1;
                        }
-#endif
                }
                cpy_bytes = nand_cache_off + NAND_CACHE_SIZE - (off + bytes_read);
                if (cpy_bytes > size - bytes_read)
@@ -245,7 +229,7 @@ static void *get_fl_mem_nand(u32 off, u32 size, void *ext_buf)
        return buf;
 }
 
-static void *get_node_mem_nand(u32 off)
+static void *get_node_mem_nand(u32 off, void *ext_buf)
 {
        struct jffs2_unknown_node node;
        void *ret = NULL;
@@ -255,7 +239,7 @@ static void *get_node_mem_nand(u32 off)
 
        if (!(ret = get_fl_mem_nand(off, node.magic ==
                               JFFS2_MAGIC_BITMASK ? node.totlen : sizeof(node),
-                              NULL))) {
+                              ext_buf))) {
                printf("off = %#x magic %#x type %#x node.totlen = %d\n",
                       off, node.magic, node.nodetype, node.totlen);
        }
@@ -344,7 +328,7 @@ static void *get_fl_mem_onenand(u32 off, u32 size, void *ext_buf)
        return buf;
 }
 
-static void *get_node_mem_onenand(u32 off)
+static void *get_node_mem_onenand(u32 off, void *ext_buf)
 {
        struct jffs2_unknown_node node;
        void *ret = NULL;
@@ -354,7 +338,7 @@ static void *get_node_mem_onenand(u32 off)
 
        ret = get_fl_mem_onenand(off, node.magic ==
                        JFFS2_MAGIC_BITMASK ? node.totlen : sizeof(node),
-                       NULL);
+                       ext_buf);
        if (!ret) {
                printf("off = %#x magic %#x type %#x node.totlen = %d\n",
                       off, node.magic, node.nodetype, node.totlen);
@@ -377,7 +361,7 @@ static void put_fl_mem_onenand(void *buf)
  * NOR flash memory is mapped in processor's address space,
  * just return address.
  */
-static inline void *get_fl_mem_nor(u32 off)
+static inline void *get_fl_mem_nor(u32 off, u32 size, void *ext_buf)
 {
        u32 addr = off;
        struct mtdids *id = current_part->dev->id;
@@ -386,18 +370,22 @@ static inline void *get_fl_mem_nor(u32 off)
        flash_info_t *flash = &flash_info[id->num];
 
        addr += flash->start[0];
+       if (ext_buf) {
+               memcpy(ext_buf, (void *)addr, size);
+               return ext_buf;
+       }
        return (void*)addr;
 }
 
-static inline void *get_fl_mem_nor_copy(u32 off, u32 size, void *ext_buf)
+static inline void *get_node_mem_nor(u32 off, void *ext_buf)
 {
-       memcpy(ext_buf, get_fl_mem_nor(off), size);
-       return ext_buf;
-}
+       struct jffs2_unknown_node *pNode;
 
-static inline void *get_node_mem_nor(u32 off)
-{
-       return (void*)get_fl_mem_nor(off);
+       /* pNode will point directly to flash - don't provide external buffer
+          and don't care about size */
+       pNode = get_fl_mem_nor(off, 0, NULL);
+       return (void *)get_fl_mem_nor(off, pNode->magic == JFFS2_MAGIC_BITMASK ?
+                       pNode->totlen : sizeof(*pNode), ext_buf);
 }
 #endif
 
@@ -410,56 +398,65 @@ static inline void *get_fl_mem(u32 off, u32 size, void *ext_buf)
 {
        struct mtdids *id = current_part->dev->id;
 
+       switch(id->type) {
 #if defined(CONFIG_CMD_FLASH)
-       if (id->type == MTD_DEV_TYPE_NOR) {
-               if (ext_buf)
-                       return get_fl_mem_nor_copy(off, size, ext_buf);
-               return get_fl_mem_nor(off);
-       }
+       case MTD_DEV_TYPE_NOR:
+               return get_fl_mem_nor(off, size, ext_buf);
+               break;
 #endif
-
 #if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
-       if (id->type == MTD_DEV_TYPE_NAND)
+       case MTD_DEV_TYPE_NAND:
                return get_fl_mem_nand(off, size, ext_buf);
+               break;
 #endif
-
 #if defined(CONFIG_CMD_ONENAND)
-       if (id->type == MTD_DEV_TYPE_ONENAND)
+       case MTD_DEV_TYPE_ONENAND:
                return get_fl_mem_onenand(off, size, ext_buf);
+               break;
 #endif
-
-       printf("get_fl_mem: unknown device type, using raw offset!\n");
+       default:
+               printf("get_fl_mem: unknown device type, " \
+                       "using raw offset!\n");
+       }
        return (void*)off;
 }
 
-static inline void *get_node_mem(u32 off)
+static inline void *get_node_mem(u32 off, void *ext_buf)
 {
        struct mtdids *id = current_part->dev->id;
 
+       switch(id->type) {
 #if defined(CONFIG_CMD_FLASH)
-       if (id->type == MTD_DEV_TYPE_NOR)
-               return get_node_mem_nor(off);
+       case MTD_DEV_TYPE_NOR:
+               return get_node_mem_nor(off, ext_buf);
+               break;
 #endif
-
 #if defined(CONFIG_JFFS2_NAND) && \
     defined(CONFIG_CMD_NAND)
-       if (id->type == MTD_DEV_TYPE_NAND)
-               return get_node_mem_nand(off);
+       case MTD_DEV_TYPE_NAND:
+               return get_node_mem_nand(off, ext_buf);
+               break;
 #endif
-
 #if defined(CONFIG_CMD_ONENAND)
-       if (id->type == MTD_DEV_TYPE_ONENAND)
-               return get_node_mem_onenand(off);
+       case MTD_DEV_TYPE_ONENAND:
+               return get_node_mem_onenand(off, ext_buf);
+               break;
 #endif
-
-       printf("get_node_mem: unknown device type, using raw offset!\n");
+       default:
+               printf("get_fl_mem: unknown device type, " \
+                       "using raw offset!\n");
+       }
        return (void*)off;
 }
 
-static inline void put_fl_mem(void *buf)
+static inline void put_fl_mem(void *buf, void *ext_buf)
 {
        struct mtdids *id = current_part->dev->id;
 
+       /* If buf is the same as ext_buf, it was provided by the caller -
+          we shouldn't free it then. */
+       if (buf == ext_buf)
+               return;
        switch (id->type) {
 #if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
        case MTD_DEV_TYPE_NAND:
@@ -481,9 +478,8 @@ static char *compr_names[] = {
        "COPY",
        "DYNRUBIN",
        "ZLIB",
-#if defined(CONFIG_JFFS2_LZO_LZARI)
+#if defined(CONFIG_JFFS2_LZO)
        "LZO",
-       "LZARI",
 #endif
 };
 
@@ -666,6 +662,7 @@ jffs2_free_cache(struct part_info *part)
                pL = (struct b_lists *)part->jffs2_priv;
                free_nodes(&pL->frag);
                free_nodes(&pL->dir);
+               free(pL->readbuf);
                free(pL);
        }
 }
@@ -699,7 +696,6 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
        u32 latestVersion = 0;
        uchar *lDest;
        uchar *src;
-       long ret;
        int i;
        u32 counter = 0;
 #ifdef CONFIG_SYS_JFFS2_SORT_FRAGMENTS
@@ -712,7 +708,7 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
         */
        for (b = pL->frag.listHead; b != NULL; b = b->next) {
                jNode = (struct jffs2_raw_inode *) get_fl_mem(b->offset,
-                       sizeof(struct jffs2_raw_inode), NULL);
+                       sizeof(struct jffs2_raw_inode), pL->readbuf);
                if ((inode == jNode->ino)) {
                        /* get actual file length from the newest node */
                        if (jNode->version >= latestVersion) {
@@ -720,12 +716,13 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
                                latestVersion = jNode->version;
                        }
                }
-               put_fl_mem(jNode);
+               put_fl_mem(jNode, pL->readbuf);
        }
 #endif
 
        for (b = pL->frag.listHead; b != NULL; b = b->next) {
-               jNode = (struct jffs2_raw_inode *) get_node_mem(b->offset);
+               jNode = (struct jffs2_raw_inode *) get_node_mem(b->offset,
+                                                               pL->readbuf);
                if ((inode == jNode->ino)) {
 #if 0
                        putLabeledWord("\r\n\r\nread_inode: totlen = ", jNode->totlen);
@@ -752,11 +749,14 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
                                src = ((uchar *) jNode) + sizeof(struct jffs2_raw_inode);
                                /* ignore data behind latest known EOF */
                                if (jNode->offset > totalSize) {
-                                       put_fl_mem(jNode);
+                                       put_fl_mem(jNode, pL->readbuf);
                                        continue;
                                }
-                               if (!data_crc(jNode)) {
-                                       put_fl_mem(jNode);
+                               if (b->datacrc == CRC_UNKNOWN)
+                                       b->datacrc = data_crc(jNode) ?
+                                               CRC_OK : CRC_BAD;
+                               if (b->datacrc == CRC_BAD) {
+                                       put_fl_mem(jNode, pL->readbuf);
                                        continue;
                                }
 
@@ -767,37 +767,31 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
 #endif
                                switch (jNode->compr) {
                                case JFFS2_COMPR_NONE:
-                                       ret = (unsigned long) ldr_memcpy(lDest, src, jNode->dsize);
+                                       ldr_memcpy(lDest, src, jNode->dsize);
                                        break;
                                case JFFS2_COMPR_ZERO:
-                                       ret = 0;
                                        for (i = 0; i < jNode->dsize; i++)
                                                *(lDest++) = 0;
                                        break;
                                case JFFS2_COMPR_RTIME:
-                                       ret = 0;
                                        rtime_decompress(src, lDest, jNode->csize, jNode->dsize);
                                        break;
                                case JFFS2_COMPR_DYNRUBIN:
                                        /* this is slow but it works */
-                                       ret = 0;
                                        dynrubin_decompress(src, lDest, jNode->csize, jNode->dsize);
                                        break;
                                case JFFS2_COMPR_ZLIB:
-                                       ret = zlib_decompress(src, lDest, jNode->csize, jNode->dsize);
+                                       zlib_decompress(src, lDest, jNode->csize, jNode->dsize);
                                        break;
-#if defined(CONFIG_JFFS2_LZO_LZARI)
+#if defined(CONFIG_JFFS2_LZO)
                                case JFFS2_COMPR_LZO:
-                                       ret = lzo_decompress(src, lDest, jNode->csize, jNode->dsize);
-                                       break;
-                               case JFFS2_COMPR_LZARI:
-                                       ret = lzari_decompress(src, lDest, jNode->csize, jNode->dsize);
+                                       lzo_decompress(src, lDest, jNode->csize, jNode->dsize);
                                        break;
 #endif
                                default:
                                        /* unknown */
-                                       putLabeledWord("UNKOWN COMPRESSION METHOD = ", jNode->compr);
-                                       put_fl_mem(jNode);
+                                       putLabeledWord("UNKNOWN COMPRESSION METHOD = ", jNode->compr);
+                                       put_fl_mem(jNode, pL->readbuf);
                                        return -1;
                                        break;
                                }
@@ -805,11 +799,10 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
 
 #if 0
                        putLabeledWord("read_inode: totalSize = ", totalSize);
-                       putLabeledWord("read_inode: compr ret = ", ret);
 #endif
                }
                counter++;
-               put_fl_mem(jNode);
+               put_fl_mem(jNode, pL->readbuf);
        }
 
 #if 0
@@ -835,12 +828,13 @@ jffs2_1pass_find_inode(struct b_lists * pL, const char *name, u32 pino)
        counter = 0;
        /* we need to search all and return the inode with the highest version */
        for(b = pL->dir.listHead; b; b = b->next, counter++) {
-               jDir = (struct jffs2_raw_dirent *) get_node_mem(b->offset);
+               jDir = (struct jffs2_raw_dirent *) get_node_mem(b->offset,
+                                                               pL->readbuf);
                if ((pino == jDir->pino) && (len == jDir->nsize) &&
                    (jDir->ino) &&      /* 0 for unlink */
                    (!strncmp((char *)jDir->name, name, len))) {        /* a match */
                        if (jDir->version < version) {
-                               put_fl_mem(jDir);
+                               put_fl_mem(jDir, pL->readbuf);
                                continue;
                        }
 
@@ -862,7 +856,7 @@ jffs2_1pass_find_inode(struct b_lists * pL, const char *name, u32 pino)
                putLabeledWord("b = ", (u32) b);
                putLabeledWord("counter = ", counter);
 #endif
-               put_fl_mem(jDir);
+               put_fl_mem(jDir, pL->readbuf);
        }
        return inode;
 }
@@ -956,7 +950,8 @@ jffs2_1pass_list_inodes(struct b_lists * pL, u32 pino)
        struct jffs2_raw_dirent *jDir;
 
        for (b = pL->dir.listHead; b; b = b->next) {
-               jDir = (struct jffs2_raw_dirent *) get_node_mem(b->offset);
+               jDir = (struct jffs2_raw_dirent *) get_node_mem(b->offset,
+                                                               pL->readbuf);
                if ((pino == jDir->pino) && (jDir->ino)) { /* ino=0 -> unlink */
                        u32 i_version = 0;
                        struct jffs2_raw_inode ojNode;
@@ -969,20 +964,23 @@ jffs2_1pass_list_inodes(struct b_lists * pL, u32 pino)
                                if (jNode->ino == jDir->ino && jNode->version >= i_version) {
                                        i_version = jNode->version;
                                        if (i)
-                                               put_fl_mem(i);
+                                               put_fl_mem(i, NULL);
 
                                        if (jDir->type == DT_LNK)
-                                               i = get_node_mem(b2->offset);
+                                               i = get_node_mem(b2->offset,
+                                                                NULL);
                                        else
-                                               i = get_fl_mem(b2->offset, sizeof(*i), NULL);
+                                               i = get_fl_mem(b2->offset,
+                                                              sizeof(*i),
+                                                              NULL);
                                }
                                b2 = b2->next;
                        }
 
                        dump_inode(pL, jDir, i);
-                       put_fl_mem(i);
+                       put_fl_mem(i, NULL);
                }
-               put_fl_mem(jDir);
+               put_fl_mem(jDir, pL->readbuf);
        }
        return pino;
 }
@@ -1060,10 +1058,11 @@ jffs2_1pass_resolve_inode(struct b_lists * pL, u32 ino)
 
        /* we need to search all and return the inode with the highest version */
        for(b = pL->dir.listHead; b; b = b->next) {
-               jDir = (struct jffs2_raw_dirent *) get_node_mem(b->offset);
+               jDir = (struct jffs2_raw_dirent *) get_node_mem(b->offset,
+                                                               pL->readbuf);
                if (ino == jDir->ino) {
                        if (jDir->version < version) {
-                               put_fl_mem(jDir);
+                               put_fl_mem(jDir, pL->readbuf);
                                continue;
                        }
 
@@ -1080,7 +1079,7 @@ jffs2_1pass_resolve_inode(struct b_lists * pL, u32 ino)
                        jDirFoundPino = jDir->pino;
                        version = jDir->version;
                }
-               put_fl_mem(jDir);
+               put_fl_mem(jDir, pL->readbuf);
        }
        /* now we found the right entry again. (shoulda returned inode*) */
        if (jDirFoundType != DT_LNK)
@@ -1089,7 +1088,8 @@ jffs2_1pass_resolve_inode(struct b_lists * pL, u32 ino)
        /* it's a soft link so we follow it again. */
        b2 = pL->frag.listHead;
        while (b2) {
-               jNode = (struct jffs2_raw_inode *) get_node_mem(b2->offset);
+               jNode = (struct jffs2_raw_inode *) get_node_mem(b2->offset,
+                                                               pL->readbuf);
                if (jNode->ino == jDirFoundIno) {
                        src = (unsigned char *)jNode + sizeof(struct jffs2_raw_inode);
 
@@ -1101,11 +1101,11 @@ jffs2_1pass_resolve_inode(struct b_lists * pL, u32 ino)
 #endif
                        strncpy(tmp, (char *)src, jNode->dsize);
                        tmp[jNode->dsize] = '\0';
-                       put_fl_mem(jNode);
+                       put_fl_mem(jNode, pL->readbuf);
                        break;
                }
                b2 = b2->next;
-               put_fl_mem(jNode);
+               put_fl_mem(jNode, pL->readbuf);
        }
        /* ok so the name of the new file to find is in tmp */
        /* if it starts with a slash it is root based else shared dirs */
@@ -1199,6 +1199,167 @@ jffs2_1pass_rescan_needed(struct part_info *part)
        return 0;
 }
 
+#ifdef CONFIG_JFFS2_SUMMARY
+static u32 sum_get_unaligned32(u32 *ptr)
+{
+       u32 val;
+       u8 *p = (u8 *)ptr;
+
+       val = *p | (*(p + 1) << 8) | (*(p + 2) << 16) | (*(p + 3) << 24);
+
+       return __le32_to_cpu(val);
+}
+
+static u16 sum_get_unaligned16(u16 *ptr)
+{
+       u16 val;
+       u8 *p = (u8 *)ptr;
+
+       val = *p | (*(p + 1) << 8);
+
+       return __le16_to_cpu(val);
+}
+
+#define dbg_summary(...) do {} while (0);
+/*
+ * Process the stored summary information - helper function for
+ * jffs2_sum_scan_sumnode()
+ */
+
+static int jffs2_sum_process_sum_data(struct part_info *part, uint32_t offset,
+                               struct jffs2_raw_summary *summary,
+                               struct b_lists *pL)
+{
+       void *sp;
+       int i, pass;
+       void *ret;
+
+       for (pass = 0; pass < 2; pass++) {
+               sp = summary->sum;
+
+               for (i = 0; i < summary->sum_num; i++) {
+                       struct jffs2_sum_unknown_flash *spu = sp;
+                       dbg_summary("processing summary index %d\n", i);
+
+                       switch (sum_get_unaligned16(&spu->nodetype)) {
+                               case JFFS2_NODETYPE_INODE: {
+                               struct jffs2_sum_inode_flash *spi;
+                                       if (pass) {
+                                               spi = sp;
+
+                                               ret = insert_node(&pL->frag,
+                                                       (u32)part->offset +
+                                                       offset +
+                                                       sum_get_unaligned32(
+                                                               &spi->offset));
+                                               if (ret == NULL)
+                                                       return -1;
+                                       }
+
+                                       sp += JFFS2_SUMMARY_INODE_SIZE;
+
+                                       break;
+                               }
+                               case JFFS2_NODETYPE_DIRENT: {
+                                       struct jffs2_sum_dirent_flash *spd;
+                                       spd = sp;
+                                       if (pass) {
+                                               ret = insert_node(&pL->dir,
+                                                       (u32) part->offset +
+                                                       offset +
+                                                       sum_get_unaligned32(
+                                                               &spd->offset));
+                                               if (ret == NULL)
+                                                       return -1;
+                                       }
+
+                                       sp += JFFS2_SUMMARY_DIRENT_SIZE(
+                                                       spd->nsize);
+
+                                       break;
+                               }
+                               default : {
+                                       uint16_t nodetype = sum_get_unaligned16(
+                                                               &spu->nodetype);
+                                       printf("Unsupported node type %x found"
+                                                       " in summary!\n",
+                                                       nodetype);
+                                       if ((nodetype & JFFS2_COMPAT_MASK) ==
+                                                       JFFS2_FEATURE_INCOMPAT)
+                                               return -EIO;
+                                       return -EBADMSG;
+                               }
+                       }
+               }
+       }
+       return 0;
+}
+
+/* Process the summary node - called from jffs2_scan_eraseblock() */
+int jffs2_sum_scan_sumnode(struct part_info *part, uint32_t offset,
+                          struct jffs2_raw_summary *summary, uint32_t sumsize,
+                          struct b_lists *pL)
+{
+       struct jffs2_unknown_node crcnode;
+       int ret, ofs;
+       uint32_t crc;
+
+       ofs = part->sector_size - sumsize;
+
+       dbg_summary("summary found for 0x%08x at 0x%08x (0x%x bytes)\n",
+                   offset, offset + ofs, sumsize);
+
+       /* OK, now check for node validity and CRC */
+       crcnode.magic = JFFS2_MAGIC_BITMASK;
+       crcnode.nodetype = JFFS2_NODETYPE_SUMMARY;
+       crcnode.totlen = summary->totlen;
+       crc = crc32_no_comp(0, (uchar *)&crcnode, sizeof(crcnode)-4);
+
+       if (summary->hdr_crc != crc) {
+               dbg_summary("Summary node header is corrupt (bad CRC or "
+                               "no summary at all)\n");
+               goto crc_err;
+       }
+
+       if (summary->totlen != sumsize) {
+               dbg_summary("Summary node is corrupt (wrong erasesize?)\n");
+               goto crc_err;
+       }
+
+       crc = crc32_no_comp(0, (uchar *)summary,
+                       sizeof(struct jffs2_raw_summary)-8);
+
+       if (summary->node_crc != crc) {
+               dbg_summary("Summary node is corrupt (bad CRC)\n");
+               goto crc_err;
+       }
+
+       crc = crc32_no_comp(0, (uchar *)summary->sum,
+                       sumsize - sizeof(struct jffs2_raw_summary));
+
+       if (summary->sum_crc != crc) {
+               dbg_summary("Summary node data is corrupt (bad CRC)\n");
+               goto crc_err;
+       }
+
+       if (summary->cln_mkr)
+               dbg_summary("Summary : CLEANMARKER node \n");
+
+       ret = jffs2_sum_process_sum_data(part, offset, summary, pL);
+       if (ret == -EBADMSG)
+               return 0;
+       if (ret)
+               return ret;             /* real error */
+
+       return 1;
+
+crc_err:
+       putstr("Summary node crc error, skipping summary information.\n");
+
+       return 0;
+}
+#endif /* CONFIG_JFFS2_SUMMARY */
+
 #ifdef DEBUG_FRAGMENTS
 static void
 dump_fragments(struct b_lists *pL)
@@ -1240,7 +1401,8 @@ dump_dirents(struct b_lists *pL)
        putstr("\r\n\r\n******The directory Entries******\r\n");
        b = pL->dir.listHead;
        while (b) {
-               jDir = (struct jffs2_raw_dirent *) get_node_mem(b->offset);
+               jDir = (struct jffs2_raw_dirent *) get_node_mem(b->offset,
+                                                               pL->readbuf);
                putstr("\r\n");
                putnstr(jDir->name, jDir->nsize);
                putLabeledWord("\r\n\tbuild_list: magic = ", jDir->magic);
@@ -1256,16 +1418,11 @@ dump_dirents(struct b_lists *pL)
                putLabeledWord("\tbuild_list: name_crc = ", jDir->name_crc);
                putLabeledWord("\tbuild_list: offset = ", b->offset);   /* FIXME: ? [RS] */
                b = b->next;
-               put_fl_mem(jDir);
+               put_fl_mem(jDir, pL->readbuf);
        }
 }
 #endif
 
-#define min_t(type, x, y) ({                    \
-       type __min1 = (x);                      \
-       type __min2 = (y);                      \
-       __min1 < __min2 ? __min1: __min2; })
-
 #define DEFAULT_EMPTY_SCAN_SIZE        4096
 
 static inline uint32_t EMPTY_SCAN_SIZE(uint32_t sector_size)
@@ -1286,6 +1443,7 @@ jffs2_1pass_build_lists(struct part_info * part)
        u32 counter4 = 0;
        u32 counterF = 0;
        u32 counterN = 0;
+       u32 max_totlen = 0;
        u32 buf_size = DEFAULT_EMPTY_SCAN_SIZE;
        char *buf;
 
@@ -1304,10 +1462,74 @@ jffs2_1pass_build_lists(struct part_info * part)
        for (i = 0; i < nr_sectors; i++) {
                uint32_t sector_ofs = i * part->sector_size;
                uint32_t buf_ofs = sector_ofs;
-               uint32_t buf_len = EMPTY_SCAN_SIZE(part->sector_size);
+               uint32_t buf_len;
                uint32_t ofs, prevofs;
+#ifdef CONFIG_JFFS2_SUMMARY
+               struct jffs2_sum_marker *sm;
+               void *sumptr = NULL;
+               uint32_t sumlen;
+               int ret;
+#endif
 
                WATCHDOG_RESET();
+
+#ifdef CONFIG_JFFS2_SUMMARY
+               buf_len = sizeof(*sm);
+
+               /* Read as much as we want into the _end_ of the preallocated
+                * buffer
+                */
+               get_fl_mem(part->offset + sector_ofs + part->sector_size -
+                               buf_len, buf_len, buf + buf_size - buf_len);
+
+               sm = (void *)buf + buf_size - sizeof(*sm);
+               if (sm->magic == JFFS2_SUM_MAGIC) {
+                       sumlen = part->sector_size - sm->offset;
+                       sumptr = buf + buf_size - sumlen;
+
+                       /* Now, make sure the summary itself is available */
+                       if (sumlen > buf_size) {
+                               /* Need to kmalloc for this. */
+                               sumptr = malloc(sumlen);
+                               if (!sumptr) {
+                                       putstr("Can't get memory for summary "
+                                                       "node!\n");
+                                       free(buf);
+                                       jffs2_free_cache(part);
+                                       return 0;
+                               }
+                               memcpy(sumptr + sumlen - buf_len, buf +
+                                               buf_size - buf_len, buf_len);
+                       }
+                       if (buf_len < sumlen) {
+                               /* Need to read more so that the entire summary
+                                * node is present
+                                */
+                               get_fl_mem(part->offset + sector_ofs +
+                                               part->sector_size - sumlen,
+                                               sumlen - buf_len, sumptr);
+                       }
+               }
+
+               if (sumptr) {
+                       ret = jffs2_sum_scan_sumnode(part, sector_ofs, sumptr,
+                                       sumlen, pL);
+
+                       if (buf_size && sumlen > buf_size)
+                               free(sumptr);
+                       if (ret < 0) {
+                               free(buf);
+                               jffs2_free_cache(part);
+                               return 0;
+                       }
+                       if (ret)
+                               continue;
+
+               }
+#endif /* CONFIG_JFFS2_SUMMARY */
+
+               buf_len = EMPTY_SCAN_SIZE(part->sector_size);
+
                get_fl_mem((u32)part->offset + buf_ofs, buf_len, buf);
 
                /* We temporarily use 'ofs' as a pointer into the buffer/jeb */
@@ -1348,9 +1570,8 @@ jffs2_1pass_build_lists(struct part_info * part)
 
                        if (*(uint32_t *)(&buf[ofs-buf_ofs]) == 0xffffffff) {
                                uint32_t inbuf_ofs;
-                               uint32_t empty_start, scan_end;
+                               uint32_t scan_end;
 
-                               empty_start = ofs;
                                ofs += 4;
                                scan_end = min_t(uint32_t, EMPTY_SCAN_SIZE(
                                                        part->sector_size)/8,
@@ -1413,8 +1634,13 @@ jffs2_1pass_build_lists(struct part_info * part)
                                       break;
 
                                if (insert_node(&pL->frag, (u32) part->offset +
-                                               ofs) == NULL)
+                                               ofs) == NULL) {
+                                       free(buf);
+                                       jffs2_free_cache(part);
                                        return 0;
+                               }
+                               if (max_totlen < node->totlen)
+                                       max_totlen = node->totlen;
                                break;
                        case JFFS2_NODETYPE_DIRENT:
                                if (buf_ofs + buf_len < ofs + sizeof(struct
@@ -1438,8 +1664,13 @@ jffs2_1pass_build_lists(struct part_info * part)
                                if (! (counterN%100))
                                        puts ("\b\b.  ");
                                if (insert_node(&pL->dir, (u32) part->offset +
-                                               ofs) == NULL)
+                                               ofs) == NULL) {
+                                       free(buf);
+                                       jffs2_free_cache(part);
                                        return 0;
+                               }
+                               if (max_totlen < node->totlen)
+                                       max_totlen = node->totlen;
                                counterN++;
                                break;
                        case JFFS2_NODETYPE_CLEANMARKER:
@@ -1456,6 +1687,8 @@ jffs2_1pass_build_lists(struct part_info * part)
                                                node->totlen,
                                                sizeof(struct jffs2_unknown_node));
                                break;
+                       case JFFS2_NODETYPE_SUMMARY:
+                               break;
                        default:
                                printf("Unknown node type: %x len %d offset 0x%x\n",
                                        node->nodetype,
@@ -1468,6 +1701,13 @@ jffs2_1pass_build_lists(struct part_info * part)
 
        free(buf);
        putstr("\b\b done.\r\n");               /* close off the dots */
+
+       /* We don't care if malloc failed - then each read operation will
+        * allocate its own buffer as necessary (NAND) or will read directly
+        * from flash (NOR).
+        */
+       pL->readbuf = malloc(max_totlen);
+
        /* turn the lcd back on. */
        /* splash(); */