Revert "nrf nvm: touchups to nickzoic PR #1768"

2 files changed, 74 insertions, 15 deletions

diff --git a/ports/nrf/supervisor/internal_flash.c b/ports/nrf/supervisor/internal_flash.c
index 5713dea88..c18b708a3 100644
--- a/ports/nrf/supervisor/internal_flash.c
+++ b/ports/nrf/supervisor/internal_flash.c
@@ -35,7 +35,7 @@
 #include "py/runtime.h"
 #include "lib/oofatfs/ff.h"
 
-#include "peripherals/nrf/nvm.h"
+#include "nrf_nvmc.h"
 
 #ifdef BLUETOOTH_SD
 #include "ble_drv.h"
@@ -47,8 +47,9 @@ extern uint32_t __fatfs_flash_start_addr[];
 extern uint32_t __fatfs_flash_length[];
 
 #define NO_CACHE        0xffffffff
+#define FL_PAGE_SZ      4096
 
-uint8_t  _flash_cache[FLASH_PAGE_SIZE] __attribute__((aligned(4)));
+uint8_t  _flash_cache[FL_PAGE_SZ] __attribute__((aligned(4)));
 uint32_t _flash_page_addr = NO_CACHE;
 
 
@@ -67,22 +68,81 @@ uint32_t supervisor_flash_get_block_size(void) {
 }
 
 uint32_t supervisor_flash_get_block_count(void) {
-    return ((uint32_t) __fatfs_flash_length - CIRCUITPY_INTERNAL_NVM_SIZE) / FILESYSTEM_BLOCK_SIZE ;
+    return ((uint32_t) __fatfs_flash_length) / FILESYSTEM_BLOCK_SIZE ;
 }
 
+#ifdef BLUETOOTH_SD
+STATIC void sd_flash_operation_start(void) {
+    sd_flash_operation_status = SD_FLASH_OPERATION_IN_PROGRESS;
+}
+
+STATIC sd_flash_operation_status_t sd_flash_operation_wait_until_done(void) {
+    while (sd_flash_operation_status == SD_FLASH_OPERATION_IN_PROGRESS) {
+        sd_app_evt_wait();
+    }
+    return sd_flash_operation_status;
+}
+#endif
+
 void supervisor_flash_flush(void) {
     if (_flash_page_addr == NO_CACHE) return;
 
     // Skip if data is the same
-    if (memcmp(_flash_cache, (void *)_flash_page_addr, FLASH_PAGE_SIZE) != 0) {
-        nrf_nvm_safe_flash_page_write(_flash_page_addr, _flash_cache);
+    if (memcmp(_flash_cache, (void *)_flash_page_addr, FL_PAGE_SZ) != 0) {
+
+#ifdef BLUETOOTH_SD
+        uint8_t sd_en = 0;
+        (void) sd_softdevice_is_enabled(&sd_en);
+
+        if (sd_en) {
+            uint32_t err_code;
+            sd_flash_operation_status_t status;
+
+            sd_flash_operation_start();
+            err_code = sd_flash_page_erase(_flash_page_addr / FL_PAGE_SZ);
+            if (err_code != NRF_SUCCESS) {
+                mp_raise_OSError_msg_varg(translate("Flash erase failed to start, err 0x%04x"), err_code);
+            }
+            status = sd_flash_operation_wait_until_done();
+            if (status == SD_FLASH_OPERATION_ERROR) {
+                mp_raise_OSError_msg(translate("Flash erase failed"));
+            }
+
+            // Divide a full page into parts, because writing a full page causes an assertion failure.
+            // See https://devzone.nordicsemi.com/f/nordic-q-a/40088/sd_flash_write-cause-nrf_fault_id_sd_assert/
+            const size_t BLOCK_PARTS = 2;
+            size_t words_to_write = FL_PAGE_SZ / sizeof(uint32_t) / BLOCK_PARTS;
+            for (size_t i = 0; i < BLOCK_PARTS; i++) {
+                sd_flash_operation_start();
+                err_code = sd_flash_write(((uint32_t *)_flash_page_addr) + i * words_to_write,
+                                          (uint32_t *)_flash_cache + i * words_to_write,
+                                          words_to_write);
+                if (err_code != NRF_SUCCESS) {
+                    mp_raise_OSError_msg_varg(translate("Flash write failed to start, err 0x%04x"), err_code);
+                }
+                status = sd_flash_operation_wait_until_done();
+                if (status == SD_FLASH_OPERATION_ERROR) {
+                    mp_raise_OSError_msg(translate("Flash write failed"));
+                }
+            }
+        } else {
+#endif
+            nrf_nvmc_page_erase(_flash_page_addr);
+            nrf_nvmc_write_words(_flash_page_addr, (uint32_t *)_flash_cache, FL_PAGE_SZ / sizeof(uint32_t));
+#ifdef BLUETOOTH_SD
+        }
+#endif
+
     }
+    _flash_page_addr = NO_CACHE;
+}
+
+void supervisor_flash_release_cache(void) {
 }
 
 mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t num_blocks) {
     // Must write out anything in cache before trying to read.
     supervisor_flash_flush();
-
     uint32_t src = lba2addr(block);
     memcpy(dest, (uint8_t*) src, FILESYSTEM_BLOCK_SIZE*num_blocks);
     return 0; // success
@@ -91,21 +151,21 @@ mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t n
 mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32_t num_blocks) {
     while (num_blocks) {
         uint32_t const addr      = lba2addr(lba);
-        uint32_t const page_addr = addr & ~(FLASH_PAGE_SIZE - 1);
+        uint32_t const page_addr = addr & ~(FL_PAGE_SZ - 1);
 
         uint32_t count = 8 - (lba % 8); // up to page boundary
         count = MIN(num_blocks, count);
 
         if (page_addr != _flash_page_addr) {
-            nrf_nvm_safe_flash_page_write(_flash_page_addr, _flash_cache);
-            _flash_page_addr = page_addr;
+            supervisor_flash_flush();
 
+            _flash_page_addr = page_addr;
             // Copy the current contents of the entire page into the cache.
-            memcpy(_flash_cache, (void *)page_addr, FLASH_PAGE_SIZE);
+            memcpy(_flash_cache, (void *)page_addr, FL_PAGE_SZ);
         }
 
         // Overwrite part or all of the page cache with the src data.
-        memcpy(_flash_cache + (addr & (FLASH_PAGE_SIZE - 1)), src, count * FILESYSTEM_BLOCK_SIZE);
+        memcpy(_flash_cache + (addr & (FL_PAGE_SZ - 1)), src, count * FILESYSTEM_BLOCK_SIZE);
 
         // adjust for next run
         lba        += count;
@@ -115,7 +175,3 @@ mp_uint_t supervisor_flash_write_blocks(const uint8_t *src, uint32_t lba, uint32
 
     return 0; // success
 }
-
-void supervisor_flash_release_cache(void) {
-}
-
diff --git a/ports/nrf/supervisor/internal_flash.h b/ports/nrf/supervisor/internal_flash.h
index 024a53ebb..cf1dc91b5 100644
--- a/ports/nrf/supervisor/internal_flash.h
+++ b/ports/nrf/supervisor/internal_flash.h
@@ -31,6 +31,9 @@
 
 #include "py/mpconfig.h"
 
+#define FLASH_PAGE_SIZE                 0x1000
+#define CIRCUITPY_INTERNAL_NVM_SIZE     0
+
 #define INTERNAL_FLASH_SYSTICK_MASK     (0x1ff) // 512ms
 #define INTERNAL_FLASH_IDLE_TICK(tick)  (((tick) & INTERNAL_FLASH_SYSTICK_MASK) == 2)