mimxrt: Allow local write only after a soft reset.

robert-hh · robert-hh · commit f88d61125743 · 2022-06-26T21:02:25.000+02:00
Since remount after MSC eject does not update the file system's data
in memory, keep file the system readonly until after a soft reset, which
has to be done deliberately.
That's neither comfortable nor elegant, but safe.

Disabled MSC as default option.
Disabled MSC for MIMXRT1050_EVK deliberately.
Enabled MSC for MIMXRT1020_EVK, Teensy 4.1 and OLIMEX_RT1010 for testing.
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -1,6 +1,8 @@
 #define MICROPY_HW_BOARD_NAME "i.MX RT1020 EVK"
 #define MICROPY_HW_MCU_NAME   "MIMXRT1021DAG5A"
 
+#define MICROPY_HW_USB_MSC    (1)
+
 // i.MX RT1020 EVK has 1 board LED
 // Todo: think about replacing the define with searching in the generated pins?
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_05)
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
@@ -5,6 +5,8 @@
 #define MICROPY_HW_USB_PID 0x0046
 #define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (0)
 
+#define MICROPY_HW_USB_MSC    (1)
+
 // Olimex RT1010-Py has 1 board LED
 #define MICROPY_HW_LED1_PIN (pin_GPIO_11)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -1,6 +1,8 @@
 #define MICROPY_HW_BOARD_NAME "Teensy 4.1"
 #define MICROPY_HW_MCU_NAME   "MIMXRT1062DVJ6A"
 
+#define MICROPY_HW_USB_MSC    (1)
+
 // Teensy 4.1 has 1 board LED
 #define MICROPY_HW_LED1_PIN (pin_GPIO_B0_03)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
diff --git a/ports/mimxrt/flash.h b/ports/mimxrt/flash.h
@@ -45,6 +45,12 @@ extern uint8_t __flash_start;
 
 extern flexspi_nor_config_t qspiflash_config;
 
+enum {
+    MOUNTED = 0,
+    EJECTED,
+    TRANSIT
+};
+
 // --------------------------------------------------------------------+
 // Global Function Declarations
 // --------------------------------------------------------------------+
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
@@ -49,6 +49,7 @@
 extern uint8_t _sstack, _estack, _gc_heap_start, _gc_heap_end;
 
 void board_init(void);
+void update_msc_state(void);
 
 int main(void) {
     board_init();
@@ -123,6 +124,9 @@ int main(void) {
         #if MICROPY_PY_NETWORK
         mod_network_deinit();
         #endif
+        #if CFG_TUD_MSC
+        update_msc_state();
+        #endif
         machine_pwm_deinit_all();
         gc_sweep_all();
         mp_deinit();
diff --git a/ports/mimxrt/mimxrt_flash.c b/ports/mimxrt/mimxrt_flash.c
@@ -45,7 +45,7 @@ STATIC mimxrt_flash_obj_t mimxrt_flash_obj = {
     .base = { &mimxrt_flash_type }
 };
 
-extern bool tud_msc_ejected;
+extern uint8_t tud_msc_state;
 
 STATIC mp_obj_t mimxrt_flash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     // Check args.
@@ -145,7 +145,7 @@ STATIC mp_obj_t mimxrt_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t a
         }
         case MP_BLOCKDEV_IOCTL_STATUS:
             #if MICROPY_HW_USB_MSC
-            return MP_OBJ_NEW_SMALL_INT(!tud_msc_ejected);
+            return MP_OBJ_NEW_SMALL_INT(tud_msc_state != EJECTED);
             #else
             return MP_OBJ_NEW_SMALL_INT(false);
             #endif
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
@@ -191,13 +191,12 @@ uint32_t trng_random_u32(void);
 // by default enable MSC support, unless disabled at some boards
 // Boards with hyperflash must disbale MSC support.
 #ifndef MICROPY_HW_USB_MSC
-#define MICROPY_HW_USB_MSC                  (1)
+#define MICROPY_HW_USB_MSC                  (0)
 #endif
 
 #if MICROPY_HW_USB_MSC
 #define MICROPY_FATFS_USE_LABEL             (1)
 #define MICROPY_FATFS_MULTI_PARTITION       (1)
-#define MICROPY_HW_USB_MSC_EXCLUSIVE_ACCESS (1)
 #endif
 
 #if MICROPY_VFS_FAT && MICROPY_HW_USB_MSC
diff --git a/ports/mimxrt/msc_disk.c b/ports/mimxrt/msc_disk.c
@@ -34,8 +34,13 @@
 #define BLOCK_COUNT         (MICROPY_HW_FLASH_STORAGE_BYTES / BLOCK_SIZE)
 #define FLASH_BASE_ADDR     (MICROPY_HW_FLASH_STORAGE_BASE)
 
-bool tud_msc_ejected = true;
-extern void tud_msc_remount(void);
+uint8_t tud_msc_state = EJECTED;
+
+void update_msc_state(void) {
+    if (tud_msc_state == TRANSIT) {
+        tud_msc_state = EJECTED;
+    }
+}
 
 // Invoked when received SCSI_CMD_INQUIRY
 // Application fill vendor id, product id and revision with string up to 8, 16, 4 characters respectively
@@ -47,13 +52,13 @@ void tud_msc_inquiry_cb(uint8_t lun, uint8_t vendor_id[8], uint8_t product_id[16
     strncpy((char *)vendor_id,   vid, 8);
     strncpy((char *)product_id,  pid, 16);
     strncpy((char *)product_rev, rev, 4);
-    tud_msc_ejected = false;
+    tud_msc_state = MOUNTED;
 }
 
 // Invoked when received Test Unit Ready command.
 // return true allowing host to read/write this LUN e.g SD card inserted
 bool tud_msc_test_unit_ready_cb(uint8_t lun) {
-    if (tud_msc_ejected) {
+    if (tud_msc_state != MOUNTED) {
         tud_msc_set_sense(lun, SCSI_SENSE_NOT_READY, 0x3a, 0x00);
         return false;
     }
@@ -65,7 +70,6 @@ bool tud_msc_test_unit_ready_cb(uint8_t lun) {
 void tud_msc_capacity_cb(uint8_t lun, uint32_t *block_count, uint16_t *block_size) {
     *block_size = BLOCK_SIZE;
     *block_count = BLOCK_COUNT;
-    tud_msc_ejected = false;
 }
 
 // Invoked when received Start Stop Unit command
@@ -75,13 +79,10 @@ bool tud_msc_start_stop_cb(uint8_t lun, uint8_t power_condition, bool start, boo
     if (load_eject) {
         if (start) {
             // load disk storage
-            tud_msc_ejected = false;
+            tud_msc_state = MOUNTED;
         } else {
             // unload disk storage
-            tud_msc_ejected = true;
-            #if MICROPY_HW_USB_MSC_EXCLUSIVE_ACCESS
-            tud_msc_remount();
-            #endif
+            tud_msc_state = TRANSIT;
         }
     }
     return true;
@@ -125,4 +126,5 @@ int32_t tud_msc_scsi_cb(uint8_t lun, uint8_t const scsi_cmd[16], void *buffer, u
     }
     return resplen;
 }
+
 #endif
diff --git a/shared/runtime/tinyusb_helpers.c b/shared/runtime/tinyusb_helpers.c
@@ -52,31 +52,3 @@ void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) {
 }
 
 #endif
-
-#if MICROPY_HW_USB_MSC_EXCLUSIVE_ACCESS
-#include "tusb.h"
-#include "extmod/vfs.h"
-#include "extmod/vfs_fat.h"
-static mp_sched_node_t mp_remount_sched_node;
-
-STATIC void tud_msc_remount_task(mp_sched_node_t *node) {
-    mp_vfs_mount_t *vfs = NULL;
-    for (vfs = MP_STATE_VM(vfs_mount_table); vfs != NULL; vfs = vfs->next) {
-        if (vfs->len == 1) {
-            const char *path_str = "/";
-            mp_obj_t path = mp_obj_new_str(path_str, strlen(path_str));
-            nlr_buf_t nlr;
-            if (nlr_push(&nlr) == 0) {
-                mp_vfs_umount(vfs->obj);
-                mp_vfs_mount_and_chdir_protected(vfs->obj, path);
-                nlr_pop();
-            }
-            break;
-        }
-    }
-}
-
-void tud_msc_remount(void) {
-    mp_sched_schedule_node(&mp_remount_sched_node, tud_msc_remount_task);
-}
-#endif
