]> git.sur5r.net Git - u-boot/blobdiff - nand_spl/nand_boot.c
nand_spl: Support page-aligned read in nand_load, use chipselect
[u-boot] / nand_spl / nand_boot.c
index 6e3af13939f18b5ffba6c5b7e3b53d07192988b0..16d128fc836182b5b552ed28a119ac80b6c8b736 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2006
+ * (C) Copyright 2006-2008
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
  *
  * This program is free software; you can redistribute it and/or
 
 #include <common.h>
 #include <nand.h>
+#include <asm/io.h>
 
 #define CFG_NAND_READ_DELAY \
        { volatile int dummy; int i; for (i=0; i<10000; i++) dummy = i; }
 
+static int nand_ecc_pos[] = CFG_NAND_ECCPOS;
+
 extern void board_nand_init(struct nand_chip *nand);
-extern void ndfc_hwcontrol(struct mtd_info *mtdinfo, int cmd);
-extern void ndfc_write_byte(struct mtd_info *mtdinfo, u_char byte);
-extern u_char ndfc_read_byte(struct mtd_info *mtdinfo);
-extern int ndfc_dev_ready(struct mtd_info *mtdinfo);
-extern int jump_to_ram(ulong delta);
-extern int jump_to_uboot(ulong addr);
 
-static int nand_is_bad_block(struct mtd_info *mtd, int block)
+#if (CFG_NAND_PAGE_SIZE <= 512)
+/*
+ * NAND command for small page NAND devices (512)
+ */
+static int nand_command(struct mtd_info *mtd, int block, int page, int offs, u8 cmd)
 {
-        struct nand_chip *this = mtd->priv;
-       int page_addr = block * CFG_NAND_PAGE_COUNT;
+       struct nand_chip *this = mtd->priv;
+       int page_addr = page + block * CFG_NAND_PAGE_COUNT;
+
+       if (this->dev_ready)
+               while (!this->dev_ready(mtd))
+                       ;
+       else
+               CFG_NAND_READ_DELAY;
 
        /* Begin command latch cycle */
-       this->hwcontrol(mtd, NAND_CTL_SETCLE);
-       this->write_byte(mtd, NAND_CMD_READOOB);
+       this->cmd_ctrl(mtd, cmd, NAND_CTRL_CLE | NAND_CTRL_CHANGE);
        /* Set ALE and clear CLE to start address cycle */
-       this->hwcontrol(mtd, NAND_CTL_CLRCLE);
-       this->hwcontrol(mtd, NAND_CTL_SETALE);
        /* Column address */
-       this->write_byte(mtd, CFG_NAND_BAD_BLOCK_POS);                  /* A[7:0] */
-       this->write_byte(mtd, (uchar)(page_addr & 0xff));               /* A[16:9] */
-       this->write_byte(mtd, (uchar)((page_addr >> 8) & 0xff));        /* A[24:17] */
+       this->cmd_ctrl(mtd, offs, NAND_CTRL_ALE | NAND_CTRL_CHANGE);
+       this->cmd_ctrl(mtd, page_addr & 0xff, 0); /* A[16:9] */
+       this->cmd_ctrl(mtd, (page_addr >> 8) & 0xff, 0); /* A[24:17] */
 #ifdef CFG_NAND_4_ADDR_CYCLE
        /* One more address cycle for devices > 32MiB */
-       this->write_byte(mtd, (uchar)((page_addr >> 16) & 0x0f));       /* A[xx:25] */
+       this->cmd_ctrl(mtd, (page_addr >> 16) & 0x0f, 0); /* A[28:25] */
 #endif
        /* Latch in address */
-       this->hwcontrol(mtd, NAND_CTL_CLRALE);
+       this->cmd_ctrl(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);
 
        /*
         * Wait a while for the data to be ready
         */
        if (this->dev_ready)
-               this->dev_ready(mtd);
+               while (!this->dev_ready(mtd))
+                       ;
        else
                CFG_NAND_READ_DELAY;
 
-       /*
-        * Read on byte
-        */
-       if (this->read_byte(mtd) != 0xff)
-               return 1;
-
        return 0;
 }
-
-static int nand_read_page(struct mtd_info *mtd, int block, int page, uchar *dst)
+#else
+/*
+ * NAND command for large page NAND devices (2k)
+ */
+static int nand_command(struct mtd_info *mtd, int block, int page, int offs, u8 cmd)
 {
-        struct nand_chip *this = mtd->priv;
+       struct nand_chip *this = mtd->priv;
        int page_addr = page + block * CFG_NAND_PAGE_COUNT;
-       int i;
+
+       if (this->dev_ready)
+               while (!this->dev_ready(mtd))
+                       ;
+       else
+               CFG_NAND_READ_DELAY;
+
+       /* Emulate NAND_CMD_READOOB */
+       if (cmd == NAND_CMD_READOOB) {
+               offs += CFG_NAND_PAGE_SIZE;
+               cmd = NAND_CMD_READ0;
+       }
 
        /* Begin command latch cycle */
-       this->hwcontrol(mtd, NAND_CTL_SETCLE);
-       this->write_byte(mtd, NAND_CMD_READ0);
+       this->cmd_ctrl(mtd, cmd, NAND_CTRL_CLE | NAND_CTRL_CHANGE);
        /* Set ALE and clear CLE to start address cycle */
-       this->hwcontrol(mtd, NAND_CTL_CLRCLE);
-       this->hwcontrol(mtd, NAND_CTL_SETALE);
        /* Column address */
-       this->write_byte(mtd, 0);                                       /* A[7:0] */
-       this->write_byte(mtd, (uchar)(page_addr & 0xff));               /* A[16:9] */
-       this->write_byte(mtd, (uchar)((page_addr >> 8) & 0xff));        /* A[24:17] */
-#ifdef CFG_NAND_4_ADDR_CYCLE
-       /* One more address cycle for devices > 32MiB */
-       this->write_byte(mtd, (uchar)((page_addr >> 16) & 0x0f));       /* A[xx:25] */
+       this->cmd_ctrl(mtd, offs & 0xff,
+                      NAND_CTRL_ALE | NAND_CTRL_CHANGE); /* A[7:0] */
+       this->cmd_ctrl(mtd, (offs >> 8) & 0xff, 0); /* A[11:9] */
+       /* Row address */
+       this->cmd_ctrl(mtd, (page_addr & 0xff), 0); /* A[19:12] */
+       this->cmd_ctrl(mtd, ((page_addr >> 8) & 0xff), 0); /* A[27:20] */
+#ifdef CFG_NAND_5_ADDR_CYCLE
+       /* One more address cycle for devices > 128MiB */
+       this->cmd_ctrl(mtd, (page_addr >> 16) & 0x0f, 0); /* A[31:28] */
 #endif
        /* Latch in address */
-       this->hwcontrol(mtd, NAND_CTL_CLRALE);
+       this->cmd_ctrl(mtd, NAND_CMD_READSTART,
+                      NAND_CTRL_CLE | NAND_CTRL_CHANGE);
+       this->cmd_ctrl(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);
 
        /*
         * Wait a while for the data to be ready
         */
        if (this->dev_ready)
-               this->dev_ready(mtd);
+               while (!this->dev_ready(mtd))
+                       ;
        else
                CFG_NAND_READ_DELAY;
 
+       return 0;
+}
+#endif
+
+static int nand_is_bad_block(struct mtd_info *mtd, int block)
+{
+       struct nand_chip *this = mtd->priv;
+
+       nand_command(mtd, block, 0, CFG_NAND_BAD_BLOCK_POS, NAND_CMD_READOOB);
+
        /*
-        * Read page into buffer
+        * Read one byte
         */
-       for (i=0; i<CFG_NAND_PAGE_SIZE; i++)
-               *dst++ = this->read_byte(mtd);
+       if (readb(this->IO_ADDR_R) != 0xff)
+               return 1;
 
        return 0;
 }
 
-static int nand_load(struct mtd_info *mtd, int offs, int uboot_size, uchar *dst)
+static int nand_read_page(struct mtd_info *mtd, int block, int page, uchar *dst)
 {
-       int block;
-       int blockcopy_count;
-       int page;
+       struct nand_chip *this = mtd->priv;
+       u_char *ecc_calc;
+       u_char *ecc_code;
+       u_char *oob_data;
+       int i;
+       int eccsize = CFG_NAND_ECCSIZE;
+       int eccbytes = CFG_NAND_ECCBYTES;
+       int eccsteps = CFG_NAND_ECCSTEPS;
+       uint8_t *p = dst;
+       int stat;
+
+       nand_command(mtd, block, page, 0, NAND_CMD_READ0);
+
+       /* No malloc available for now, just use some temporary locations
+        * in SDRAM
+        */
+       ecc_calc = (u_char *)(CFG_SDRAM_BASE + 0x10000);
+       ecc_code = ecc_calc + 0x100;
+       oob_data = ecc_calc + 0x200;
+
+       for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
+               this->ecc.hwctl(mtd, NAND_ECC_READ);
+               this->read_buf(mtd, p, eccsize);
+               this->ecc.calculate(mtd, p, &ecc_calc[i]);
+       }
+       this->read_buf(mtd, oob_data, CFG_NAND_OOBSIZE);
+
+       /* Pick the ECC bytes out of the oob data */
+       for (i = 0; i < CFG_NAND_ECCTOTAL; i++)
+               ecc_code[i] = oob_data[nand_ecc_pos[i]];
+
+       eccsteps = CFG_NAND_ECCSTEPS;
+       p = dst;
+
+       for (i = 0 ; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
+               /* No chance to do something with the possible error message
+                * from correct_data(). We just hope that all possible errors
+                * are corrected by this routine.
+                */
+               stat = this->ecc.correct(mtd, p, &ecc_code[i], &ecc_calc[i]);
+       }
+
+       return 0;
+}
+
+static int nand_load(struct mtd_info *mtd, unsigned int offs,
+                     unsigned int uboot_size, uchar *dst)
+{
+       unsigned int block, lastblock;
+       unsigned int page;
 
        /*
-        * offs has to be aligned to a block address!
+        * offs has to be aligned to a page address!
         */
        block = offs / CFG_NAND_BLOCK_SIZE;
-       blockcopy_count = 0;
+       lastblock = (offs + uboot_size - 1) / CFG_NAND_BLOCK_SIZE;
+       page = (offs % CFG_NAND_BLOCK_SIZE) / CFG_NAND_PAGE_SIZE;
 
-       while (blockcopy_count < (uboot_size / CFG_NAND_BLOCK_SIZE)) {
+       while (block <= lastblock) {
                if (!nand_is_bad_block(mtd, block)) {
                        /*
                         * Skip bad blocks
                         */
-                       for (page = 0; page < CFG_NAND_PAGE_COUNT; page++) {
+                       while (page < CFG_NAND_PAGE_COUNT) {
                                nand_read_page(mtd, block, page, dst);
                                dst += CFG_NAND_PAGE_SIZE;
+                               page++;
                        }
 
-                       blockcopy_count++;
+                       page = 0;
+               } else {
+                       lastblock++;
                }
 
                block++;
@@ -142,18 +219,17 @@ static int nand_load(struct mtd_info *mtd, int offs, int uboot_size, uchar *dst)
        return 0;
 }
 
+/*
+ * The main entry for NAND booting. It's necessary that SDRAM is already
+ * configured and available since this code loads the main U-Boot image
+ * from NAND into SDRAM and starts it from there.
+ */
 void nand_boot(void)
 {
-       ulong mem_size;
        struct nand_chip nand_chip;
        nand_info_t nand_info;
        int ret;
-       void (*uboot)(void);
-
-       /*
-        * Init sdram, so we have access to memory
-        */
-       mem_size = initdram(0);
+       __attribute__((noreturn)) void (*uboot)(void);
 
        /*
         * Init board specific nand support
@@ -163,16 +239,21 @@ void nand_boot(void)
        nand_chip.dev_ready = NULL;     /* preset to NULL */
        board_nand_init(&nand_chip);
 
+       if (nand_chip.select_chip)
+               nand_chip.select_chip(&nand_info, 0);
+
        /*
         * Load U-Boot image from NAND into RAM
         */
-       ret = nand_load(&nand_info, CFG_NAND_U_BOOT_OFFS,
-                       CFG_NAND_U_BOOT_SIZE,
+       ret = nand_load(&nand_info, CFG_NAND_U_BOOT_OFFS, CFG_NAND_U_BOOT_SIZE,
                        (uchar *)CFG_NAND_U_BOOT_DST);
 
+       if (nand_chip.select_chip)
+               nand_chip.select_chip(&nand_info, -1);
+
        /*
         * Jump to U-Boot image
         */
-       uboot = (void (*)(void))CFG_NAND_U_BOOT_START;
+       uboot = (void *)CFG_NAND_U_BOOT_START;
        (*uboot)();
 }