openocd-commit — OpenOCD commit maling list - read only

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-30-gc6fe10de7

[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  c6fe10de75763623dfdaaf2fe3fff7e78a4ca146 (commit)
      from  2278878a05d8dfbbed3e59f0cfbeeb598af3129c (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 c6fe10de75763623dfdaaf2fe3fff7e78a4ca146
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Dec 10 18:19:54 2022 +0100

    arm_adi_v5: fix SIGSEGV due to failing re-examine
    
    Commit 35a503b08d14 ("arm_adi_v5: add ap refcount and add get/put
    around ap use") modifies the examine functions of mem_ap, cortex_m,
    cortex_a and aarch64 by calling dap_put_ap() and then looking again
    for the mem-ap and calling dap_get_ap().
    This causes an issue if the system is irresponsive and the examine
    fails and left the AP pointer to NULL. If the system was already
    examined the NULL pointer will cause a SIGSEGV.
    
    Commit b6dad912b85d ("target/cortex_m: prevent segmentation fault
    in cortex_m_poll()") proposes a fix for one specific case and only
    on cortex_m.
    
    Modify all the examine functions by skipping look-up for the AP if
    it was already set in a previous examine; the target's AP is not
    supposed to change during runtime.
    
    Remove the partial fix for cortex_m as it is not needed anymore.
    
    Change-Id: I806ec3b1b02fcc76e141c8dd3a65044febbf0a8c
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Fixes: 35a503b08d14 ("arm_adi_v5: add ap refcount and add get/put around ap use")
    Reviewed-on: https://review.openocd.org/c/openocd/+/7392
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/target/aarch64.c b/src/target/aarch64.c
index 8592daa16..8e90e6400 100644
--- a/src/target/aarch64.c
+++ b/src/target/aarch64.c
@@ -2546,23 +2546,20 @@ static int aarch64_examine_first(struct target *target)
 	if (!pc)
 		return ERROR_FAIL;
 
-	if (armv8->debug_ap) {
-		dap_put_ap(armv8->debug_ap);
-		armv8->debug_ap = NULL;
-	}
-
-	if (pc->adiv5_config.ap_num == DP_APSEL_INVALID) {
-		/* Search for the APB-AB */
-		retval = dap_find_get_ap(swjdp, AP_TYPE_APB_AP, &armv8->debug_ap);
-		if (retval != ERROR_OK) {
-			LOG_ERROR("Could not find APB-AP for debug access");
-			return retval;
-		}
-	} else {
-		armv8->debug_ap = dap_get_ap(swjdp, pc->adiv5_config.ap_num);
-		if (!armv8->debug_ap) {
-			LOG_ERROR("Cannot get AP");
-			return ERROR_FAIL;
+	if (!armv8->debug_ap) {
+		if (pc->adiv5_config.ap_num == DP_APSEL_INVALID) {
+			/* Search for the APB-AB */
+			retval = dap_find_get_ap(swjdp, AP_TYPE_APB_AP, &armv8->debug_ap);
+			if (retval != ERROR_OK) {
+				LOG_ERROR("Could not find APB-AP for debug access");
+				return retval;
+			}
+		} else {
+			armv8->debug_ap = dap_get_ap(swjdp, pc->adiv5_config.ap_num);
+			if (!armv8->debug_ap) {
+				LOG_ERROR("Cannot get AP");
+				return ERROR_FAIL;
+			}
 		}
 	}
 
diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index 7286a305b..07796d57c 100644
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -2874,23 +2874,20 @@ static int cortex_a_examine_first(struct target *target)
 	int retval = ERROR_OK;
 	uint32_t didr, cpuid, dbg_osreg, dbg_idpfr1;
 
-	if (armv7a->debug_ap) {
-		dap_put_ap(armv7a->debug_ap);
-		armv7a->debug_ap = NULL;
-	}
-
-	if (pc->ap_num == DP_APSEL_INVALID) {
-		/* Search for the APB-AP - it is needed for access to debug registers */
-		retval = dap_find_get_ap(swjdp, AP_TYPE_APB_AP, &armv7a->debug_ap);
-		if (retval != ERROR_OK) {
-			LOG_ERROR("Could not find APB-AP for debug access");
-			return retval;
-		}
-	} else {
-		armv7a->debug_ap = dap_get_ap(swjdp, pc->ap_num);
-		if (!armv7a->debug_ap) {
-			LOG_ERROR("Cannot get AP");
-			return ERROR_FAIL;
+	if (!armv7a->debug_ap) {
+		if (pc->ap_num == DP_APSEL_INVALID) {
+			/* Search for the APB-AP - it is needed for access to debug registers */
+			retval = dap_find_get_ap(swjdp, AP_TYPE_APB_AP, &armv7a->debug_ap);
+			if (retval != ERROR_OK) {
+				LOG_ERROR("Could not find APB-AP for debug access");
+				return retval;
+			}
+		} else {
+			armv7a->debug_ap = dap_get_ap(swjdp, pc->ap_num);
+			if (!armv7a->debug_ap) {
+				LOG_ERROR("Cannot get AP");
+				return ERROR_FAIL;
+			}
 		}
 	}
 
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 186344167..2472e38e2 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -879,16 +879,6 @@ static int cortex_m_poll(struct target *target)
 	struct cortex_m_common *cortex_m = target_to_cm(target);
 	struct armv7m_common *armv7m = &cortex_m->armv7m;
 
-	/* Check if debug_ap is available to prevent segmentation fault.
-	 * If the re-examination after an error does not find a MEM-AP
-	 * (e.g. the target stopped communicating), debug_ap pointer
-	 * can suddenly become NULL.
-	 */
-	if (!armv7m->debug_ap) {
-		target->state = TARGET_UNKNOWN;
-		return ERROR_TARGET_NOT_EXAMINED;
-	}
-
 	/* Read from Debug Halting Control and Status Register */
 	retval = cortex_m_read_dhcsr_atomic_sticky(target);
 	if (retval != ERROR_OK) {
@@ -2311,23 +2301,20 @@ int cortex_m_examine(struct target *target)
 	/* hla_target shares the examine handler but does not support
 	 * all its calls */
 	if (!armv7m->is_hla_target) {
-		if (armv7m->debug_ap) {
-			dap_put_ap(armv7m->debug_ap);
-			armv7m->debug_ap = NULL;
-		}
-
-		if (cortex_m->apsel == DP_APSEL_INVALID) {
-			/* Search for the MEM-AP */
-			retval = cortex_m_find_mem_ap(swjdp, &armv7m->debug_ap);
-			if (retval != ERROR_OK) {
-				LOG_TARGET_ERROR(target, "Could not find MEM-AP to control the core");
-				return retval;
-			}
-		} else {
-			armv7m->debug_ap = dap_get_ap(swjdp, cortex_m->apsel);
-			if (!armv7m->debug_ap) {
-				LOG_ERROR("Cannot get AP");
-				return ERROR_FAIL;
+		if (!armv7m->debug_ap) {
+			if (cortex_m->apsel == DP_APSEL_INVALID) {
+				/* Search for the MEM-AP */
+				retval = cortex_m_find_mem_ap(swjdp, &armv7m->debug_ap);
+				if (retval != ERROR_OK) {
+					LOG_TARGET_ERROR(target, "Could not find MEM-AP to control the core");
+					return retval;
+				}
+			} else {
+				armv7m->debug_ap = dap_get_ap(swjdp, cortex_m->apsel);
+				if (!armv7m->debug_ap) {
+					LOG_ERROR("Cannot get AP");
+					return ERROR_FAIL;
+				}
 			}
 		}
 
diff --git a/src/target/mem_ap.c b/src/target/mem_ap.c
index a66250693..50dc91c7b 100644
--- a/src/target/mem_ap.c
+++ b/src/target/mem_ap.c
@@ -136,15 +136,12 @@ static int mem_ap_examine(struct target *target)
 	struct mem_ap *mem_ap = target->arch_info;
 
 	if (!target_was_examined(target)) {
-		if (mem_ap->ap) {
-			dap_put_ap(mem_ap->ap);
-			mem_ap->ap = NULL;
-		}
-
-		mem_ap->ap = dap_get_ap(mem_ap->dap, mem_ap->ap_num);
 		if (!mem_ap->ap) {
-			LOG_ERROR("Cannot get AP");
-			return ERROR_FAIL;
+			mem_ap->ap = dap_get_ap(mem_ap->dap, mem_ap->ap_num);
+			if (!mem_ap->ap) {
+				LOG_ERROR("Cannot get AP");
+				return ERROR_FAIL;
+			}
 		}
 		target_set_examined(target);
 		target->state = TARGET_UNKNOWN;

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

Summary of changes:
 src/target/aarch64.c  | 31 ++++++++++++++-----------------
 src/target/cortex_a.c | 31 ++++++++++++++-----------------
 src/target/cortex_m.c | 41 ++++++++++++++---------------------------
 src/target/mem_ap.c   | 13 +++++--------
 4 files changed, 47 insertions(+), 69 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-29-g2278878a0

[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  2278878a05d8dfbbed3e59f0cfbeeb598af3129c (commit)
      from  9501b263e0ae127b012f5c5e3ba5dffcc7daa8d1 (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 2278878a05d8dfbbed3e59f0cfbeeb598af3129c
Author: Nima Palizban <n.p...@gm...>
Date:   Thu Dec 1 12:41:30 2022 -0500

    src/target/mips_m4k.c: set missing flag in set_watchpoint
    
    Without the fix, will see "Can not find free FP Comparator" error log
    
    Change-Id: Id0d91cc02b7055e44d27507f9c05ccd48ff49838
    Signed-off-by: Nima Palizban <n.p...@gm...>
    Fixes: fb43f1ff4e2f (target: Rework 'set' variable of break-/watchpoints)
    Reviewed-on: https://review.openocd.org/c/openocd/+/7389
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index e85018c87..491b247b1 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -900,7 +900,7 @@ static int mips_m4k_set_watchpoint(struct target *target,
 			LOG_ERROR("BUG: watchpoint->rw neither read, write nor access");
 	}
 
-	watchpoint->number = wp_num;
+	watchpoint_set(watchpoint, wp_num);
 	comparator_list[wp_num].used = 1;
 	comparator_list[wp_num].bp_value = watchpoint->address;
 

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

Summary of changes:
 src/target/mips_m4k.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-28-g9501b263e

[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  9501b263e0ae127b012f5c5e3ba5dffcc7daa8d1 (commit)
      from  04887d3b688aef999f83eebf9c521d1bb7d29b0b (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 9501b263e0ae127b012f5c5e3ba5dffcc7daa8d1
Author: Karl Palsson <ka...@tw...>
Date:   Tue Nov 29 13:12:14 2022 +0000

    doc: describe tcl port consistently.
    
    One place described the tcl port as 5555, which was changed in 163bd86071a
    Reported on IRC.
    
    Change-Id: If740a29443793d6a4d4f8c9db54f0fc8344a6c1c
    Signed-off-by: Karl Palsson <ka...@tw...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7385
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index e9f93614c..d8a5e86b4 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -8523,7 +8523,7 @@ command. All output is relayed through the GDB session.
 
 @item @b{Machine Interface}
 The Tcl interface's intent is to be a machine interface. The default Tcl
-port is 5555.
+port is 6666.
 @end itemize
 
 

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

Summary of changes:
 doc/openocd.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-27-g04887d3b6

[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  04887d3b688aef999f83eebf9c521d1bb7d29b0b (commit)
      from  4fe3997294e24d9a7bb41290088d6410f7ba1eca (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 04887d3b688aef999f83eebf9c521d1bb7d29b0b
Author: Evgeniy Naydanov <evg...@sy...>
Date:   Fri Sep 16 16:01:46 2022 +0300

    Fix jim_target_smp for smp rtos target
    
    If multiple targets are specified as -rtos <rtos_type>, the
    rtos_update_threads was called only if the last target was specified as
    rtos, which is inconsistent with other checks of whether or not smp target
    is an rtos one.
    
    Signed-off-by: Evgeniy Naydanov <evg...@sy...>
    Change-Id: Ie52bc6b6c8f841d31b9590fcbc44e985d3cba0eb
    Reviewed-on: https://review.openocd.org/c/openocd/+/7244
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/target.c b/src/target/target.c
index 783159fec..e4fe20f72 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -6433,16 +6433,52 @@ static int jim_target_names(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	return JIM_OK;
 }
 
+static struct target_list *
+__attribute__((warn_unused_result))
+create_target_list_node(Jim_Obj *const name) {
+	int len;
+	const char *targetname = Jim_GetString(name, &len);
+	struct target *target = get_target(targetname);
+	LOG_DEBUG("%s ", targetname);
+	if (!target)
+		return NULL;
+
+	struct target_list *new = malloc(sizeof(struct target_list));
+	if (!new) {
+		LOG_ERROR("Out of memory");
+		return new;
+	}
+
+	new->target = target;
+	return new;
+}
+
+static int get_target_with_common_rtos_type(struct list_head *lh, struct target **result)
+{
+	struct target *target = NULL;
+	struct target_list *curr;
+	foreach_smp_target(curr, lh) {
+		struct rtos *curr_rtos = curr->target->rtos;
+		if (curr_rtos) {
+			if (target && target->rtos && target->rtos->type != curr_rtos->type) {
+				LOG_ERROR("Different rtos types in members of one smp target!");
+				return JIM_ERR;
+			}
+			target = curr->target;
+		}
+	}
+	*result = target;
+	return JIM_OK;
+}
+
 static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
-	int i;
-	const char *targetname;
-	int retval, len;
 	static int smp_group = 1;
-	struct target *target = NULL;
-	struct target_list *head, *new;
 
-	retval = 0;
+	if (argc == 1) {
+		LOG_DEBUG("Empty SMP target");
+		return JIM_OK;
+	}
 	LOG_DEBUG("%d", argc);
 	/* argv[1] = target to associate in smp
 	 * argv[2] = target to associate in smp
@@ -6456,27 +6492,24 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	}
 	INIT_LIST_HEAD(lh);
 
-	for (i = 1; i < argc; i++) {
-
-		targetname = Jim_GetString(argv[i], &len);
-		target = get_target(targetname);
-		LOG_DEBUG("%s ", targetname);
-		if (target) {
-			new = malloc(sizeof(struct target_list));
-			new->target = target;
+	for (int i = 1; i < argc; i++) {
+		struct target_list *new = create_target_list_node(argv[i]);
+		if (new)
 			list_add_tail(&new->lh, lh);
-		}
 	}
 	/*  now parse the list of cpu and put the target in smp mode*/
-	foreach_smp_target(head, lh) {
-		target = head->target;
+	struct target_list *curr;
+	foreach_smp_target(curr, lh) {
+		struct target *target = curr->target;
 		target->smp = smp_group;
 		target->smp_targets = lh;
 	}
 	smp_group++;
 
-	if (target && target->rtos)
-		retval = rtos_smp_init(target);
+	struct target *rtos_target;
+	int retval = get_target_with_common_rtos_type(lh, &rtos_target);
+	if (retval == JIM_OK && rtos_target)
+		retval = rtos_smp_init(rtos_target);
 
 	return retval;
 }

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

Summary of changes:
 src/target/target.c | 71 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 52 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-26-g4fe399729

[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  4fe3997294e24d9a7bb41290088d6410f7ba1eca (commit)
       via  a9d74285358b2e2c8adc822b6151e9e548920c64 (commit)
      from  3ea1bfce4faf656d0506c194084807f1e498abff (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 4fe3997294e24d9a7bb41290088d6410f7ba1eca
Author: Koudai Iwahori <ko...@go...>
Date:   Fri Nov 18 06:18:17 2022 -0800

    hwthread: Restore current_threadid in hwthread_update_threads
    
    When OpenOCD receives a step-execution command from GDB and the target
    is configured as rtos=hwthread, OpenOCD reconstructs the thread-info.
    However, OpenOCD does not restore the thread id which is currently
    selected by GDB. Due to this issue, OpenOCD sends the information of
    wrong thread to GDB after the step execution.
    This commit fixes the above issue by adding a code to save/restore the
    thread id selected by GDB.
    
    Signed-off-by: Koudai Iwahori <ko...@go...>
    Change-Id: I761a1141c04d48f1290e4f09baa7c7024f86f36a
    Reviewed-on: https://review.openocd.org/c/openocd/+/7358
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/rtos/hwthread.c b/src/rtos/hwthread.c
index 1540168c3..03c4d8550 100644
--- a/src/rtos/hwthread.c
+++ b/src/rtos/hwthread.c
@@ -82,6 +82,7 @@ static int hwthread_update_threads(struct rtos *rtos)
 	struct target_list *head;
 	struct target *target;
 	int64_t current_thread = 0;
+	int64_t current_threadid = rtos->current_threadid; /* thread selected by GDB */
 	enum target_debug_reason current_reason = DBG_REASON_UNDEFINED;
 
 	if (!rtos)
@@ -105,6 +106,15 @@ static int hwthread_update_threads(struct rtos *rtos)
 	} else
 		thread_list_size = 1;
 
+	/* restore the threadid which is currently selected by GDB
+	 * because rtos_free_threadlist() wipes out it
+	 * (GDB thread id is 1-based indexing) */
+	if (current_threadid <= thread_list_size)
+		rtos->current_threadid = current_threadid;
+	else
+		LOG_WARNING("SMP node change, disconnect GDB from core/thread %" PRId64,
+			    current_threadid);
+
 	/* create space for new thread details */
 	rtos->thread_details = malloc(sizeof(struct thread_detail) * thread_list_size);
 

commit a9d74285358b2e2c8adc822b6151e9e548920c64
Author: Koudai Iwahori <ko...@go...>
Date:   Fri Nov 18 01:23:43 2022 -0800

    hwthread: Add register validity check in get_thread_reg_list
    
    When OpenOCD receives 'g' packet (read general registers) from GDB and
    target is configured as rtos=hwthread, hwthread_get_thread_reg_list is
    called. However, it does not check if the register valid or not. Due to
    this issue, OpenOCD returns invalid register values to GDB.
    This commit adds a validity check to hwthread_get_thread_reg_list. If
    the register is not valid, it tries to read the register from the
    target.
    
    Signed-off-by: Koudai Iwahori <ko...@go...>
    Change-Id: Iad6424b62124271ec411b1dfc044b57dfc460280
    Reviewed-on: https://review.openocd.org/c/openocd/+/7357
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/rtos/hwthread.c b/src/rtos/hwthread.c
index 50e7bae51..1540168c3 100644
--- a/src/rtos/hwthread.c
+++ b/src/rtos/hwthread.c
@@ -255,6 +255,15 @@ static int hwthread_get_thread_reg_list(struct rtos *rtos, int64_t thread_id,
 	for (int i = 0; i < reg_list_size; i++) {
 		if (!reg_list[i] || reg_list[i]->exist == false || reg_list[i]->hidden)
 			continue;
+		if (!reg_list[i]->valid) {
+			retval = reg_list[i]->type->get(reg_list[i]);
+			if (retval != ERROR_OK) {
+				LOG_ERROR("Couldn't get register %s.", reg_list[i]->name);
+				free(reg_list);
+				free(*rtos_reg_list);
+				return retval;
+			}
+		}
 		(*rtos_reg_list)[j].number = reg_list[i]->number;
 		(*rtos_reg_list)[j].size = reg_list[i]->size;
 		memcpy((*rtos_reg_list)[j].value, reg_list[i]->value,

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

Summary of changes:
 src/rtos/hwthread.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-24-g3ea1bfce4

[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  3ea1bfce4faf656d0506c194084807f1e498abff (commit)
      from  0f034868f2c90741e57c5e27121e292b1774c080 (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 3ea1bfce4faf656d0506c194084807f1e498abff
Author: Antonio Borneo <bor...@gm...>
Date:   Wed Nov 16 23:06:12 2022 +0100

    jtag: xds110: fix clang error core.StackAddressEscape
    
    Clang ignores that xds110_swd_write_reg() is always called with
    bit SWD_CMD_RNW in 'cmd' set to zero.
    It then complains that the local variable 'value' gets passed by
    address to xds110_swd_queue_cmd() and in case of 'read request'
    such stack address get stored for later use:
            src/jtag/drivers/xds110.c:1363:1: warning: Address of
             stack memory associated with local variable 'value' is
             still referred to by the global variable 'xds110' upon
             returning to the caller. This will be a dangling
             reference [core.StackAddressEscape]
    
    To both xds110_swd_write_reg() and xds110_swd_read_reg(), add an
    assert() to inform Clang about the state of bit SWD_CMD_RNW.
    
    Change-Id: I7687c055ec71424b642e152f478723a930966e3a
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7380
    Tested-by: jenkins

diff --git a/src/jtag/drivers/xds110.c b/src/jtag/drivers/xds110.c
index ecba36bb9..8e5d638db 100644
--- a/src/jtag/drivers/xds110.c
+++ b/src/jtag/drivers/xds110.c
@@ -1354,11 +1354,13 @@ static void xds110_swd_queue_cmd(uint8_t cmd, uint32_t *value)
 static void xds110_swd_read_reg(uint8_t cmd, uint32_t *value,
 	uint32_t ap_delay_clk)
 {
+	assert(cmd & SWD_CMD_RNW);
 	xds110_swd_queue_cmd(cmd, value);
 }
 static void xds110_swd_write_reg(uint8_t cmd, uint32_t value,
 	uint32_t ap_delay_clk)
 {
+	assert(!(cmd & SWD_CMD_RNW));
 	xds110_swd_queue_cmd(cmd, &value);
 }
 

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

Summary of changes:
 src/jtag/drivers/xds110.c | 2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-23-g0f034868f

[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  0f034868f2c90741e57c5e27121e292b1774c080 (commit)
      from  6ea1ccf3e6dd84c600c4ae9fb70347872634ded4 (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 0f034868f2c90741e57c5e27121e292b1774c080
Author: Antonio Borneo <bor...@gm...>
Date:   Wed Nov 16 01:02:02 2022 +0100

    flash: lpc2900: fix clang error 'dead assignment'
    
    The variable retval is assigned a value that is never used.
    Scan-build reports:
            Although the value stored to 'retval' is used in the
            enclosing expression, the value is never actually read
            from 'retval'.
    
    Drop the dead assignment.
    
    Change-Id: I11588dee748a55d52aa7f35bc1967b7df55af7fc
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7379
    Tested-by: jenkins

diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c
index c30fa7637..948def982 100644
--- a/src/flash/nor/lpc2900.c
+++ b/src/flash/nor/lpc2900.c
@@ -1132,9 +1132,9 @@ static int lpc2900_write(struct flash_bank *bank, const uint8_t *buffer,
 	 * reduced size if that fails. */
 	struct working_area *warea;
 	uint32_t buffer_size = lpc2900_info->max_ram_block - 1 * KiB;
-	while ((retval = target_alloc_working_area_try(target,
+	while (target_alloc_working_area_try(target,
 				 buffer_size + target_code_size,
-				 &warea)) != ERROR_OK) {
+				 &warea) != ERROR_OK) {
 		/* Try a smaller buffer now, and stop if it's too small. */
 		buffer_size -= 1 * KiB;
 		if (buffer_size < 2 * KiB) {

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

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


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-22-g6ea1ccf3e

[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  6ea1ccf3e6dd84c600c4ae9fb70347872634ded4 (commit)
      from  5193f61cf5562587ada989ae84005efa62d1b155 (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 6ea1ccf3e6dd84c600c4ae9fb70347872634ded4
Author: Marc Schink <de...@za...>
Date:   Thu Nov 24 12:54:57 2022 +0100

    flash/nor/stm32lx: Add revision '1, X' for Cat.2 devices
    
    Change-Id: I0ff1e2102175ee952b066b325c9acbcb598b3af7
    Signed-off-by: Marc Schink <de...@za...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7378
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c
index 42b52c5c2..1459e942d 100644
--- a/src/flash/nor/stm32lx.c
+++ b/src/flash/nor/stm32lx.c
@@ -132,7 +132,7 @@ static const struct stm32lx_rev stm32_417_revs[] = {
 	{ 0x1000, "A" }, { 0x1008, "Z" }, { 0x1018, "Y" }, { 0x1038, "X" }
 };
 static const struct stm32lx_rev stm32_425_revs[] = {
-	{ 0x1000, "A" }, { 0x2000, "B" }, { 0x2008, "Y" },
+	{ 0x1000, "A" }, { 0x2000, "B" }, { 0x2008, "Y" }, { 0x2018, "1, X" },
 };
 static const struct stm32lx_rev stm32_427_revs[] = {
 	{ 0x1000, "A" }, { 0x1018, "Y" }, { 0x1038, "X" }, { 0x10f8, "V" },

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

Summary of changes:
 src/flash/nor/stm32lx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-21-g5193f61cf

[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  5193f61cf5562587ada989ae84005efa62d1b155 (commit)
      from  e345cefabdda4e14c64b2206105e99b2fa0b9b6b (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 5193f61cf5562587ada989ae84005efa62d1b155
Author: Rocco Marco Guglielmi <roc...@gm...>
Date:   Wed Nov 23 09:54:30 2022 +0100

    tcl: max326xx: fix target scripts for latest version of OpenOCD
    
    Change-Id: Iec5aba3a082f2e25f21d7ca173ed710894b370a4
    
    Signed-off-by: Rocco Marco Guglielmi <roc...@gm...>
    Change-Id: Ia83850e326661c8acb0712a280fdf961258322a4
    Reviewed-on: https://review.openocd.org/c/openocd/+/7373
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/tcl/target/max32620.cfg b/tcl/target/max32620.cfg
index 9f0f4929d..f3a9f84c8 100644
--- a/tcl/target/max32620.cfg
+++ b/tcl/target/max32620.cfg
@@ -16,8 +16,10 @@ if {[using_jtag]} {
     swd newdap max32620 cpu -irlen 4 -irmask 0xf -expected-id 0x2ba01477 -ignore-version
 }
 
+dap create max32620.dap -chain-position max32620.cpu
+
 # target configuration
-target create max32620.cpu cortex_m -chain-position max32620.cpu
+target create max32620.cpu cortex_m -dap max32620.dap
 max32620.cpu configure -work-area-phys 0x20005000 -work-area-size 0x2000
 
 # Config Command: flash bank name driver base size chip_width bus_width target [driver_options]
diff --git a/tcl/target/max32625.cfg b/tcl/target/max32625.cfg
index 35e1c3bbd..90eb39266 100644
--- a/tcl/target/max32625.cfg
+++ b/tcl/target/max32625.cfg
@@ -16,8 +16,10 @@ if {[using_jtag]} {
     swd newdap max32625 cpu -irlen 4 -irmask 0xf -expected-id 0x2ba01477 -ignore-version
 }
 
+dap create max32625.dap -chain-position max32625.cpu
+
 # target configuration
-target create max32625.cpu cortex_m -chain-position max32625.cpu
+target create max32625.cpu cortex_m -dap max32625.dap
 max32625.cpu configure -work-area-phys 0x20005000 -work-area-size 0x2000
 
 # Config Command: flash bank name driver base size chip_width bus_width target [driver_options]
diff --git a/tcl/target/max3263x.cfg b/tcl/target/max3263x.cfg
index 52a5a770e..852e04af1 100644
--- a/tcl/target/max3263x.cfg
+++ b/tcl/target/max3263x.cfg
@@ -16,8 +16,10 @@ if {[using_jtag]} {
     swd newdap max3263x cpu -irlen 4 -irmask 0xf -expected-id 0x2ba01477 -ignore-version
 }
 
+dap create max3263x.dap -chain-position max3263x.cpu
+
 # target configuration
-target create max3263x.cpu cortex_m -chain-position max3263x.cpu
+target create max3263x.cpu cortex_m -dap max3263x.dap
 max3263x.cpu configure -work-area-phys 0x20005000 -work-area-size 0x2000
 
 # Config Command: flash bank name driver base size chip_width bus_width target [driver_options]

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

Summary of changes:
 tcl/target/max32620.cfg | 4 +++-
 tcl/target/max32625.cfg | 4 +++-
 tcl/target/max3263x.cfg | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-20-ge345cefab

[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  e345cefabdda4e14c64b2206105e99b2fa0b9b6b (commit)
      from  9d925776b4504f71306b16467c1b731e57b6e7d0 (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 e345cefabdda4e14c64b2206105e99b2fa0b9b6b
Author: Nick Kraus <ni...@nc...>
Date:   Mon Nov 21 09:55:11 2022 -0500

    jtag/drivers/cmsis_dap.c: Fix Length of SWO Baudrate Command
    
    The command should now send the full 5 byte command length, which
    includes the command tag (0x19) and the 4-byte baudrate word, instead
    of only the last 3 bytes of the baudrate.
    
    Signed-off-by: Nick Kraus <ni...@nc...>
    Change-Id: Idd6e084efd7492489aa900cdbf08f540944041cb
    Reviewed-on: https://review.openocd.org/c/openocd/+/7370
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/drivers/cmsis_dap.c b/src/jtag/drivers/cmsis_dap.c
index 2f5f9c907..44a7dd8cb 100644
--- a/src/jtag/drivers/cmsis_dap.c
+++ b/src/jtag/drivers/cmsis_dap.c
@@ -660,7 +660,7 @@ static int cmsis_dap_cmd_dap_swo_baudrate(
 	command[0] = CMD_DAP_SWO_BAUDRATE;
 	h_u32_to_le(&command[1], in_baudrate);
 
-	int retval = cmsis_dap_xfer(cmsis_dap_handle, 4);
+	int retval = cmsis_dap_xfer(cmsis_dap_handle, 5);
 	uint32_t rvbr = le_to_h_u32(&cmsis_dap_handle->response[1]);
 	if (retval != ERROR_OK || rvbr == 0) {
 		LOG_ERROR("CMSIS-DAP: command CMD_SWO_Baudrate(%u) -> %u failed.", in_baudrate, rvbr);

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

Summary of changes:
 src/jtag/drivers/cmsis_dap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-19-g9d925776b

[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  9d925776b4504f71306b16467c1b731e57b6e7d0 (commit)
      from  2e9f04c11a5aeb9c7aa9d387f9f4d0e7c65a1f5b (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 9d925776b4504f71306b16467c1b731e57b6e7d0
Author: Tomas Vanek <va...@fb...>
Date:   Sun Oct 16 11:34:57 2022 +0200

    target/armv7m: fix feature name of ARMv8M security extension regs
    
    gdb requires this feature to enable stack unwinding of secure/nonsecure
    interstate calls and exceptions on an ARMv8M target with
    the security extension.
    
    Tested on STM32L5 (Cortex-M33).
    
    Change-Id: Ib09780c011afbc095b352074068597559ad14fcd
    Link: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ae7e2f45aa4798be449f282bbf75ad41e73f055e
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7265
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index d28702dd7..93df5877e 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -116,27 +116,27 @@ static const struct {
 	{ ARMV7M_FAULTMASK, "faultmask", 1, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
 	{ ARMV7M_CONTROL, "control", 3, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
 
-	/* ARMv8-M specific registers */
-	{ ARMV8M_MSP_NS, "msp_ns", 32, REG_TYPE_DATA_PTR, "stack", "v8-m.sp" },
-	{ ARMV8M_PSP_NS, "psp_ns", 32, REG_TYPE_DATA_PTR, "stack", "v8-m.sp" },
-	{ ARMV8M_MSP_S, "msp_s", 32, REG_TYPE_DATA_PTR, "stack", "v8-m.sp" },
-	{ ARMV8M_PSP_S, "psp_s", 32, REG_TYPE_DATA_PTR, "stack", "v8-m.sp" },
-	{ ARMV8M_MSPLIM_S, "msplim_s", 32, REG_TYPE_DATA_PTR, "stack", "v8-m.sp" },
-	{ ARMV8M_PSPLIM_S, "psplim_s", 32, REG_TYPE_DATA_PTR, "stack", "v8-m.sp" },
-	{ ARMV8M_MSPLIM_NS, "msplim_ns", 32, REG_TYPE_DATA_PTR, "stack", "v8-m.sp" },
-	{ ARMV8M_PSPLIM_NS, "psplim_ns", 32, REG_TYPE_DATA_PTR, "stack", "v8-m.sp" },
+	/* ARMv8-M security extension (TrustZone) specific registers */
+	{ ARMV8M_MSP_NS, "msp_ns", 32, REG_TYPE_DATA_PTR, "stack", "org.gnu.gdb.arm.secext" },
+	{ ARMV8M_PSP_NS, "psp_ns", 32, REG_TYPE_DATA_PTR, "stack", "org.gnu.gdb.arm.secext" },
+	{ ARMV8M_MSP_S, "msp_s", 32, REG_TYPE_DATA_PTR, "stack", "org.gnu.gdb.arm.secext" },
+	{ ARMV8M_PSP_S, "psp_s", 32, REG_TYPE_DATA_PTR, "stack", "org.gnu.gdb.arm.secext" },
+	{ ARMV8M_MSPLIM_S, "msplim_s", 32, REG_TYPE_DATA_PTR, "stack", "org.gnu.gdb.arm.secext" },
+	{ ARMV8M_PSPLIM_S, "psplim_s", 32, REG_TYPE_DATA_PTR, "stack", "org.gnu.gdb.arm.secext" },
+	{ ARMV8M_MSPLIM_NS, "msplim_ns", 32, REG_TYPE_DATA_PTR, "stack", "org.gnu.gdb.arm.secext" },
+	{ ARMV8M_PSPLIM_NS, "psplim_ns", 32, REG_TYPE_DATA_PTR, "stack", "org.gnu.gdb.arm.secext" },
 
 	{ ARMV8M_PMSK_BPRI_FLTMSK_CTRL_S, "pmsk_bpri_fltmsk_ctrl_s", 32, REG_TYPE_INT, NULL, NULL },
-	{ ARMV8M_PRIMASK_S, "primask_s", 1, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
-	{ ARMV8M_BASEPRI_S, "basepri_s", 8, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
-	{ ARMV8M_FAULTMASK_S, "faultmask_s", 1, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
-	{ ARMV8M_CONTROL_S, "control_s", 3, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
+	{ ARMV8M_PRIMASK_S, "primask_s", 1, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.secext" },
+	{ ARMV8M_BASEPRI_S, "basepri_s", 8, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.secext" },
+	{ ARMV8M_FAULTMASK_S, "faultmask_s", 1, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.secext" },
+	{ ARMV8M_CONTROL_S, "control_s", 3, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.secext" },
 
 	{ ARMV8M_PMSK_BPRI_FLTMSK_CTRL_NS, "pmsk_bpri_fltmsk_ctrl_ns", 32, REG_TYPE_INT, NULL, NULL },
-	{ ARMV8M_PRIMASK_NS, "primask_ns", 1, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
-	{ ARMV8M_BASEPRI_NS, "basepri_ns", 8, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
-	{ ARMV8M_FAULTMASK_NS, "faultmask_ns", 1, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
-	{ ARMV8M_CONTROL_NS, "control_ns", 3, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.m-system" },
+	{ ARMV8M_PRIMASK_NS, "primask_ns", 1, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.secext" },
+	{ ARMV8M_BASEPRI_NS, "basepri_ns", 8, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.secext" },
+	{ ARMV8M_FAULTMASK_NS, "faultmask_ns", 1, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.secext" },
+	{ ARMV8M_CONTROL_NS, "control_ns", 3, REG_TYPE_INT8, "system", "org.gnu.gdb.arm.secext" },
 
 	/* FPU registers */
 	{ ARMV7M_D0, "d0", 64, REG_TYPE_IEEE_DOUBLE, "float", "org.gnu.gdb.arm.vfp" },

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

Summary of changes:
 src/target/armv7m.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-18-g2e9f04c11

[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  2e9f04c11a5aeb9c7aa9d387f9f4d0e7c65a1f5b (commit)
      from  2bad55bf83bcd4a24711a88b06971f3f828947bd (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 2e9f04c11a5aeb9c7aa9d387f9f4d0e7c65a1f5b
Author: Giulio Fieramosca <gi...@gl...>
Date:   Thu Nov 3 20:38:20 2022 +0100

    rtos/ThreadX: added check for NULL-named tasks
    
    Thread name loading was not correctly handled if a ThreadX task has a NULL
    name.
    
    Signed-off-by: Giulio Fieramosca <gi...@gl...>
    Change-Id: I03071930182bc2585b61ce5d8c67491710883dd6
    Reviewed-on: https://review.openocd.org/c/openocd/+/7328
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/rtos/ThreadX.c b/src/rtos/ThreadX.c
index 5f90eb644..5bdd007d4 100644
--- a/src/rtos/ThreadX.c
+++ b/src/rtos/ThreadX.c
@@ -370,16 +370,21 @@ static int threadx_update_threads(struct rtos *rtos)
 		}
 
 		/* Read the thread name */
-		retval =
-			target_read_buffer(rtos->target,
-				name_ptr,
-				THREADX_THREAD_NAME_STR_SIZE,
-				(uint8_t *)&tmp_str);
-		if (retval != ERROR_OK) {
-			LOG_ERROR("Error reading thread name from ThreadX target");
-			return retval;
+		tmp_str[0] = '\x00';
+
+		/* Check if thread has a valid name */
+		if (name_ptr != 0) {
+			retval =
+				target_read_buffer(rtos->target,
+					name_ptr,
+					THREADX_THREAD_NAME_STR_SIZE,
+					(uint8_t *)&tmp_str);
+			if (retval != ERROR_OK) {
+				LOG_ERROR("Error reading thread name from ThreadX target");
+				return retval;
+			}
+			tmp_str[THREADX_THREAD_NAME_STR_SIZE - 1] = '\x00';
 		}
-		tmp_str[THREADX_THREAD_NAME_STR_SIZE-1] = '\x00';
 
 		if (tmp_str[0] == '\x00')
 			strcpy(tmp_str, "No Name");

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

Summary of changes:
 src/rtos/ThreadX.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-17-g2bad55bf8

[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  2bad55bf83bcd4a24711a88b06971f3f828947bd (commit)
      from  1762aa04ce9a7883e85631c371d6e1f94d16e31a (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 2bad55bf83bcd4a24711a88b06971f3f828947bd
Author: Andreas Bolsch <hyp...@gm...>
Date:   Sat Nov 12 16:29:18 2022 +0100

    Fix for segfault and some clang reported problems in stmqspi
    
    Change-Id: Id003adb574085cdd603cc13aeb6f2efec73593f1
    Signed-off-by: Andreas Bolsch <hyp...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7345
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/stmqspi.c b/src/flash/nor/stmqspi.c
index e5df3b9e0..77ea4c40d 100644
--- a/src/flash/nor/stmqspi.c
+++ b/src/flash/nor/stmqspi.c
@@ -616,8 +616,6 @@ COMMAND_HANDLER(stmqspi_handle_set)
 
 	LOG_DEBUG("%s", __func__);
 
-	dual = (stmqspi_info->saved_cr & BIT(SPI_DUAL_FLASH)) ? 1 : 0;
-
 	/* chip_erase_cmd, sectorsize and erase_cmd are optional */
 	if ((CMD_ARGC < 7) || (CMD_ARGC > 10))
 		return ERROR_COMMAND_SYNTAX_ERROR;
@@ -628,8 +626,9 @@ COMMAND_HANDLER(stmqspi_handle_set)
 
 	target = bank->target;
 	stmqspi_info = bank->driver_priv;
+	dual = (stmqspi_info->saved_cr & BIT(SPI_DUAL_FLASH)) ? 1 : 0;
 
-	/* invalidate all old info */
+	/* invalidate all flash device info */
 	if (stmqspi_info->probed)
 		free(bank->sectors);
 	bank->size = 0;
@@ -721,10 +720,8 @@ COMMAND_HANDLER(stmqspi_handle_set)
 
 	uint32_t dcr;
 	retval = target_read_u32(target, io_base + SPI_DCR, &dcr);
-
 	if (retval != ERROR_OK)
 		return retval;
-
 	fsize = (dcr >> SPI_FSIZE_POS) & (BIT(SPI_FSIZE_LEN) - 1);
 
 	LOG_DEBUG("FSIZE = 0x%04x", fsize);
@@ -2080,16 +2077,17 @@ static int stmqspi_probe(struct flash_bank *bank)
 	bool octal_dtr;
 	int retval;
 
-	if (stmqspi_info->probed) {
-		bank->size = 0;
-		bank->num_sectors = 0;
+	/* invalidate all flash device info */
+	if (stmqspi_info->probed)
 		free(bank->sectors);
-		bank->sectors = NULL;
-		memset(&stmqspi_info->dev, 0, sizeof(stmqspi_info->dev));
-		stmqspi_info->sfdp_dummy1 = 0;
-		stmqspi_info->sfdp_dummy2 = 0;
-		stmqspi_info->probed = false;
-	}
+	bank->size = 0;
+	bank->num_sectors = 0;
+	bank->sectors = NULL;
+	stmqspi_info->sfdp_dummy1 = 0;
+	stmqspi_info->sfdp_dummy2 = 0;
+	stmqspi_info->probed = false;
+	memset(&stmqspi_info->dev, 0, sizeof(stmqspi_info->dev));
+	stmqspi_info->dev.name = "unknown";
 
 	/* Abort any previous operation */
 	retval = stmqspi_abort(bank);
@@ -2104,8 +2102,8 @@ static int stmqspi_probe(struct flash_bank *bank)
 	/* check whether QSPI_ABR is writeable and readback returns the value written */
 	retval = target_write_u32(target, io_base + QSPI_ABR, magic);
 	if (retval == ERROR_OK) {
-		retval = target_read_u32(target, io_base + QSPI_ABR, &data);
-		retval = target_write_u32(target, io_base + QSPI_ABR, 0);
+		(void)target_read_u32(target, io_base + QSPI_ABR, &data);
+		(void)target_write_u32(target, io_base + QSPI_ABR, 0);
 	}
 
 	if (data == magic) {

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

Summary of changes:
 src/flash/nor/stmqspi.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-16-g1762aa04c

[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  1762aa04ce9a7883e85631c371d6e1f94d16e31a (commit)
      from  0d055602c3fcf81e42a3928328e763f80a73097b (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 1762aa04ce9a7883e85631c371d6e1f94d16e31a
Author: Antonio Borneo <bor...@gm...>
Date:   Tue Nov 8 11:25:27 2022 +0100

    jep106: update to revision JEP106BF.01 Oct 2022
    
    Change-Id: Ia1f19dcce48da997c036ccffa65e76e179de2eb9
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7341
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/helper/jep106.inc b/src/helper/jep106.inc
index 01c3aac07..cb67b926a 100644
--- a/src/helper/jep106.inc
+++ b/src/helper/jep106.inc
@@ -8,7 +8,7 @@
  * identification code list, please visit the JEDEC website at www.jedec.org .
  */
 
-/* This file is aligned to revision JEP106BE January 2022. */
+/* This file is aligned to revision JEP106BF.01 October 2022. */
 
 [0][0x01 - 1] = "AMD",
 [0][0x02 - 1] = "AMI",
@@ -149,7 +149,7 @@
 [1][0x0b - 1] = "Bestlink Systems",
 [1][0x0c - 1] = "Graychip",
 [1][0x0d - 1] = "GENNUM",
-[1][0x0e - 1] = "VideoLogic",
+[1][0x0e - 1] = "Imagination Technologies Limited",
 [1][0x0f - 1] = "Robert Bosch",
 [1][0x10 - 1] = "Chip Express",
 [1][0x11 - 1] = "DATARAM",
@@ -1501,7 +1501,7 @@
 [11][0x67 - 1] = "Guangzhou Shuvrwine Technology Co",
 [11][0x68 - 1] = "Shenzhen Hangshun Chip Technology",
 [11][0x69 - 1] = "Chengboliwei Electronic Business",
-[11][0x6a - 1] = "Kowin Memory Technology Co Ltd",
+[11][0x6a - 1] = "Kowin Technology HK Limited",
 [11][0x6b - 1] = "Euronet Technology Inc",
 [11][0x6c - 1] = "SCY",
 [11][0x6d - 1] = "Shenzhen Xinhongyusheng Electrical",
@@ -1705,4 +1705,85 @@
 [13][0x37 - 1] = "ORICO Technologies Co. Ltd.",
 [13][0x38 - 1] = "Space Exploration Technologies Corp",
 [13][0x39 - 1] = "AONDEVICES Inc",
+[13][0x3a - 1] = "Shenzhen Netforward Micro Electronic",
+[13][0x3b - 1] = "Syntacore Ltd",
+[13][0x3c - 1] = "Shenzhen Secmem Microelectronics Co",
+[13][0x3d - 1] = "ONiO As",
+[13][0x3e - 1] = "Shenzhen Peladn Technology Co Ltd",
+[13][0x3f - 1] = "O-Cubes Shanghai Microelectronics",
+[13][0x40 - 1] = "ASTC",
+[13][0x41 - 1] = "UMIS",
+[13][0x42 - 1] = "Paradromics",
+[13][0x43 - 1] = "Sinh Micro Co Ltd",
+[13][0x44 - 1] = "Metorage Semiconductor Technology Co",
+[13][0x45 - 1] = "Aeva Inc",
+[13][0x46 - 1] = "HongKong Hyunion Electronics Co Ltd",
+[13][0x47 - 1] = "China Flash Co Ltd",
+[13][0x48 - 1] = "Sunplus Technology Co Ltd",
+[13][0x49 - 1] = "Idaho Scientific",
+[13][0x4a - 1] = "Suzhou SF Micro Electronics Co Ltd",
+[13][0x4b - 1] = "IMEX Cap AG",
+[13][0x4c - 1] = "Fitipower Integrated Technology Co Ltd",
+[13][0x4d - 1] = "ShenzhenWooacme Technology Co Ltd",
+[13][0x4e - 1] = "KeepData Original Chips",
+[13][0x4f - 1] = "Rivos Inc",
+[13][0x50 - 1] = "Big Innovation Company Limited",
+[13][0x51 - 1] = "Wuhan YuXin Semiconductor Co Ltd",
+[13][0x52 - 1] = "United Memory Technology (Jiangsu)",
+[13][0x53 - 1] = "PQShield Ltd",
+[13][0x54 - 1] = "ArchiTek Corporation",
+[13][0x55 - 1] = "ShenZhen AZW Technology Co Ltd",
+[13][0x56 - 1] = "Hengchi Zhixin (Dongguan) Technology",
+[13][0x57 - 1] = "Eggtronic Engineering Spa",
+[13][0x58 - 1] = "Fusontai Technology",
+[13][0x59 - 1] = "PULP Platform",
+[13][0x5a - 1] = "Koitek Electronic Technology (Shenzhen) Co",
+[13][0x5b - 1] = "Shenzhen Jiteng Network Technology Co",
+[13][0x5c - 1] = "Aviva Links Inc",
+[13][0x5d - 1] = "Trilinear Technologies Inc",
+[13][0x5e - 1] = "Shenzhen Developer Microelectronics Co",
+[13][0x5f - 1] = "Guangdong OPPO Mobile Telecommunication",
+[13][0x60 - 1] = "Akeana",
+[13][0x61 - 1] = "Lyczar",
+[13][0x62 - 1] = "Shenzhen Qiji Technology Co Ltd",
+[13][0x63 - 1] = "Shenzhen Shangzhaoyuan Technology",
+[13][0x64 - 1] = "Han Stor",
+[13][0x65 - 1] = "China Micro Semicon Co., Ltd.",
+[13][0x66 - 1] = "Shenzhen Zhuqin Technology Co Ltd",
+[13][0x67 - 1] = "Shanghai Ningyuan Electronic Technology",
+[13][0x68 - 1] = "Auradine",
+[13][0x69 - 1] = "Suzhou Yishuo Electronics Co Ltd",
+[13][0x6a - 1] = "Faurecia Clarion Electronics",
+[13][0x6b - 1] = "SiMa Technologies",
+[13][0x6c - 1] = "CFD Sales Inc",
+[13][0x6d - 1] = "Suzhou Comay Information Co Ltd",
+[13][0x6e - 1] = "Yentek",
+[13][0x6f - 1] = "Qorvo Inc",
+[13][0x70 - 1] = "Shenzhen Youzhi Computer Technology",
+[13][0x71 - 1] = "Sychw Technology (Shenzhen) Co Ltd",
+[13][0x72 - 1] = "MK Founder Technology Co Ltd",
+[13][0x73 - 1] = "Siliconwaves Technologies Co Ltd",
+[13][0x74 - 1] = "Hongkong Hyunion Electronics Co Ltd",
+[13][0x75 - 1] = "Shenzhen Xinxinzhitao Electronics Business",
+[13][0x76 - 1] = "Shenzhen HenQi Electronic Commerce Co",
+[13][0x77 - 1] = "Shenzhen Jingyi Technology Co Ltd",
+[13][0x78 - 1] = "Xiaohua Semiconductor Co. Ltd.",
+[13][0x79 - 1] = "Shenzhen Dalu Semiconductor Technology",
+[13][0x7a - 1] = "Shenzhen Ninespeed Electronics Co Ltd",
+[13][0x7b - 1] = "ICYC Semiconductor Co Ltd",
+[13][0x7c - 1] = "Shenzhen Jaguar Microsystems Co Ltd",
+[13][0x7d - 1] = "Beijing EC-Founder Co Ltd",
+[13][0x7e - 1] = "Shenzhen Taike Industrial Automation Co",
+[14][0x01 - 1] = "Kalray SA",
+[14][0x02 - 1] = "Shanghai Iluvatar CoreX Semiconductor Co",
+[14][0x03 - 1] = "Fungible Inc",
+[14][0x04 - 1] = "Song Industria E Comercio de Eletronicos",
+[14][0x05 - 1] = "DreamBig Semiconductor Inc",
+[14][0x06 - 1] = "ChampTek Electronics Corp",
+[14][0x07 - 1] = "Fusontai Technology",
+[14][0x08 - 1] = "Endress Hauser AG",
+[14][0x09 - 1] = "altec ComputerSysteme GmbH",
+[14][0x0a - 1] = "UltraRISC Technology (Shanghai) Co Ltd",
+[14][0x0b - 1] = "Shenzhen Jing Da Kang Technology Co Ltd",
+[14][0x0c - 1] = "Hangzhou Hongjun Microelectronics Co Ltd",
 /* EOF */

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

Summary of changes:
 src/helper/jep106.inc | 87 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 84 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-15-g0d055602c

[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  0d055602c3fcf81e42a3928328e763f80a73097b (commit)
      from  69391878535ec584a472475ee9767b6beaaa138c (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 0d055602c3fcf81e42a3928328e763f80a73097b
Author: Simon Smiganovski <sim...@fr...>
Date:   Wed Nov 9 16:32:26 2022 +0100

    flash/nor/stm32f1x: adjust size of the flash loader buffer
    
    target_run_flash_async_algorithm expects the source_buffer to have
    at least 2 words reserved for read and write pointers in addition to the
    FIFO buffer. If the size of the data to be flashed is <= 8 bytes then
    the flash function will fail with "corrupted fifo read pointer" error.
    
    Ensure the allocated buffer is big enough to hold both FIFO buffer and
    read/write pointers.
    
    Change-Id: I09c22eaac517b8cfea8e0b463f5deb6b98afd267
    Signed-off-by: Simon Smiganovski <sim...@fr...>
    Signed-off-by: Paul Fertser <fer...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7342
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c
index e882d7f79..ab1ef2aef 100644
--- a/src/flash/nor/stm32f1x.c
+++ b/src/flash/nor/stm32f1x.c
@@ -473,7 +473,7 @@ static int stm32x_write_block_async(struct flash_bank *bank, const uint8_t *buff
 
 	/* memory buffer */
 	buffer_size = target_get_working_area_avail(target);
-	buffer_size = MIN(hwords_count * 2, MAX(buffer_size, 256));
+	buffer_size = MIN(hwords_count * 2 + 8, MAX(buffer_size, 256));
 	/* Normally we allocate all available working area.
 	 * MIN shrinks buffer_size if the size of the written block is smaller.
 	 * MAX prevents using async algo if the available working area is smaller

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

Summary of changes:
 src/flash/nor/stm32f1x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-14-g693918785

[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  69391878535ec584a472475ee9767b6beaaa138c (commit)
      from  1d04ef3e55843f9880b7bbab32f564d2018a4b93 (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 69391878535ec584a472475ee9767b6beaaa138c
Author: Tomas Vanek <va...@fb...>
Date:   Tue Oct 18 22:00:18 2022 +0200

    target/armv7m: prevent saving and restoring non existent regs
    
    armv7m_start_algorithm() saves register values to arch_info->context.
    armv7m_wait_algorithm() restores register values from arch_info->context.
    Exclude registers with flag exist = false from both loops.
    
    While on it refactor the register restore: introduce 'struct reg' pointer
    and dereference it instead of numerous accesses by a full path
    from armv7m pointer.
    
    Change-Id: I1600084db84809ee13bcf8e7828b79f8c9ff9077
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7276
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index d9d01923a..d28702dd7 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -529,6 +529,9 @@ int armv7m_start_algorithm(struct target *target,
 	/* Store all non-debug execution registers to armv7m_algorithm_info context */
 	for (unsigned i = 0; i < armv7m->arm.core_cache->num_regs; i++) {
 		struct reg *reg = &armv7m->arm.core_cache->reg_list[i];
+		if (!reg->exist)
+			continue;
+
 		if (!reg->valid)
 			armv7m_get_core_reg(reg);
 
@@ -688,16 +691,19 @@ int armv7m_wait_algorithm(struct target *target,
 	}
 
 	for (int i = armv7m->arm.core_cache->num_regs - 1; i >= 0; i--) {
+		struct reg *reg = &armv7m->arm.core_cache->reg_list[i];
+		if (!reg->exist)
+			continue;
+
 		uint32_t regvalue;
-		regvalue = buf_get_u32(armv7m->arm.core_cache->reg_list[i].value, 0, 32);
+		regvalue = buf_get_u32(reg->value, 0, 32);
 		if (regvalue != armv7m_algorithm_info->context[i]) {
 			LOG_DEBUG("restoring register %s with value 0x%8.8" PRIx32,
-					armv7m->arm.core_cache->reg_list[i].name,
-				armv7m_algorithm_info->context[i]);
-			buf_set_u32(armv7m->arm.core_cache->reg_list[i].value,
+					  reg->name, armv7m_algorithm_info->context[i]);
+			buf_set_u32(reg->value,
 				0, 32, armv7m_algorithm_info->context[i]);
-			armv7m->arm.core_cache->reg_list[i].valid = true;
-			armv7m->arm.core_cache->reg_list[i].dirty = true;
+			reg->valid = true;
+			reg->dirty = true;
 		}
 	}
 

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

Summary of changes:
 src/target/armv7m.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-13-g1d04ef3e5

[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  1d04ef3e55843f9880b7bbab32f564d2018a4b93 (commit)
      from  4e077fddadd7d8fedacc61f59ce18a700f6759cf (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 1d04ef3e55843f9880b7bbab32f564d2018a4b93
Author: Tomas Vanek <va...@fb...>
Date:   Thu Nov 3 08:48:53 2022 +0100

    tcl/interface: fix raspberrypi2-native.cfg speed coefficient
    
    The speed coefficient for Raspberry Pi 2 was probably calibrated
    for a scaled down clock frequency.
    
    To prevent JTAG/SWD overclocking, use the value corresponding
    to the 'official' maximum CPU clock.
    
    Change-Id: Iaff58b092198dce6d6552c9d31d6a3ba4aaaa2d5
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7305
    Tested-by: jenkins
    Reviewed-by: Jonathan Bell <jon...@ra...>

diff --git a/tcl/interface/raspberrypi2-native.cfg b/tcl/interface/raspberrypi2-native.cfg
index 5faabed9d..d5edded0f 100644
--- a/tcl/interface/raspberrypi2-native.cfg
+++ b/tcl/interface/raspberrypi2-native.cfg
@@ -15,9 +15,9 @@ adapter driver bcm2835gpio
 bcm2835gpio peripheral_base 0x3F000000
 
 # Transition delay calculation: SPEED_COEFF/khz - SPEED_OFFSET
-# These depend on system clock, calibrated for stock 700MHz
+# These depend on system clock, calibrated for scaling_max_freq 900MHz
 # bcm2835gpio speed SPEED_COEFF SPEED_OFFSET
-bcm2835gpio speed_coeffs 146203 36
+bcm2835gpio speed_coeffs 225000 36
 
 # Each of the JTAG lines need a gpio number set: tck tms tdi tdo
 # Header pin numbers: 23 22 19 21

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

Summary of changes:
 tcl/interface/raspberrypi2-native.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-12-g4e077fdda

[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  4e077fddadd7d8fedacc61f59ce18a700f6759cf (commit)
      from  d3e79c1eafedf24ee8f6ff872826be07d9e9b654 (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 4e077fddadd7d8fedacc61f59ce18a700f6759cf
Author: George Voicu <raz...@ho...>
Date:   Sat Nov 5 10:59:43 2022 +0100

    tcl/cpld/xilinx-xcu: fix typo
    
    Fix typo in comments
    
    Signed-off-by: George Voicu <raz...@ho...>
    Change-Id: Icc2d770e73f896e20dd347de324328030544bdb9
    Reviewed-on: https://review.openocd.org/c/openocd/+/7333
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/tcl/cpld/xilinx-xcu.cfg b/tcl/cpld/xilinx-xcu.cfg
index 57a59f59a..9df696d4c 100644
--- a/tcl/cpld/xilinx-xcu.cfg
+++ b/tcl/cpld/xilinx-xcu.cfg
@@ -9,7 +9,7 @@ if { [info exists CHIPNAME] } {
 	set _CHIPNAME xcu
 }
 
-# The cvarious chips in the Ultrascale family have different IR length.
+# The various chips in the Ultrascale family have different IR length.
 # Set $CHIP before including this file to determine the device.
 array set _XCU_DATA {
 	XCKU025 {0x03824093 6}

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

Summary of changes:
 tcl/cpld/xilinx-xcu.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-11-gd3e79c1ea

[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  d3e79c1eafedf24ee8f6ff872826be07d9e9b654 (commit)
      from  fb23c9c10bd161ac05b85e73ad91676063592b96 (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 d3e79c1eafedf24ee8f6ff872826be07d9e9b654
Author: Daniel Anselmi <dan...@gm...>
Date:   Wed Nov 2 17:21:18 2022 +0100

    pld/virtex2: small doc extension
    
    Change-Id: I174cd702388be04268b38178fbfacb90db452f72
    Signed-off-by: Daniel Anselmi <dan...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7303
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 0fd2322f2..e9f93614c 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -8478,12 +8478,20 @@ that particular type of PLD.
 
 @deffn {FPGA Driver} {virtex2} [no_jstart]
 Virtex-II is a family of FPGAs sold by Xilinx.
+This driver can also be used to load Series3, Series6, Series7 and Zynq 7000 devices.
 It supports the IEEE 1532 standard for In-System Configuration (ISC).
 
 If @var{no_jstart} is non-zero, the JSTART instruction is not used after
 loading the bitstream. While required for Series2, Series3, and Series6, it
 breaks bitstream loading on Series7.
 
+@example
+openocd -f board/digilent_zedboard.cfg -c "init" \
+	-c "pld load 0 zedboard_bitstream.bit"
+@end example
+
+
+
 @deffn {Command} {virtex2 read_stat} num
 Reads and displays the Virtex-II status register (STAT)
 for FPGA @var{num}.

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

Summary of changes:
 doc/openocd.texi | 8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-10-gfb23c9c10

[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  fb23c9c10bd161ac05b85e73ad91676063592b96 (commit)
      from  09731b69a6f50c7e0e2f6fa0ba245374034217cb (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 fb23c9c10bd161ac05b85e73ad91676063592b96
Author: Antonio Borneo <bor...@gm...>
Date:   Fri Nov 4 00:32:20 2022 +0100

    rtos: hwthread: fix clang error core.NullDereference
    
    Clang spots a potential NULL pointer dereferencing that is instead
    an incorrect use of an array of pointers:
    
            src/rtos/hwthread.c:254:32: warning: Dereference of null pointer
              [core.NullDereference]
                    (*rtos_reg_list)[j].number = (*reg_list)[i].number;
                                                 ^~~~~~~~~~~~~~~~~~~~~
    The error has not been spotted before because:
    - this function is not called for the first core of the SMP node,
    - for the other cores on Cortex-A it still returns valid register
      value for the first 12 ARM registers, then it diverges.
    
    Also Valgrind does not spot any issue at runtime.
    
    Address the array correctly.
    
    While there, use DIV_ROUND_UP() macro for the computation.
    
    Change-Id: Ib87e60e0edfd9671091f5dcfa9aedaf1aed800d1
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7337
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/rtos/hwthread.c b/src/rtos/hwthread.c
index e5eaf425f..50e7bae51 100644
--- a/src/rtos/hwthread.c
+++ b/src/rtos/hwthread.c
@@ -255,10 +255,10 @@ static int hwthread_get_thread_reg_list(struct rtos *rtos, int64_t thread_id,
 	for (int i = 0; i < reg_list_size; i++) {
 		if (!reg_list[i] || reg_list[i]->exist == false || reg_list[i]->hidden)
 			continue;
-		(*rtos_reg_list)[j].number = (*reg_list)[i].number;
-		(*rtos_reg_list)[j].size = (*reg_list)[i].size;
-		memcpy((*rtos_reg_list)[j].value, (*reg_list)[i].value,
-				((*reg_list)[i].size + 7) / 8);
+		(*rtos_reg_list)[j].number = reg_list[i]->number;
+		(*rtos_reg_list)[j].size = reg_list[i]->size;
+		memcpy((*rtos_reg_list)[j].value, reg_list[i]->value,
+				DIV_ROUND_UP(reg_list[i]->size, 8));
 		j++;
 	}
 	free(reg_list);

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

Summary of changes:
 src/rtos/hwthread.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-9-g09731b69a

[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  09731b69a6f50c7e0e2f6fa0ba245374034217cb (commit)
      from  3da0c2504c14ea0736b973fa0b5085c42a9c6ce8 (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 09731b69a6f50c7e0e2f6fa0ba245374034217cb
Author: Tomas Vanek <va...@fb...>
Date:   Sun Oct 30 08:22:37 2022 +0000

    Revert "Remove duplicate of a counter in hwthread_update_threads"
    
    Commit 0cedf10f8fd6 ("Remove duplicate of a counter in
    hwthread_update_threads") introduced a code bug.
    
    In the second foreach_smp_target() loop, variable "threads_found"
    gets passed to routine hwthread_fill_thread(). By removing the
    counting of threads_found from the second loop, the
    incorrect thread counter value gets passed to hwthread_fill_thread().
    
    Change-Id: Ie89e53ccd28bb72b6838ef2f12106a1fe8d00994
    Suggested-by: Daniel Goehring <dgo...@os...>
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7307
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/rtos/hwthread.c b/src/rtos/hwthread.c
index bdd5835c2..e5eaf425f 100644
--- a/src/rtos/hwthread.c
+++ b/src/rtos/hwthread.c
@@ -78,6 +78,7 @@ static int hwthread_fill_thread(struct rtos *rtos, struct target *curr, int thre
 static int hwthread_update_threads(struct rtos *rtos)
 {
 	int threads_found = 0;
+	int thread_list_size = 0;
 	struct target_list *head;
 	struct target *target;
 	int64_t current_thread = 0;
@@ -99,13 +100,13 @@ static int hwthread_update_threads(struct rtos *rtos)
 			if (!target_was_examined(curr))
 				continue;
 
-			++threads_found;
+			++thread_list_size;
 		}
 	} else
-		threads_found = 1;
+		thread_list_size = 1;
 
 	/* create space for new thread details */
-	rtos->thread_details = malloc(sizeof(struct thread_detail) * threads_found);
+	rtos->thread_details = malloc(sizeof(struct thread_detail) * thread_list_size);
 
 	if (target->smp) {
 		/* loop over all threads */
@@ -170,10 +171,13 @@ static int hwthread_update_threads(struct rtos *rtos)
 			default:
 				break;
 			}
+
+			threads_found++;
 		}
 	} else {
 		hwthread_fill_thread(rtos, target, threads_found);
 		current_thread = threadid_from_target(target);
+		threads_found++;
 	}
 
 	rtos->thread_count = threads_found;

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

Summary of changes:
 src/rtos/hwthread.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-8-g3da0c2504

[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  3da0c2504c14ea0736b973fa0b5085c42a9c6ce8 (commit)
      from  1dea9ab41f988c5173325521b1e9b75274a785da (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 3da0c2504c14ea0736b973fa0b5085c42a9c6ce8
Author: Tomas Vanek <va...@fb...>
Date:   Thu Oct 20 11:43:10 2022 +0200

    jtag/drivers/cmsis_dap: prevent CDC missdetect as CMSIS-DAP bulk
    
    The autodetection of CMSIS-DAP v2 bulk interface is tricky
    as not all adapters conform CMSIS-DAP specs.
    
    If an interface has a string descriptor containing CMSIS-DAP,
    then OpenOCD did not insisted on the correct interface class
    LIBUSB_CLASS_VENDOR_SPEC.
    
    However the relaxed test caused false autodetection of v2 bulk
    interface on some CMSIS-DAP v1 adapters with an additional serial
    interface with the string descriptor stupidly containing
    CMSIS-DAP text.
    
    Make the test less relaxed, refuse autodetection of the interfaces
    with the class number of well known functions including CDC and MSC.
    
    Link: https://sourceforge.net/p/openocd/tickets/368/
    Change-Id: I917cb257eb42aab93560cc39c61ec35a60ce52e3
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7279
    Tested-by: jenkins
    Reviewed-by: SilverFox <yyj...@12...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/drivers/cmsis_dap_usb_bulk.c b/src/jtag/drivers/cmsis_dap_usb_bulk.c
index a738200ea..55b9a558a 100644
--- a/src/jtag/drivers/cmsis_dap_usb_bulk.c
+++ b/src/jtag/drivers/cmsis_dap_usb_bulk.c
@@ -262,8 +262,10 @@ static int cmsis_dap_usb_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t p
 					/* If the interface is reliably identified
 					 * then we need not insist on setting USB class, subclass and protocol
 					 * exactly as the specification requires.
+					 * Just filter out the well known classes, mainly CDC and MSC.
 					 * At least KitProg3 uses class 0 contrary to the specification */
-					if (intf_identified_reliably) {
+					if (intf_identified_reliably &&
+							(intf_desc->bInterfaceClass == 0 || intf_desc->bInterfaceClass > 0x12)) {
 						LOG_WARNING("Using CMSIS-DAPv2 interface %d with wrong class %" PRId8
 								  " subclass %" PRId8 " or protocol %" PRId8,
 								  interface_num,

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

Summary of changes:
 src/jtag/drivers/cmsis_dap_usb_bulk.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-7-g1dea9ab41

[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  1dea9ab41f988c5173325521b1e9b75274a785da (commit)
      from  5fc4882b8039dbd35f2efcd1419e83fbda9eba28 (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 1dea9ab41f988c5173325521b1e9b75274a785da
Author: Antonio Borneo <bor...@gm...>
Date:   Wed Nov 2 23:11:19 2022 +0100

    flash: stmqspi: fix clang error 'dead assignment'
    
    The variable retval is assigned a value that is never used, as it
    is reassigned few lines below.
    
    Drop the dead assignment.
    
    Change-Id: Id4e9134408fab3e04936d36e95724bf8d3ab55aa
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7304
    Tested-by: jenkins

diff --git a/src/flash/nor/stmqspi.c b/src/flash/nor/stmqspi.c
index 9c266e91a..e5df3b9e0 100644
--- a/src/flash/nor/stmqspi.c
+++ b/src/flash/nor/stmqspi.c
@@ -1799,7 +1799,6 @@ static int find_sfdp_dummy(struct flash_bank *bank, int len)
 		}
 	}
 
-	retval = ERROR_FAIL;
 	LOG_DEBUG("no start of SFDP header even after %u dummy bytes", count);
 
 err:

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

Summary of changes:
 src/flash/nor/stmqspi.c | 1 -
 1 file changed, 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-6-g5fc4882b8

[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  5fc4882b8039dbd35f2efcd1419e83fbda9eba28 (commit)
      from  0946e80407150b68acd02bc59f0f3a3170142c4c (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 5fc4882b8039dbd35f2efcd1419e83fbda9eba28
Author: Antonio Borneo <bor...@gm...>
Date:   Wed Nov 2 01:13:49 2022 +0100

    dsp5680xx: fix clang error core.UndefinedBinaryOperatorResult
    
    Clang get confused by initializing the array uint16_t lock_word[],
    casting it to (uint8_t *), then accessing the second element of
    the uint8_t pointer.
    
      src/target/dsp5680xx.c:2046:41: warning: The left operand of '<<'
        is a garbage value [core.UndefinedBinaryOperatorResult]
            uint16_t tmp = (buffer[0] | (buffer[1] << 8));
                                         ~~~~~~~~~ ^
    Fix it by replacing the array with a single uint16_t.
    
    The code is still depending on host endianness; no fix for this is
    proposed.
    
    Change-Id: I16dfd60cab117dd145aeecf10d9593574ff233a2
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7302
    Tested-by: jenkins

diff --git a/src/target/dsp5680xx.c b/src/target/dsp5680xx.c
index 37cf0590d..c90bca3c1 100644
--- a/src/target/dsp5680xx.c
+++ b/src/target/dsp5680xx.c
@@ -2200,8 +2200,8 @@ int dsp5680xx_f_lock(struct target *target)
 	struct jtag_tap *tap_chp;
 
 	struct jtag_tap *tap_cpu;
-	uint16_t lock_word[] = { HFM_LOCK_FLASH };
-	retval = dsp5680xx_f_wr(target, (uint8_t *) (lock_word), HFM_LOCK_ADDR_L, 2, 1);
+	uint16_t lock_word = HFM_LOCK_FLASH;
+	retval = dsp5680xx_f_wr(target, (uint8_t *)&lock_word, HFM_LOCK_ADDR_L, 2, 1);
 	err_check_propagate(retval);
 
 	jtag_add_reset(0, 1);

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

Summary of changes:
 src/target/dsp5680xx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-5-g0946e8040

[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  0946e80407150b68acd02bc59f0f3a3170142c4c (commit)
      from  7a09635735486dd2d74576b003c85c7ff16705d5 (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 0946e80407150b68acd02bc59f0f3a3170142c4c
Author: Antonio Borneo <bor...@gm...>
Date:   Wed Nov 2 00:57:17 2022 +0100

    esirisc_jtag: fix clang error core.VLASize
    
    The function esirisc_jtag_recv() can be called with argument
    num_in_fields = 0, for example as consequence of calling
    esirisc_jtag_continue().
    In this case, num_in_bytes is zero and the allocation of the
    variable-length array 'r' requires size zero.
    
      src/target/esirisc_jtag.c:133:2: warning: Declared variable-length
        array (VLA) has zero size [core.VLASize]
            uint8_t r[num_in_bytes * 2];
            ^~~~~~~~~ ~~~~~~~~~~~~~~~~
    
    Fix it by forcing size one when num_in_bytes is zero.
    
    Change-Id: Id764c7b5ec4f5b3c18c7da650bbff39fc98ed049
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7301
    Tested-by: jenkins

diff --git a/src/target/esirisc_jtag.c b/src/target/esirisc_jtag.c
index 54abc4003..1ec1726e5 100644
--- a/src/target/esirisc_jtag.c
+++ b/src/target/esirisc_jtag.c
@@ -130,7 +130,9 @@ static int esirisc_jtag_recv(struct esirisc_jtag *jtag_info,
 	int num_in_bytes = DIV_ROUND_UP(num_in_bits, 8);
 
 	struct scan_field fields[3];
-	uint8_t r[num_in_bytes * 2];
+	/* prevent zero-size variable length array */
+	int r_size = num_in_bytes ? num_in_bytes * 2 : 1;
+	uint8_t r[r_size];
 
 	esirisc_jtag_set_instr(jtag_info, INSTR_DEBUG);
 

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

Summary of changes:
 src/target/esirisc_jtag.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository