Bugfix: Concurrent SFDP header address init fixed

After switching from local variables to shared info structure JEDEC
Basic Flash Parameter Table and Sector Map Parameter Table addresses
and sizes must be protected by a mutex. Theoretically multiple calls
to Q/SPIFBlockDevice might occur.

Author: Veijo Pesonen

components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp

@@ -179,6 +179,8 @@ QSPIFBlockDevice::QSPIFBlockDevice(PinName io0, PinName io1, PinName io2, PinNam
 
 int QSPIFBlockDevice::init()
 {
+    int status = QSPIF_BD_ERROR_OK;
+
     if (_unique_device_status == 0) {
         tr_debug("QSPIFBlockDevice csel: %d", (int)_csel);
     } else if (_unique_device_status == -1) {
@@ -189,12 +191,6 @@ int QSPIFBlockDevice::init()
         return QSPIF_BD_ERROR_DEVICE_MAX_EXCEED;
     }
 
-    int status = QSPIF_BD_ERROR_OK;
-    _sfdp_info.bptbl.addr = 0x0;
-    _sfdp_info.bptbl.size = 0;
-    _sfdp_info.smptbl.addr = 0x0;
-    _sfdp_info.smptbl.size = 0;
-
     _mutex.lock();
 
     // All commands other than Read and RSFDP use default 1-1-1 bus mode (Program/Erase are constrained by flash memory performance more than bus performance)
@@ -236,6 +232,11 @@ int QSPIFBlockDevice::init()
         goto exit_point;
     }
 
+    _sfdp_info.bptbl.addr = 0x0;
+    _sfdp_info.bptbl.size = 0;
+    _sfdp_info.smptbl.addr = 0x0;
+    _sfdp_info.smptbl.size = 0;
+
     /**************************** Parse SFDP Header ***********************************/
     if (sfdp_parse_headers(callback(this, &QSPIFBlockDevice::_qspi_send_read_sfdp_command), _sfdp_info) < 0) {
         tr_error("Init - Parse SFDP Headers Failed");

components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp

@@ -120,11 +120,6 @@ int SPIFBlockDevice::init()
     int status = SPIF_BD_ERROR_OK;
     spif_bd_error spi_status = SPIF_BD_ERROR_OK;
 
-    _sfdp_info.bptbl.addr = 0x0;
-    _sfdp_info.bptbl.size = 0;
-    _sfdp_info.smptbl.addr = 0x0;
-    _sfdp_info.smptbl.size = 0;
-
     _mutex->lock();
 
     if (!_is_initialized) {
@@ -171,6 +166,11 @@ int SPIFBlockDevice::init()
         goto exit_point;
     }
 
+    _sfdp_info.bptbl.addr = 0x0;
+    _sfdp_info.bptbl.size = 0;
+    _sfdp_info.smptbl.addr = 0x0;
+    _sfdp_info.smptbl.size = 0;
+
     /**************************** Parse SFDP Header ***********************************/
     if (sfdp_parse_headers(callback(this, &SPIFBlockDevice::_spi_send_read_sfdp_command), _sfdp_info) < 0) {
         tr_error("init - Parse SFDP Headers Failed");