[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-836-g77f9da762

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  77f9da76264d4970faf22a40a31fc66fa7543b57 (commit)
      from  3099547069896ccff054d64bac6041fe1e20add9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 77f9da76264d4970faf22a40a31fc66fa7543b57
Author: Tomas Vanek <va...@fb...>
Date:   Fri Jan 17 18:02:50 2025 +0100

    flash/nor/kinetis: fix assertion during flash write
    
    If the device has at lest one FlexNVM bank and it is set as EE backup
    only, the bank has no protection blocks.
    
    kinetis_fill_fcf() collects protection data from all banks before
    flash write of the sector containing FCF block. In case it encountered
    a FlexNVM bank with no protection blocks assert failed.
    
    Failed flash write of previously erased FCF block could cause
    engaging debugging lock (if the device was run or reset).
    
    Skip banks with zero protection blocks.
    Replace assert() by LOG_ERROR() as we have to finish FCF write.
    
    Change-Id: Ibe7e7ec6d0db4453b8a53c8256987621b809c99d
    Signed-off-by: Tomas Vanek <va...@fb...>
    Suggested-by: Jasper v. Blanckenburg <ja...@us...>
    Fixes: https://sourceforge.net/p/openocd/tickets/448/
    Reviewed-on: https://review.openocd.org/c/openocd/+/8719
    Tested-by: jenkins
    Reviewed-by: Jasper v. Blanckenburg <ja...@me...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c
index 2f88b9c1f..85c306bd4 100644
--- a/src/flash/nor/kinetis.c
+++ b/src/flash/nor/kinetis.c
@@ -1489,7 +1489,22 @@ static int kinetis_fill_fcf(struct flash_bank *bank, uint8_t *fcf)
 
 		kinetis_auto_probe(bank_iter);
 
-		assert(bank_iter->prot_blocks);
+		if (bank_iter->num_prot_blocks == 0) {
+			if (k_bank->flash_class == FC_PFLASH) {
+				LOG_ERROR("BUG: PFLASH bank %u has no protection blocks",
+						  bank_idx);
+			} else {
+				LOG_DEBUG("skipping FLEX_NVM bank %u with no prot blocks (EE bkp only)",
+						  bank_idx);
+			}
+			continue;
+		}
+
+		if (!bank_iter->prot_blocks) {
+			LOG_ERROR("BUG: bank %u has NULL protection blocks array",
+					  bank_idx);
+			continue;
+		}
 
 		if (k_bank->flash_class == FC_PFLASH) {
 			for (unsigned int i = 0; i < bank_iter->num_prot_blocks; i++) {

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nor/kinetis.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository