[IOTSTOR-990] SPIFBlockDevice doesn't play nice on shared SPI bus. Back to use select and deselect

Author: Marcin Tomczyk

components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp

@@ -330,6 +330,8 @@ int DataFlashBlockDevice::read(void *buffer, bd_addr_t addr, bd_size_t size)
 
         uint8_t *external_buffer = static_cast<uint8_t *>(buffer);
 
+        _spi.select();
+
         /* send read opcode */
         _spi.write(DATAFLASH_OP_READ_LOW_FREQUENCY);
 
@@ -348,6 +350,8 @@ int DataFlashBlockDevice::read(void *buffer, bd_addr_t addr, bd_size_t size)
             external_buffer[index] = _spi.write(DATAFLASH_OP_NOP);
         }
 
+        _spi.deselect();
+
         result = BD_ERROR_OK;
     }
 
@@ -539,13 +543,17 @@ uint16_t DataFlashBlockDevice::_get_register(uint8_t opcode)
     _mutex.lock();
     DEBUG_PRINTF("_get_register: %" PRIX8 "\r\n", opcode);
 
+    _spi.select();
+
     /* write opcode */
     _spi.write(opcode);
 
     /* read and store result */
     int status = (_spi.write(DATAFLASH_OP_NOP));
     status = (status << 8) | (_spi.write(DATAFLASH_OP_NOP));
 
+    _spi.deselect()''
+
     _mutex.unlock();
     return status;
 }
@@ -566,6 +574,8 @@ void DataFlashBlockDevice::_write_command(uint32_t command, const uint8_t *buffe
 {
     DEBUG_PRINTF("_write_command: %" PRIX32 " %p %" PRIX32 "\r\n", command, buffer, size);
 
+    _spi.select();
+
     /* send command (opcode with data or 4 byte command) */
     _spi.write((command >> 24) & 0xFF);
     _spi.write((command >> 16) & 0xFF);
@@ -578,6 +588,8 @@ void DataFlashBlockDevice::_write_command(uint32_t command, const uint8_t *buffe
             _spi.write(buffer[index]);
         }
     }
+
+    _spi.deselect();
 }
 
 /**

components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp

@@ -1129,22 +1129,26 @@ void SDBlockDevice::_spi_wait(uint8_t count)
 
 void SDBlockDevice::_spi_init()
 {
+    _spi.select();
     // Set to SCK for initialization, and clock card with cs = 1
     _spi.frequency(_init_sck);
     _spi.format(8, 0);
     _spi.set_default_write_value(SPI_FILL_CHAR);
     // Initial 74 cycles required for few cards, before selecting SPI mode
     _spi_wait(10);
+    _spi.deselect();
 }
 
 void SDBlockDevice::_select()
 {
+    _spi.select();
     _spi.write(SPI_FILL_CHAR);
 }
 
 void SDBlockDevice::_deselect()
 {
     _spi.write(SPI_FILL_CHAR);
+    _spi.deselect();
 }
 
 #endif  /* DEVICE_SPI */

components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp

@@ -470,6 +470,8 @@ spif_bd_error SPIFBlockDevice::_spi_send_read_command(int read_inst, uint8_t *bu
     uint32_t dummy_bytes = _dummy_and_mode_cycles / 8;
     int dummy_byte = 0;
 
+    _spi.select();
+
     // Write 1 byte Instruction
     _spi.write(read_inst);
 
@@ -488,6 +490,8 @@ spif_bd_error SPIFBlockDevice::_spi_send_read_command(int read_inst, uint8_t *bu
         buffer[i] = _spi.write(0);
     }
 
+    _spi.deselect();
+
     return SPIF_BD_ERROR_OK;
 }
 
@@ -514,6 +518,8 @@ spif_bd_error SPIFBlockDevice::_spi_send_program_command(int prog_inst, const vo
     int dummy_byte = 0;
     uint8_t *data = (uint8_t *)buffer;
 
+    _spi.select();
+
     // Write 1 byte Instruction
     _spi.write(prog_inst);
 
@@ -532,6 +538,8 @@ spif_bd_error SPIFBlockDevice::_spi_send_program_command(int prog_inst, const vo
         _spi.write(data[i]);
     }
 
+    _spi.deselect();
+
     return SPIF_BD_ERROR_OK;
 }
 
@@ -550,6 +558,8 @@ spif_bd_error SPIFBlockDevice::_spi_send_general_command(int instruction, bd_add
     uint32_t dummy_bytes = _dummy_and_mode_cycles / 8;
     uint8_t dummy_byte = 0x00;
 
+    _spi.select();
+
     // Write 1 byte Instruction
     _spi.write(instruction);
 
@@ -569,6 +579,8 @@ spif_bd_error SPIFBlockDevice::_spi_send_general_command(int instruction, bd_add
     // Read/Write Data
     _spi.write(tx_buffer, (int)tx_length, rx_buffer, (int)rx_length);
 
+    _spi.deselect();
+
     return SPIF_BD_ERROR_OK;
 }
 

drivers/source/SPI.cpp

@@ -220,17 +220,13 @@ void SPI::_acquire()
 
 int SPI::write(int value)
 {
-    select();
     int ret = spi_master_write(&_peripheral->spi, value);
-    deselect();
     return ret;
 }
 
 int SPI::write(const char *tx_buffer, int tx_length, char *rx_buffer, int rx_length)
 {
-    select();
     int ret = spi_master_block_write(&_peripheral->spi, tx_buffer, tx_length, rx_buffer, rx_length, _write_fill);
-    deselect();
     return ret;
 }