powerpc/mpc8xxx: move LAW code into arch/powerpc/cpu/mpc8xxx

[kernel/u-boot.git] / nand_spl / nand_boot_fsl_nfc.c

diff --git a/nand_spl/nand_boot_fsl_nfc.c b/nand_spl/nand_boot_fsl_nfc.c
index b90f93e..a40c998 100644 (file)
--- a/nand_spl/nand_boot_fsl_nfc.c
+++ b/nand_spl/nand_boot_fsl_nfc.c
@@ -47,7 +47,7 @@ static void nfc_wait_ready(void)
 
 static void nfc_nand_init(void)
 {
-#if defined(MXC_NFC_V1_1)
+#if defined(MXC_NFC_V2_1)
        int ecc_per_page = CONFIG_SYS_NAND_PAGE_SIZE / 512;
        int config1;
 
@@ -57,7 +57,8 @@ static void nfc_nand_init(void)
        writew(0x2, &nfc->config);
 
        /* hardware ECC checking and correct */
-       config1 = readw(&nfc->config1) | NFC_ECC_EN | NFC_FP_INT;
+       config1 = readw(&nfc->config1) | NFC_ECC_EN | NFC_INT_MSK |
+                       NFC_ONE_CYCLE | NFC_FP_INT;
        /*
         * if spare size is larger that 16 bytes per 512 byte hunk
         * then use 8 symbol correction instead of 4
@@ -72,7 +73,7 @@ static void nfc_nand_init(void)
        writew(0x2, &nfc->config);
 
        /* hardware ECC checking and correct */
-       writew(NFC_ECC_EN, &nfc->config1);
+       writew(NFC_ECC_EN | NFC_INT_MSK, &nfc->config1);
 #endif
 }
 
@@ -83,48 +84,43 @@ static void nfc_nand_command(unsigned short command)
        nfc_wait_ready();
 }
 
+static void nfc_nand_address(unsigned short address)
+{
+       writew(address, &nfc->flash_addr);
+       writew(NFC_ADDR, &nfc->config2);
+       nfc_wait_ready();
+}
+
 static void nfc_nand_page_address(unsigned int page_address)
 {
        unsigned int page_count;
 
-       writew(0x00, &nfc->flash_addr);
-       writew(NFC_ADDR, &nfc->config2);
-       nfc_wait_ready();
+       nfc_nand_address(0x00);
 
        /* code only for large page flash */
-       if (CONFIG_SYS_NAND_PAGE_SIZE > 512) {
-               writew(0x00, &nfc->flash_addr);
-               writew(NFC_ADDR, &nfc->config2);
-               nfc_wait_ready();
-       }
+       if (CONFIG_SYS_NAND_PAGE_SIZE > 512)
+               nfc_nand_address(0x00);
 
        page_count = CONFIG_SYS_NAND_SIZE / CONFIG_SYS_NAND_PAGE_SIZE;
 
        if (page_address <= page_count) {
                page_count--; /* transform 0x01000000 to 0x00ffffff */
                do {
-                       writew(page_address & 0xff, &nfc->flash_addr);
-                       writew(NFC_ADDR, &nfc->config2);
-                       nfc_wait_ready();
+                       nfc_nand_address(page_address & 0xff);
                        page_address = page_address >> 8;
                        page_count = page_count >> 8;
                } while (page_count);
        }
 
-       writew(0x00, &nfc->flash_addr);
-       writew(NFC_ADDR, &nfc->config2);
-       nfc_wait_ready();
+       nfc_nand_address(0x00);
 }
 
 static void nfc_nand_data_output(void)
 {
-       int config1 = readw(&nfc->config1);
 #ifdef NAND_MXC_2K_MULTI_CYCLE
        int i;
 #endif
 
-       config1 |= NFC_ECC_EN | NFC_INT_MSK;
-       writew(config1, &nfc->config1);
        writew(0, &nfc->buf_addr);
        writew(NFC_OUTPUT, &nfc->config2);
        nfc_wait_ready();
@@ -134,9 +130,6 @@ static void nfc_nand_data_output(void)
         * for pages larger than 512 bytes.
         */
        for (i = 1; i < CONFIG_SYS_NAND_PAGE_SIZE / 512; i++) {
-               config1 = readw(&nfc->config1);
-               config1 |= NFC_ECC_EN | NFC_INT_MSK;
-               writew(config1, &nfc->config1);
                writew(i, &nfc->buf_addr);
                writew(NFC_OUTPUT, &nfc->config2);
                nfc_wait_ready();
@@ -146,15 +139,27 @@ static void nfc_nand_data_output(void)
 
 static int nfc_nand_check_ecc(void)
 {
-       return readw(&nfc->ecc_status_result);
+#if defined(MXC_NFC_V1)
+       u16 ecc_status = readw(&nfc->ecc_status_result);
+       return (ecc_status & 0x3) == 2 || (ecc_status >> 2) == 2;
+#elif defined(MXC_NFC_V2_1)
+       u32 ecc_status = readl(&nfc->ecc_status_result);
+       int ecc_per_page = CONFIG_SYS_NAND_PAGE_SIZE / 512;
+       int err_limit = CONFIG_SYS_NAND_SPARE_SIZE / ecc_per_page > 16 ? 8 : 4;
+       int subpages = CONFIG_SYS_NAND_PAGE_SIZE / 512;
+
+       do {
+               if ((ecc_status & 0xf) > err_limit)
+                       return 1;
+               ecc_status >>= 4;
+       } while (--subpages);
+
+       return 0;
+#endif
 }
 
-static int nfc_read_page(unsigned int page_address, unsigned char *buf)
+static void nfc_nand_read_page(unsigned int page_address)
 {
-       int i;
-       u32 *src;
-       u32 *dst;
-
        writew(0, &nfc->buf_addr); /* read in first 0 buffer */
        nfc_nand_command(NAND_CMD_READ0);
        nfc_nand_page_address(page_address);
@@ -163,6 +168,15 @@ static int nfc_read_page(unsigned int page_address, unsigned char *buf)
                nfc_nand_command(NAND_CMD_READSTART);
 
        nfc_nand_data_output(); /* fill the main buffer 0 */
+}
+
+static int nfc_read_page(unsigned int page_address, unsigned char *buf)
+{
+       int i;
+       u32 *src;
+       u32 *dst;
+
+       nfc_nand_read_page(page_address);
 
        if (nfc_nand_check_ecc())
                return -1;
@@ -188,14 +202,7 @@ static int is_badblock(int pagenumber)
 
        /* Check the first two pages for bad block markers */
        for (page = pagenumber; page < pagenumber + 2; page++) {
-               writew(0, &nfc->buf_addr); /* read in first 0 buffer */
-               nfc_nand_command(NAND_CMD_READ0);
-               nfc_nand_page_address(page);
-
-               if (CONFIG_SYS_NAND_PAGE_SIZE > 512)
-                       nfc_nand_command(NAND_CMD_READSTART);
-
-               nfc_nand_data_output(); /* fill the main buffer 0 */
+               nfc_nand_read_page(page);
 
                src = (u32 *)&nfc->spare_area[0][0];