[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1423-g3ffa14b04

[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  3ffa14b043225b9766132b1979db7ddb8d91ba5e (commit)
       via  63d3640add4c024864b18d021f626fd377b1165c (commit)
      from  9a877a83a1c8b1f105cdc0de46c5cbc4d9e8799e (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 3ffa14b043225b9766132b1979db7ddb8d91ba5e
Author: Antonio Borneo <bor...@gm...>
Date:   Wed Sep 16 15:26:40 2020 +0200

    target/aarch64: fix use of 'target->private_config'
    
    The function adiv5_jim_configure() casts the void pointer
    'target->private_config' to a struct adiv5_private_config pointer.
    This is tricky in case of aarch64, where the private data are in a
    struct aarch64_private_config that has as first element the struct
    adiv5_private_config.
    
    While the current solution is working fine, it's not clean and
    requires special attention for any further code development.
    
    Override 'target->private_config' to the correct pointer while
    calling adiv5_jim_configure().
    
    Change-Id: Ic2fc047dd1e57013943d96e6d5879a919d1eb7b3
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5847
    Tested-by: jenkins
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>

diff --git a/src/target/aarch64.c b/src/target/aarch64.c
index 8d23bcabc..d111a0568 100644
--- a/src/target/aarch64.c
+++ b/src/target/aarch64.c
@@ -2504,8 +2504,13 @@ static int aarch64_jim_configure(struct target *target, Jim_GetOptInfo *goi)
 	 * options, JIM_OK if it correctly parsed the topmost option
 	 * and JIM_ERR if an error occurred during parameter evaluation.
 	 * For JIM_CONTINUE, we check our own params.
+	 *
+	 * adiv5_jim_configure() assumes 'private_config' to point to
+	 * 'struct adiv5_private_config'. Override 'private_config'!
 	 */
+	target->private_config = &pc->adiv5_config;
 	e = adiv5_jim_configure(target, goi);
+	target->private_config = pc;
 	if (e != JIM_CONTINUE)
 		return e;
 

commit 63d3640add4c024864b18d021f626fd377b1165c
Author: Kevin Yang <kan...@go...>
Date:   Wed Sep 2 20:15:31 2020 -0700

    target/aarch64: Use apnum setting
    
    Change aarch64 to use ap-num setting if provided. Fall back to original
    behavior of using first AP when ap-num is invalid.
    
    Change-Id: I0d3624f75c86ba5fd5a322ac60856dbbb6e71eaf
    Signed-off-by: Kevin Yang <kan...@go...>
    Reviewed-on: http://openocd.zylin.com/5831
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/aarch64.c b/src/target/aarch64.c
index dee16d116..8d23bcabc 100644
--- a/src/target/aarch64.c
+++ b/src/target/aarch64.c
@@ -2248,7 +2248,7 @@ static int aarch64_examine_first(struct target *target)
 	struct aarch64_common *aarch64 = target_to_aarch64(target);
 	struct armv8_common *armv8 = &aarch64->armv8_common;
 	struct adiv5_dap *swjdp = armv8->arm.dap;
-	struct aarch64_private_config *pc;
+	struct aarch64_private_config *pc = target->private_config;
 	int i;
 	int retval = ERROR_OK;
 	uint64_t debug, ttypr;
@@ -2256,11 +2256,18 @@ static int aarch64_examine_first(struct target *target)
 	uint32_t tmp0, tmp1, tmp2, tmp3;
 	debug = ttypr = cpuid = 0;
 
-	/* Search for the APB-AB - it is needed for access to debug registers */
-	retval = dap_find_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;
+	if (pc == NULL)
+		return ERROR_FAIL;
+
+	if (pc->adiv5_config.ap_num == DP_APSEL_INVALID) {
+		/* Search for the APB-AB */
+		retval = dap_find_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_ap(swjdp, pc->adiv5_config.ap_num);
 	}
 
 	retval = mem_ap_init(armv8->debug_ap);
@@ -2335,10 +2342,6 @@ static int aarch64_examine_first(struct target *target)
 	LOG_DEBUG("ttypr = 0x%08" PRIx64, ttypr);
 	LOG_DEBUG("debug = 0x%08" PRIx64, debug);
 
-	if (target->private_config == NULL)
-		return ERROR_FAIL;
-
-	pc = (struct aarch64_private_config *)target->private_config;
 	if (pc->cti == NULL)
 		return ERROR_FAIL;
 
@@ -2491,6 +2494,7 @@ static int aarch64_jim_configure(struct target *target, Jim_GetOptInfo *goi)
 	pc = (struct aarch64_private_config *)target->private_config;
 	if (pc == NULL) {
 			pc = calloc(1, sizeof(struct aarch64_private_config));
+			pc->adiv5_config.ap_num = DP_APSEL_INVALID;
 			target->private_config = pc;
 	}
 

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

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


hooks/post-receive
-- 
Main OpenOCD repository