May 2021 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: tests: Add unit test to run init/shutdown for mec1308.c, ene_lpc.c
by Anastasia Klimchuk (Code Review) 25 May '21

25 May '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/51487 ) Change subject: tests: Add unit test to run init/shutdown for mec1308.c, ene_lpc.c ...................................................................... Patch Set 18: (2 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/51487/comment/64b18c06_4cdf9bf9 PS6, Line 9: hwaccess_io.h : because those are needed to test lifecycle of mec1308.c > I added test for ene_lpc. […] This is done, marking resolved File tests/tests.c: https://review.coreboot.org/c/flashrom/+/51487/comment/c77a3e1c_c78ab0f8 PS6, Line 102: return ((port == 0x2e /* MEC1308_SIO_PORT1 */ : || port == 0x4e /* MEC1308_SIO_PORT2 */) : ? 0x20 /* MEC1308_DEVICE_ID_REG */ : : ((outb_val == 0x84 /* MEC1308_MBX_DATA_START */) : ? 0xaa /* MEC1308_CMD_PASSTHRU_SUCCESS */ : : 0)); > This is awesome, and it works! Thank you! Done -- To view, visit https://review.coreboot.org/c/flashrom/+/51487 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3af612defe1af3850dfc1626a208d873e3a3eddc Gerrit-Change-Number: 51487 Gerrit-PatchSet: 18 Gerrit-Owner: 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Simon Glass <sjg(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 25 May 2021 04:05:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: spi_master: Make use of new register_spi_master() API
by Anastasia Klimchuk (Code Review) 25 May '21

25 May '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/54889 ) Change subject: spi_master: Make use of new register_spi_master() API ...................................................................... spi_master: Make use of new register_spi_master() API Some more spi masters are now ready to get the advantage of new API and pass pointers to dynamically allocated data to register_spi_master(). This way we can avoid some mutable globals. BUG=b:185191942 TEST=builds Change-Id: If72f54c28a95b402b3565fd14ea481f734e1c970 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M ene_lpc.c M mec1308.c M raiden_debug_spi.c M realtek_mst_i2c_spi.c 4 files changed, 7 insertions(+), 12 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/89/54889/1 diff --git a/ene_lpc.c b/ene_lpc.c index 46f1783..04c17e3 100644 --- a/ene_lpc.c +++ b/ene_lpc.c @@ -504,7 +504,7 @@ return rv; } -static struct spi_master spi_master_ene = { +static const struct spi_master spi_master_ene = { .max_data_read = 256, .max_data_write = 256, .command = ene_spi_send_command, @@ -568,11 +568,10 @@ ene_enter_flash_mode(ctx_data); internal_buses_supported |= BUS_LPC; - spi_master_ene.data = ctx_data; if (register_shutdown(ene_leave_flash_mode, ctx_data)) goto init_err_cleanup_exit; - register_spi_master(&spi_master_ene, NULL); + register_spi_master(&spi_master_ene, ctx_data); msg_pdbg("%s: successfully initialized ene\n", __func__); return 0; diff --git a/mec1308.c b/mec1308.c index 70d2a79..3923d5b 100644 --- a/mec1308.c +++ b/mec1308.c @@ -397,7 +397,7 @@ return rc; } -static struct spi_master spi_master_mec1308 = { +static const struct spi_master spi_master_mec1308 = { .max_data_read = 256, /* FIXME: should be MAX_DATA_READ_UNLIMITED? */ .max_data_write = 256, /* FIXME: should be MAX_DATA_WRITE_UNLIMITED? */ .command = mec1308_spi_send_command, @@ -505,11 +505,10 @@ goto init_err_cleanup_exit; internal_buses_supported |= BUS_LPC; /* for LPC <--> SPI bridging */ - spi_master_mec1308.data = ctx_data; if (register_shutdown(mec1308_shutdown, ctx_data)) goto init_err_cleanup_exit; - register_spi_master(&spi_master_mec1308, NULL); + register_spi_master(&spi_master_mec1308, ctx_data); msg_pdbg("%s(): successfully initialized mec1308\n", __func__); return 0; diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c index c275851..30a71ca 100644 --- a/raiden_debug_spi.c +++ b/raiden_debug_spi.c @@ -1597,7 +1597,6 @@ data->in_ep = in_endpoint; data->out_ep = out_endpoint; - spi_config->data = data; /* * The SPI master needs to be configured based on the device connected. * Using the device protocol interrogation, we will set the limits on @@ -1614,7 +1613,7 @@ return SPI_GENERIC_ERROR; } - register_spi_master(spi_config, NULL); + register_spi_master(spi_config, data); register_shutdown(raiden_debug_spi_shutdown, spi_config); return 0; diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c index f0a6dce..95c017f 100644 --- a/realtek_mst_i2c_spi.c +++ b/realtek_mst_i2c_spi.c @@ -410,7 +410,7 @@ return SPI_GENERIC_ERROR; } -static struct spi_master spi_master_i2c_realtek_mst = { +static const struct spi_master spi_master_i2c_realtek_mst = { .max_data_read = 16, .max_data_write = 8, .command = realtek_mst_i2c_spi_send_command, @@ -513,9 +513,7 @@ data->fd = fd; data->reset = reset; ret |= register_shutdown(realtek_mst_i2c_spi_shutdown, data); - - spi_master_i2c_realtek_mst.data = data; - ret |= register_spi_master(&spi_master_i2c_realtek_mst, NULL); + ret |= register_spi_master(&spi_master_i2c_realtek_mst, data); return ret; } -- To view, visit https://review.coreboot.org/c/flashrom/+/54889 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If72f54c28a95b402b3565fd14ea481f734e1c970 Gerrit-Change-Number: 54889 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: buspirate: Add psus option
by Jeremy Kerr (Code Review) 24 May '21

24 May '21

Jeremy Kerr has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/54887 ) Change subject: buspirate: Add psus option ...................................................................... buspirate: Add psus option This change adds a 'psus=<on|off>' option, to control the external Vcc state of the bus pirate, allowing hardware where the SPI flash chip is powered by the 3V3/5V lines directly. Change-Id: I8a7d4b40c0f7f04f6976f6757f05b61f2c9958f9 Signed-off-by: Jeremy Kerr <jk(a)codeconstruct.com.au> --- M buspirate_spi.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/87/54887/1 diff --git a/buspirate_spi.c b/buspirate_spi.c index 96e9673..2024458 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -316,6 +316,7 @@ int serialspeed_index = -1; int ret = 0; int pullup = 0; + int psu = 0; dev = extract_programmer_param("dev"); if (dev && !strlen(dev)) { @@ -365,6 +366,17 @@ } free(tmp); + tmp = extract_programmer_param("psus"); + if (tmp) { + if (strcasecmp("on", tmp) == 0) + psu = 1; + else if (strcasecmp("off", tmp) == 0) + ; // ignore + else + msg_perr("Invalid psus state, not enabling.\n"); + } + free(tmp); + /* Default buffer size is 19: 16 bytes data, 3 bytes control. */ #define DEFAULT_BUFSIZE (16 + 3) bp_commbuf = malloc(DEFAULT_BUFSIZE); @@ -613,6 +625,10 @@ bp_commbuf[0] |= (1 << 2); msg_pdbg("Enabling pull-up resistors.\n"); } + if (psu == 1) { + bp_commbuf[0] |= (1 << 3); + msg_pdbg("Enabling PSUs.\n"); + } ret = buspirate_sendrecv(bp_commbuf, 1, 1); if (ret) return 1; -- To view, visit https://review.coreboot.org/c/flashrom/+/54887 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8a7d4b40c0f7f04f6976f6757f05b61f2c9958f9 Gerrit-Change-Number: 54887 Gerrit-PatchSet: 1 Gerrit-Owner: Jeremy Kerr <jk(a)ozlabs.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: dummyflasher.c: Extract params processing into a separate function
by Anastasia Klimchuk (Code Review) 24 May '21

24 May '21

Attention is currently required from: Nico Huber, Namyoon Woo, Edward O'Callaghan, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54748 ) Change subject: dummyflasher.c: Extract params processing into a separate function ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > Can I do this after the chain submitted? Sure, I will resolve all conflicts, but if I rebase now and […] I rebased on the top of what is already submitted. -- To view, visit https://review.coreboot.org/c/flashrom/+/54748 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I04f55f77bb4703f1d88b2191c45a22be3c97bf87 Gerrit-Change-Number: 54748 Gerrit-PatchSet: 2 Gerrit-Owner: 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: Namyoon Woo <namyoon(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Namyoon Woo <namyoon(a)google.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Tue, 25 May 2021 00:25:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: dummyflasher.c: Extract params processing into a separate function
by Anastasia Klimchuk (Code Review) 24 May '21

24 May '21

Attention is currently required from: Nico Huber, Namyoon Woo, Edward O'Callaghan, Angel Pons. Hello build bot (Jenkins), Nico Huber, Namyoon Woo, Edward O'Callaghan, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/54748 to look at the new patch set (#2). Change subject: dummyflasher.c: Extract params processing into a separate function ...................................................................... dummyflasher.c: Extract params processing into a separate function This makes init function easier to read. A good side-effect of the change is: 13 error paths of params processing are not leaking data anymore. All those error paths return 1 back to init function which frees data. And there was just one more error path in init function were free(data) needed to be added. BUG=b:185191942 TEST=ninja test Change-Id: I04f55f77bb4703f1d88b2191c45a22be3c97bf87 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M dummyflasher.c 1 file changed, 41 insertions(+), 19 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/48/54748/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/54748 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I04f55f77bb4703f1d88b2191c45a22be3c97bf87 Gerrit-Change-Number: 54748 Gerrit-PatchSet: 2 Gerrit-Owner: 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: Namyoon Woo <namyoon(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Namyoon Woo <namyoon(a)google.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: serprog.c: Use braces in both branches of conditional statement
by Anastasia Klimchuk (Code Review) 24 May '21

24 May '21

Attention is currently required from: Nico Huber. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54862 ) Change subject: serprog.c: Use braces in both branches of conditional statement ...................................................................... Patch Set 2: (2 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/54862/comment/3b3ae941_c2e4f9ad PS1, Line 9: According to the style guide. > Make it a full sentence? […] Done File serprog.c: https://review.coreboot.org/c/flashrom/+/54862/comment/fcb8532d_58e761fe PS1, Line 876: } else { > `else` isn't necessary here. I don't really care, though. oh I see, if branch goes to error anyway. maybe I will return to this later? -- To view, visit https://review.coreboot.org/c/flashrom/+/54862 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4fdccbd66f0351af98811bf7c2d8e15f0a99d852 Gerrit-Change-Number: 54862 Gerrit-PatchSet: 2 Gerrit-Owner: 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Comment-Date: Mon, 24 May 2021 23:41:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: serprog.c: Use braces in both branches of conditional statement
by Anastasia Klimchuk (Code Review) 24 May '21

24 May '21

Attention is currently required from: Nico Huber, Anastasia Klimchuk. Hello build bot (Jenkins), Nico Huber, Edward O'Callaghan, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/54862 to look at the new patch set (#2). Change subject: serprog.c: Use braces in both branches of conditional statement ...................................................................... serprog.c: Use braces in both branches of conditional statement As per the coding style, if one branch of a conditional statement needs braces, all other branches need to have braces as well. BUG=b:185191942 TEST=builds Change-Id: I4fdccbd66f0351af98811bf7c2d8e15f0a99d852 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M serprog.c 1 file changed, 13 insertions(+), 9 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/62/54862/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/54862 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4fdccbd66f0351af98811bf7c2d8e15f0a99d852 Gerrit-Change-Number: 54862 Gerrit-PatchSet: 2 Gerrit-Owner: 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: buspirate_spi.c: Refactor singleton states into reentrant pattern
by Anastasia Klimchuk (Code Review) 24 May '21

24 May '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52958 ) Change subject: buspirate_spi.c: Refactor singleton states into reentrant pattern ...................................................................... Patch Set 3: (2 comments) File buspirate_spi.c: https://review.coreboot.org/c/flashrom/+/52958/comment/bf5dbd9e_23229ca3 PS2, Line 54: bp_ > The `bp_` prefix seems unnecessary now. Yes sure, I usually do this as separate patch - so now there is CB:54886 on the top of the chain. https://review.coreboot.org/c/flashrom/+/52958/comment/428cd28f_28fc3f97 PS2, Line 167: struct buspirate_spi_data *buspirate_data = data; > Thank you so much for detailed explanation, and I am really sorry for delay from my side! During las […] After some more thinking, I did this: I really wanted to keep as much optimisations from the Author as possible, but also reduce noise and diffs because that was the suggestion which started this thread. So bp_data is still spi_master data (keeps optimisations), but I use a shortcut local variable in most of functions (reduce noise and diffs). -- To view, visit https://review.coreboot.org/c/flashrom/+/52958 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I418bbfff15fb126b042fbc9be09dbf59f4d243b8 Gerrit-Change-Number: 52958 Gerrit-PatchSet: 3 Gerrit-Owner: 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Mon, 24 May 2021 22:29:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: buspirate_spi.c: Drop bp_ prefix for spi data struct members
by Anastasia Klimchuk (Code Review) 24 May '21

24 May '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/54886 ) Change subject: buspirate_spi.c: Drop bp_ prefix for spi data struct members ...................................................................... buspirate_spi.c: Drop bp_ prefix for spi data struct members The name of the struct type already contains bp_ prefix, so prefix doesn't need to be repeated in members name. BUG=b:185191942 TEST=builds Change-Id: Ia463e3f58497e4b10be072bdd29244f4868098e7 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M buspirate_spi.c 1 file changed, 15 insertions(+), 15 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/86/54886/1 diff --git a/buspirate_spi.c b/buspirate_spi.c index c201d38..440d12d 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -51,8 +51,8 @@ #endif struct bp_spi_data { - unsigned char *bp_commbuf; - int bp_commbufsize; + unsigned char *commbuf; + int commbufsize; }; static int buspirate_commbuf_grow(int bufsize, unsigned char **bp_commbuf, int *bp_commbufsize) @@ -165,7 +165,7 @@ static int buspirate_spi_shutdown(void *data) { struct bp_spi_data *bp_data = data; - unsigned char *const bp_commbuf = bp_data->bp_commbuf; + unsigned char *const bp_commbuf = bp_data->commbuf; int ret = 0, ret2 = 0; /* No need to allocate a buffer here, we know that bp_commbuf is at least DEFAULT_BUFSIZE big. */ @@ -215,10 +215,10 @@ return SPI_INVALID_LENGTH; /* 3 bytes extra for CS#, len, CS#. */ - if (buspirate_commbuf_grow(writecnt + readcnt + 3, &bp_data->bp_commbuf, &bp_data->bp_commbufsize)) + if (buspirate_commbuf_grow(writecnt + readcnt + 3, &bp_data->commbuf, &bp_data->commbufsize)) return ERROR_OOM; - unsigned char *const bp_commbuf = bp_data->bp_commbuf; + unsigned char *const bp_commbuf = bp_data->commbuf; /* Assert CS# */ bp_commbuf[i++] = 0x02; @@ -272,10 +272,10 @@ /* 5 bytes extra for command, writelen, readlen. * 1 byte extra for Ack/Nack. */ - if (buspirate_commbuf_grow(max(writecnt + 5, readcnt + 1), &bp_data->bp_commbuf, &bp_data->bp_commbufsize)) + if (buspirate_commbuf_grow(max(writecnt + 5, readcnt + 1), &bp_data->commbuf, &bp_data->commbufsize)) return ERROR_OOM; - unsigned char *const bp_commbuf = bp_data->bp_commbuf; + unsigned char *const bp_commbuf = bp_data->commbuf; /* Combined SPI write/read. */ bp_commbuf[i++] = 0x04; @@ -401,8 +401,8 @@ free(bp_commbuf); return 1; } - bp_data->bp_commbuf = bp_commbuf; - bp_data->bp_commbufsize = bp_commbufsize; + bp_data->commbuf = bp_commbuf; + bp_data->commbufsize = bp_commbufsize; /* This is the brute force version, but it should work. * It is likely to fail if a previous flashrom run was aborted during a write with the new SPI commands @@ -504,8 +504,8 @@ ret = ERROR_OOM; goto init_err_cleanup_exit; } - bp_data->bp_commbuf = bp_commbuf; - bp_data->bp_commbufsize = bp_commbufsize; + bp_data->commbuf = bp_commbuf; + bp_data->commbufsize = bp_commbufsize; spi_master_buspirate.max_data_read = 2048; spi_master_buspirate.max_data_write = 256; spi_master_buspirate.command = buspirate_spi_send_command_v2; @@ -518,8 +518,8 @@ ret = ERROR_OOM; goto init_err_cleanup_exit; } - bp_data->bp_commbuf = bp_commbuf; - bp_data->bp_commbufsize = bp_commbufsize; + bp_data->commbuf = bp_commbuf; + bp_data->commbufsize = bp_commbufsize; spi_master_buspirate.max_data_read = 12; spi_master_buspirate.max_data_write = 12; spi_master_buspirate.command = buspirate_spi_send_command_v1; @@ -693,8 +693,8 @@ } /* Storing the latest values into data, commbuf migth have grown during init. */ - bp_data->bp_commbuf = bp_commbuf; - bp_data->bp_commbufsize = bp_commbufsize; + bp_data->commbuf = bp_commbuf; + bp_data->commbufsize = bp_commbufsize; if (register_shutdown(buspirate_spi_shutdown, bp_data) != 0) { ret = 1; goto init_err_cleanup_exit; -- To view, visit https://review.coreboot.org/c/flashrom/+/54886 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia463e3f58497e4b10be072bdd29244f4868098e7 Gerrit-Change-Number: 54886 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: buspirate_spi.c: Refactor singleton states into reentrant pattern
by Anastasia Klimchuk (Code Review) 24 May '21

24 May '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Angel Pons. Hello build bot (Jenkins), Nico Huber, Edward O'Callaghan, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/52958 to look at the new patch set (#3). Change subject: buspirate_spi.c: Refactor singleton states into reentrant pattern ...................................................................... buspirate_spi.c: Refactor singleton states into reentrant pattern Move global singleton states into a struct and store within the spi_master data field for the life-time of the driver. This is one of the steps on the way to move spi_master data memory management behind the initialisation API, for more context see other patches under the same topic "register_master_api". BUG=b:185191942 TEST=builds Change-Id: I418bbfff15fb126b042fbc9be09dbf59f4d243b8 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M buspirate_spi.c 1 file changed, 45 insertions(+), 19 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/58/52958/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/52958 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I418bbfff15fb126b042fbc9be09dbf59f4d243b8 Gerrit-Change-Number: 52958 Gerrit-PatchSet: 3 Gerrit-Owner: 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit May 2021