[PATCH]: 6c6a92c6bc target/arm: add nested AP DAP 'apid' cmd support

[<ge...@op...>]

This is an automated email from Gerrit.

"Daniel Goehring <dgo...@os...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9254

-- gerrit

commit 6c6a92c6bcb4f9b8e134b417c5f4f79f180bde87
Author: Daniel Goehring <dgo...@os...>
Date:   Mon Jul 14 20:27:56 2025 -0600

    target/arm: add nested AP DAP 'apid' cmd support
    
    Add nested AP support to the DAP 'apid' command.
    
    Change-Id: Ic51dee2636191cf6fdad6f302dedb36b94f3cea6
    Signed-off-by: Daniel Goehring <dgo...@os...>

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 9fdf32476f..b99c67ee5c 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -2888,13 +2888,16 @@ COMMAND_HANDLER(dap_apcsw_command)
 COMMAND_HANDLER(dap_apid_command)
 {
 	struct adiv5_dap *dap = adiv5_get_dap(CMD_DATA);
+	struct adiv5_ap *ap;
 	uint64_t apsel;
+	uint64_t apsel_gateway = DP_APSEL_INVALID;
 	uint32_t apid;
 	int retval;
 
 	switch (CMD_ARGC) {
 	case 0:
 		apsel = dap->apsel;
+		apsel_gateway = dap->apsel_gateway;
 		break;
 	case 1:
 		COMMAND_PARSE_NUMBER(u64, CMD_ARGV[0], apsel);
@@ -2903,11 +2906,27 @@ COMMAND_HANDLER(dap_apid_command)
 			return ERROR_COMMAND_ARGUMENT_INVALID;
 		}
 		break;
+	case 2:
+		COMMAND_PARSE_NUMBER(u64, CMD_ARGV[0], apsel);
+		if (!is_ap_num_valid(dap, apsel)) {
+			command_print(CMD, "Invalid AP number");
+			return ERROR_COMMAND_ARGUMENT_INVALID;
+		}
+		COMMAND_PARSE_NUMBER(u64, CMD_ARGV[1], apsel_gateway);
+		if (!is_ap_num_valid(dap, apsel_gateway)) {
+			command_print(CMD, "Invalid AP_GATEWAY number");
+			return ERROR_COMMAND_ARGUMENT_INVALID;
+		}
+		break;
 	default:
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	struct adiv5_ap *ap = dap_get_ap(dap, apsel);
+	if (apsel_gateway == DP_APSEL_INVALID)
+		ap = dap_get_ap(dap, apsel);
+	else
+		ap = dap_get_ap_gateway(dap, apsel, apsel_gateway);
+
 	if (!ap) {
 		command_print(CMD, "Cannot get AP");
 		return ERROR_FAIL;
@@ -3181,7 +3200,7 @@ const struct command_registration dap_instance_commands[] = {
 		.mode = COMMAND_EXEC,
 		.help = "return ID register from AP "
 			"(default currently selected AP)",
-		.usage = "[ap_num]",
+		.usage = "[ap_num [ap_num_gateway]]",
 	},
 	{
 		.name = "apreg",

--