[PATCH]: 7d743ec86 flash/stm32h7x: fix FLASH_WPSN_PRG mask used for protection

[gerrit]

This is an automated email from Gerrit.

"Tarek BOCHKATI <tarek.bouchk...@gmail.com>" just uploaded a new patch set to 
Gerrit, which you can find at https://review.openocd.org/c/openocd/+/6858

-- gerrit

commit 7d743ec86ba342f98d94b44f1ba90cb130cd9fb9
Author: Tarek BOCHKATI <tarek.bouchk...@gmail.com>
Date:   Thu Feb 24 15:18:53 2022 +0100

    flash/stm32h7x: fix FLASH_WPSN_PRG mask used for protection
    
    STM32H7Ax/7Bx devices have a different WPSN mask (0xFFFFFFFF),
    (0xFF for STM32H74x/75x and STM32H72x/73x devices).
    
    And when supporting STM32H7Ax/7Bx devices, stm32x_protect() was
    not updated accordingly.
    
    Change-Id: I081217af3e5ed815b67bfdfec7f4ebaa3152a865
    Signed-off-by: Tarek BOCHKATI <tarek.bouchk...@gmail.com>

diff --git a/src/flash/nor/stm32h7x.c b/src/flash/nor/stm32h7x.c
index d3f17b2b1..2da279871 100644
--- a/src/flash/nor/stm32h7x.c
+++ b/src/flash/nor/stm32h7x.c
@@ -531,6 +531,7 @@ static int stm32x_protect(struct flash_bank *bank, int set, 
unsigned int first,
                unsigned int last)
 {
        struct target *target = bank->target;
+       struct stm32h7x_flash_bank *stm32x_info = bank->driver_priv;
        uint32_t protection;
 
        if (target->state != TARGET_HALTED) {
@@ -553,7 +554,7 @@ static int stm32x_protect(struct flash_bank *bank, int set, 
unsigned int first,
        }
 
        /* apply WRPSN mask */
-       protection &= 0xff;
+       protection &= stm32x_info->part_info->wps_mask;
 
        LOG_DEBUG("stm32x_protect, option_bytes written WPSN 0x%" PRIx32, 
protection);
 

--