stm32/storage: Make spi_bdev interface take a data pointer as first arg.

This allows a board to have multiple instances of the SPI block device.

3 files changed, 36 insertions, 27 deletions

diff --git a/ports/stm32/spibdev.c b/ports/stm32/spibdev.c
index 88f2cf51b..74b400a8f 100644
--- a/ports/stm32/spibdev.c
+++ b/ports/stm32/spibdev.c
@@ -35,8 +35,6 @@
 #include "drivers/memory/spiflash.h"
 #include "genhdr/pins.h"
 
-static uint32_t flash_tick_counter_last_write;
-
 #if defined(MICROPY_HW_SPIFLASH_MOSI)
 
 // External SPI flash uses standard SPI interface
@@ -50,7 +48,7 @@ STATIC const mp_soft_spi_obj_t soft_spi_bus = {
     .miso = &MICROPY_HW_SPIFLASH_MISO,
 };
 
-STATIC const mp_spiflash_config_t spiflash_config = {
+const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_SPI,
     .bus.u_spi.cs = &MICROPY_HW_SPIFLASH_CS,
     .bus.u_spi.data = (void*)&soft_spi_bus,
@@ -72,7 +70,7 @@ STATIC const mp_soft_qspi_obj_t soft_qspi_bus = {
     .io3 = &MICROPY_HW_SPIFLASH_IO3,
 };
 
-STATIC const mp_spiflash_config_t spiflash_config = {
+const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_QSPI,
     .bus.u_qspi.data = (void*)&soft_qspi_bus,
     .bus.u_qspi.proto = &mp_soft_qspi_proto,
@@ -80,32 +78,29 @@ STATIC const mp_spiflash_config_t spiflash_config = {
 
 #endif
 
-STATIC mp_spiflash_t spiflash;
-
-int32_t spi_bdev_ioctl(uint32_t op, uint32_t arg) {
-    (void)arg;
+int32_t spi_bdev_ioctl(spi_bdev_t *bdev, uint32_t op, uint32_t arg) {
     switch (op) {
         case BDEV_IOCTL_INIT:
-            spiflash.config = &spiflash_config;
-            mp_spiflash_init(&spiflash);
-            flash_tick_counter_last_write = 0;
+            bdev->spiflash.config = (const mp_spiflash_config_t*)arg;
+            mp_spiflash_init(&bdev->spiflash);
+            bdev->flash_tick_counter_last_write = 0;
             return 0;
 
         case BDEV_IOCTL_NUM_BLOCKS:
             return MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE;
 
         case BDEV_IOCTL_IRQ_HANDLER:
-            if ((spiflash.flags & 1) && sys_tick_has_passed(flash_tick_counter_last_write, 1000)) {
-                mp_spiflash_flush(&spiflash);
+            if ((bdev->spiflash.flags & 1) && sys_tick_has_passed(bdev->flash_tick_counter_last_write, 1000)) {
+                mp_spiflash_flush(&bdev->spiflash);
                 led_state(PYB_LED_RED, 0); // indicate a clean cache with LED off
             }
             return 0;
 
         case BDEV_IOCTL_SYNC:
-            if (spiflash.flags & 1) {
+            if (bdev->spiflash.flags & 1) {
                 // we must disable USB irqs to prevent MSC contention with SPI flash
                 uint32_t basepri = raise_irq_pri(IRQ_PRI_OTG_FS);
-                mp_spiflash_flush(&spiflash);
+                mp_spiflash_flush(&bdev->spiflash);
                 led_state(PYB_LED_RED, 0); // indicate a clean cache with LED off
                 restore_irq_pri(basepri);
             }
@@ -114,22 +109,22 @@ int32_t spi_bdev_ioctl(uint32_t op, uint32_t arg) {
     return -MP_EINVAL;
 }
 
-int spi_bdev_readblocks(uint8_t *dest, uint32_t block_num, uint32_t num_blocks) {
+int spi_bdev_readblocks(spi_bdev_t *bdev, uint8_t *dest, uint32_t block_num, uint32_t num_blocks) {
     // we must disable USB irqs to prevent MSC contention with SPI flash
     uint32_t basepri = raise_irq_pri(IRQ_PRI_OTG_FS);
-    mp_spiflash_read(&spiflash, block_num * FLASH_BLOCK_SIZE, num_blocks * FLASH_BLOCK_SIZE, dest);
+    mp_spiflash_read(&bdev->spiflash, block_num * FLASH_BLOCK_SIZE, num_blocks * FLASH_BLOCK_SIZE, dest);
     restore_irq_pri(basepri);
 
     return 0;
 }
 
-int spi_bdev_writeblocks(const uint8_t *src, uint32_t block_num, uint32_t num_blocks) {
+int spi_bdev_writeblocks(spi_bdev_t *bdev, const uint8_t *src, uint32_t block_num, uint32_t num_blocks) {
     // we must disable USB irqs to prevent MSC contention with SPI flash
     uint32_t basepri = raise_irq_pri(IRQ_PRI_OTG_FS);
-    int ret = mp_spiflash_write(&spiflash, block_num * FLASH_BLOCK_SIZE, num_blocks * FLASH_BLOCK_SIZE, src);
-    if (spiflash.flags & 1) {
+    int ret = mp_spiflash_write(&bdev->spiflash, block_num * FLASH_BLOCK_SIZE, num_blocks * FLASH_BLOCK_SIZE, src);
+    if (bdev->spiflash.flags & 1) {
         led_state(PYB_LED_RED, 1); // indicate a dirty cache with LED on
-        flash_tick_counter_last_write = HAL_GetTick();
+        bdev->flash_tick_counter_last_write = HAL_GetTick();
     }
     restore_irq_pri(basepri);
 
diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index 4e32fa3cc..0f565508b 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -37,9 +37,14 @@
 #if defined(MICROPY_HW_SPIFLASH_SIZE_BITS)
 
 // Use external SPI flash as the storage medium
-#define BDEV_IOCTL spi_bdev_ioctl
-#define BDEV_READBLOCKS spi_bdev_readblocks
-#define BDEV_WRITEBLOCKS spi_bdev_writeblocks
+STATIC spi_bdev_t spi_bdev;
+#define BDEV_IOCTL(op, arg) ( \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
+    (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
+    spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
+)
+#define BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
+#define BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
 
 #else
 
diff --git a/ports/stm32/storage.h b/ports/stm32/storage.h
index a3cdd84eb..c9514b8bc 100644
--- a/ports/stm32/storage.h
+++ b/ports/stm32/storage.h
@@ -26,6 +26,8 @@
 #ifndef MICROPY_INCLUDED_STM32_STORAGE_H
 #define MICROPY_INCLUDED_STM32_STORAGE_H
 
+#include "drivers/memory/spiflash.h"
+
 #define FLASH_BLOCK_SIZE (512)
 
 #define STORAGE_SYSTICK_MASK    (0x1ff) // 512ms
@@ -55,9 +57,16 @@ int32_t flash_bdev_ioctl(uint32_t op, uint32_t arg);
 bool flash_bdev_readblock(uint8_t *dest, uint32_t block);
 bool flash_bdev_writeblock(const uint8_t *src, uint32_t block);
 
-int32_t spi_bdev_ioctl(uint32_t op, uint32_t arg);
-int spi_bdev_readblocks(uint8_t *dest, uint32_t block_num, uint32_t num_blocks);
-int spi_bdev_writeblocks(const uint8_t *src, uint32_t block_num, uint32_t num_blocks);
+typedef struct _spi_bdev_t {
+    mp_spiflash_t spiflash;
+    uint32_t flash_tick_counter_last_write;
+} spi_bdev_t;
+
+extern const mp_spiflash_config_t spiflash_config;
+
+int32_t spi_bdev_ioctl(spi_bdev_t *bdev, uint32_t op, uint32_t arg);
+int spi_bdev_readblocks(spi_bdev_t *bdev, uint8_t *dest, uint32_t block_num, uint32_t num_blocks);
+int spi_bdev_writeblocks(spi_bdev_t *bdev, const uint8_t *src, uint32_t block_num, uint32_t num_blocks);
 
 extern const struct _mp_obj_type_t pyb_flash_type;