MAINTAINERS: fix Andreas Bießmann AVR32 entry

[karo-tx-uboot.git] / onenand_ipl / onenand_read.c

diff --git a/onenand_ipl/onenand_read.c b/onenand_ipl/onenand_read.c
index 6d04943ba1b5e2aad65a62bc8f5e4e944d7f9215..8d0df81af6362347667d649820b32a63f05e7dfa 100644 (file)
--- a/onenand_ipl/onenand_read.c
+++ b/onenand_ipl/onenand_read.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2005-2008 Samsung Electronis
+ * (C) Copyright 2005-2009 Samsung Electronics
  * Kyungmin Park <kyungmin.park@samsung.com>
  *
  * See file CREDITS for list of people who contributed to this
@@ -37,8 +37,10 @@
 extern void *memcpy32(void *dest, void *src, int size);
 #endif
 
+int (*onenand_read_page)(ulong block, ulong page, u_char *buf, int pagesize);
+
 /* read a page with ECC */
-static inline int onenand_read_page(ulong block, ulong page,
+static int generic_onenand_read_page(ulong block, ulong page,
                                u_char * buf, int pagesize)
 {
        unsigned long *base;
@@ -49,20 +51,20 @@ static inline int onenand_read_page(ulong block, ulong page,
 #endif
 
        onenand_writew(onenand_block_address(block),
-               THIS_ONENAND(ONENAND_REG_START_ADDRESS1));
+                       ONENAND_REG_START_ADDRESS1);
 
        onenand_writew(onenand_bufferram_address(block),
-               THIS_ONENAND(ONENAND_REG_START_ADDRESS2));
+                       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_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;
@@ -72,6 +74,10 @@ static inline int onenand_read_page(ulong block, ulong page,
        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, pagesize);
@@ -85,29 +91,67 @@ static inline int onenand_read_page(ulong block, ulong page,
        return 0;
 }
 
-#define ONENAND_START_PAGE             1
+#ifndef CONFIG_ONENAND_START_PAGE
+#define CONFIG_ONENAND_START_PAGE      1
+#endif
 #define ONENAND_PAGES_PER_BLOCK                64
 
+static void onenand_generic_init(int *page_is_4KiB, int *page)
+{
+       int dev_id, density;
+
+       if (onenand_readw(ONENAND_REG_TECHNOLOGY))
+               *page_is_4KiB = 1;
+       dev_id = onenand_readw(ONENAND_REG_DEVICE_ID);
+       density = dev_id >> ONENAND_DEVICE_DENSITY_SHIFT;
+       density &= ONENAND_DEVICE_DENSITY_MASK;
+       if (density >= ONENAND_DEVICE_DENSITY_4Gb &&
+           !(dev_id & ONENAND_DEVICE_IS_DDP))
+               *page_is_4KiB = 1;
+}
+
 /**
- * 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_block0(unsigned char *buf)
+int onenand_read_block(unsigned char *buf)
 {
-       int page, offset = 0;
-       int pagesize = ONENAND_PAGE_SIZE;
+       int block, nblocks;
+       int page = CONFIG_ONENAND_START_PAGE, offset = 0;
+       int pagesize, erasesize, erase_shift;
+       int page_is_4KiB = 0;
 
-       /* MLC OneNAND has 4KiB page size */
-       if (onenand_readw(THIS_ONENAND(ONENAND_REG_TECHNOLOGY)))
-               pagesize <<= 1;
+       onenand_read_page = generic_onenand_read_page;
 
-       /* 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_generic_init(&page_is_4KiB, &page);
+
+       if (page_is_4KiB) {
+               pagesize = 4096; /* OneNAND has 4KiB pagesize */
+               erase_shift = 18;
+       } else {
+               pagesize = 2048; /* OneNAND has 2KiB pagesize */
+               erase_shift = 17;
+       }
 
-               onenand_read_page(0, page, buf + offset, pagesize);
-               offset += pagesize;
+       erasesize = (1 << erase_shift);
+       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 (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;