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

Change in flashrom[master]: sb600spi.c: Drop sb600_ prefix for spi data struct member
by Anastasia Klimchuk (Code Review) 20 May '21

20 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/+/54714 to look at the new patch set (#2). Change subject: sb600spi.c: Drop sb600_ prefix for spi data struct member ...................................................................... sb600spi.c: Drop sb600_ prefix for spi data struct member The name of the struct type already contains sb600spi_ prefix, so prefix doesn't need to be repeated in members name. BUG=b:185191942 TEST=builds Change-Id: I001ae2044453d1bc205fa253ffb773ed993f57f8 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M sb600spi.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/14/54714/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/54714 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I001ae2044453d1bc205fa253ffb773ed993f57f8 Gerrit-Change-Number: 54714 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]: sb600spi.c: Move sb600_spibar into spi data instead of being global
by Anastasia Klimchuk (Code Review) 20 May '21

20 May '21

Attention is currently required from: Nico Huber. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54712 ) Change subject: sb600spi.c: Move sb600_spibar into spi data instead of being global ...................................................................... Patch Set 1: (1 comment) File sb600spi.c: https://review.coreboot.org/c/flashrom/+/54712/comment/a45a42aa_1b0fa27a PS1, Line 610: free(data); > Oh, I see now. Thank you so much for your explanations!! -- To view, visit https://review.coreboot.org/c/flashrom/+/54712 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ifaad0f0a2c0e956029d2df18ddcfd092515ca3c0 Gerrit-Change-Number: 54712 Gerrit-PatchSet: 1 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: Fri, 21 May 2021 00:14: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: 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]: programmer: Smoothen register_par_master API
by Anastasia Klimchuk (Code Review) 20 May '21

20 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/+/54169 ) Change subject: programmer: Smoothen register_par_master API ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: I rebased on the top of most recent commits (for dummyflasher). It would be really great to submit this chain, then "smoothen APIs" idea would be completed. And also that would unblock more work that I want to do for par masters. Thank you!! -- To view, visit https://review.coreboot.org/c/flashrom/+/54169 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I95bc92f6c54c5bcdac1c522ca87054aaffed0f40 Gerrit-Change-Number: 54169 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-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: Thu, 20 May 2021 23:56:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: programmer: Make use of new register_par_master() API
by Anastasia Klimchuk (Code Review) 20 May '21

20 May '21

Attention is currently required from: Edward O'Callaghan, Angel Pons, 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/+/54172 to look at the new patch set (#4). Change subject: programmer: Make use of new register_par_master() API ...................................................................... programmer: Make use of new register_par_master() API Pass pointers to dynamically allocated data to register_par_master(). This way we can avoid a mutable global. BUG=b:185191942 TEST=builds Change-Id: I76572e43d01f8a5e1aa73b1b9e8a187465ed8fef Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M dummyflasher.c 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/72/54172/4 -- To view, visit https://review.coreboot.org/c/flashrom/+/54172 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I76572e43d01f8a5e1aa73b1b9e8a187465ed8fef Gerrit-Change-Number: 54172 Gerrit-PatchSet: 4 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-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: programmer: Smoothen register_par_master API
by Anastasia Klimchuk (Code Review) 20 May '21

20 May '21

Attention is currently required from: Edward O'Callaghan, Angel Pons, 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/+/54169 to look at the new patch set (#3). Change subject: programmer: Smoothen register_par_master API ...................................................................... programmer: Smoothen register_par_master API It was impossible to register a const struct par_master that would point to dynamically allocated `data`. Fix that so that we won't have to create more mutable globals. BUG=b:185191942 TEST=builds Change-Id: I95bc92f6c54c5bcdac1c522ca87054aaffed0f40 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M atahpt.c M atapromise.c M atavia.c M drkaiser.c M dummyflasher.c M gfxnvidia.c M internal.c M it8212.c M nic3com.c M nicintel.c M nicnatsemi.c M nicrealtek.c M programmer.c M programmer.h M satamv.c M satasii.c M serprog.c 17 files changed, 21 insertions(+), 17 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/69/54169/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/54169 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I95bc92f6c54c5bcdac1c522ca87054aaffed0f40 Gerrit-Change-Number: 54169 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-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: dummyflasher.c: Move 'flashchip_contents' into emu_data
by Anastasia Klimchuk (Code Review) 20 May '21

20 May '21

Attention is currently required from: Namyoon Woo, Edward O'Callaghan, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54722 ) Change subject: dummyflasher.c: Move 'flashchip_contents' into emu_data ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/54722 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I11dfe713dd2fecfd3981ab50e31c9215d00bc787 Gerrit-Change-Number: 54722 Gerrit-PatchSet: 1 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: Namyoon Woo <namyoon(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> 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: Thu, 20 May 2021 23:29:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: dummyflasher.c: Move 'spi_write_256_chunksize' into emu_data
by Anastasia Klimchuk (Code Review) 20 May '21

20 May '21

Attention is currently required from: Namyoon Woo, Edward O'Callaghan, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54721 ) Change subject: dummyflasher.c: Move 'spi_write_256_chunksize' into emu_data ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/54721 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I633f4df4bd47e661cd69801f21910b667899d505 Gerrit-Change-Number: 54721 Gerrit-PatchSet: 1 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: Namyoon Woo <namyoon(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> 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: Thu, 20 May 2021 23:27:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: dummyflasher.c: Make entry struct names consistent
by Anastasia Klimchuk (Code Review) 20 May '21

20 May '21

Attention is currently required from: Namyoon Woo, Edward O'Callaghan, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54720 ) Change subject: dummyflasher.c: Make entry struct names consistent ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/54720 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ib8ade96c47b4e4d358ba1fe34d06f22de326c60a Gerrit-Change-Number: 54720 Gerrit-PatchSet: 1 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: Namyoon Woo <namyoon(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> 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: Thu, 20 May 2021 23:25:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: dummyflasher.c: Move 'flashchip_contents' into emu_data
by Edward O'Callaghan (Code Review) 20 May '21

20 May '21

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/54722 ) Change subject: dummyflasher.c: Move 'flashchip_contents' into emu_data ...................................................................... dummyflasher.c: Move 'flashchip_contents' into emu_data Move 'flashchip_contents' out of global scope and into the emu_data reentrent struct. BUG=none BRANCH=none TEST=builds Change-Id: I11dfe713dd2fecfd3981ab50e31c9215d00bc787 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M dummyflasher.c 1 file changed, 20 insertions(+), 20 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/22/54722/1 diff --git a/dummyflasher.c b/dummyflasher.c index 5581d0b..ce8300f 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -37,7 +37,6 @@ #endif #if EMULATE_CHIP -static uint8_t *flashchip_contents = NULL; enum emu_chip { EMULATE_NONE, EMULATE_ST_M25P10_RES, @@ -71,6 +70,7 @@ unsigned int spi_ignorelist_size; unsigned int spi_write_256_chunksize; + uint8_t *flashchip_contents; }; #if EMULATE_SPI_CHIP @@ -353,14 +353,14 @@ /* Truncate to emu_chip_size. */ offs %= data->emu_chip_size; if (readcnt > 0) - memcpy(readarr, flashchip_contents + offs, readcnt); + memcpy(readarr, data->flashchip_contents + offs, readcnt); break; case JEDEC_READ_4BA: offs = writearr[1] << 24 | writearr[2] << 16 | writearr[3] << 8 | writearr[4]; /* Truncate to emu_chip_size. */ offs %= data->emu_chip_size; if (readcnt > 0) - memcpy(readarr, flashchip_contents + offs, readcnt); + memcpy(readarr, data->flashchip_contents + offs, readcnt); break; case JEDEC_BYTE_PROGRAM: offs = writearr[1] << 16 | writearr[2] << 8 | writearr[3]; @@ -374,7 +374,7 @@ msg_perr("Max BYTE PROGRAM size exceeded!\n"); return 1; } - memcpy(flashchip_contents + offs, writearr + 4, writecnt - 4); + memcpy(data->flashchip_contents + offs, writearr + 4, writecnt - 4); data->emu_modified = 1; break; case JEDEC_BYTE_PROGRAM_4BA: @@ -389,7 +389,7 @@ msg_perr("Max BYTE PROGRAM size exceeded!\n"); return 1; } - memcpy(flashchip_contents + offs, writearr + 5, writecnt - 5); + memcpy(data->flashchip_contents + offs, writearr + 5, writecnt - 5); data->emu_modified = 1; break; case JEDEC_AAI_WORD_PROGRAM: @@ -411,7 +411,7 @@ writearr[3]; /* Truncate to emu_chip_size. */ aai_offs %= data->emu_chip_size; - memcpy(flashchip_contents + aai_offs, writearr + 4, 2); + memcpy(data->flashchip_contents + aai_offs, writearr + 4, 2); aai_offs += 2; } else { if (writecnt < JEDEC_AAI_WORD_PROGRAM_CONT_OUTSIZE) { @@ -424,7 +424,7 @@ "too long!\n"); return 1; } - memcpy(flashchip_contents + aai_offs, writearr + 1, 2); + memcpy(data->flashchip_contents + aai_offs, writearr + 1, 2); aai_offs += 2; } data->emu_modified = 1; @@ -448,7 +448,7 @@ if (offs & (data->emu_jedec_se_size - 1)) msg_pdbg("Unaligned SECTOR ERASE 0x20: 0x%x\n", offs); offs &= ~(data->emu_jedec_se_size - 1); - memset(flashchip_contents + offs, 0xff, data->emu_jedec_se_size); + memset(data->flashchip_contents + offs, 0xff, data->emu_jedec_se_size); data->emu_modified = 1; break; case JEDEC_BE_52: @@ -466,7 +466,7 @@ if (offs & (data->emu_jedec_be_52_size - 1)) msg_pdbg("Unaligned BLOCK ERASE 0x52: 0x%x\n", offs); offs &= ~(data->emu_jedec_be_52_size - 1); - memset(flashchip_contents + offs, 0xff, data->emu_jedec_be_52_size); + memset(data->flashchip_contents + offs, 0xff, data->emu_jedec_be_52_size); data->emu_modified = 1; break; case JEDEC_BE_D8: @@ -484,7 +484,7 @@ if (offs & (data->emu_jedec_be_d8_size - 1)) msg_pdbg("Unaligned BLOCK ERASE 0xd8: 0x%x\n", offs); offs &= ~(data->emu_jedec_be_d8_size - 1); - memset(flashchip_contents + offs, 0xff, data->emu_jedec_be_d8_size); + memset(data->flashchip_contents + offs, 0xff, data->emu_jedec_be_d8_size); data->emu_modified = 1; break; case JEDEC_CE_60: @@ -500,7 +500,7 @@ } /* JEDEC_CE_60_OUTSIZE is 1 (no address) -> no offset. */ /* emu_jedec_ce_60_size is emu_chip_size. */ - memset(flashchip_contents, 0xff, data->emu_jedec_ce_60_size); + memset(data->flashchip_contents, 0xff, data->emu_jedec_ce_60_size); data->emu_modified = 1; break; case JEDEC_CE_C7: @@ -516,7 +516,7 @@ } /* JEDEC_CE_C7_OUTSIZE is 1 (no address) -> no offset. */ /* emu_jedec_ce_c7_size is emu_chip_size. */ - memset(flashchip_contents, 0xff, data->emu_jedec_ce_c7_size); + memset(data->flashchip_contents, 0xff, data->emu_jedec_ce_c7_size); data->emu_modified = 1; break; case JEDEC_SFDP: @@ -643,13 +643,13 @@ if (emu_data->emu_chip != EMULATE_NONE) { if (emu_data->emu_persistent_image && emu_data->emu_modified) { msg_pdbg("Writing %s\n", emu_data->emu_persistent_image); - write_buf_to_file(flashchip_contents, + write_buf_to_file(emu_data->flashchip_contents, emu_data->emu_chip_size, emu_data->emu_persistent_image); free(emu_data->emu_persistent_image); emu_data->emu_persistent_image = NULL; } - free(flashchip_contents); + free(emu_data->flashchip_contents); } #endif free(data); @@ -970,8 +970,8 @@ } free(tmp); - flashchip_contents = malloc(data->emu_chip_size); - if (!flashchip_contents) { + data->flashchip_contents = malloc(data->emu_chip_size); + if (!data->flashchip_contents) { msg_perr("Out of memory!\n"); return 1; } @@ -995,7 +995,7 @@ msg_pdbg("Filling fake flash chip with 0x%02x, size %i\n", data->erase_to_zero ? 0x00 : 0xff, data->emu_chip_size); - memset(flashchip_contents, data->erase_to_zero ? 0x00 : 0xff, data->emu_chip_size); + memset(data->flashchip_contents, data->erase_to_zero ? 0x00 : 0xff, data->emu_chip_size); /* Will be freed by shutdown function if necessary. */ data->emu_persistent_image = extract_programmer_param("image"); @@ -1011,10 +1011,10 @@ if ((uintmax_t)image_stat.st_size == data->emu_chip_size) { msg_pdbg("matches.\n"); msg_pdbg("Reading %s\n", data->emu_persistent_image); - if (read_buf_from_file(flashchip_contents, data->emu_chip_size, + if (read_buf_from_file(data->flashchip_contents, data->emu_chip_size, data->emu_persistent_image)) { msg_perr("Unable to read %s\n", data->emu_persistent_image); - free(flashchip_contents); + free(data->flashchip_contents); return 1; } } else { @@ -1025,7 +1025,7 @@ dummy_init_out: if (register_shutdown(dummy_shutdown, data)) { - free(flashchip_contents); + free(data->flashchip_contents); free(data); return 1; } -- To view, visit https://review.coreboot.org/c/flashrom/+/54722 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I11dfe713dd2fecfd3981ab50e31c9215d00bc787 Gerrit-Change-Number: 54722 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: dummyflasher.c: Move 'spi_write_256_chunksize' into emu_data
by Edward O'Callaghan (Code Review) 20 May '21

20 May '21

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/54721 ) Change subject: dummyflasher.c: Move 'spi_write_256_chunksize' into emu_data ...................................................................... dummyflasher.c: Move 'spi_write_256_chunksize' into emu_data Move 'spi_write_256_chunksize' out of global scope and into the emu_data reentrent struct. BUG=none BRANCH=none TEST=builds Change-Id: I633f4df4bd47e661cd69801f21910b667899d505 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M dummyflasher.c 1 file changed, 18 insertions(+), 14 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/21/54721/1 diff --git a/dummyflasher.c b/dummyflasher.c index 127c632..5581d0b 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -69,6 +69,8 @@ unsigned char spi_ignorelist[256]; unsigned int spi_blacklist_size; unsigned int spi_ignorelist_size; + + unsigned int spi_write_256_chunksize; }; #if EMULATE_SPI_CHIP @@ -101,9 +103,18 @@ #endif #endif -static unsigned int spi_write_256_chunksize = 256; static enum chipbustype dummy_buses_supported = BUS_NONE; +static struct emu_data* get_data_from_context(const struct flashctx *flash) +{ + if (dummy_buses_supported & BUS_NONSPI) + return (struct emu_data *)flash->mst->par.data; + else if (dummy_buses_supported & BUS_SPI) + return (struct emu_data *)flash->mst->spi.data; + + return NULL; /* buses was set to BUS_NONE. */ +} + void *dummy_map(const char *descr, uintptr_t phys_addr, size_t len) { msg_pspew("%s: Mapping %s, 0x%zx bytes at 0x%0*" PRIxPTR "\n", @@ -118,8 +129,9 @@ static int dummy_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { + struct emu_data *emu_data = get_data_from_context(flash); return spi_write_chunked(flash, buf, start, len, - spi_write_256_chunksize); + emu_data->spi_write_256_chunksize); } static void dummy_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr) @@ -173,16 +185,6 @@ return; } -static struct emu_data* get_data_from_context(const struct flashctx *flash) -{ - if (dummy_buses_supported & BUS_NONSPI) - return (struct emu_data *)flash->mst->par.data; - else if (dummy_buses_supported & BUS_SPI) - return (struct emu_data *)flash->mst->spi.data; - - return NULL; /* buses was set to BUS_NONE. */ -} - #if EMULATE_SPI_CHIP static int emulate_spi_chip_response(unsigned int writecnt, unsigned int readcnt, @@ -674,6 +676,8 @@ } data->emu_chip = EMULATE_NONE; data->delay_us = 0; + data->spi_write_256_chunksize = 256; + par_master_dummyflasher.data = data; msg_pspew("%s\n", __func__); @@ -708,9 +712,9 @@ tmp = extract_programmer_param("spi_write_256_chunksize"); if (tmp) { - spi_write_256_chunksize = atoi(tmp); + data->spi_write_256_chunksize = atoi(tmp); free(tmp); - if (spi_write_256_chunksize < 1) { + if (data->spi_write_256_chunksize < 1) { msg_perr("invalid spi_write_256_chunksize\n"); return 1; } -- To view, visit https://review.coreboot.org/c/flashrom/+/54721 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I633f4df4bd47e661cd69801f21910b667899d505 Gerrit-Change-Number: 54721 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit May 2021