[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-320-gfb52ba4fa

[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  fb52ba4fa1ea4f5bcf4b72ac85af4fe2fada7ee7 (commit)
      from  8bbbff185ff97102f7b0db4f1aee7f4d81a06e7d (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 fb52ba4fa1ea4f5bcf4b72ac85af4fe2fada7ee7
Author: Fedi Bouzazi <fed...@st...>
Date:   Mon Aug 14 13:03:31 2023 +0100

    target/cortex_m: support DWT version 2.1 for Archv8_M
    
    According to Arm®v8-M Architecture Reference Manual:
    section D1.2.59 DWT_DEVARCH, DWT Device Architecture Register,
    the field REVISION bits [19:16] defines two DWT architectures revision
    
    Signed-off-by: Fedi Bouzazi <fed...@st...>
    Change-Id: I948dae0710ac921a7f0fbcef3ccacdae99184fe4
    Reviewed-on: https://review.openocd.org/c/openocd/+/7800
    Tested-by: jenkins
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 014ceaeba..854e8eb58 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -1959,7 +1959,8 @@ static int cortex_m_set_watchpoint(struct target *target, struct watchpoint *wat
 	target_write_u32(target, comparator->dwt_comparator_address + 0,
 		comparator->comp);
 
-	if ((cortex_m->dwt_devarch & 0x1FFFFF) != DWT_DEVARCH_ARMV8M) {
+	if ((cortex_m->dwt_devarch & 0x1FFFFF) != DWT_DEVARCH_ARMV8M_V2_0
+			&& (cortex_m->dwt_devarch & 0x1FFFFF) != DWT_DEVARCH_ARMV8M_V2_1) {
 		uint32_t mask = 0, temp;
 
 		/* watchpoint params were validated earlier */
diff --git a/src/target/cortex_m.h b/src/target/cortex_m.h
index b5d1da7f2..065e4d47b 100644
--- a/src/target/cortex_m.h
+++ b/src/target/cortex_m.h
@@ -92,7 +92,8 @@ struct cortex_m_part_info {
 #define DWT_FUNCTION0	0xE0001028
 #define DWT_DEVARCH		0xE0001FBC
 
-#define DWT_DEVARCH_ARMV8M	0x101A02
+#define DWT_DEVARCH_ARMV8M_V2_0	0x101A02
+#define DWT_DEVARCH_ARMV8M_V2_1	0x111A02
 
 #define FP_CTRL		0xE0002000
 #define FP_REMAP	0xE0002004

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

Summary of changes:
 src/target/cortex_m.c | 3 ++-
 src/target/cortex_m.h | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository