[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-793-gc582cfbf7

[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  c582cfbf758fdf188b02d8e57e0f57ce9c36663e (commit)
      from  8c739a45a042cf7a9b5bba48f0e20cbc3168ee73 (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 c582cfbf758fdf188b02d8e57e0f57ce9c36663e
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Nov 10 14:30:25 2024 +0100

    driver: stlink: get adapter speed through adapter_get_speed_khz()
    
    The stlink driver, both in dapdirect and in HLA modes, pretends to
    store locally the value of the adapter speed in order to use it
    later-on during adapter initialization.
    It doesn't work in dapdirect mode since the code to store locally
    the value will not be executed until the adapter is already fully
    initialized.
    
    This cause an issue in dapdirect mode:
    - due to the local value, still kept at -1, the adapter will be
      initialized to the lowest clock speed (5 KHz on stlink v2 in SWD
      mode);
    - after the adapter initialization the framework will again set
      the speed with the value requested by the user.
    
    Some target, like nRF51822, only accepts JTAG/SWD speed in a
    defined range of frequencies. The initial speed of 5 KHz used by
    dapdirect can be out of range, making the target debug port not
    working.
    
    The adapter framework already stores the value of speed and makes
    it available through adapter_get_speed_khz().
    
    Drop struct hl_interface_param::initial_interface_speed.
    Let the code to use adapter_get_speed_khz().
    
    Change-Id: Ie11bf0234574f2a9180d3d3a16efb78e08dfcd86
    Reported-by: Andrzej Sierżęga <as...@gm...>
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8574
    Reviewed-by: Andrzej Sierżęga <as...@gm...>
    Tested-by: jenkins

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 0385e4d85..d77f28b0f 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -3781,7 +3781,7 @@ static int stlink_open(struct hl_interface_param *param, enum stlink_mode mode,
 	}
 
 	/* initialize the debug hardware */
-	err = stlink_usb_init_mode(h, param->connect_under_reset, param->initial_interface_speed);
+	err = stlink_usb_init_mode(h, param->connect_under_reset, adapter_get_speed_khz());
 
 	if (err != ERROR_OK) {
 		LOG_ERROR("init mode failed (unable to connect to the target)");
@@ -5174,7 +5174,6 @@ static int stlink_dap_speed(int speed)
 		return ERROR_JTAG_NOT_IMPLEMENTED;
 	}
 
-	stlink_dap_param.initial_interface_speed = speed;
 	stlink_speed(stlink_dap_handle, speed, false);
 	return ERROR_OK;
 }
diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index e826f7910..96862b0d0 100644
--- a/src/jtag/hla/hla_interface.c
+++ b/src/jtag/hla/hla_interface.c
@@ -30,7 +30,6 @@ static struct hl_interface hl_if = {
 		.pid = { 0 },
 		.transport = HL_TRANSPORT_UNKNOWN,
 		.connect_under_reset = false,
-		.initial_interface_speed = -1,
 		.use_stlink_tcp = false,
 		.stlink_tcp_port = 7184,
 	},
@@ -165,11 +164,8 @@ static int hl_interface_speed(int speed)
 	if (!hl_if.layout->api->speed)
 		return ERROR_OK;
 
-	if (!hl_if.handle) {
-		/* pass speed as initial param as interface not open yet */
-		hl_if.param.initial_interface_speed = speed;
+	if (!hl_if.handle)
 		return ERROR_OK;
-	}
 
 	hl_if.layout->api->speed(hl_if.handle, speed, false);
 
diff --git a/src/jtag/hla/hla_interface.h b/src/jtag/hla/hla_interface.h
index c95638b92..f1550d991 100644
--- a/src/jtag/hla/hla_interface.h
+++ b/src/jtag/hla/hla_interface.h
@@ -31,8 +31,6 @@ struct hl_interface_param {
 	enum hl_transports transport;
 	/** */
 	bool connect_under_reset;
-	/** Initial interface clock clock speed */
-	int initial_interface_speed;
 	/** */
 	bool use_stlink_tcp;
 	/** */

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

Summary of changes:
 src/jtag/drivers/stlink_usb.c | 3 +--
 src/jtag/hla/hla_interface.c  | 6 +-----
 src/jtag/hla/hla_interface.h  | 2 --
 3 files changed, 2 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository