[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-53-g08c7b904c

[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  08c7b904c38b97f9de72a19196b295652f051268 (commit)
       via  eca4f964b47d317a0eb4b148f11588cec0e3bf60 (commit)
      from  6db49eb8858023654084088c73d968e190aec491 (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 08c7b904c38b97f9de72a19196b295652f051268
Author: Oleksij Rempel <o.r...@pe...>
Date:   Tue Feb 12 13:51:54 2019 +0100

    drivers: USB Blaster II: claim interface before using it
    
    If not, multiple instances of OOCD can concurrently use it.
    
    Change-Id: I48cc9d90521d1dcc7720c6e8bec74f45972d16f7
    Signed-off-by: Oleksij Rempel <o.r...@pe...>
    Reviewed-on: http://openocd.zylin.com/4589
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
index 6f15fa70a..82dc95071 100644
--- a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
+++ b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
@@ -133,6 +133,11 @@ static int load_usb_blaster_firmware(struct libusb_device_handle *libusb_dev,
 		return ERROR_FAIL;
 	}
 
+	if (libusb_claim_interface(libusb_dev, 0)) {
+		LOG_ERROR("unable to claim interface");
+		return ERROR_JTAG_INIT_FAILED;
+	}
+
 	ublast2_firmware_image.base_address = 0;
 	ublast2_firmware_image.base_address_set = false;
 
@@ -184,6 +189,13 @@ static int load_usb_blaster_firmware(struct libusb_device_handle *libusb_dev,
 
 	image_close(&ublast2_firmware_image);
 
+	/*
+	 * Release claimed interface. Most probably it is already disconnected
+	 * and re-enumerated as new devices after firmware upload, so we do
+	 * not need to care about errors.
+	 */
+	libusb_release_interface(libusb_dev, 0);
+
 	return ERROR_OK;
 }
 
@@ -228,6 +240,12 @@ static int ublast2_libusb_init(struct ublast_lowlevel *low)
 		}
 	}
 
+	if (libusb_claim_interface(low->libusb_dev, 0)) {
+		LOG_ERROR("unable to claim interface");
+		jtag_libusb_close(low->libusb_dev);
+		return ERROR_JTAG_INIT_FAILED;
+	}
+
 	char buffer[5];
 	jtag_libusb_control_transfer(low->libusb_dev,
 				     LIBUSB_REQUEST_TYPE_VENDOR |
@@ -246,6 +264,9 @@ static int ublast2_libusb_init(struct ublast_lowlevel *low)
 
 static int ublast2_libusb_quit(struct ublast_lowlevel *low)
 {
+	if (libusb_release_interface(low->libusb_dev, 0))
+		LOG_ERROR("usb release interface failed");
+
 	jtag_libusb_close(low->libusb_dev);
 	return ERROR_OK;
 };

commit eca4f964b47d317a0eb4b148f11588cec0e3bf60
Author: Evgeniy Didin <di...@sy...>
Date:   Mon Mar 15 16:30:13 2021 +0300

    target/arc: refactor ARC register numbers defines
    
    For Zephyr rtos support it is necessary to define general register
    numbers for architecture. There were some already in arc.h file.
    Let's define ARC registers numbers as a set instead of separate defines.
    
    Change-Id: I63742b8608f9556c2ec9bd2661a0fd9cf88e9b74
    Signed-off-by: Evgeniy Didin <di...@sy...>
    Reviewed-on: http://openocd.zylin.com/6105
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/arc.c b/src/target/arc.c
index 8e568455e..694ac6f85 100644
--- a/src/target/arc.c
+++ b/src/target/arc.c
@@ -227,7 +227,7 @@ static int arc_get_register(struct reg *reg)
 
 	if (desc->is_core) {
 		/* Accessing to R61/R62 registers causes Jtag hang */
-		if (desc->arch_num == CORE_R61_NUM || desc->arch_num == CORE_R62_NUM) {
+		if (desc->arch_num == ARC_R61 || desc->arch_num == ARC_R62) {
 			LOG_ERROR("It is forbidden to read core registers 61 and 62.");
 			return ERROR_FAIL;
 		}
@@ -267,8 +267,8 @@ static int arc_set_register(struct reg *reg, uint8_t *buf)
 		return ERROR_TARGET_NOT_HALTED;
 
 	/* Accessing to R61/R62 registers causes Jtag hang */
-	if (desc->is_core && (desc->arch_num == CORE_R61_NUM ||
-			desc->arch_num == CORE_R62_NUM)) {
+	if (desc->is_core && (desc->arch_num == ARC_R61 ||
+			desc->arch_num == ARC_R62)) {
 		LOG_ERROR("It is forbidden to write core registers 61 and 62.");
 		return ERROR_FAIL;
 	}
diff --git a/src/target/arc.h b/src/target/arc.h
index aeb326cb5..8d44bfa41 100644
--- a/src/target/arc.h
+++ b/src/target/arc.h
@@ -45,9 +45,52 @@
 #define AUX_STATUS32_REG_HALT_BIT       BIT(0)
 #define AUX_STATUS32_REG_IE_BIT         BIT(31)    /* STATUS32[31] = IE field */
 
-/* Reserved core registers */
-#define CORE_R61_NUM			(61)
-#define CORE_R62_NUM			(62)
+/* ARC register numbers */
+enum {
+	ARC_R0,
+	ARC_R1,
+	ARC_R2,
+	ARC_R3,
+	ARC_R4,
+	ARC_R5,
+	ARC_R6,
+	ARC_R7,
+	ARC_R8,
+	ARC_R9,
+	ARC_R10,
+	ARC_R11,
+	ARC_R12,
+	ARC_R13,
+	ARC_R14,
+	ARC_R15,
+	ARC_R16,
+	ARC_R17,
+	ARC_R18,
+	ARC_R19,
+	ARC_R20,
+	ARC_R21,
+	ARC_R22,
+	ARC_R23,
+	ARC_R24,
+	ARC_R25,
+	ARC_GP		= 26,
+	ARC_FP		= 27,
+	ARC_SP		= 28,
+	ARC_ILINK	= 29,
+	ARC_R30,
+	ARC_BLINK	= 31,
+	ARC_LP_COUNT	= 60,
+
+	/* Reserved registers */
+	ARC_R61		= 61,
+	ARC_R62		= 62,
+
+	ARC_PCL		= 63,
+	ARC_PC		= 64,
+	ARC_LP_START	= 65,
+	ARC_LP_END	= 66,
+	ARC_STATUS32	= 67,
+};
 
 #define CORE_REG_MAX_NUMBER		(63)
 
diff --git a/src/target/arc_cmd.c b/src/target/arc_cmd.c
index 18f5cb8f4..5c5247b88 100644
--- a/src/target/arc_cmd.c
+++ b/src/target/arc_cmd.c
@@ -382,7 +382,7 @@ static int jim_arc_get_core_reg(Jim_Interp *interp, int argc, Jim_Obj * const *a
 
 	/* Register number */
 	JIM_CHECK_RETVAL(arc_cmd_jim_get_uint32(&goi, &regnum));
-	if (regnum > CORE_REG_MAX_NUMBER || regnum == CORE_R61_NUM || regnum == CORE_R62_NUM) {
+	if (regnum > CORE_REG_MAX_NUMBER || regnum == ARC_R61 || regnum == ARC_R62) {
 		Jim_SetResultFormatted(goi.interp, "Core register number %i "
 			"is invalid. Must less then 64 and not 61 and 62.", regnum);
 		return JIM_ERR;
@@ -425,7 +425,7 @@ static int jim_arc_set_core_reg(Jim_Interp *interp, int argc, Jim_Obj * const *a
 
 	/* Register number */
 	JIM_CHECK_RETVAL(arc_cmd_jim_get_uint32(&goi, &regnum));
-	if (regnum > CORE_REG_MAX_NUMBER || regnum == CORE_R61_NUM || regnum == CORE_R62_NUM) {
+	if (regnum > CORE_REG_MAX_NUMBER || regnum == ARC_R61 || regnum == ARC_R62) {
 		Jim_SetResultFormatted(goi.interp, "Core register number %i "
 			"is invalid. Must less then 64 and not 61 and 62.", regnum);
 		return JIM_ERR;

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

Summary of changes:
 .../drivers/usb_blaster/ublast2_access_libusb.c    | 21 ++++++++++
 src/target/arc.c                                   |  6 +--
 src/target/arc.h                                   | 49 ++++++++++++++++++++--
 src/target/arc_cmd.c                               |  4 +-
 4 files changed, 72 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository