(mynewt-core) branch master updated: hw/mcu/nordic: Fix common QSPI HAL

[jerzy]

This is an automated email from the ASF dual-hosted git repository.

jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 93189a84c hw/mcu/nordic: Fix common QSPI HAL
93189a84c is described below

commit 93189a84c847345768afa0fc365b058ab209eba8
Author: Jerzy Kasenberg <jerzy.kasenb...@codecoup.pl>
AuthorDate: Fri Feb 21 11:01:06 2025 +0100

    hw/mcu/nordic: Fix common QSPI HAL
    
    When common code for QSPI was introduced to
    use nrfx API instead of direct register access,
    erase functions that waited for QSPI controller
    to become ready started usin nrfx API but did
    not take into account that waiting for previous
    task to complete is required.
    
    Now after each nrfx_qspi_erase() call, code
    waits for controller to be ready as was the
    case before switching to nrfx
---
 hw/mcu/nordic/nrf_common/src/hal_qspi.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/mcu/nordic/nrf_common/src/hal_qspi.c 
b/hw/mcu/nordic/nrf_common/src/hal_qspi.c
index 6a2b8eb3b..b5d6dd8e2 100644
--- a/hw/mcu/nordic/nrf_common/src/hal_qspi.c
+++ b/hw/mcu/nordic/nrf_common/src/hal_qspi.c
@@ -188,6 +188,7 @@ nrf_qspi_erase_sector(const struct hal_flash *dev,
     erases = MYNEWT_VAL(QSPI_FLASH_SECTOR_SIZE) / 4096;
     while (erases-- > 0) {
         nrfx_qspi_erase(NRF_QSPI_ERASE_LEN_4KB, sector_address);
+        while (!nrf_qspi_event_check(NRF_QSPI, NRF_QSPI_EVENT_READY));
         sector_address += 4096;
     }
 
@@ -206,6 +207,7 @@ nrf_qspi_erase(const struct hal_flash *dev, uint32_t 
address,
     if (end == MYNEWT_VAL(QSPI_FLASH_SECTOR_COUNT) *
         MYNEWT_VAL(QSPI_FLASH_SECTOR_SIZE)) {
         nrfx_qspi_erase(NRF_QSPI_ERASE_LEN_ALL, 0);
+        while (!nrf_qspi_event_check(NRF_QSPI, NRF_QSPI_EVENT_READY));
         return 0;
     }
 
@@ -213,12 +215,14 @@ nrf_qspi_erase(const struct hal_flash *dev, uint32_t 
address,
         if ((address & 0xFFFFU) == 0 && (size >= 0x10000)) {
             /* 64 KB erase if possible */
             nrfx_qspi_erase(NRF_QSPI_ERASE_LEN_64KB, address);
+            while (!nrf_qspi_event_check(NRF_QSPI, NRF_QSPI_EVENT_READY));
             address += 0x10000;
             size -= 0x10000;
             continue;
         }
 
         nrfx_qspi_erase(NRF_QSPI_ERASE_LEN_4KB, address);
+        while (!nrf_qspi_event_check(NRF_QSPI, NRF_QSPI_EVENT_READY));
         address += 0x1000;
         if (size > 0x1000) {
             size -= 0x1000;