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

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

21 May '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/54748 ) 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/1 diff --git a/dummyflasher.c b/dummyflasher.c index e19e46c..98b759e 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -654,8 +654,9 @@ return 0; } -int dummy_init(void) +static int init_data(struct emu_data *data) { + char *bustext = NULL; char *tmp = NULL; unsigned int i; @@ -663,20 +664,6 @@ char *status = NULL; int size = -1; /* size for VARIABLE_SIZE chip device */ #endif -#if EMULATE_CHIP - struct stat image_stat; -#endif - - struct emu_data *data = calloc(1, sizeof(struct emu_data)); - if (!data) { - msg_perr("Out of memory!\n"); - return 1; - } - data->emu_chip = EMULATE_NONE; - data->delay_us = 0; - par_master_dummy.data = data; - - msg_pspew("%s\n", __func__); bustext = extract_programmer_param("bus"); msg_pdbg("Requested buses are: %s\n", bustext ? bustext : "default"); @@ -847,14 +834,15 @@ } free(tmp); } -#endif +#endif /* EMULATE_SPI_CHIP */ tmp = extract_programmer_param("emulate"); if (!tmp) { msg_pdbg("Not emulating any flash chip.\n"); /* Nothing else to do. */ - goto dummy_init_out; + return 0; } + #if EMULATE_SPI_CHIP if (!strcmp(tmp, "M25P10.RES")) { data->emu_chip = EMULATE_ST_M25P10_RES; @@ -942,7 +930,7 @@ msg_pdbg("Emulating generic SPI flash chip (size=%d bytes)\n", data->emu_chip_size); } -#endif +#endif /* EMULATE_SPI_CHIP */ if (data->emu_chip == EMULATE_NONE) { msg_perr("Invalid chip specified for emulation: %s\n", tmp); free(tmp); @@ -987,8 +975,41 @@ msg_pdbg("Initial status register is set to 0x%02x.\n", data->emu_status); } +#endif /* EMULATE_SPI_CHIP */ +#endif /* EMULATE_CHIP */ + + return 0; +} + +int dummy_init(void) +{ +#if EMULATE_CHIP + struct stat image_stat; #endif + struct emu_data *data = calloc(1, sizeof(struct emu_data)); + if (!data) { + msg_perr("Out of memory!\n"); + return 1; + } + data->emu_chip = EMULATE_NONE; + data->delay_us = 0; + par_master_dummy.data = data; + + msg_pspew("%s\n", __func__); + + if (init_data(data)) { + free(data); + return 1; + } + +#if EMULATE_CHIP + if (data->emu_chip == EMULATE_NONE) { + msg_pdbg("Not emulating any flash chip.\n"); + /* Nothing else to do. */ + goto dummy_init_out; + } + 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); @@ -1011,13 +1032,14 @@ data->emu_persistent_image)) { msg_perr("Unable to read %s\n", data->emu_persistent_image); free(flashchip_contents); + free(data); return 1; } } else { msg_pdbg("doesn't match.\n"); } } -#endif +#endif /* EMULATE_CHIP */ dummy_init_out: if (register_shutdown(dummy_shutdown, data)) { -- 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: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: programmer: Smoothen register_par_master API
by Edward O'Callaghan (Code Review) 21 May '21

21 May '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan 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) File programmer.c: https://review.coreboot.org/c/flashrom/+/54169/comment/d8636250_b29bf770 PS3, Line 100: if (data) > Good thing there is one follow-up patch in my mind anyway: to move these lines / this line into regi […] I am fine with this patch getting merged ASAP to level up all the interface interfaces to become consistent yes. -- 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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 21 May 2021 02:07:58 +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]: programmer: Smoothen register_par_master API
by Anastasia Klimchuk (Code Review) 21 May '21

21 May '21

Attention is currently required from: Nico Huber, 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) File programmer.c: https://review.coreboot.org/c/flashrom/+/54169/comment/964ac248_e82a444b PS3, Line 100: if (data) > Just to clarify some ambiguity in my writing here. […] Good thing there is one follow-up patch in my mind anyway: to move these lines / this line into register_master, I can address your suggestion there? -- 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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Fri, 21 May 2021 01:08:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: programmer: Smoothen register_par_master API
by Edward O'Callaghan (Code Review) 21 May '21

21 May '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan 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) File programmer.c: https://review.coreboot.org/c/flashrom/+/54169/comment/5a142db1_6258313b PS3, Line 100: if (data) > While this is consistent with the other patches already merged so maybe worth doing as a cleanup pat […] Just to clarify some ambiguity in my writing here. The manual cases of `data` getting set in the drivers, which this branch is effectively working around, just be collapsed instead of the intermediate workaround here. -- 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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 21 May 2021 00:59:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: programmer: Make use of new register_par_master() API
by Edward O'Callaghan (Code Review) 21 May '21

21 May '21

Attention is currently required from: Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54172 ) Change subject: programmer: Make use of new register_par_master() API ...................................................................... Patch Set 4: Code-Review+2 -- 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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 21 May 2021 00:53:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: programmer: Make use of new register_opaque_master() API
by Edward O'Callaghan (Code Review) 21 May '21

21 May '21

Attention is currently required from: Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54171 ) Change subject: programmer: Make use of new register_opaque_master() API ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/54171 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I160810cd67f782131962e96fc6d20e2987fb0390 Gerrit-Change-Number: 54171 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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 21 May 2021 00:52:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: programmer: Smoothen register_opaque_master() API
by Edward O'Callaghan (Code Review) 21 May '21

21 May '21

Attention is currently required from: Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54170 ) Change subject: programmer: Smoothen register_opaque_master() API ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/54170 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id3adb4cf04ae04dbe87ddb96f30871cb5f7c8ff0 Gerrit-Change-Number: 54170 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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 21 May 2021 00:52:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: programmer: Smoothen register_par_master API
by Edward O'Callaghan (Code Review) 21 May '21

21 May '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54169 ) Change subject: programmer: Smoothen register_par_master API ...................................................................... Patch Set 3: Code-Review+2 (1 comment) File programmer.c: https://review.coreboot.org/c/flashrom/+/54169/comment/b7570155_5c7cd548 PS3, Line 100: if (data) While this is consistent with the other patches already merged so maybe worth doing as a cleanup patch after this lands there is no point in this branching. Either the argument is a non-NULL pointer so we take the branch or the argument is NULL in which case it is a nop. -- 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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 21 May 2021 00:51:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

21 May '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54714 ) Change subject: sb600spi.c: Drop sb600_ prefix for spi data struct member ...................................................................... Patch Set 2: Code-Review+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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 21 May 2021 00:46:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

21 May '21

Attention is currently required from: Nico Huber, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54714 ) Change subject: sb600spi.c: Drop sb600_ prefix for spi data struct member ...................................................................... Patch Set 2: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/54714/comment/52d8adfb_2b016f6e PS1, Line 9: sb600spi_ > nit, pedantic: Strictly speaking, this prefix is only used in the name of the struct *type*. […] If I understand you correctly, this is about commit message - so I changed it a little bit to mention struct type. -- 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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Fri, 21 May 2021 00:24:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit May 2021