[spiflash][bio][stm32f7] Fixed (sub)sector erase on spiflash device.

platform/stm32f7xx/qspi.c

 /*
  * Copyright (c) 2015 Gurjant Kalsi <me@gurjantkalsi.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files
  * (the "Software"), to deal in the Software without restriction,
  * including without limitation the rights to use, copy, modify, merge,
  * publish, distribute, sublicense, and/or sell copies of the Software,
  * and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
@@ skipping 544 matching lines @@
         // block_addr is irrelevant when performing a bulk erase.
         return ERR_INVALID_ARGS;
     }
 
     QSPI_CommandTypeDef erase_cmd;
 
     ssize_t num_erased_bytes;
     switch (instruction) {
         case SUBSECTOR_ERASE_CMD: {
             num_erased_bytes = N25QXXA_SUBSECTOR_SIZE;
-            erase_cmd.AddressMode = get_address_size(block_addr);
+            erase_cmd.AddressSize = get_address_size(block_addr);
             erase_cmd.Instruction = get_specialized_instruction(instruction, block_addr);
+            erase_cmd.AddressMode = QSPI_ADDRESS_1_LINE;
+            erase_cmd.Address     = block_addr;
+
             break;
         }
         case SECTOR_ERASE_CMD: {
             num_erased_bytes = N25QXXA_SECTOR_SIZE;
-            erase_cmd.AddressMode = get_address_size(block_addr);
+            erase_cmd.AddressSize = get_address_size(block_addr);
             erase_cmd.Instruction = get_specialized_instruction(instruction, block_addr);
+            erase_cmd.AddressMode = QSPI_ADDRESS_1_LINE;
+            erase_cmd.Address     = block_addr;
+
             break;
         }
         case BULK_ERASE_CMD: {
             num_erased_bytes = device->total_size;
             erase_cmd.AddressMode = QSPI_ADDRESS_NONE;
             erase_cmd.Instruction = instruction;
             break;
         }
         default: {
             // Instruction must be a valid erase instruction.
             return ERR_INVALID_ARGS;
         }
     }
 
     erase_cmd.InstructionMode   = QSPI_INSTRUCTION_1_LINE;
-    erase_cmd.AddressSize       = QSPI_ADDRESS_24_BITS;
-    erase_cmd.Address           = block_addr;
     erase_cmd.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE;
     erase_cmd.DataMode          = QSPI_DATA_NONE;
     erase_cmd.DummyCycles       = 0;
     erase_cmd.DdrMode           = QSPI_DDR_MODE_DISABLE;
     erase_cmd.DdrHoldHalfCycle  = QSPI_DDR_HHC_ANALOG_DELAY;
     erase_cmd.SIOOMode          = QSPI_SIOO_INST_EVERY_CMD;
 
 
     /* Enable write operations */
     status_t qspi_write_enable_result = qspi_write_enable_unsafe(&qspi_handle);
@@ skipping 201 matching lines @@
     HAL_StatusTypeDef hal_result = HAL_QSPI_MemoryMapped(&qspi_handle, &s_command, &linear_mode_cfg);
     if (hal_result != HAL_OK) {
         result = hal_error_to_status(hal_result);
         goto err;
     }
 
 err:
     mutex_release(&spiflash_mutex);
     return result;
 }