Nico Huber submitted this change.

View Change

jlink_spi: Add option to enable target power

Change-Id: I026c22ae1c22541d0024f164c827909ca4a34cf4
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/48380
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M flashrom.8.tmpl
M jlink_spi.c
2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl
index db6d619..23b6f71 100644
--- a/flashrom.8.tmpl
+++ b/flashrom.8.tmpl
@@ -1422,6 +1422,9 @@
 .sp
 syntax where \fBfrequency\fP is the SPI clock frequency in kHz.
 The maximum speed depends on the device in use.
+.sp
+The \fBpower=on\fP option can be used to activate the 5 V power supply (PWR_5V)
+of the J-Link during a flash operation.
 .SS
 .BR "stlinkv3_spi " programmer
 .IP
diff --git a/jlink_spi.c b/jlink_spi.c
index 4b34bfd..65084b4 100644
--- a/jlink_spi.c
+++ b/jlink_spi.c
@@ -55,6 +55,7 @@
 	struct jaylink_context *ctx;
 	struct jaylink_device_handle *devh;
 	bool reset_cs;
+	bool enable_target_power;
 };
 
 static bool assert_cs(struct jlink_spi_data *jlink_data)
@@ -158,11 +159,20 @@
 static int jlink_spi_shutdown(void *data)
 {
 	struct jlink_spi_data *jlink_data = data;
+
+	if (jlink_data->enable_target_power) {
+		int ret = jaylink_set_target_power(jlink_data->devh, false);
+
+		if (ret != JAYLINK_OK) {
+			msg_perr("jaylink_set_target_power() failed: %s.\n",
+				jaylink_strerror(ret));
+		}
+	}
+
 	if (jlink_data->devh)
 		jaylink_close(jlink_data->devh);
 
 	jaylink_exit(jlink_data->ctx);
-
 	/* jlink_data->ctx, jlink_data->devh are freed by jaylink_close and jaylink_exit */
 	free(jlink_data);
 	return 0;
@@ -190,6 +200,7 @@
 	struct jaylink_device_handle *jaylink_devh = NULL;
 	bool reset_cs;
 	struct jlink_spi_data *jlink_data = NULL;
+	bool enable_target_power;
 
 	arg = extract_programmer_param("spispeed");
 
@@ -268,6 +279,21 @@
 	else
 		msg_pdbg("Using TRST as chip select signal.\n");
 
+	enable_target_power = false;
+	arg = extract_programmer_param("power");
+
+	if (arg) {
+		if (!strcasecmp(arg, "on")) {
+			enable_target_power = true;
+		} else {
+			msg_perr("Invalid value for 'power' argument: '%s'.\n", arg);
+			free(arg);
+			return 1;
+		}
+	}
+
+	free(arg);
+
 	ret = jaylink_init(&jaylink_ctx);
 
 	if (ret != JAYLINK_OK) {
@@ -377,6 +403,13 @@
 		}
 	}
 
+	if (enable_target_power) {
+		if (!jaylink_has_cap(caps, JAYLINK_DEV_CAP_SET_TARGET_POWER)) {
+			msg_perr("Device does not support target power.\n");
+			goto init_err;
+		}
+	}
+
 	uint32_t ifaces;
 
 	ret = jaylink_get_available_interfaces(jaylink_devh, &ifaces);
@@ -398,6 +431,18 @@
 		goto init_err;
 	}
 
+	if (enable_target_power) {
+		ret = jaylink_set_target_power(jaylink_devh, true);
+
+		if (ret != JAYLINK_OK) {
+			msg_perr("jaylink_set_target_power() failed: %s.\n", jaylink_strerror(ret));
+			goto init_err;
+		}
+
+		/* Wait some time until the target is powered up. */
+		internal_sleep(10000);
+	}
+
 	struct jaylink_hardware_status hwstat;
 
 	ret = jaylink_get_hardware_status(jaylink_devh, &hwstat);
@@ -464,6 +509,7 @@
 	jlink_data->ctx = jaylink_ctx;
 	jlink_data->devh = jaylink_devh;
 	jlink_data->reset_cs = reset_cs;
+	jlink_data->enable_target_power = enable_target_power;
 
 	/* Ensure that the CS signal is not active initially. */
 	if (!deassert_cs(jlink_data))

To view, visit change 48380. To unsubscribe, or for help writing mail filters, visit settings.