October 2022 - flashrom-gerrit

[S] Change in flashrom[master]: rayer_spi.c: Get rid of temporary `prog_type` string
by Edward O'Callaghan (Code Review) 22 Oct '22

22 Oct '22

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/68239 ) Change subject: rayer_spi.c: Get rid of temporary `prog_type` string ...................................................................... rayer_spi.c: Get rid of temporary `prog_type` string Make the `get_params()` function provide a pointer to `struct rayer_programmer` directly, instead of having a `prog_type` string passed around three functions. Change-Id: I83e34382ee9814f224025e21e5099fdab73cee8c Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/68239 Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M rayer_spi.c 1 file changed, 26 insertions(+), 14 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/rayer_spi.c b/rayer_spi.c index 9be41e7..27caf2b 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -254,12 +254,13 @@ return prog; } -static int get_params(const struct programmer_cfg *cfg, uint16_t *lpt_iobase, char **prog_type) +static int get_params(const struct programmer_cfg *cfg, uint16_t *lpt_iobase, + const struct rayer_programmer **prog) { /* Pick a default value for the I/O base. */ *lpt_iobase = 0x378; /* no programmer type specified. */ - *prog_type = NULL; + *prog = NULL; /* Non-default port requested? */ char *arg = extract_programmer_param_str(cfg, "iobase"); @@ -289,26 +290,19 @@ } arg = extract_programmer_param_str(cfg, "type"); - if (arg) { - *prog_type = strdup(arg); - free(arg); - } + *prog = find_progtype(arg); + free(arg); - return 0; + return *prog ? 0 : -1; } static int rayer_spi_init(const struct programmer_cfg *cfg) { + const struct rayer_programmer *prog; struct rayer_pinout *pinout = NULL; uint16_t lpt_iobase; - char *prog_type; - if (get_params(cfg, &lpt_iobase, &prog_type) < 0) - return 1; - - const struct rayer_programmer *prog = find_progtype(prog_type); - free(prog_type); - if (!prog) + if (get_params(cfg, &lpt_iobase, &prog) < 0) return 1; msg_pdbg("Using address 0x%x as I/O base for parallel port access.\n", -- To view, visit https://review.coreboot.org/c/flashrom/+/68239 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I83e34382ee9814f224025e21e5099fdab73cee8c Gerrit-Change-Number: 68239 Gerrit-PatchSet: 4 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: 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: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[M] Change in flashrom[master]: rayer_spi.c: Roll up programmer type search logic into func
by Edward O'Callaghan (Code Review) 22 Oct '22

22 Oct '22

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/68238 ) Change subject: rayer_spi.c: Roll up programmer type search logic into func ...................................................................... rayer_spi.c: Roll up programmer type search logic into func Roll up the programmer type table search and match logic into it's own function and lexically scope the 'rayer_spi_types' table into the function while we are here. Change-Id: Id226ea61132ecc30fd8696e1d8ea50373e752cac Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/68238 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M rayer_spi.c 1 file changed, 50 insertions(+), 24 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved diff --git a/rayer_spi.c b/rayer_spi.c index 41c5364..9be41e7 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -174,16 +174,6 @@ .miso_bit = 7, }; -static const struct rayer_programmer rayer_spi_types[] = { - {"rayer", NT, "RayeR SPIPGM", &rayer_spipgm}, - {"xilinx", NT, "Xilinx Parallel Cable III (DLC 5)", &xilinx_dlc5}, - {"byteblastermv", OK, "Altera ByteBlasterMV", &altera_byteblastermv}, - {"stk200", NT, "Atmel STK200/300 adapter", &atmel_stk200}, - {"wiggler", OK, "Wiggler LPT", &wiggler_lpt}, - {"spi_tt", NT, "SPI Tiny Tools (SPI_TT LPT)", &spi_tt}, - {0}, -}; - static void rayer_bitbang_set_cs(int val, void *spi_data) { struct rayer_spi_data *data = spi_data; @@ -235,6 +225,35 @@ .half_period = 0, }; +static const struct rayer_programmer *find_progtype(const char *prog_type) +{ + static const struct rayer_programmer rayer_spi_types[] = { + {"rayer", NT, "RayeR SPIPGM", &rayer_spipgm}, + {"xilinx", NT, "Xilinx Parallel Cable III (DLC 5)", &xilinx_dlc5}, + {"byteblastermv", OK, "Altera ByteBlasterMV", &altera_byteblastermv}, + {"stk200", NT, "Atmel STK200/300 adapter", &atmel_stk200}, + {"wiggler", OK, "Wiggler LPT", &wiggler_lpt}, + {"spi_tt", NT, "SPI Tiny Tools (SPI_TT LPT)", &spi_tt}, + {0}, + }; + if (!prog_type) + return &rayer_spi_types[0]; + + const struct rayer_programmer *prog = rayer_spi_types; + for (; prog->type != NULL; prog++) { + if (strcasecmp(prog_type, prog->type) == 0) { + break; + } + } + + if (!prog->type) { + msg_perr("Error: Invalid device type specified.\n"); + return NULL; + } + + return prog; +} + static int get_params(const struct programmer_cfg *cfg, uint16_t *lpt_iobase, char **prog_type) { /* Pick a default value for the I/O base. */ @@ -280,7 +299,6 @@ static int rayer_spi_init(const struct programmer_cfg *cfg) { - const struct rayer_programmer *prog = rayer_spi_types; struct rayer_pinout *pinout = NULL; uint16_t lpt_iobase; char *prog_type; @@ -288,19 +306,10 @@ if (get_params(cfg, &lpt_iobase, &prog_type) < 0) return 1; - if (prog_type) { - for (; prog->type != NULL; prog++) { - if (strcasecmp(prog_type, prog->type) == 0) { - break; - } - } - free(prog_type); - - if (prog->type == NULL) { - msg_perr("Error: Invalid device type specified.\n"); - return 1; - } - } + const struct rayer_programmer *prog = find_progtype(prog_type); + free(prog_type); + if (!prog) + return 1; msg_pdbg("Using address 0x%x as I/O base for parallel port access.\n", lpt_iobase); -- To view, visit https://review.coreboot.org/c/flashrom/+/68238 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id226ea61132ecc30fd8696e1d8ea50373e752cac Gerrit-Change-Number: 68238 Gerrit-PatchSet: 5 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: rayer_spi.c: Drop lpt_outbyte intermediate var
by Edward O'Callaghan (Code Review) 22 Oct '22

22 Oct '22

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/68232 ) Change subject: rayer_spi.c: Drop lpt_outbyte intermediate var ...................................................................... rayer_spi.c: Drop lpt_outbyte intermediate var The intermediate variable in this case serves no extra assistance in readability or additional control flow branching. Just assign the result directly into the driver state tracker. Change-Id: Idedabb7b1c401d666b3b7e621e75704c7e765fd1 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/68232 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M rayer_spi.c 1 file changed, 20 insertions(+), 5 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved diff --git a/rayer_spi.c b/rayer_spi.c index 8eee7ab..41c5364 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -283,7 +283,6 @@ const struct rayer_programmer *prog = rayer_spi_types; struct rayer_pinout *pinout = NULL; uint16_t lpt_iobase; - uint8_t lpt_outbyte; char *prog_type; if (get_params(cfg, &lpt_iobase, &prog_type) < 0) @@ -312,9 +311,6 @@ if (rget_io_perms()) return 1; - /* Get the initial value before writing to any line. */ - lpt_outbyte = INB(lpt_iobase); - struct rayer_spi_data *data = calloc(1, sizeof(*data)); if (!data) { msg_perr("Unable to allocate space for SPI master data\n"); @@ -322,7 +318,8 @@ } data->pinout = pinout; data->lpt_iobase = lpt_iobase; - data->lpt_outbyte = lpt_outbyte; + /* Get the initial value before writing to any line. */ + data->lpt_outbyte = INB(lpt_iobase); if (pinout->shutdown) register_shutdown(pinout->shutdown, data); -- To view, visit https://review.coreboot.org/c/flashrom/+/68232 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Idedabb7b1c401d666b3b7e621e75704c7e765fd1 Gerrit-Change-Number: 68232 Gerrit-PatchSet: 5 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[M] Change in flashrom[master]: rayer_spi.c: Move param parse logic into own func
by Edward O'Callaghan (Code Review) 22 Oct '22

22 Oct '22

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/68230 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: rayer_spi.c: Move param parse logic into own func ...................................................................... rayer_spi.c: Move param parse logic into own func Deconvolve programmer parameter parse logic out of main 'rayer_spi_init()' entry-point function control flow. Change-Id: I287aa2e5d94e872553d08c0750f8dc6d60b9caff Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/68230 Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M rayer_spi.c 1 file changed, 60 insertions(+), 29 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved diff --git a/rayer_spi.c b/rayer_spi.c index 8fdcc01..8eee7ab 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -235,20 +235,18 @@ .half_period = 0, }; -static int rayer_spi_init(const struct programmer_cfg *cfg) +static int get_params(const struct programmer_cfg *cfg, uint16_t *lpt_iobase, char **prog_type) { - const struct rayer_programmer *prog = rayer_spi_types; - char *arg = NULL; - struct rayer_pinout *pinout = NULL; - uint16_t lpt_iobase; - uint8_t lpt_outbyte; + /* Pick a default value for the I/O base. */ + *lpt_iobase = 0x378; + /* no programmer type specified. */ + *prog_type = NULL; /* Non-default port requested? */ - arg = extract_programmer_param_str(cfg, "iobase"); + char *arg = extract_programmer_param_str(cfg, "iobase"); if (arg) { char *endptr = NULL; - unsigned long tmp; - tmp = strtoul(arg, &endptr, 0); + unsigned long tmp = strtoul(arg, &endptr, 0); /* Port 0, port >0x10000, unaligned ports and garbage strings * are rejected. */ @@ -262,35 +260,52 @@ "given was invalid.\nIt must be a multiple of " "0x4 and lie between 0x100 and 0xfffc.\n"); free(arg); - return 1; + return -1; } else { - lpt_iobase = (uint16_t)tmp; + *lpt_iobase = (uint16_t)tmp; msg_pinfo("Non-default I/O base requested. This will " "not change the hardware settings.\n"); } - } else { - /* Pick a default value for the I/O base. */ - lpt_iobase = 0x378; + free(arg); } - free(arg); + + arg = extract_programmer_param_str(cfg, "type"); + if (arg) { + *prog_type = strdup(arg); + free(arg); + } + + return 0; +} + +static int rayer_spi_init(const struct programmer_cfg *cfg) +{ + const struct rayer_programmer *prog = rayer_spi_types; + struct rayer_pinout *pinout = NULL; + uint16_t lpt_iobase; + uint8_t lpt_outbyte; + char *prog_type; + + if (get_params(cfg, &lpt_iobase, &prog_type) < 0) + return 1; + + if (prog_type) { + for (; prog->type != NULL; prog++) { + if (strcasecmp(prog_type, prog->type) == 0) { + break; + } + } + free(prog_type); + + if (prog->type == NULL) { + msg_perr("Error: Invalid device type specified.\n"); + return 1; + } + } msg_pdbg("Using address 0x%x as I/O base for parallel port access.\n", lpt_iobase); - arg = extract_programmer_param_str(cfg, "type"); - if (arg) { - for (; prog->type != NULL; prog++) { - if (strcasecmp(arg, prog->type) == 0) { - break; - } - } - if (prog->type == NULL) { - msg_perr("Error: Invalid device type specified.\n"); - free(arg); - return 1; - } - free(arg); - } msg_pinfo("Using %s pinout.\n", prog->description); pinout = (struct rayer_pinout *)prog->dev_data; -- To view, visit https://review.coreboot.org/c/flashrom/+/68230 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I287aa2e5d94e872553d08c0750f8dc6d60b9caff Gerrit-Change-Number: 68230 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: stlinkv3_spi: Bug fix, Initialize uninitialized pointers
by Angel Pons (Code Review) 21 Oct '22

21 Oct '22

Attention is currently required from: Felix Singer, Thomas Heijligen, Shreeyash . Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/66225 ) Change subject: stlinkv3_spi: Bug fix, Initialize uninitialized pointers ...................................................................... Patch Set 2: (1 comment) File stlinkv3_spi.c: https://review.coreboot.org/c/flashrom/+/66225/comment/59d4b63b_06ce8b6b PS1, Line 501: stlinkv3_handle = usb_dev_get_by_vid_pid_serial(usb_ctx, > ``` […] `(all conflicts fixed: run "git cherry-pick --continue")` -- To view, visit https://review.coreboot.org/c/flashrom/+/66225 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7ce156a9f7455434ea461560320c84660c93c02f Gerrit-Change-Number: 66225 Gerrit-PatchSet: 2 Gerrit-Owner: Shreeyash <shreeyash335(a)gmail.com> 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Shreeyash <shreeyash335(a)gmail.com> Gerrit-Comment-Date: Fri, 21 Oct 2022 18:45:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Comment-In-Reply-To: Shreeyash <shreeyash335(a)gmail.com> Comment-In-Reply-To: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: stlinkv3_spi: Bug fix, Initialize uninitialized pointers
by Shreeyash (Code Review) 21 Oct '22

21 Oct '22

Attention is currently required from: Felix Singer, Thomas Heijligen, Angel Pons. Shreeyash has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/66225 ) Change subject: stlinkv3_spi: Bug fix, Initialize uninitialized pointers ...................................................................... Patch Set 2: (1 comment) File stlinkv3_spi.c: https://review.coreboot.org/c/flashrom/+/66225/comment/d8ff90b9_40abeba3 PS1, Line 501: stlinkv3_handle = usb_dev_get_by_vid_pid_serial(usb_ctx, > > So, "fixing conflicts" is essentially making my changes? What's the "conflict" here? […] ``` $ git status On branch stlink_bug Your branch is ahead of 'upstream/master' by 1 commit. (use "git push" to publish your local commits) You are currently cherry-picking commit 17aa4ed. (all conflicts fixed: run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: modified: stlinkv3_spi.c ``` `git diff` doesn't return anything... This is after I've changed the file. -- To view, visit https://review.coreboot.org/c/flashrom/+/66225 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7ce156a9f7455434ea461560320c84660c93c02f Gerrit-Change-Number: 66225 Gerrit-PatchSet: 2 Gerrit-Owner: Shreeyash <shreeyash335(a)gmail.com> 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Fri, 21 Oct 2022 18:42:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <felixsinger(a)posteo.net> Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Comment-In-Reply-To: Shreeyash <shreeyash335(a)gmail.com> Comment-In-Reply-To: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: stlinkv3_spi: Bug fix, Initialize uninitialized pointers
by Felix Singer (Code Review) 21 Oct '22

21 Oct '22

Attention is currently required from: Thomas Heijligen, Angel Pons, Shreeyash . Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/66225 ) Change subject: stlinkv3_spi: Bug fix, Initialize uninitialized pointers ...................................................................... Patch Set 2: (1 comment) File stlinkv3_spi.c: https://review.coreboot.org/c/flashrom/+/66225/comment/27e6ade1_d73bf395 PS1, Line 501: stlinkv3_handle = usb_dev_get_by_vid_pid_serial(usb_ctx, > So, "fixing conflicts" is essentially making my changes? What's the "conflict" here? We don't know yet. `git status` can tell us. So please provide the info which was asked by Angel 3 times now. Most likely the conflict is somewhere in a file. Also, have a look at `git diff`. This shows you the specific changes, and in this case also the conflict. -- To view, visit https://review.coreboot.org/c/flashrom/+/66225 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7ce156a9f7455434ea461560320c84660c93c02f Gerrit-Change-Number: 66225 Gerrit-PatchSet: 2 Gerrit-Owner: Shreeyash <shreeyash335(a)gmail.com> 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Shreeyash <shreeyash335(a)gmail.com> Gerrit-Comment-Date: Fri, 21 Oct 2022 17:04:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Comment-In-Reply-To: Shreeyash <shreeyash335(a)gmail.com> Comment-In-Reply-To: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: stlinkv3_spi: Bug fix, Initialize uninitialized pointers
by Angel Pons (Code Review) 21 Oct '22

21 Oct '22

Attention is currently required from: Felix Singer, Thomas Heijligen, Shreeyash . Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/66225 ) Change subject: stlinkv3_spi: Bug fix, Initialize uninitialized pointers ...................................................................... Patch Set 2: (1 comment) File stlinkv3_spi.c: https://review.coreboot.org/c/flashrom/+/66225/comment/53e8e355_f57e5c5b PS1, Line 501: stlinkv3_handle = usb_dev_get_by_vid_pid_serial(usb_ctx, > So, "fixing conflicts" is essentially making my changes? What's the "conflict" here? Could you please provide the output of `git status`? Otherwise it's impossible to know what's going on... -- To view, visit https://review.coreboot.org/c/flashrom/+/66225 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7ce156a9f7455434ea461560320c84660c93c02f Gerrit-Change-Number: 66225 Gerrit-PatchSet: 2 Gerrit-Owner: Shreeyash <shreeyash335(a)gmail.com> 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Shreeyash <shreeyash335(a)gmail.com> Gerrit-Comment-Date: Fri, 21 Oct 2022 16:50:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Comment-In-Reply-To: Shreeyash <shreeyash335(a)gmail.com> Comment-In-Reply-To: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: stlinkv3_spi: Bug fix, Initialize uninitialized pointers
by Shreeyash (Code Review) 21 Oct '22

21 Oct '22

Attention is currently required from: Felix Singer, Thomas Heijligen, Angel Pons. Shreeyash has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/66225 ) Change subject: stlinkv3_spi: Bug fix, Initialize uninitialized pointers ...................................................................... Patch Set 2: (1 comment) File stlinkv3_spi.c: https://review.coreboot.org/c/flashrom/+/66225/comment/404a36dc_afbc73ac PS1, Line 501: stlinkv3_handle = usb_dev_get_by_vid_pid_serial(usb_ctx, > Yes, you likely have to `git add` the modified files first, and then `git cherry-pick --continue` So, "fixing conflicts" is essentially making my changes? What's the "conflict" here? -- To view, visit https://review.coreboot.org/c/flashrom/+/66225 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7ce156a9f7455434ea461560320c84660c93c02f Gerrit-Change-Number: 66225 Gerrit-PatchSet: 2 Gerrit-Owner: Shreeyash <shreeyash335(a)gmail.com> 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Fri, 21 Oct 2022 16:48:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Comment-In-Reply-To: Shreeyash <shreeyash335(a)gmail.com> Comment-In-Reply-To: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: stlinkv3_spi: Bug fix, Initialize uninitialized pointers
by Angel Pons (Code Review) 21 Oct '22

21 Oct '22

Attention is currently required from: Felix Singer, Thomas Heijligen, Shreeyash . Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/66225 ) Change subject: stlinkv3_spi: Bug fix, Initialize uninitialized pointers ...................................................................... Patch Set 2: (1 comment) File stlinkv3_spi.c: https://review.coreboot.org/c/flashrom/+/66225/comment/5fce0bb6_e8af67b0 PS1, Line 501: stlinkv3_handle = usb_dev_get_by_vid_pid_serial(usb_ctx, > I believe, after "resolving merge conflicts", running "git cherry-pick --continue" would update the […] Yes, you likely have to `git add` the modified files first, and then `git cherry-pick --continue` -- To view, visit https://review.coreboot.org/c/flashrom/+/66225 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7ce156a9f7455434ea461560320c84660c93c02f Gerrit-Change-Number: 66225 Gerrit-PatchSet: 2 Gerrit-Owner: Shreeyash <shreeyash335(a)gmail.com> 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Shreeyash <shreeyash335(a)gmail.com> Gerrit-Comment-Date: Fri, 21 Oct 2022 16:39:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Comment-In-Reply-To: Shreeyash <shreeyash335(a)gmail.com> Comment-In-Reply-To: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit October 2022