mcuboot: Application fails to access QSPI flash after image swap

[hjuul]

My Zephyr application uses QSPI flash. I'm using MCUboot to boot the application.

On normal boot my application can access the QSPI flash as expected.

But on the first boot after an image swap the QSPI driver fails when reading serial flash discovery parameters:

[00:00:05.001,000] <err> flash_stm32_qspi: 2: Failed to send QSPI instruction
[00:00:05.001,000] <inf> flash_stm32_qspi: ra cmd: 0x5a
[00:00:05.001,000] <err> flash_stm32_qspi: SFDP read failed: -5

MCUboot is configured to use internal flash only (slot0, slot1 and swap partitions are all in internal flash). But MCUboot has QSPI support because it finds the &quadspi entry in my dts file.

A few interesting observations:

• Removing the &quadspi entry in my DTS file when compiling MCUboot fixes the issue
• Setting CONFIG_FLASH_STM32_QSPI=n when compiling MCUboot fixes the issue
• Setting CONFIG_BOOT_ENCRYPT_RSA=n when compiling MCUboot fixes the issue ** With encryption enabled it fails regardless of whether the updated image is actually encrypted

Environment

• OS: Linux
• Platform: stm32f7xx, qspi flash is MT25QL256ABA
• Toolchain: zephyr-sdk-0.12.4
• Zephyr v2.6.0 -- I also tried updating mcuboot to the main branch on zephyrproject-rtos/mcuboot, but the problem persists

Additional context It fails both for BOOT_SWAP_TYPE_TEST and BOOT_SWAP_TYPE_REVERT.

If I remove lines 542-667 here and attempt a firmware update the images won't be swapped, but my application will start with a functioning QSPI flash. This isolates the problem to these lines and their subroutines, and the bug is likely to be found in one of the #ifdef MCUBOOT_ENC_IMAGES blocks there. But that's as far as I got.

[github-actions[bot]]

This issue has been marked as stale because it has been open (more than) 60 days with no activity. Remove the stale label or add a comment saying that you would like to have the label removed otherwise this issue will automatically be closed in 14 days. Note, that you can always re-open a closed issue at any time.