Fix OneNAND ipl to read CONFIG_SYS_MONITOR_LEN

[people/ms/u-boot.git] / onenand_ipl / onenand_read.c

diff --git a/onenand_ipl/onenand_read.c b/onenand_ipl/onenand_read.c
index f553220237604efcf6baf80fffd53ff4b46b68e8..d1a842dd67d4cd53b4fc0f40bc86c3f4b892b516 100644 (file)
--- a/onenand_ipl/onenand_read.c
+++ b/onenand_ipl/onenand_read.c
@@ -33,8 +33,13 @@
 #define onenand_buffer_address()               ((1 << 3) << 8)
 #define onenand_bufferram_address(block)       (0)
 
+#ifdef __HAVE_ARCH_MEMCPY32
+extern void *memcpy32(void *dest, void *src, int size);
+#endif
+
 /* read a page with ECC */
-static inline int onenand_read_page(ulong block, ulong page, u_char *buf)
+static inline int onenand_read_page(ulong block, ulong page,
+                               u_char * buf, int pagesize)
 {
        unsigned long *base;
 
@@ -44,34 +49,38 @@ static inline int onenand_read_page(ulong block, ulong page, u_char *buf)
 #endif
 
        onenand_writew(onenand_block_address(block),
-               THIS_ONENAND(ONENAND_REG_START_ADDRESS1));
+                       ONENAND_REG_START_ADDRESS1);
+
+       onenand_writew(onenand_bufferram_address(block),
+                       ONENAND_REG_START_ADDRESS2);
 
        onenand_writew(onenand_sector_address(page),
-               THIS_ONENAND(ONENAND_REG_START_ADDRESS8));
+                       ONENAND_REG_START_ADDRESS8);
 
        onenand_writew(onenand_buffer_address(),
-               THIS_ONENAND(ONENAND_REG_START_BUFFER));
-
-       onenand_writew(onenand_bufferram_address(block),
-               THIS_ONENAND(ONENAND_REG_START_ADDRESS2));
+                       ONENAND_REG_START_BUFFER);
 
-       onenand_writew(ONENAND_INT_CLEAR, THIS_ONENAND(ONENAND_REG_INTERRUPT));
+       onenand_writew(ONENAND_INT_CLEAR, ONENAND_REG_INTERRUPT);
 
-       onenand_writew(ONENAND_CMD_READ, THIS_ONENAND(ONENAND_REG_COMMAND));
+       onenand_writew(ONENAND_CMD_READ, ONENAND_REG_COMMAND);
 
 #ifndef __HAVE_ARCH_MEMCPY32
        p = (unsigned long *) buf;
 #endif
-       base = (unsigned long *) (CFG_ONENAND_BASE + ONENAND_DATARAM);
+       base = (unsigned long *) (CONFIG_SYS_ONENAND_BASE + ONENAND_DATARAM);
 
        while (!(READ_INTERRUPT() & ONENAND_INT_READ))
                continue;
 
+       /* Check for invalid block mark */
+       if (page < 2 && (onenand_readw(ONENAND_SPARERAM) != 0xffff))
+               return 1;
+
 #ifdef __HAVE_ARCH_MEMCPY32
        /* 32 bytes boundary memory copy */
-       memcpy32(buf, base, ONENAND_PAGE_SIZE);
+       memcpy32(buf, base, pagesize);
 #else
-       for (offset = 0; offset < (ONENAND_PAGE_SIZE >> 2); offset++) {
+       for (offset = 0; offset < (pagesize >> 2); offset++) {
                value = *(base + offset);
                *p++ = value;
        }
@@ -84,21 +93,43 @@ static inline int onenand_read_page(ulong block, ulong page, u_char *buf)
 #define ONENAND_PAGES_PER_BLOCK                64
 
 /**
- * onenand_read_block - Read a block data to buf
+ * onenand_read_block - Read CONFIG_SYS_MONITOR_LEN from begining
+ *                      of OneNAND, skipping bad blocks
  * @return 0 on success
  */
-int onenand_read_block(unsigned char *buf, ulong block)
+int onenand_read_block(unsigned char *buf)
 {
-       int page, offset = 0;
+       int block;
+       int page = ONENAND_START_PAGE, offset = 0;
+       int pagesize = 0, erase_shift = 0;
+       int erasesize = 0, nblocks = 0;
+
+       if (onenand_readw(ONENAND_REG_TECHNOLOGY)) {
+               pagesize = 4096; /* MLC OneNAND has 4KiB pagesize */
+               erase_shift = 18;
+       } else {
+               pagesize = 2048;
+               erase_shift = 17;
+       }
+
+       erasesize = ONENAND_PAGES_PER_BLOCK * pagesize;
+       nblocks = (CONFIG_SYS_MONITOR_LEN + erasesize - 1) >> erase_shift;
 
        /* NOTE: you must read page from page 1 of block 0 */
        /* read the block page by page*/
-       for (page = ONENAND_START_PAGE;
-           page < ONENAND_PAGES_PER_BLOCK; page++) {
-
-               onenand_read_page(block, page, buf + offset);
-
-               offset += ONENAND_PAGE_SIZE;
+       for (block = 0; block < nblocks; block++) {
+               for (; page < ONENAND_PAGES_PER_BLOCK; page++) {
+                       if (onenand_read_page(block, page, buf + offset,
+                                               pagesize)) {
+                               /* This block is bad. Skip it
+                                * and read next block */
+                               offset -= page * pagesize;
+                               nblocks++;
+                               break;
+                       }
+                       offset += pagesize;
+               }
+               page = 0;
        }
 
        return 0;