openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

jlink_spi: Add option to enable target power

Browse Source 
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>
This commit is contained in:
Marc Schink 2020-08-23 16:19:44 +02:00 committed by Nico Huber
parent 9f44e1494d
commit 393e19bd2e
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flashrom.8.tmpl
View File

@ -1422,6 +1422,9 @@ The SPI speed can be selected by using the
.sp .sp
syntax where \fBfrequency\fP is the SPI clock frequency in kHz. syntax where \fBfrequency\fP is the SPI clock frequency in kHz.
The maximum speed depends on the device in use. 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 .SS
.BR "stlinkv3_spi " programmer .BR "stlinkv3_spi " programmer
.IP .IP

48
jlink_spi.c
View File

@ -55,6 +55,7 @@ struct jlink_spi_data {
struct jaylink_context *ctx; struct jaylink_context *ctx;
struct jaylink_device_handle *devh; struct jaylink_device_handle *devh;
bool reset_cs; bool reset_cs;
bool enable_target_power;
}; };
static bool assert_cs(struct jlink_spi_data *jlink_data) static bool assert_cs(struct jlink_spi_data *jlink_data)
@ -158,11 +159,20 @@ static int jlink_spi_send_command(const struct flashctx *flash, unsigned int wri
static int jlink_spi_shutdown(void *data) static int jlink_spi_shutdown(void *data)
{ {
struct jlink_spi_data *jlink_data = 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) if (jlink_data->devh)
jaylink_close(jlink_data->devh); jaylink_close(jlink_data->devh);
jaylink_exit(jlink_data->ctx); jaylink_exit(jlink_data->ctx);
/* jlink_data->ctx, jlink_data->devh are freed by jaylink_close and jaylink_exit */ /* jlink_data->ctx, jlink_data->devh are freed by jaylink_close and jaylink_exit */
free(jlink_data); free(jlink_data);
return 0; return 0;
@ -190,6 +200,7 @@ static int jlink_spi_init(void)
struct jaylink_device_handle *jaylink_devh = NULL; struct jaylink_device_handle *jaylink_devh = NULL;
bool reset_cs; bool reset_cs;
struct jlink_spi_data *jlink_data = NULL; struct jlink_spi_data *jlink_data = NULL;
bool enable_target_power;
arg = extract_programmer_param("spispeed"); arg = extract_programmer_param("spispeed");
@ -268,6 +279,21 @@ static int jlink_spi_init(void)
else else
msg_pdbg("Using TRST as chip select signal.\n"); 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); ret = jaylink_init(&jaylink_ctx);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
@ -377,6 +403,13 @@ static int jlink_spi_init(void)
} }
} }
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; uint32_t ifaces;
ret = jaylink_get_available_interfaces(jaylink_devh, &ifaces); ret = jaylink_get_available_interfaces(jaylink_devh, &ifaces);
@ -398,6 +431,18 @@ static int jlink_spi_init(void)
goto init_err; 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; struct jaylink_hardware_status hwstat;
ret = jaylink_get_hardware_status(jaylink_devh, &hwstat); ret = jaylink_get_hardware_status(jaylink_devh, &hwstat);
@ -464,6 +509,7 @@ static int jlink_spi_init(void)
jlink_data->ctx = jaylink_ctx; jlink_data->ctx = jaylink_ctx;
jlink_data->devh = jaylink_devh; jlink_data->devh = jaylink_devh;
jlink_data->reset_cs = reset_cs; jlink_data->reset_cs = reset_cs;
jlink_data->enable_target_power = enable_target_power;
/* Ensure that the CS signal is not active initially. */ /* Ensure that the CS signal is not active initially. */
if (!deassert_cs(jlink_data)) if (!deassert_cs(jlink_data))