September 2022 - flashrom-gerrit

[S] Change in flashrom[master]: dirtyjtag: Release claimed USB interface
by Jean THOMAS (Code Review) 27 Sep '22

27 Sep '22

Jean THOMAS has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67899 ) Change subject: dirtyjtag: Release claimed USB interface ...................................................................... dirtyjtag: Release claimed USB interface Change-Id: I2cafade0ee215f8154867c595af0e9af47a32823 Signed-off-by: Jean THOMAS <virgule(a)jeanthomas.me> --- M dirtyjtag_spi.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/99/67899/1 diff --git a/dirtyjtag_spi.c b/dirtyjtag_spi.c index 8fdac00..d970629 100644 --- a/dirtyjtag_spi.c +++ b/dirtyjtag_spi.c @@ -109,6 +109,7 @@ static int dirtyjtag_spi_shutdown(void *data) { struct dirtyjtag_spi_data *djtag_data = (struct dirtyjtag_spi_data*)data; + libusb_release_interface(djtag_data->libusb_handle, 0); libusb_close(djtag_data->libusb_handle); libusb_exit(djtag_data->libusb_ctx); free(data); -- To view, visit https://review.coreboot.org/c/flashrom/+/67899 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2cafade0ee215f8154867c595af0e9af47a32823 Gerrit-Change-Number: 67899 Gerrit-PatchSet: 1 Gerrit-Owner: Jean THOMAS <virgule(a)jeanthomas.me> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: dirtyjtag: Use owned libusb context
by Jean THOMAS (Code Review) 27 Sep '22

27 Sep '22

Jean THOMAS has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67898 ) Change subject: dirtyjtag: Use owned libusb context ...................................................................... dirtyjtag: Use owned libusb context Change-Id: I940646d8454bc4ea6cfe263c87ce1f150642988d Signed-off-by: Jean THOMAS <virgule(a)jeanthomas.me> --- M dirtyjtag_spi.c 1 file changed, 19 insertions(+), 7 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/98/67898/1 diff --git a/dirtyjtag_spi.c b/dirtyjtag_spi.c index 6c5fc72..8fdac00 100644 --- a/dirtyjtag_spi.c +++ b/dirtyjtag_spi.c @@ -26,6 +26,7 @@ #include "programmer.h" struct dirtyjtag_spi_data { + struct libusb_context *libusb_ctx; struct libusb_device_handle *libusb_handle; enum { DJTAG1, @@ -109,6 +110,7 @@ { struct dirtyjtag_spi_data *djtag_data = (struct dirtyjtag_spi_data*)data; libusb_close(djtag_data->libusb_handle); + libusb_exit(djtag_data->libusb_ctx); free(data); return 0; } @@ -191,7 +193,13 @@ struct libusb_device_handle *handle = NULL; struct dirtyjtag_spi_data *djtag_data = NULL; - int ret = libusb_init(NULL); + 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; + } + + int ret = libusb_init(&djtag_data->libusb_ctx); if (ret < 0) { msg_perr("%s: couldn't initialize libusb!\n", __func__); return -1; @@ -223,12 +231,6 @@ 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; -- To view, visit https://review.coreboot.org/c/flashrom/+/67898 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I940646d8454bc4ea6cfe263c87ce1f150642988d Gerrit-Change-Number: 67898 Gerrit-PatchSet: 1 Gerrit-Owner: Jean THOMAS <virgule(a)jeanthomas.me> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: realtek_mst_i2c_spi.c: Move variable enter_isp into parameter struct
by Peter Marheine (Code Review) 27 Sep '22

27 Sep '22

Attention is currently required from: Felix Singer. Peter Marheine has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67897 ) Change subject: realtek_mst_i2c_spi.c: Move variable enter_isp into parameter struct ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/67897 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If95160c68b2dea40fb31abf68a430be5d20c4cf1 Gerrit-Change-Number: 67897 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Comment-Date: Tue, 27 Sep 2022 05:51:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: realtek_mst_i2c_spi.c: Move variable `reset` into parameters struct
by Peter Marheine (Code Review) 27 Sep '22

27 Sep '22

Attention is currently required from: Felix Singer. Peter Marheine has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67895 ) Change subject: realtek_mst_i2c_spi.c: Move variable `reset` into parameters struct ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/67895 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I471ce9e6fedc5ec7f3d2bf54a0e1633dbac3cfd5 Gerrit-Change-Number: 67895 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Comment-Date: Tue, 27 Sep 2022 05:51:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: realtek_mst_i2c_spi.c: Move variable allow_brick into parameters struct
by Peter Marheine (Code Review) 27 Sep '22

27 Sep '22

Attention is currently required from: Felix Singer. Peter Marheine has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67896 ) Change subject: realtek_mst_i2c_spi.c: Move variable allow_brick into parameters struct ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/67896 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I98ef6f7a44714ea684b6875dc7e61ea5e5911184 Gerrit-Change-Number: 67896 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Comment-Date: Tue, 27 Sep 2022 05:50:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: realtek_mst_i2c_spi.c: Move variable enter_isp into parameter struct
by Felix Singer (Code Review) 27 Sep '22

27 Sep '22

Attention is currently required from: Peter Marheine. Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67897 ) Change subject: realtek_mst_i2c_spi.c: Move variable enter_isp into parameter struct ...................................................................... realtek_mst_i2c_spi.c: Move variable enter_isp into parameter struct Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: If95160c68b2dea40fb31abf68a430be5d20c4cf1 --- M realtek_mst_i2c_spi.c 1 file changed, 17 insertions(+), 7 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/97/67897/1 diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c index 1863e9b..db999d4 100644 --- a/realtek_mst_i2c_spi.c +++ b/realtek_mst_i2c_spi.c @@ -56,6 +56,7 @@ struct realtek_mst_i2c_spi_parameters { bool allow_brick; + bool enter_isp; bool reset; }; @@ -449,7 +450,7 @@ .probe_opcode = default_spi_probe_opcode, }; -static int get_params(const struct programmer_cfg *cfg, bool *enter_isp, struct realtek_mst_i2c_spi_parameters *parameters) +static int get_params(const struct programmer_cfg *cfg, struct realtek_mst_i2c_spi_parameters *parameters) { char *param_str; int ret = 0; @@ -480,13 +481,13 @@ } free(param_str); - *enter_isp = true; /* Default behaviour is enter ISP on setup. */ + parameters->enter_isp = true; /* Default behaviour is enter ISP on setup. */ param_str = extract_programmer_param_str(cfg, "enter_isp"); if (param_str) { if (param_str[0] == '1') { - *enter_isp = true; + parameters->enter_isp = true; } else if (param_str[0] == '0') { - *enter_isp = false; + parameters->enter_isp = false; } else { msg_perr("%s: Incorrect param format, enter_isp=1 or 0.\n", __func__); ret = SPI_GENERIC_ERROR; @@ -500,10 +501,9 @@ static int realtek_mst_i2c_spi_init(const struct programmer_cfg *cfg) { int ret = 0; - bool enter_isp; struct realtek_mst_i2c_spi_parameters parameters = { 0 }; - if (get_params(cfg, &enter_isp, &parameters)) + if (get_params(cfg, &parameters)) return SPI_GENERIC_ERROR; /* @@ -522,7 +522,7 @@ if (fd < 0) return fd; - if (enter_isp) { + if (parameters.enter_isp) { ret |= realtek_mst_i2c_spi_enter_isp_mode(fd); if (ret) return ret; -- To view, visit https://review.coreboot.org/c/flashrom/+/67897 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If95160c68b2dea40fb31abf68a430be5d20c4cf1 Gerrit-Change-Number: 67897 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: realtek_mst_i2c_spi.c: Move variable allow_brick into parameters struct
by Felix Singer (Code Review) 27 Sep '22

27 Sep '22

Attention is currently required from: Peter Marheine. Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67896 ) Change subject: realtek_mst_i2c_spi.c: Move variable allow_brick into parameters struct ...................................................................... realtek_mst_i2c_spi.c: Move variable allow_brick into parameters struct Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I98ef6f7a44714ea684b6875dc7e61ea5e5911184 --- M realtek_mst_i2c_spi.c 1 file changed, 17 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/96/67896/1 diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c index 6221134..1863e9b 100644 --- a/realtek_mst_i2c_spi.c +++ b/realtek_mst_i2c_spi.c @@ -55,6 +55,7 @@ }; struct realtek_mst_i2c_spi_parameters { + bool allow_brick; bool reset; }; @@ -448,16 +449,16 @@ .probe_opcode = default_spi_probe_opcode, }; -static int get_params(const struct programmer_cfg *cfg, bool *enter_isp, bool *allow_brick, struct realtek_mst_i2c_spi_parameters *parameters) +static int get_params(const struct programmer_cfg *cfg, bool *enter_isp, struct realtek_mst_i2c_spi_parameters *parameters) { char *param_str; int ret = 0; - *allow_brick = false; /* Default behaviour is to bail. */ + parameters->allow_brick = false; /* Default behaviour is to bail. */ param_str = extract_programmer_param_str(cfg, "allow_brick"); if (param_str) { if (!strcmp(param_str, "yes")) { - *allow_brick = true; + parameters->allow_brick = true; } else { msg_perr("%s: Incorrect param format, allow_brick=yes.\n", __func__); ret = SPI_GENERIC_ERROR; @@ -499,17 +500,17 @@ static int realtek_mst_i2c_spi_init(const struct programmer_cfg *cfg) { int ret = 0; - bool enter_isp, allow_brick; + bool enter_isp; struct realtek_mst_i2c_spi_parameters parameters = { 0 }; - if (get_params(cfg, &enter_isp, &allow_brick, &parameters)) + if (get_params(cfg, &enter_isp, &parameters)) return SPI_GENERIC_ERROR; /* * TODO: Once board_enable can facilitate safe i2c allow listing * then this can be removed. */ - if (!allow_brick) { + if (!parameters.allow_brick) { msg_perr("%s: For i2c drivers you must explicitly 'allow_brick=yes'. ", __func__); msg_perr("There is currently no way to determine if the programmer works on a board " "as i2c device address space can be overloaded. Set 'allow_brick=yes' if " -- To view, visit https://review.coreboot.org/c/flashrom/+/67896 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I98ef6f7a44714ea684b6875dc7e61ea5e5911184 Gerrit-Change-Number: 67896 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: realtek_mst_i2c_spi.c: Move variable `reset` into parameters struct
by Felix Singer (Code Review) 27 Sep '22

27 Sep '22

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67895 ) Change subject: realtek_mst_i2c_spi.c: Move variable `reset` into parameters struct ...................................................................... realtek_mst_i2c_spi.c: Move variable `reset` into parameters struct Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I471ce9e6fedc5ec7f3d2bf54a0e1633dbac3cfd5 --- M realtek_mst_i2c_spi.c 1 file changed, 22 insertions(+), 7 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/95/67895/1 diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c index 74458c8..6221134 100644 --- a/realtek_mst_i2c_spi.c +++ b/realtek_mst_i2c_spi.c @@ -54,6 +54,10 @@ bool reset; }; +struct realtek_mst_i2c_spi_parameters { + bool reset; +}; + static int realtek_mst_i2c_spi_write_data(int fd, uint16_t addr, void *buf, uint16_t len) { i2c_buffer_t data; @@ -444,7 +448,7 @@ .probe_opcode = default_spi_probe_opcode, }; -static int get_params(const struct programmer_cfg *cfg, bool *reset, bool *enter_isp, bool *allow_brick) +static int get_params(const struct programmer_cfg *cfg, bool *enter_isp, bool *allow_brick, struct realtek_mst_i2c_spi_parameters *parameters) { char *param_str; int ret = 0; @@ -461,13 +465,13 @@ } free(param_str); - *reset = false; /* Default behaviour is no MCU reset on tear-down. */ + parameters->reset = false; /* Default behaviour is no MCU reset on tear-down. */ param_str = extract_programmer_param_str(cfg, "reset_mcu"); if (param_str) { if (param_str[0] == '1') { - *reset = true; + parameters->reset = true; } else if (param_str[0] == '0') { - *reset = false; + parameters->reset = false; } else { msg_perr("%s: Incorrect param format, reset_mcu=1 or 0.\n", __func__); ret = SPI_GENERIC_ERROR; @@ -495,9 +499,10 @@ static int realtek_mst_i2c_spi_init(const struct programmer_cfg *cfg) { int ret = 0; - bool reset, enter_isp, allow_brick; + bool enter_isp, allow_brick; + struct realtek_mst_i2c_spi_parameters parameters = { 0 }; - if (get_params(cfg, &reset, &enter_isp, &allow_brick)) + if (get_params(cfg, &enter_isp, &allow_brick, &parameters)) return SPI_GENERIC_ERROR; /* @@ -535,7 +540,7 @@ } data->fd = fd; - data->reset = reset; + data->reset = parameters.reset; return register_spi_master(&spi_master_i2c_realtek_mst, data); } -- To view, visit https://review.coreboot.org/c/flashrom/+/67895 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I471ce9e6fedc5ec7f3d2bf54a0e1633dbac3cfd5 Gerrit-Change-Number: 67895 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: buspirate_spi.c: Move variable `psu` into parameter struct
by Felix Singer (Code Review) 27 Sep '22

27 Sep '22

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67894 ) Change subject: buspirate_spi.c: Move variable `psu` into parameter struct ...................................................................... buspirate_spi.c: Move variable `psu` into parameter struct Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I928af8450734473cdf1c07796b6c57c328d587d5 --- M buspirate_spi.c 1 file changed, 14 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/94/67894/1 diff --git a/buspirate_spi.c b/buspirate_spi.c index 1abb9ec..740e6b9 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -319,6 +319,7 @@ char *dev; int spispeed; bool pullup; + bool psu; }; static int buspirate_spi_init(const struct programmer_cfg *cfg) @@ -332,7 +333,6 @@ unsigned int hw_version_minor = 0; int serialspeed_index = -1; int ret = 0; - bool psu = false; unsigned char *bp_commbuf; int bp_commbufsize; struct buspirate_spi_parameters parameters = { 0 }; @@ -390,10 +390,11 @@ free(tmp); } + parameters.psu = false; tmp = extract_programmer_param_str(cfg, "psus"); if (tmp) { if (strcasecmp("on", tmp) == 0) - psu = true; + parameters.psu = true; else if (strcasecmp("off", tmp) == 0) ; // ignore else @@ -661,7 +662,7 @@ bp_commbuf[0] |= (1 << 2); msg_pdbg("Enabling pull-up resistors.\n"); } - if (psu) { + if (parameters.psu) { bp_commbuf[0] |= (1 << 3); msg_pdbg("Enabling PSUs.\n"); } -- To view, visit https://review.coreboot.org/c/flashrom/+/67894 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I928af8450734473cdf1c07796b6c57c328d587d5 Gerrit-Change-Number: 67894 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: buspirate_spi.c: Move variable `pullup` into parameters struct
by Felix Singer (Code Review) 27 Sep '22

27 Sep '22

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67893 ) Change subject: buspirate_spi.c: Move variable `pullup` into parameters struct ...................................................................... buspirate_spi.c: Move variable `pullup` into parameters struct Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I6b571d2f034fc3f8657cc4e9a0f2891df84e38c3 --- M buspirate_spi.c 1 file changed, 15 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/93/67893/1 diff --git a/buspirate_spi.c b/buspirate_spi.c index 5580451..1abb9ec 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -318,6 +318,7 @@ struct buspirate_spi_parameters { char *dev; int spispeed; + bool pullup; }; static int buspirate_spi_init(const struct programmer_cfg *cfg) @@ -331,7 +332,6 @@ unsigned int hw_version_minor = 0; int serialspeed_index = -1; int ret = 0; - bool pullup = false; bool psu = false; unsigned char *bp_commbuf; int bp_commbufsize; @@ -377,10 +377,11 @@ free(tmp); } + parameters.pullup = false; tmp = extract_programmer_param_str(cfg, "pullups"); if (tmp) { if (strcasecmp("on", tmp) == 0) - pullup = true; + parameters.pullup = true; else if (strcasecmp("off", tmp) == 0) ; // ignore else @@ -656,7 +657,7 @@ /* Initial setup (SPI peripherals config): Enable power, CS high, AUX */ bp_commbuf[0] = 0x40 | 0x0b; - if (pullup) { + if (parameters.pullup) { bp_commbuf[0] |= (1 << 2); msg_pdbg("Enabling pull-up resistors.\n"); } @@ -686,7 +687,7 @@ /* Set SPI config: output type, idle, clock edge, sample */ bp_commbuf[0] = 0x80 | 0xa; - if (pullup) { + if (parameters.pullup) { bp_commbuf[0] &= ~(1 << 3); msg_pdbg("Pull-ups enabled, so using HiZ pin output! (Open-Drain mode)\n"); } -- To view, visit https://review.coreboot.org/c/flashrom/+/67893 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I6b571d2f034fc3f8657cc4e9a0f2891df84e38c3 Gerrit-Change-Number: 67893 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit September 2022