September 2022 - flashrom-gerrit

[S] Change in flashrom[master]: buspirate_spi.c: Move variable `spispeed` 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/+/67892 ) Change subject: buspirate_spi.c: Move variable `spispeed` into parameters struct ...................................................................... buspirate_spi.c: Move variable `spispeed` into parameters struct Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I816a0017dcb206a8f3284c1c79aed20a96008406 --- M buspirate_spi.c 1 file changed, 17 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/92/67892/1 diff --git a/buspirate_spi.c b/buspirate_spi.c index 2c551c4..5580451 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -317,6 +317,7 @@ struct buspirate_spi_parameters { char *dev; + int spispeed; }; static int buspirate_spi_init(const struct programmer_cfg *cfg) @@ -328,7 +329,6 @@ unsigned int fw_version_minor = 0; unsigned int hw_version_major = 0; unsigned int hw_version_minor = 0; - int spispeed = 0x7; int serialspeed_index = -1; int ret = 0; bool pullup = false; @@ -347,11 +347,12 @@ return 1; } + parameters.spispeed = 0x7; tmp = extract_programmer_param_str(cfg, "spispeed"); if (tmp) { for (i = 0; spispeeds[i].name; i++) { if (!strncasecmp(spispeeds[i].name, tmp, strlen(spispeeds[i].name))) { - spispeed = spispeeds[i].speed; + parameters.spispeed = spispeeds[i].speed; break; } } @@ -550,15 +551,15 @@ /* Workaround for broken speed settings in firmware 6.1 and older. */ if (BP_FWVERSION(fw_version_major, fw_version_minor) < BP_FWVERSION(6, 2)) - if (spispeed > 0x4) { + if (parameters.spispeed > 0x4) { msg_perr("Bus Pirate firmware 6.1 and older does not support SPI speeds above 2 MHz. " "Limiting speed to 2 MHz.\n"); msg_pinfo("It is recommended to upgrade to firmware 6.2 or newer.\n"); - spispeed = 0x4; + parameters.spispeed = 0x4; } /* This works because speeds numbering starts at 0 and is contiguous. */ - msg_pdbg("SPI speed is %sHz\n", spispeeds[spispeed].name); + msg_pdbg("SPI speed is %sHz\n", spispeeds[parameters.spispeed].name); /* Set 2M baud serial speed by default on hardware 3.0 and newer if a custom speed was not set */ if (serialspeed_index == -1 && BP_HWVERSION(hw_version_major, hw_version_minor) >= BP_HWVERSION(3, 0)) { @@ -673,7 +674,7 @@ } /* Set SPI speed */ - bp_commbuf[0] = 0x60 | spispeed; + bp_commbuf[0] = 0x60 | parameters.spispeed; ret = buspirate_sendrecv(bp_commbuf, 1, 1); if (ret) goto init_err_cleanup_exit; -- To view, visit https://review.coreboot.org/c/flashrom/+/67892 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I816a0017dcb206a8f3284c1c79aed20a96008406 Gerrit-Change-Number: 67892 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 `dev` 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/+/67891 ) Change subject: buspirate_spi.c: Move variable `dev` into parameter struct ...................................................................... buspirate_spi.c: Move variable `dev` into parameter struct Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I5a791f1d9204982d7972eed85ccf8eb10ce02b78 --- M buspirate_spi.c 1 file changed, 23 insertions(+), 9 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/91/67891/1 diff --git a/buspirate_spi.c b/buspirate_spi.c index cf84c9c..2c551c4 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -315,10 +315,13 @@ */ #define BP_DIVISOR(baud) ((4000000/(baud)) - 1) +struct buspirate_spi_parameters { + char *dev; +}; + static int buspirate_spi_init(const struct programmer_cfg *cfg) { char *tmp; - char *dev; int i; int cnt; unsigned int fw_version_major = 0; @@ -332,13 +335,14 @@ bool psu = false; unsigned char *bp_commbuf; int bp_commbufsize; + struct buspirate_spi_parameters parameters = { 0 }; - dev = extract_programmer_param_str(cfg, "dev"); - if (dev && !strlen(dev)) { - free(dev); - dev = NULL; + parameters.dev = extract_programmer_param_str(cfg, "dev"); + if (parameters.dev && !strlen(parameters.dev)) { + free(parameters.dev); + parameters.dev = NULL; } - if (!dev) { + if (!parameters.dev) { msg_perr("No serial device given. Use flashrom -p buspirate_spi:dev=/dev/ttyUSB0\n"); return 1; } @@ -401,13 +405,13 @@ bp_commbuf = malloc(DEFAULT_BUFSIZE); if (!bp_commbuf) { msg_perr("Out of memory!\n"); - free(dev); + free(parameters.dev); return ERROR_OOM; } bp_commbufsize = DEFAULT_BUFSIZE; - ret = buspirate_serialport_setup(dev); - free(dev); + ret = buspirate_serialport_setup(parameters.dev); + free(parameters.dev); if (ret) { free(bp_commbuf); return ret; -- To view, visit https://review.coreboot.org/c/flashrom/+/67891 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5a791f1d9204982d7972eed85ccf8eb10ce02b78 Gerrit-Change-Number: 67891 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: buspirate_spi.c: Call free() on a pointer only if it's not NULL
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/+/67890 ) Change subject: buspirate_spi.c: Call free() on a pointer only if it's not NULL ...................................................................... buspirate_spi.c: Call free() on a pointer only if it's not NULL Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I48e1621589cf84156a8849458ab2a8a8499bb427 --- M buspirate_spi.c 1 file changed, 18 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/90/67890/1 diff --git a/buspirate_spi.c b/buspirate_spi.c index 0704887..cf84c9c 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -353,8 +353,9 @@ } if (!spispeeds[i].name) msg_perr("Invalid SPI speed, using default.\n"); + + free(tmp); } - free(tmp); /* Extract serialspeed parameter */ tmp = extract_programmer_param_str(cfg, "serialspeed"); @@ -367,8 +368,9 @@ } if (!serialspeeds[i].name) msg_perr("Invalid serial speed %s, using default.\n", tmp); + + free(tmp); } - free(tmp); tmp = extract_programmer_param_str(cfg, "pullups"); if (tmp) { @@ -378,8 +380,9 @@ ; // ignore else msg_perr("Invalid pullups state, not using them.\n"); + + free(tmp); } - free(tmp); tmp = extract_programmer_param_str(cfg, "psus"); if (tmp) { @@ -389,8 +392,9 @@ ; // ignore else msg_perr("Invalid psus state, not enabling.\n"); + + free(tmp); } - free(tmp); /* Default buffer size is 19: 16 bytes data, 3 bytes control. */ #define DEFAULT_BUFSIZE (16 + 3) -- To view, visit https://review.coreboot.org/c/flashrom/+/67890 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I48e1621589cf84156a8849458ab2a8a8499bb427 Gerrit-Change-Number: 67890 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: drivers/: Make 'internal_delay' the default unless defined
by Felix Singer (Code Review) 27 Sep '22

27 Sep '22

Felix Singer has submitted this change. ( https://review.coreboot.org/c/flashrom/+/67391 ) ( 6 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: drivers/: Make 'internal_delay' the default unless defined ...................................................................... drivers/: Make 'internal_delay' the default unless defined Drop the explicit need to specify the default 'internal_delay' callback function pointer in the programmer_entry struct. This is a reasonable default for every other driver in the tree with only the two exceptions of ch341a_spi.c and serprog.c. Thus this simplifies driver development. Change-Id: I17460bc2c0aebcbb48c8dfa052b260991525cc49 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/67391 Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Thomas Heijligen <src(a)posteo.de> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-by: Nikolai Artemiev <nartemiev(a)google.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M atahpt.c M atapromise.c M atavia.c M buspirate_spi.c M dediprog.c M developerbox_spi.c M digilent_spi.c M drkaiser.c M dummyflasher.c M flashrom.c M ft2232_spi.c M gfxnvidia.c M internal.c M it8212.c M jlink_spi.c M linux_mtd.c M linux_spi.c M mediatek_i2c_spi.c M mstarddc_spi.c M ni845x_spi.c M nic3com.c M nicintel.c M nicintel_eeprom.c M nicintel_spi.c M nicnatsemi.c M nicrealtek.c M ogp_spi.c M parade_lspcon.c M pickit2_spi.c M pony_spi.c M raiden_debug_spi.c M rayer_spi.c M realtek_mst_i2c_spi.c M satamv.c M satasii.c M stlinkv3_spi.c M usbblaster_spi.c 37 files changed, 30 insertions(+), 42 deletions(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Thomas Heijligen: Looks good to me, but someone else must approve Angel Pons: Looks good to me, but someone else must approve Peter Marheine: Looks good to me, but someone else must approve Nikolai Artemiev: Looks good to me, but someone else must approve diff --git a/atahpt.c b/atahpt.c index 5c636d1..fa69137 100644 --- a/atahpt.c +++ b/atahpt.c @@ -122,5 +122,4 @@ .init = atahpt_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/atapromise.c b/atapromise.c index d4a3aa8..5de0921 100644 --- a/atapromise.c +++ b/atapromise.c @@ -186,5 +186,4 @@ .init = atapromise_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/atavia.c b/atavia.c index 51530a4..a0be396 100644 --- a/atavia.c +++ b/atavia.c @@ -191,5 +191,4 @@ .init = atavia_init, .map_flash_region = atavia_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/buspirate_spi.c b/buspirate_spi.c index 0704887..121c7e5 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -716,5 +716,4 @@ .init = buspirate_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/dediprog.c b/dediprog.c index f957be6..99c91e0 100644 --- a/dediprog.c +++ b/dediprog.c @@ -1321,5 +1321,4 @@ .init = dediprog_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/developerbox_spi.c b/developerbox_spi.c index 3774d04..04957a3 100644 --- a/developerbox_spi.c +++ b/developerbox_spi.c @@ -195,5 +195,4 @@ .init = developerbox_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/digilent_spi.c b/digilent_spi.c index 41342a8..85f3884 100644 --- a/digilent_spi.c +++ b/digilent_spi.c @@ -470,5 +470,4 @@ .init = digilent_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/drkaiser.c b/drkaiser.c index b121eec..039e686 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -124,5 +124,4 @@ .init = drkaiser_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/dummyflasher.c b/dummyflasher.c index 49a541b..b2a41c6 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -1426,5 +1426,4 @@ .init = dummy_init, .map_flash_region = dummy_map, .unmap_flash_region = dummy_unmap, - .delay = internal_delay, }; diff --git a/flashrom.c b/flashrom.c index 2604594..3328a71 100644 --- a/flashrom.c +++ b/flashrom.c @@ -219,8 +219,12 @@ void programmer_delay(unsigned int usecs) { - if (usecs > 0) - programmer->delay(usecs); + if (usecs > 0) { + if (programmer->delay) + programmer->delay(usecs); + else + internal_delay(usecs); + } } int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, @@ -1419,10 +1423,6 @@ msg_gerr("Programmer %s does not have a valid init function!\n", p->name); ret = 1; } - if (p->delay == NULL) { - msg_gerr("Programmer %s does not have a valid delay function!\n", p->name); - ret = 1; - } if (p->map_flash_region == NULL) { msg_gerr("Programmer %s does not have a valid map_flash_region function!\n", p->name); ret = 1; diff --git a/ft2232_spi.c b/ft2232_spi.c index 5b45d7e..6d7aa6a 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -713,5 +713,4 @@ .init = ft2232_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/gfxnvidia.c b/gfxnvidia.c index ff510ef..cab408c 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -152,5 +152,4 @@ .init = gfxnvidia_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/internal.c b/internal.c index 6a8db5e..2558cde 100644 --- a/internal.c +++ b/internal.c @@ -349,5 +349,4 @@ .init = internal_init, .map_flash_region = physmap, .unmap_flash_region = physunmap, - .delay = internal_delay, }; diff --git a/it8212.c b/it8212.c index 18d1173..9b4a263 100644 --- a/it8212.c +++ b/it8212.c @@ -113,5 +113,4 @@ .init = it8212_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/jlink_spi.c b/jlink_spi.c index 52fc786..ef4d9ca 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -538,5 +538,4 @@ .devs.note = "SEGGER J-Link and compatible devices\n", .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/linux_mtd.c b/linux_mtd.c index c0147f6..26244a8 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -559,5 +559,4 @@ .init = linux_mtd_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/linux_spi.c b/linux_spi.c index 09ee8a0..b51d9e9 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -253,5 +253,4 @@ .init = linux_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/mediatek_i2c_spi.c b/mediatek_i2c_spi.c index 39a9cea..727f933 100644 --- a/mediatek_i2c_spi.c +++ b/mediatek_i2c_spi.c @@ -544,5 +544,4 @@ .init = mediatek_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/mstarddc_spi.c b/mstarddc_spi.c index af46b24..88a4afa 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -257,5 +257,4 @@ .init = mstarddc_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/ni845x_spi.c b/ni845x_spi.c index 3d74fd9..b5cfc06 100644 --- a/ni845x_spi.c +++ b/ni845x_spi.c @@ -637,5 +637,4 @@ .init = ni845x_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/nic3com.c b/nic3com.c index 44710ed..8fafef9 100644 --- a/nic3com.c +++ b/nic3com.c @@ -170,5 +170,4 @@ .init = nic3com_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/nicintel.c b/nicintel.c index 16cb5e4..fa91ff1 100644 --- a/nicintel.c +++ b/nicintel.c @@ -135,5 +135,4 @@ .init = nicintel_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index 4d3e7d5..01f9075 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -540,5 +540,4 @@ .init = nicintel_ee_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/nicintel_spi.c b/nicintel_spi.c index 851b525..b99da53 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -339,5 +339,4 @@ .init = nicintel_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/nicnatsemi.c b/nicnatsemi.c index 779fb33..7236d4d 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -129,5 +129,4 @@ .init = nicnatsemi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/nicrealtek.c b/nicrealtek.c index 7bf1ac9..c96f998 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -148,5 +148,4 @@ .init = nicrealtek_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/ogp_spi.c b/ogp_spi.c index 94915a3..52b1d4e 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -180,5 +180,4 @@ .init = ogp_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/parade_lspcon.c b/parade_lspcon.c index 761e46b..72f7600 100644 --- a/parade_lspcon.c +++ b/parade_lspcon.c @@ -509,5 +509,4 @@ .init = parade_lspcon_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/pickit2_spi.c b/pickit2_spi.c index b838234..f550b4f 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -513,5 +513,4 @@ .init = pickit2_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/pony_spi.c b/pony_spi.c index ebeac94..63359d2 100644 --- a/pony_spi.c +++ b/pony_spi.c @@ -274,5 +274,4 @@ .init = pony_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index 28cab06..9ded585 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -1651,5 +1651,4 @@ .init = raiden_debug_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/rayer_spi.c b/rayer_spi.c index 3867cfc..cd7a066 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -331,5 +331,4 @@ .init = rayer_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c index 74458c8..9637eca 100644 --- a/realtek_mst_i2c_spi.c +++ b/realtek_mst_i2c_spi.c @@ -546,5 +546,4 @@ .init = realtek_mst_i2c_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/satamv.c b/satamv.c index f886076..c3831d1 100644 --- a/satamv.c +++ b/satamv.c @@ -213,5 +213,4 @@ .init = satamv_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/satasii.c b/satasii.c index 44b7331..0f3311f 100644 --- a/satasii.c +++ b/satasii.c @@ -155,5 +155,4 @@ .init = satasii_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c index 38fe9f9..dcbed6d 100644 --- a/stlinkv3_spi.c +++ b/stlinkv3_spi.c @@ -558,5 +558,4 @@ .init = stlinkv3_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; diff --git a/usbblaster_spi.c b/usbblaster_spi.c index 2880a3c..c5914c4 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -234,5 +234,4 @@ .init = usbblaster_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, - .delay = internal_delay, }; -- To view, visit https://review.coreboot.org/c/flashrom/+/67391 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I17460bc2c0aebcbb48c8dfa052b260991525cc49 Gerrit-Change-Number: 67391 Gerrit-PatchSet: 8 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: merged

1 0

[M] Change in flashrom[master]: drivers/: Make 'internal_delay' the default unless defined
by Edward O'Callaghan (Code Review) 27 Sep '22

27 Sep '22

Attention is currently required from: Nico Huber, Thomas Heijligen, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67391 ) Change subject: drivers/: Make 'internal_delay' the default unless defined ...................................................................... Patch Set 7: (1 comment) Patchset: PS6: > Needs a rebase, then we can submit it :) Done. -- To view, visit https://review.coreboot.org/c/flashrom/+/67391 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I17460bc2c0aebcbb48c8dfa052b260991525cc49 Gerrit-Change-Number: 67391 Gerrit-PatchSet: 7 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Tue, 27 Sep 2022 04:28:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: jlink_spi.c: Move variable `enable_target_power` 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/+/67889 ) Change subject: jlink_spi.c: Move variable `enable_target_power` into parameter struct ...................................................................... jlink_spi.c: Move variable `enable_target_power` into parameter struct Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: Id32a6866372658a04fd62385d226294cfbcd4227 --- M jlink_spi.c 1 file changed, 16 insertions(+), 7 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/89/67889/1 diff --git a/jlink_spi.c b/jlink_spi.c index 24ab466..ad046e6 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -198,6 +198,7 @@ uint32_t serial_number; bool use_serial_number; bool reset_cs; + bool enable_target_power; }; static int jlink_spi_init(const struct programmer_cfg *cfg) @@ -207,7 +208,6 @@ struct jaylink_device_handle *jaylink_devh = NULL; struct jlink_spi_data *jlink_data = NULL; struct jlink_spi_parameters parameters = { 0 }; - bool enable_target_power; param_str = extract_programmer_param_str(cfg, "spispeed"); if (param_str) { @@ -276,12 +276,11 @@ else msg_pdbg("Using TRST as chip select signal.\n"); - enable_target_power = false; + parameters.enable_target_power = false; param_str = extract_programmer_param_str(cfg, "power"); - if (param_str) { if (!strcasecmp(param_str, "on")) { - enable_target_power = true; + parameters.enable_target_power = true; } else { msg_perr("Invalid value for 'power' argument: '%s'.\n", param_str); free(param_str); @@ -398,7 +397,7 @@ } } - if (enable_target_power) { + if (parameters.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; @@ -426,7 +425,7 @@ goto init_err; } - if (enable_target_power) { + if (parameters.enable_target_power) { ret = jaylink_set_target_power(jaylink_devh, true); if (ret != JAYLINK_OK) { @@ -504,7 +503,7 @@ jlink_data->ctx = jaylink_ctx; jlink_data->devh = jaylink_devh; jlink_data->reset_cs = parameters.reset_cs; - jlink_data->enable_target_power = enable_target_power; + jlink_data->enable_target_power = parameters.enable_target_power; /* Ensure that the CS signal is not active initially. */ if (!deassert_cs(jlink_data)) -- To view, visit https://review.coreboot.org/c/flashrom/+/67889 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id32a6866372658a04fd62385d226294cfbcd4227 Gerrit-Change-Number: 67889 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: newchange

1 0

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

27 Sep '22

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/67888 to look at the new patch set (#2). Change subject: jlink_spi.c: Move variable `reset_cs` into parameter struct ...................................................................... jlink_spi.c: Move variable `reset_cs` into parameter struct Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I79f9009b407bc5601fa03878b6fe53c190214c3f --- M jlink_spi.c 1 file changed, 16 insertions(+), 7 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/88/67888/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/67888 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I79f9009b407bc5601fa03878b6fe53c190214c3f Gerrit-Change-Number: 67888 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: jlink_spi.c: Move serial number vars into parameter struct
by Felix Singer (Code Review) 27 Sep '22

27 Sep '22

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/67887 to look at the new patch set (#3). Change subject: jlink_spi.c: Move serial number vars into parameter struct ...................................................................... jlink_spi.c: Move serial number vars into parameter struct Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: Ib22224cca4c02f82a643488c118b88cba6b6a50a --- M jlink_spi.c 1 file changed, 19 insertions(+), 10 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/87/67887/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/67887 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ib22224cca4c02f82a643488c118b88cba6b6a50a Gerrit-Change-Number: 67887 Gerrit-PatchSet: 3 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

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

27 Sep '22

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/67886 to look at the new patch set (#3). Change subject: jlink_spi.c: Move variable `speed` into parameter struct ...................................................................... jlink_spi.c: Move variable `speed` into parameter struct Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I7af29e4bd107bfcda929155bbe603798d092fa79 --- M jlink_spi.c 1 file changed, 24 insertions(+), 11 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/86/67886/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/67886 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7af29e4bd107bfcda929155bbe603798d092fa79 Gerrit-Change-Number: 67886 Gerrit-PatchSet: 3 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: jlink_spi.c: Move reset_cs variable into struct `jlink_spi_parameters`
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/+/67888 ) Change subject: jlink_spi.c: Move reset_cs variable into struct `jlink_spi_parameters` ...................................................................... jlink_spi.c: Move reset_cs variable into struct `jlink_spi_parameters` Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I79f9009b407bc5601fa03878b6fe53c190214c3f --- M jlink_spi.c 1 file changed, 16 insertions(+), 7 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/88/67888/1 diff --git a/jlink_spi.c b/jlink_spi.c index 8b4a83b..24ab466 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -197,6 +197,7 @@ unsigned long speed; uint32_t serial_number; bool use_serial_number; + bool reset_cs; }; static int jlink_spi_init(const struct programmer_cfg *cfg) @@ -204,7 +205,6 @@ char *param_str; struct jaylink_context *jaylink_ctx = NULL; struct jaylink_device_handle *jaylink_devh = NULL; - bool reset_cs; struct jlink_spi_data *jlink_data = NULL; struct jlink_spi_parameters parameters = { 0 }; bool enable_target_power; @@ -256,14 +256,13 @@ free(param_str); } - reset_cs = true; + parameters.reset_cs = true; param_str = extract_programmer_param_str(cfg, "cs"); - if (param_str) { if (!strcasecmp(param_str, "reset")) { - reset_cs = true; + parameters.reset_cs = true; } else if (!strcasecmp(param_str, "trst")) { - reset_cs = false; + parameters.reset_cs = false; } else { msg_perr("Invalid chip select pin specified: '%s'.\n", param_str); free(param_str); @@ -272,7 +271,7 @@ free(param_str); } - if (reset_cs) + if (parameters.reset_cs) msg_pdbg("Using RESET as chip select signal.\n"); else msg_pdbg("Using TRST as chip select signal.\n"); @@ -504,7 +503,7 @@ /* jaylink_ctx, jaylink_devh are allocated by jaylink_init and jaylink_open */ jlink_data->ctx = jaylink_ctx; jlink_data->devh = jaylink_devh; - jlink_data->reset_cs = reset_cs; + jlink_data->reset_cs = parameters.reset_cs; jlink_data->enable_target_power = enable_target_power; /* Ensure that the CS signal is not active initially. */ -- To view, visit https://review.coreboot.org/c/flashrom/+/67888 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I79f9009b407bc5601fa03878b6fe53c190214c3f Gerrit-Change-Number: 67888 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