ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13399 from LDong-Arm/sfdp_legacy 

QSPIF: options to preset reset sequence for legacy SFDP
pull/13478/head
Martin Kojtal 2020-08-21 14:43:15 +01:00 committed by GitHub
parent 7829238c61 61fd872cc3
commit 1c0318ccfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
storage/blockdevice/COMPONENT_QSPIF/mbed_lib.json
View File

@ -1,6 +1,14 @@
{
"name": "qspif",
"name": "qspif",
"config": {
"enable-and-reset": {
"help": "(Legacy SFDP 1.0 ONLY) Reset sequence is enable reset (0x66) then reset (0x99)",
"value": false
},
"direct-reset": {
"help": "(Legacy SFDP 1.0 ONLY) Reset involves a single command (0xF0)",
"value": false
},
"QSPI_IO0": "MBED_CONF_DRIVERS_QSPI_IO0",
"QSPI_IO1": "MBED_CONF_DRIVERS_QSPI_IO1",
"QSPI_IO2": "MBED_CONF_DRIVERS_QSPI_IO2",
@ -23,7 +31,8 @@
"QSPI_FREQ": "66000000"
},
"N25Q128A": {
"QSPI_FREQ": "80000000"
"QSPI_FREQ": "80000000",
"enable-and-reset": true
},
"MCU_NRF52840": {
"QSPI_FREQ": "32000000",

22
storage/blockdevice/COMPONENT_QSPIF/source/QSPIFBlockDevice.cpp
View File

@ -995,18 +995,35 @@ int QSPIFBlockDevice::_sfdp_detect_and_enable_4byte_addressing(uint8_t *basic_pa
return status;
}
#if MBED_CONF_QSPIF_ENABLE_AND_RESET && MBED_CONF_QSPIF_DIRECT_RESET
#error "qspif.enable-and-reset and qspif.direct-reset cannot be both true!"
#endif
#define RESET_SEQUENCE_FROM_SFDP ( !MBED_CONF_QSPIF_ENABLE_AND_RESET && !MBED_CONF_QSPIF_DIRECT_RESET )
int QSPIFBlockDevice::_sfdp_detect_reset_protocol_and_reset(uint8_t *basic_param_table_ptr)
{
int status = QSPIF_BD_ERROR_OK;
#if RESET_SEQUENCE_FROM_SFDP
uint8_t examined_byte = basic_param_table_ptr[QSPIF_BASIC_PARAM_TABLE_SOFT_RESET_BYTE];
// Ignore bit indicating need to exit 0-4-4 mode - should not enter 0-4-4 mode from QSPIFBlockDevice
if (examined_byte & SOFT_RESET_RESET_INST_BITMASK) {
#endif
#if !MBED_CONF_QSPIF_ENABLE_AND_RESET // i.e. direct reset, or determined from SFDP
// Issue instruction 0xF0 to reset the device
qspi_status_t qspi_status = _qspi_send_general_command(0xF0, QSPI_NO_ADDRESS_COMMAND, // Send reset instruction
NULL, 0, NULL, 0);
status = (qspi_status == QSPI_STATUS_OK) ? QSPIF_BD_ERROR_OK : QSPIF_BD_ERROR_PARSING_FAILED;
#endif
#if RESET_SEQUENCE_FROM_SFDP
} else if (examined_byte & SOFT_RESET_ENABLE_AND_RESET_INST_BITMASK) {
#endif
#if !MBED_CONF_QSPIF_DIRECT_RESET // i.e. enable and reset, or determined from SFDP
// Issue instruction 66h to enable resets on the device
// Then issue instruction 99h to reset the device
qspi_status_t qspi_status = _qspi_send_general_command(0x66, QSPI_NO_ADDRESS_COMMAND, // Send reset enable instruction
@ -1016,10 +1033,15 @@ int QSPIFBlockDevice::_sfdp_detect_reset_protocol_and_reset(uint8_t *basic_param
NULL, 0, NULL, 0);
}
status = (qspi_status == QSPI_STATUS_OK) ? QSPIF_BD_ERROR_OK : QSPIF_BD_ERROR_PARSING_FAILED;
#endif
#if RESET_SEQUENCE_FROM_SFDP
} else {
// Soft reset either is not supported or requires direct control over data lines
tr_error("Failed to determine soft reset sequence. If your device has a legacy SFDP table, please manually set enable-and-reset or direct-reset.");
status = QSPIF_BD_ERROR_PARSING_FAILED;
}
#endif
if (status == QSPIF_BD_ERROR_OK) {
if (false == _is_mem_ready()) {