[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-624-gab43721be

[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  ab43721be6ff7470ff8b9771c95c1d5661a5a689 (commit)
      from  9cdbe61aab418bdf75bc443b16ce4cdf96732e3e (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 ab43721be6ff7470ff8b9771c95c1d5661a5a689
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Mon Feb 28 13:55:26 2022 +0100

    flash/stm32l4x: fix auto-probe when RDP is promoted from 0 to 0.5
    
    Considering this use case: (using STM32 L5 or U5)
     1- first probe : TZEN enabled, RDP level 0
        flash_regs_base |= STM32L5_REGS_SEC_OFFSET => 0x50022000
     2- the user promotes the RDP to level 0.5
     3- the second probe, fails to read OPTR using secure flags_regs_base:
        used OPTR address is 0x50022040
    
    Step 3 fails because when RDP is level 0.5, we should use Non-Secure
    flash registers.
    To fix this, always use NS flash regs to read OPTR in probe functions.
    
    Fixes: 80d323c6e82b (flash/stm32l4x: introduce auto-probe when OPTR is changed)
    Change-Id: I296aa633972b0c410b927488c999584a07b912d3
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6864
    Reviewed-by: Tomas Vanek <va...@fb...>
    Tested-by: jenkins

diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index fd0338899..7b35a0635 100644
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -1757,7 +1757,7 @@ static int stm32l4_probe(struct flash_bank *bank)
 	 * Ask the flash infrastructure to ensure required alignment */
 	bank->write_start_alignment = bank->write_end_alignment = stm32l4_info->data_width;
 
-	/* initialise the flash registers layout */
+	/* Initialize the flash registers layout */
 	if (part_info->flags & F_HAS_L5_FLASH_REGS)
 		stm32l4_info->flash_regs = stm32l5_ns_flash_regs;
 	else
@@ -1770,7 +1770,7 @@ static int stm32l4_probe(struct flash_bank *bank)
 
 	stm32l4_sync_rdp_tzen(bank);
 
-	/* for devices with trustzone, use flash secure registers when TZEN=1 and RDP is LEVEL_0 */
+	/* for devices with TrustZone, use flash secure registers when TZEN=1 and RDP is LEVEL_0 */
 	if (stm32l4_info->tzen && (stm32l4_info->rdp == RDP_LEVEL_0)) {
 		if (part_info->flags & F_HAS_L5_FLASH_REGS) {
 			stm32l4_info->flash_regs_base |= STM32L5_REGS_SEC_OFFSET;
@@ -2046,8 +2046,19 @@ static int stm32l4_auto_probe(struct flash_bank *bank)
 	if (stm32l4_info->probed) {
 		uint32_t optr_cur;
 
+		/* save flash_regs_base */
+		uint32_t saved_flash_regs_base = stm32l4_info->flash_regs_base;
+
+		/* for devices with TrustZone, use NS flash registers to read OPTR */
+		if (stm32l4_info->part_info->flags & F_HAS_L5_FLASH_REGS)
+			stm32l4_info->flash_regs_base &= ~STM32L5_REGS_SEC_OFFSET;
+
 		/* read flash option register and re-probe if optr value is changed */
 		int retval = stm32l4_read_flash_reg_by_index(bank, STM32_FLASH_OPTR_INDEX, &optr_cur);
+
+		/* restore saved flash_regs_base */
+		stm32l4_info->flash_regs_base = saved_flash_regs_base;
+
 		if (retval != ERROR_OK)
 			return retval;
 

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

Summary of changes:
 src/flash/nor/stm32l4x.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository