[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-492-g8d9379c9b

[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  8d9379c9bab8defe1ddb875352b432567d94f65b (commit)
      from  d2033997871f8561d1406550c12508461f63de48 (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 8d9379c9bab8defe1ddb875352b432567d94f65b
Author: Tomas Vanek <va...@fb...>
Date:   Tue Apr 6 22:30:52 2021 +0200

    target/arm_dap: check SWD DAP configuration
    
    Raise error if
    
    * more than one plain SWD DAPs are defined
    
    * plain and multidrop DAPs are mixed
    
    * two multidrop DAPs have the same TARGETSEL value
    
    Inspired by Graham Sanderson's http://review.openocd.org/4935
    
    Change-Id: I7279744464f5cc6477e50695c596be9c5e5507bf
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6142
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/arm_dap.c b/src/target/arm_dap.c
index bde1dfb5e..4728ce3bf 100644
--- a/src/target/arm_dap.c
+++ b/src/target/arm_dap.c
@@ -251,6 +251,52 @@ static int dap_configure(struct jim_getopt_info *goi, struct arm_dap_object *dap
 	return JIM_OK;
 }
 
+static int dap_check_config(struct adiv5_dap *dap)
+{
+	if (transport_is_jtag() || transport_is_dapdirect_jtag() || transport_is_hla())
+		return ERROR_OK;
+
+	struct arm_dap_object *obj;
+	bool new_multidrop = dap_is_multidrop(dap);
+	bool had_multidrop = new_multidrop;
+	uint32_t targetsel = dap->multidrop_targetsel;
+	unsigned int non_multidrop_count = had_multidrop ? 0 : 1;
+
+	list_for_each_entry(obj, &all_dap, lh) {
+		struct adiv5_dap *dap_it = &obj->dap;
+
+		if (transport_is_swd()) {
+			if (dap_is_multidrop(dap_it)) {
+				had_multidrop = true;
+				if (new_multidrop && dap_it->multidrop_targetsel == targetsel) {
+					uint32_t dp_id = targetsel & DP_TARGETSEL_DPID_MASK;
+					uint32_t instance_id = targetsel >> DP_TARGETSEL_INSTANCEID_SHIFT;
+					LOG_ERROR("%s and %s have the same multidrop selectors -dp-id 0x%08"
+							  PRIx32 " and -instance-id 0x%" PRIx32,
+							  obj->name, adiv5_dap_name(dap),
+							  dp_id, instance_id);
+					return ERROR_FAIL;
+				}
+			} else {
+				non_multidrop_count++;
+			}
+		} else if (transport_is_dapdirect_swd()) {
+			non_multidrop_count++;
+		}
+	}
+
+	if (non_multidrop_count > 1) {
+		LOG_ERROR("Two or more SWD non multidrop DAPs are not supported");
+		return ERROR_FAIL;
+	}
+	if (had_multidrop && non_multidrop_count) {
+		LOG_ERROR("Mixing of SWD multidrop DAPs and non multidrop DAPs is not supported");
+		return ERROR_FAIL;
+	}
+
+	return ERROR_OK;
+}
+
 static int dap_create(struct jim_getopt_info *goi)
 {
 	struct command_context *cmd_ctx;
@@ -297,6 +343,12 @@ static int dap_create(struct jim_getopt_info *goi)
 		goto err;
 	}
 
+	e = dap_check_config(&dap->dap);
+	if (e != ERROR_OK) {
+		e = JIM_ERR;
+		goto err;
+	}
+
 	struct command_registration dap_commands[] = {
 		{
 			.name = cp,

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

Summary of changes:
 src/target/arm_dap.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository