September 2022 - flashrom-gerrit

[S] Change in flashrom[master]: layout.c: Validate _layout_entry_by_name() arguments before use
by Edward O'Callaghan (Code Review) 27 Sep '22

27 Sep '22

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/67722 ) Change subject: layout.c: Validate _layout_entry_by_name() arguments before use ...................................................................... layout.c: Validate _layout_entry_by_name() arguments before use It may be the case that a layout could not be derived which would result in layout logic being fed a NULL pointer. Validate this case and be defensive to validate the name argument as well. BUG=b:247055486 TEST=builds Change-Id: I2a19c0e586f8575b8b3c2c02b5afad312efacfc9 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/67722 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M layout.c 1 file changed, 23 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Angel Pons: Looks good to me, approved diff --git a/layout.c b/layout.c index 5916d66..0212699 100644 --- a/layout.c +++ b/layout.c @@ -58,6 +58,8 @@ const struct flashrom_layout *const layout, const char *name) { struct romentry *entry = NULL; + if (!layout || !name) + return NULL; while ((entry = mutable_layout_next(layout, entry))) { if (!strcmp(entry->name, name)) return entry; -- To view, visit https://review.coreboot.org/c/flashrom/+/67722 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2a19c0e586f8575b8b3c2c02b5afad312efacfc9 Gerrit-Change-Number: 67722 Gerrit-PatchSet: 6 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: atapromise.c: Use fallback_map instead of own identical implementation
by Edward O'Callaghan (Code Review) 27 Sep '22

27 Sep '22

Attention is currently required from: Thomas Heijligen. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67655 ) Change subject: atapromise.c: Use fallback_map instead of own identical implementation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/67655 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iea16d42015bdbe838364cc65cff895d9edaf03a7 Gerrit-Change-Number: 67655 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Jonathon Hall <jonathon.hall(a)puri.sm> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 00:18:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: mediatek_i2c_spi: document programmer
by Edward O'Callaghan (Code Review) 27 Sep '22

27 Sep '22

Attention is currently required from: Anastasia Klimchuk, Peter Marheine. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67825 ) Change subject: mediatek_i2c_spi: document programmer ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/67825 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia63df470170fbadcabadcdad8e5acc0cde3a274b Gerrit-Change-Number: 67825 Gerrit-PatchSet: 1 Gerrit-Owner: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Tue, 27 Sep 2022 00:07:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: jlink_spi.c: Move function argument into previous line
by Felix Singer (Code Review) 26 Sep '22

26 Sep '22

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67883 ) Change subject: jlink_spi.c: Move function argument into previous line ...................................................................... jlink_spi.c: Move function argument into previous line Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I13b7f37adb242abbbd3a2961e7cdc4cf7ec578d8 --- M jlink_spi.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/83/67883/1 diff --git a/jlink_spi.c b/jlink_spi.c index 4dd108d..2a76a4a 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -362,8 +362,7 @@ size_t length; char *firmware_version; - ret = jaylink_get_firmware_version(jaylink_devh, &firmware_version, - &length); + ret = jaylink_get_firmware_version(jaylink_devh, &firmware_version, &length); if (ret != JAYLINK_OK) { msg_perr("jaylink_get_firmware_version() failed: %s.\n", jaylink_strerror(ret)); -- To view, visit https://review.coreboot.org/c/flashrom/+/67883 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I13b7f37adb242abbbd3a2961e7cdc4cf7ec578d8 Gerrit-Change-Number: 67883 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: jlink_spi.c: Rename variable `arg` to `param_str`
by Felix Singer (Code Review) 26 Sep '22

26 Sep '22

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67882 ) Change subject: jlink_spi.c: Rename variable `arg` to `param_str` ...................................................................... jlink_spi.c: Rename variable `arg` to `param_str` To be consistent with other programmers, rename the variable `arg` to `param_str`. Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I5ca561611691a550ece79727621bc93da94cf461 --- M jlink_spi.c 1 file changed, 43 insertions(+), 30 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/82/67882/1 diff --git a/jlink_spi.c b/jlink_spi.c index 21d124f..4dd108d 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -195,7 +195,7 @@ static int jlink_spi_init(const struct programmer_cfg *cfg) { - char *arg; + char *param_str; unsigned long speed = 0; struct jaylink_context *jaylink_ctx = NULL; struct jaylink_device_handle *jaylink_devh = NULL; @@ -203,75 +203,75 @@ struct jlink_spi_data *jlink_data = NULL; bool enable_target_power; - arg = extract_programmer_param_str(cfg, "spispeed"); + param_str = extract_programmer_param_str(cfg, "spispeed"); - if (arg) { + if (param_str) { char *endptr; errno = 0; - speed = strtoul(arg, &endptr, 10); + speed = strtoul(param_str, &endptr, 10); if (*endptr != '\0' || errno != 0) { - msg_perr("Invalid SPI speed specified: %s.\n", arg); - free(arg); + msg_perr("Invalid SPI speed specified: %s.\n", param_str); + free(param_str); return 1; } if (speed < 1) { msg_perr("SPI speed must be at least 1 kHz.\n"); - free(arg); + free(param_str); return 1; } } - free(arg); + free(param_str); int ret; bool use_serial_number = false; uint32_t serial_number; - arg = extract_programmer_param_str(cfg, "serial"); + param_str = extract_programmer_param_str(cfg, "serial"); - if (arg) { - if (!strlen(arg)) { + if (param_str) { + if (!strlen(param_str)) { msg_perr("Empty serial number specified.\n"); - free(arg); + free(param_str); return 1; } - ret = jaylink_parse_serial_number(arg, &serial_number); + ret = jaylink_parse_serial_number(param_str, &serial_number); if (ret == JAYLINK_ERR) { - msg_perr("Invalid serial number specified: %s.\n", arg); - free(arg); + msg_perr("Invalid serial number specified: %s.\n", param_str); + free(param_str); return 1; } if (ret != JAYLINK_OK) { msg_perr("jaylink_parse_serial_number() failed: %s.\n", jaylink_strerror(ret)); - free(arg); + free(param_str); return 1; } use_serial_number = true; } - free(arg); + free(param_str); reset_cs = true; - arg = extract_programmer_param_str(cfg, "cs"); + param_str = extract_programmer_param_str(cfg, "cs"); - if (arg) { - if (!strcasecmp(arg, "reset")) { + if (param_str) { + if (!strcasecmp(param_str, "reset")) { reset_cs = true; - } else if (!strcasecmp(arg, "trst")) { + } else if (!strcasecmp(param_str, "trst")) { reset_cs = false; } else { - msg_perr("Invalid chip select pin specified: '%s'.\n", arg); - free(arg); + msg_perr("Invalid chip select pin specified: '%s'.\n", param_str); + free(param_str); return 1; } } - free(arg); + free(param_str); if (reset_cs) msg_pdbg("Using RESET as chip select signal.\n"); @@ -279,19 +279,19 @@ msg_pdbg("Using TRST as chip select signal.\n"); enable_target_power = false; - arg = extract_programmer_param_str(cfg, "power"); + param_str = extract_programmer_param_str(cfg, "power"); - if (arg) { - if (!strcasecmp(arg, "on")) { + if (param_str) { + if (!strcasecmp(param_str, "on")) { enable_target_power = true; } else { - msg_perr("Invalid value for 'power' argument: '%s'.\n", arg); - free(arg); + msg_perr("Invalid value for 'power' argument: '%s'.\n", param_str); + free(param_str); return 1; } } - free(arg); + free(param_str); ret = jaylink_init(&jaylink_ctx); -- To view, visit https://review.coreboot.org/c/flashrom/+/67882 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5ca561611691a550ece79727621bc93da94cf461 Gerrit-Change-Number: 67882 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: jlink_spi.c: Set `use_serial_number` to false by default
by Felix Singer (Code Review) 26 Sep '22

26 Sep '22

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67881 ) Change subject: jlink_spi.c: Set `use_serial_number` to false by default ...................................................................... jlink_spi.c: Set `use_serial_number` to false by default Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I83b5e651097d1a248baf5ddb6b09e5cff161317d --- M jlink_spi.c 1 file changed, 11 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/81/67881/1 diff --git a/jlink_spi.c b/jlink_spi.c index 52fc786..21d124f 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -227,7 +227,7 @@ free(arg); int ret; - bool use_serial_number; + bool use_serial_number = false; uint32_t serial_number; arg = extract_programmer_param_str(cfg, "serial"); @@ -252,8 +252,6 @@ } use_serial_number = true; - } else { - use_serial_number = false; } free(arg); -- To view, visit https://review.coreboot.org/c/flashrom/+/67881 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I83b5e651097d1a248baf5ddb6b09e5cff161317d Gerrit-Change-Number: 67881 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: newchange

1 0

[L] Change in flashrom[master]: dirtyjtag: Add DirtyJTAG programmer
by Thomas Heijligen (Code Review) 26 Sep '22

26 Sep '22

Attention is currently required from: Jean THOMAS. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67878 ) Change subject: dirtyjtag: Add DirtyJTAG programmer ...................................................................... Patch Set 1: (4 comments) Patchset: PS1: On first look it seems fine, there are a few minor thinks to do. But I want to have a further look when I'm back from vacation. Thanks for contributing. File dirtyjtag_spi.c: https://review.coreboot.org/c/flashrom/+/67878/comment/cab8673e_b8e96e02 PS1, Line 108: static int dirtyjtag_spi_shutdown(void *data) the usb interface should also be released https://review.coreboot.org/c/flashrom/+/67878/comment/5402a410_7911eb82 PS1, Line 194: int ret = libusb_init(NULL); please use an own libusb_contest and not the default ine (NULL), even if other programmera do so. it can be stored in the djtag_data https://review.coreboot.org/c/flashrom/+/67878/comment/f5910700_b47025ff PS1, Line 214: ret = libusb_set_auto_detach_kernel_driver(handle, 1); this function is only available on new libusb versions. please use explicit detach and attach in shutdown. have a look at the latest patchen on ch341a_spi -- To view, visit https://review.coreboot.org/c/flashrom/+/67878 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic43e9a014ed7d04e429e73b30c9dcfdde1a78913 Gerrit-Change-Number: 67878 Gerrit-PatchSet: 1 Gerrit-Owner: Jean THOMAS <virgule(a)jeanthomas.me> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Jean THOMAS <virgule(a)jeanthomas.me> Gerrit-Comment-Date: Mon, 26 Sep 2022 21:37:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in flashrom[master]: dirtyjtag: Add DirtyJTAG programmer
by Jean THOMAS (Code Review) 26 Sep '22

26 Sep '22

Jean THOMAS has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67878 ) Change subject: dirtyjtag: Add DirtyJTAG programmer ...................................................................... dirtyjtag: Add DirtyJTAG programmer Add a new programmer driver for the DirtyJTAG project (a USB-JTAG firmware for STM32 MCUs). Successfully tested with DirtyJTAG 1.4 running on an Olimex STM32-H103 development board and a SST25VF020B SPI flash chip. Change-Id: Ic43e9a014ed7d04e429e73b30c9dcfdde1a78913 Signed-off-by: Jean THOMAS <virgule(a)jeanthomas.me> --- M Makefile A dirtyjtag_spi.c M flashrom.8.tmpl M include/programmer.h M meson.build M meson_options.txt M programmer_table.c 7 files changed, 369 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/78/67878/1 diff --git a/Makefile b/Makefile index f92cefd..a8df91f 100644 --- a/Makefile +++ b/Makefile @@ -161,6 +161,7 @@ CONFIG_PICKIT2_SPI \ CONFIG_RAIDEN_DEBUG_SPI \ CONFIG_STLINKV3_SPI \ + CONFIG_DIRTYJTAG_SPI \ DEPENDS_ON_LIBFTDI1 := \ CONFIG_FT2232_SPI \ @@ -521,6 +522,9 @@ # Digilent Development board JTAG CONFIG_DIGILENT_SPI ?= yes +# DirtyJTAG +CONFIG_DIRTYJTAG_SPI ?= yes + # Disable J-Link for now. CONFIG_JLINK_SPI ?= no @@ -771,6 +775,11 @@ PROGRAMMER_OBJS += digilent_spi.o endif +ifeq ($(CONFIG_DIRTYJTAG_SPI), yes) +FEATURE_CFLAGS += -D'CONFIG_DIRTYJTAG_SPI=1' +PROGRAMMER_OBJS += dirtyjtag_spi.o +endif + ifeq ($(CONFIG_JLINK_SPI), yes) FEATURE_FLAGS += -D'CONFIG_JLINK_SPI=1' PROGRAMMER_OBJS += jlink_spi.o diff --git a/dirtyjtag_spi.c b/dirtyjtag_spi.c new file mode 100644 index 0000000..6c5fc72 --- /dev/null +++ b/dirtyjtag_spi.c @@ -0,0 +1,312 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2021-2022 Jean THOMAS <virgule(a)jeanthomas.me> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <assert.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include <libusb.h> +#include "programmer.h" + +struct dirtyjtag_spi_data { + struct libusb_device_handle *libusb_handle; + enum { + DJTAG1, + DJTAG2, + DJTAGUNK, + } protocol_version; +}; + +static const struct dev_entry devs_dirtyjtag_spi[] = { + { 0x1209, 0xC0CA, OK, "DirtyJTAG", "JTAG probe" }, + { 0 }, +}; + +static const char dirtyjtag_write_endpoint = 0x01; +static const char dirtyjtag_read_endpoint = 0x82; +static const int dirtyjtag_timeout = 100 * 10; /* 100 ms */ + +enum dirytjtag_command_identifier { + CMD_STOP = 0x00, + CMD_INFO = 0x01, + CMD_FREQ = 0x02, + CMD_XFER = 0x03, + CMD_SETSIG = 0x04, + CMD_GETSIG = 0x05, + CMD_CLK = 0x06 +}; + +enum dirytjtag_signal_identifier { + SIG_TCK = 1 << 1, + SIG_TDI = 1 << 2, + SIG_TDO = 1 << 3, + SIG_TMS = 1 << 4, + SIG_TRST = 1 << 5, + SIG_SRST = 1 << 6 +}; + +static int dirtyjtag_send(struct dirtyjtag_spi_data *djtag_data, const char* data, size_t len) +{ + int transferred; + int ret = libusb_bulk_transfer(djtag_data->libusb_handle, + dirtyjtag_write_endpoint, + (unsigned char*)data, + len, + &transferred, + dirtyjtag_timeout); + if (ret != 0) { + msg_perr("%s: failed to send query command\n", __func__); + return -1; + } + if (transferred != (int)len) { + msg_perr("%s: failed to send whole packet\n", __func__); + return -1; + } + + return 0; +} + +static int dirtyjtag_receive(struct dirtyjtag_spi_data *djtag_data, char* data, size_t buffer_len, int expected) +{ + int transferred; + int ret = libusb_bulk_transfer(djtag_data->libusb_handle, + dirtyjtag_read_endpoint, + (unsigned char*)data, + buffer_len, + &transferred, + dirtyjtag_timeout); + if (ret != 0) { + msg_perr("%s: Failed to read SPI commands\n", __func__); + return -1; + } + + if (expected != -1 && transferred != expected) { + msg_perr("%s: failed to meet expected\n", __func__); + return -1; + } + + return transferred; +} + +static int dirtyjtag_spi_shutdown(void *data) +{ + struct dirtyjtag_spi_data *djtag_data = (struct dirtyjtag_spi_data*)data; + libusb_close(djtag_data->libusb_handle); + free(data); + return 0; +} + +static inline unsigned int _min(unsigned int a, unsigned int b) +{ + return (a < b) ? a : b; +} + +static int dirtyjtag_djtag1_spi_send_command(struct dirtyjtag_spi_data *context, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) +{ + const size_t max_xfer_size = 30; // max transfer size in DJTAG1 + size_t len = writecnt+readcnt; + size_t num_xfer = (len+max_xfer_size-1)/max_xfer_size; // ceil(len/max_xfer_size) + + char *tx_buf = malloc(max_xfer_size*num_xfer); + if (!tx_buf) { + msg_perr("%s: Failed tx_buf allocation", __func__); + return -1; + } + char *rx_buf = malloc(max_xfer_size*num_xfer); + if (!rx_buf) { + msg_perr("%s: Failed rx_buf allocation", __func__); + return -1; + } + + memcpy(tx_buf, writearr, writecnt); + for (size_t i = 0; i < num_xfer; i++) { + uint8_t readout_buffer[32], command_buffer[32] = {CMD_XFER}; + size_t txn_size; + if (i == num_xfer-1 && len%max_xfer_size != 0) { + txn_size = len%max_xfer_size; + } else { + txn_size = 30; + } + command_buffer[1] = txn_size*8; + memcpy(command_buffer+2, tx_buf+30*i, txn_size); + dirtyjtag_send(context, (const char*)command_buffer, sizeof(command_buffer)); + dirtyjtag_receive(context, (char*)readout_buffer, sizeof(readout_buffer), 32); + memcpy(rx_buf+i*30, readout_buffer, txn_size); + } + memcpy(readarr, rx_buf+writecnt, readcnt); + + free(tx_buf); + free(rx_buf); + + const uint8_t tms_reset_buffer[] = { + CMD_SETSIG, + SIG_TMS, + SIG_TMS, + + CMD_STOP, + }; + dirtyjtag_send(context, (const char*)tms_reset_buffer, sizeof(tms_reset_buffer)); + + return 0; +} + +static int dirtyjtag_spi_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) +{ + struct dirtyjtag_spi_data *djtag_data = flash->mst->spi.data; + return dirtyjtag_djtag1_spi_send_command(djtag_data, writecnt, readcnt, writearr, readarr); +} + +static const struct spi_master spi_master_dirtyjtag_spi = { + .features = SPI_MASTER_4BA, + .max_data_read = 30, + .max_data_write = 30, + .command = dirtyjtag_spi_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, + .shutdown = dirtyjtag_spi_shutdown, + .probe_opcode = default_spi_probe_opcode, +}; + +static int dirtyjtag_spi_init(const struct programmer_cfg *cfg) +{ + struct libusb_device_handle *handle = NULL; + struct dirtyjtag_spi_data *djtag_data = NULL; + + int ret = libusb_init(NULL); + if (ret < 0) { + msg_perr("%s: couldn't initialize libusb!\n", __func__); + return -1; + } + +#if LIBUSB_API_VERSION < 0x01000106 + libusb_set_debug(NULL, 3); +#else + libusb_set_option(NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO); +#endif + + uint16_t vid = devs_dirtyjtag_spi[0].vendor_id; + uint16_t pid = devs_dirtyjtag_spi[0].device_id; + handle = libusb_open_device_with_vid_pid(NULL, vid, pid); + if (handle == NULL) { + msg_perr("%s: couldn't open device %04x:%04x.\n", __func__, vid, pid); + return -1; + } + + ret = libusb_set_auto_detach_kernel_driver(handle, 1); + if (ret != 0) { + msg_pwarn("Platform does not support detaching of USB kernel drivers.\n" + "If an unsupported driver is active, claiming the interface may fail.\n"); + } + + ret = libusb_claim_interface(handle, 0); + if (ret != 0) { + msg_perr("%s: failed to claim interface 0: '%s'\n", __func__, libusb_error_name(ret)); + goto cleanup; + } + + djtag_data = calloc(1, sizeof(struct dirtyjtag_spi_data)); + if (djtag_data == NULL) { + msg_perr("%s: failed to allocate internal driver data structure\n", __func__); + goto cleanup; + } + + djtag_data->libusb_handle = handle; + + unsigned long int freq = 100; + char *tmp = extract_programmer_param_str(cfg, "freq"); + if (tmp) { + char *units = tmp; + char *end = tmp + strlen(tmp); + + errno = 0; + freq = strtoul(tmp, &units, 0); + if (errno) { + msg_perr("Invalid frequency \"%s\", %s\n", + tmp, strerror(errno)); + free(tmp); + return 1; + } + + if ((units > tmp) && (units < end)) { + bool units_valid = false; + + if (units < end - 3) { + ; + } else if (units == end - 2) { + if (!strcasecmp(units, "hz")) + units_valid = true; + } else if (units == end - 3) { + if (!strcasecmp(units, "khz")) { + freq *= 1000; + units_valid = true; + } else if (!strcasecmp(units, "mhz")) { + freq *= 1000000; + units_valid = true; + } + } + + if (!units_valid) { + msg_perr("Invalid units: %s\n", units); + free(tmp); + return 1; + } + } + + freq /= 1000; + msg_pinfo("%s: programmer speed set to %lu kHz\n", __func__, freq); + } + free(tmp); + + uint8_t commands[] = { + CMD_SETSIG, /* Set all signals to low (except TRST - HOLD#) */ + SIG_TDI | SIG_TMS | SIG_TCK | SIG_SRST | SIG_TRST, + SIG_SRST | SIG_TRST | SIG_TMS, + + CMD_FREQ, /* Set frequency */ + (freq >> 8) & 0xFF, + freq & 0xFF, + + CMD_STOP, + }; + ret = dirtyjtag_send(djtag_data, (const char*)commands, sizeof(commands)); + if (ret != 0) { + msg_perr("%s: failed to configure DirtyJTAG into initialized state\n", __func__); + goto cleanup; + } + + return register_spi_master(&spi_master_dirtyjtag_spi, (void*)djtag_data); + +cleanup: + libusb_close(handle); + free(djtag_data); + return -1; +} + +const struct programmer_entry programmer_dirtyjtag_spi = { + .name = "dirtyjtag_spi", + .type = USB, + .devs.dev = devs_dirtyjtag_spi, + .init = dirtyjtag_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, +}; diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl index 2cf3a38..f074cbc 100644 --- a/flashrom.8.tmpl +++ b/flashrom.8.tmpl @@ -429,6 +429,8 @@ .sp .BR "* parade_lspcon" " (for SPI flash ROMs attached to Parade Technologies LSPCONs (PS175))" .sp +.BR "* dirtyjtag_spi" " (for SPI flash ROMs attached to DirtyJTAG-compatible devices)" +.sp Some programmers have optional or mandatory parameters which are described in detail in the .B PROGRAMMER-SPECIFIC INFORMATION @@ -1440,6 +1442,22 @@ (in Hz). The default is a frequency of 4 MHz. .sp .SS +.BR "dirtyjtag_spi " programmer +.IP +An optional +.B freq +parameter specifies the frequency of the SPI bus. +Syntax is +.sp +.B " flashrom \-p dirtyjtag_spi:freq=frequency" +.sp +where +.B frequency +can be +.BR any value in hertz, kilohertz or megahertz supported by the +programmer. +.sp +.SS .BR "jlink_spi " programmer .IP This module supports SEGGER J-Link and compatible devices. @@ -1648,7 +1666,7 @@ have to be run as superuser/root, and need additional raw access permission. .sp .BR serprog ", " buspirate_spi ", " dediprog ", " usbblaster_spi ", " ft2232_spi ", " pickit2_spi ", " \ -ch341a_spi " and " digilent_spi +ch341a_spi ", " digilent_spi " and " dirtyjtag " can be run as normal user on most operating systems if appropriate device permissions are set. .sp diff --git a/include/programmer.h b/include/programmer.h index 17abfd2..2423698 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -98,6 +98,7 @@ extern const struct programmer_entry programmer_serprog; extern const struct programmer_entry programmer_stlinkv3_spi; extern const struct programmer_entry programmer_usbblaster_spi; +extern const struct programmer_entry programmer_dirtyjtag_spi; int programmer_init(const struct programmer_entry *prog, const char *param); int programmer_shutdown(void); diff --git a/meson.build b/meson.build index 56ab55c..92df9ae 100644 --- a/meson.build +++ b/meson.build @@ -202,6 +202,12 @@ 'srcs' : files('digilent_spi.c'), 'flags' : [ '-DCONFIG_DIGILENT_SPI=1' ], }, + 'dirtyjtag_spi' : { + 'deps' : [ libusb1 ], + 'groups' : [ group_usb, group_external ], + 'srcs' : files('dirtyjtag_spi.c'), + 'flags' : [ '-DCONFIG_DIRTYJTAG_SPI=1' ], + }, 'drkaiser' : { 'systems' : systems_hwaccess, 'deps' : [ libpci ], diff --git a/meson_options.txt b/meson_options.txt index be56ac7..8c04029 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,8 +10,8 @@ 'group_internal', 'group_external', 'group_ftdi', 'group_i2c', 'group_jlink', 'group_pci', 'group_serial', 'group_usb', 'atahpt', 'atapromise', 'atavia', 'buspirate_spi', 'ch341a_spi', 'dediprog', 'developerbox_spi', - 'digilent_spi', 'drkaiser', 'dummy', 'ft2232_spi', 'gfxnvidia', 'internal', 'it8212', 'jlink_spi', - 'linux_mtd', 'linux_spi', 'mediatek_i2c_spi', 'mstarddc_spi', 'nic3com', 'nicintel', + 'digilent_spi', 'dirtyjtag_spi', 'drkaiser', 'dummy', 'ft2232_spi', 'gfxnvidia', 'internal', 'it8212', + 'jlink_spi', 'linux_mtd', 'linux_spi', 'mediatek_i2c_spi', 'mstarddc_spi', 'nic3com', 'nicintel', 'nicintel_eeprom', 'nicintel_spi', 'nicnatsemi', 'nicrealtek', 'ogp_spi', 'parade_lspcon', 'pickit2_spi', 'pony_spi', 'raiden_debug_spi', 'rayer_spi', 'realtek_mst_i2c_spi', 'satamv', 'satasii', 'serprog', 'stlinkv3_spi', 'usbblaster_spi', diff --git a/programmer_table.c b/programmer_table.c index 818cea7..d58a155 100644 --- a/programmer_table.c +++ b/programmer_table.c @@ -167,6 +167,10 @@ #if CONFIG_STLINKV3_SPI == 1 &programmer_stlinkv3_spi, #endif + +#if CONFIG_DIRTYJTAG_SPI == 1 + &programmer_dirtyjtag_spi, +#endif }; const size_t programmer_table_size = ARRAY_SIZE(programmer_table); -- To view, visit https://review.coreboot.org/c/flashrom/+/67878 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic43e9a014ed7d04e429e73b30c9dcfdde1a78913 Gerrit-Change-Number: 67878 Gerrit-PatchSet: 1 Gerrit-Owner: Jean THOMAS <virgule(a)jeanthomas.me> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[1.2.x]: test_build.sh: Move build test procedure to repository
by Nico Huber (Code Review) 26 Sep '22

26 Sep '22

Attention is currently required from: Patrick Georgi, Edward O'Callaghan, Angel Pons. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67860 ) Change subject: test_build.sh: Move build test procedure to repository ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: Overriding Jenkins as this one can't pass without the next commit and vice versa. -- To view, visit https://review.coreboot.org/c/flashrom/+/67860 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.2.x Gerrit-Change-Id: I37a8e925d1b283c3b8f87cb3d0f1ed8920f2cf95 Gerrit-Change-Number: 67860 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Georgi <patrick(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Patrick Georgi <patrick(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Mon, 26 Sep 2022 17:14:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[1.2.x]: pcidev: Always fetch ident info
by Nico Huber (Code Review) 26 Sep '22

26 Sep '22

Attention is currently required from: Thomas Heijligen, Daniel Verkamp. Hello build bot (Jenkins), Daniel Verkamp, Thomas Heijligen, I'd like you to do a code review. Please visit https://review.coreboot.org/c/flashrom/+/67877 to review the following change. Change subject: pcidev: Always fetch ident info ...................................................................... pcidev: Always fetch ident info As discovered earlier[1], the `vendor_id` and `device_id` fields are not always automatically set. However, we use these fields throughout flash- rom. To not lose track when we actually fetched them, let's always call pci_fill_info(PCI_FILL_IDENT) before returning a `pci_dev` handle. [1] Commit ca2e3bce0 (pcidev.c: populate IDs with pci_fill_info()) Signed-off-by: Nico Huber <nico.h(a)gmx.de> Change-Id: Iae2511178bec44343cbe902722fdca9eda036059 Ticket: https://ticket.coreboot.org/issues/367 Reviewed-on: https://review.coreboot.org/c/flashrom/+/64573 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Daniel Verkamp <dverkamp(a)chromium.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> --- M board_enable.c M internal.c 2 files changed, 34 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/77/67877/1 diff --git a/board_enable.c b/board_enable.c index a5980eb..94e44ee 100644 --- a/board_enable.c +++ b/board_enable.c @@ -1514,6 +1514,7 @@ /* First, look for a known LPC bridge */ for (dev = pacc->devices; dev; dev = dev->next) { + pci_fill_info(dev, PCI_FILL_IDENT); uint16_t device_class; /* libpci before version 2.2.4 does not store class info. */ device_class = pci_read_word(dev, PCI_CLASS_DEVICE); diff --git a/internal.c b/internal.c index 44570a5..60f3da1 100644 --- a/internal.c +++ b/internal.c @@ -34,8 +34,10 @@ if (pci_filter_match(&filter, temp)) { /* Read PCI class */ tmp2 = pci_read_word(temp, 0x0a); - if (tmp2 == devclass) + if (tmp2 == devclass) { + pci_fill_info(temp, PCI_FILL_IDENT); return temp; + } } return NULL; @@ -50,9 +52,12 @@ filter.vendor = vendor; filter.device = device; - for (temp = pacc->devices; temp; temp = temp->next) - if (pci_filter_match(&filter, temp)) + for (temp = pacc->devices; temp; temp = temp->next) { + if (pci_filter_match(&filter, temp)) { + pci_fill_info(temp, PCI_FILL_IDENT); return temp; + } + } return NULL; } @@ -72,8 +77,10 @@ if ((card_vendor == pci_read_word(temp, PCI_SUBSYSTEM_VENDOR_ID)) && (card_device == - pci_read_word(temp, PCI_SUBSYSTEM_ID))) + pci_read_word(temp, PCI_SUBSYSTEM_ID))) { + pci_fill_info(temp, PCI_FILL_IDENT); return temp; + } } return NULL; -- To view, visit https://review.coreboot.org/c/flashrom/+/67877 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.2.x Gerrit-Change-Id: Iae2511178bec44343cbe902722fdca9eda036059 Gerrit-Change-Number: 67877 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Daniel Verkamp <dverkamp(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Daniel Verkamp <dverkamp(a)chromium.org> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit September 2022