Re-enable fast reads in the Nano2G VFL/FTL. (Using the wrapper API in the NAND driver)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25175 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 46 insertions, 9 deletions

diff --git a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
index 4a90e66232..321495a321 100644
--- a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
+++ b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
@@ -863,18 +863,55 @@ uint32_t ftl_vfl_read_fast(uint32_t vpage, void* buffer, void* sparebuffer,
         panicf("FTL: Trying to read out-of-bounds vPage %u", (unsigned)vpage);
         //return 4;
 
+    uint32_t bank = abspage % ftl_banks;
+    uint32_t block = abspage / ((*ftl_nand_type).pagesperblock * ftl_banks);
+    uint32_t page = (abspage / ftl_banks) % (*ftl_nand_type).pagesperblock;
+    if (bank)
+    {
+        for (i = 0; i < ftl_banks; i++)
+        {
+            void* databuf = (void*)0;
+            void* sparebuf = (void*)0;
+            if (buffer) databuf = (void*)((uint32_t)buffer + 0x800 * i);
+            if (sparebuffer) sparebuf = (void*)((uint32_t)sparebuffer + 0x40 * i);
+            uint32_t ret = ftl_vfl_read(vpage + i, databuf, sparebuf, checkempty, remaponfail);
+            if (ret & 1) rc |= 1 << (i << 2);
+            if (ret & 2) rc |= 2 << (i << 2);
+            if (ret & 0x10) rc |= 4 << (i << 2);
+            if (ret & 0x100) rc |= 8 << (i << 2);
+        }
+        return rc;
+    }
+    uint32_t physblock = ftl_vfl_get_physical_block(bank, block);
+    uint32_t physpage = physblock * (*ftl_nand_type).pagesperblock + page;
+
+    rc = nand_read_page_fast(physpage, buffer, sparebuffer, 1, checkempty);
+    if (!(rc & 0xdddd)) return rc;
+
     for (i = 0; i < ftl_banks; i++)
     {
-        void* databuf = (void*)0;
-        void* sparebuf = (void*)0;
-        if (buffer) databuf = (void*)((uint32_t)buffer + 0x800 * i);
-        if (sparebuffer) sparebuf = (void*)((uint32_t)sparebuffer + 0x40 * i);
-        uint32_t ret = ftl_vfl_read(vpage + i, databuf, sparebuf, checkempty, remaponfail);
-        if (ret & 1) rc |= 1 << (i << 2);
-        if (ret & 2) rc |= 2 << (i << 2);
-        if (ret & 0x10) rc |= 4 << (i << 2);
-        if (ret & 0x100) rc |= 8 << (i << 2);
+        if ((rc >> (i << 2)) & 0x2) continue;
+        if ((rc >> (i << 2)) & 0xf)
+        {
+            rc &= ~(0xf << (i << 2));
+            nand_reset(i);
+            uint32_t ret = nand_read_page(i, physpage,
+                                          (void*)((uint32_t)buffer + 0x800 * i),
+                                          (void*)((uint32_t)sparebuffer + 0x40 * i),
+                                          1, checkempty);
+#ifdef FTL_READONLY
+            (void)remaponfail;
+#else
+            if (remaponfail == 1 && (ret & 0x11D) != 0 && (ret & 2) == 0)
+                ftl_vfl_schedule_block_for_remap(i, block);
+#endif
+            if (ret & 1) rc |= 1 << (i << 2);
+            if (ret & 2) rc |= 2 << (i << 2);
+            if (ret & 0x10) rc |= 4 << (i << 2);
+            if (ret & 0x100) rc |= 8 << (i << 2);
+        }
     }
+
     return rc;
 }