[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-670-gd4335071b

[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  d4335071b8460b227889a3a2072df424eebb4e5e (commit)
      from  209cb38aa155825175e2806d6093cecb5d77edc1 (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 d4335071b8460b227889a3a2072df424eebb4e5e
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Jan 15 15:44:20 2022 +0100

    arm_adi_v5: report sysmem on class 0x9 ROM tables
    
    As Class 0x1 ROM table, also Class 0x9 ROM tables encodes a flag
    for system memory access.
    
    Detect the flag in rtp_cs_component() and dump the same message
    for both type of ROM tables.
    Extend rtp_read_cs_regs() to read ARM_CS_C9_DEVID.
    
    Change-Id: Ic85d1ea068ed706ceedfd65076ff4c96d04e9792
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6817
    Tested-by: jenkins
    Reviewed-by: Daniel Goehring <dgo...@os...>

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 4176dcadd..5c3941b3f 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -1099,6 +1099,7 @@ struct cs_component_vals {
 	uint64_t pid;
 	uint32_t cid;
 	uint32_t devarch;
+	uint32_t devid;
 	uint32_t devtype_memtype;
 };
 
@@ -1124,13 +1125,16 @@ static int rtp_read_cs_regs(struct adiv5_ap *ap, target_addr_t component_base,
 	/* sort by offset to gain speed */
 
 	/*
-	 * Registers DEVARCH and DEVTYPE are valid on Class 0x9 devices
+	 * Registers DEVARCH, DEVID and DEVTYPE are valid on Class 0x9 devices
 	 * only, but are at offset above 0xf00, so can be read on any device
 	 * without triggering error. Read them for eventual use on Class 0x9.
 	 */
 	if (retval == ERROR_OK)
 		retval = mem_ap_read_u32(ap, component_base + ARM_CS_C9_DEVARCH, &v->devarch);
 
+	if (retval == ERROR_OK)
+		retval = mem_ap_read_u32(ap, component_base + ARM_CS_C9_DEVID, &v->devid);
+
 	/* Same address as ARM_CS_C1_MEMTYPE */
 	if (retval == ERROR_OK)
 		retval = mem_ap_read_u32(ap, component_base + ARM_CS_C9_DEVTYPE, &v->devtype_memtype);
@@ -1609,6 +1613,11 @@ static int rtp_cs_component(struct command_invocation *cmd,
 		if ((v.devarch & DEVARCH_ID_MASK) != DEVARCH_ROM_C_0X9)
 			return ERROR_OK;
 
+		if (v.devid & ARM_CS_C9_DEVID_SYSMEM_MASK)
+			command_print(cmd, "\t\tMEMTYPE system memory present on bus");
+		else
+			command_print(cmd, "\t\tMEMTYPE system memory not present: dedicated debug bus");
+
 		return rtp_rom_loop(cmd, ap, base_address, depth, 512);
 	}
 

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

Summary of changes:
 src/target/arm_adi_v5.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository