coreboot-gerrit September 2021

coreboot-gerrit@coreboot.org

1 participants
6530 discussions

Change in coreboot[master]: sb/amd/pi/hudson: drop HUDSON_UART option and corresponding code
by Felix Held (Code Review) 04 Sep '21

04 Sep '21

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/56785 to look at the new patch set (#4). Change subject: sb/amd/pi/hudson: drop HUDSON_UART option and corresponding code ...................................................................... sb/amd/pi/hudson: drop HUDSON_UART option and corresponding code This option is neither selected nor usable for the only remaining SoC that uses this code, so drop the remaining parts. configure_hudson_uart isn't called anywhere and isn't even compiled, since it's guarded by an #if CONFIG(HUDSON_UART) block and the HUDSON_UART Kconfig option isn't selected anywhere. Both the offsets used in the iomux_write8 calls and the UART controller itself aren't listed in the BKDG #52740 Rev 3.05 for the AMD Family 16h Models 30h-3Fh APUs which is the only SoC that uses this code, so the code didn't even apply for this chip. TEST=Timeless build for pcengines/apu2 results in identical binary. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: I3f462d1f83a0f1ba851329ebebb1f3263267fdc6 --- M src/southbridge/amd/pi/hudson/Kconfig M src/southbridge/amd/pi/hudson/Makefile.inc M src/southbridge/amd/pi/hudson/early_setup.c M src/southbridge/amd/pi/hudson/hudson.h D src/southbridge/amd/pi/hudson/uart.c 5 files changed, 0 insertions(+), 59 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/56785/4 -- To view, visit https://review.coreboot.org/c/coreboot/+/56785 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I3f462d1f83a0f1ba851329ebebb1f3263267fdc6 Gerrit-Change-Number: 56785 Gerrit-PatchSet: 4 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: sb/amd/pi/hudson/soc/gpio: add SOC_GPIO_TOTAL_PINS definition
by Felix Held (Code Review) 04 Sep '21

04 Sep '21

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/56809 ) Change subject: sb/amd/pi/hudson/soc/gpio: add SOC_GPIO_TOTAL_PINS definition ...................................................................... sb/amd/pi/hudson/soc/gpio: add SOC_GPIO_TOTAL_PINS definition EGPIO132 is the last documented GPIO on the GPIO controller in the NDA version of the BKDG for AMD Family 16h Models 30h-3Fh Processors (#52740 Rev 3.06) which is the only SoC using this code, so define SOC_GPIO_TOTAL_PINS as 133, since the internal GPIO numbers are 0-indexed. This definition will be needed the subsequent patch that'll add the remote GPIO support to the common AMD GPIO code to make sure that the compiler can optimize out the code path needed to support the remote GPIO access which isn't available on this platform anyway. Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: I877d462c5e753c9bbb3461dbb10cde2adc2cb12c Reviewed-on: https://review.coreboot.org/c/coreboot/+/56809 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Martin Roth <martinroth(a)google.com> --- M src/southbridge/amd/pi/hudson/soc/gpio.h 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved diff --git a/src/southbridge/amd/pi/hudson/soc/gpio.h b/src/southbridge/amd/pi/hudson/soc/gpio.h index 10a47cb..6069ee0 100644 --- a/src/southbridge/amd/pi/hudson/soc/gpio.h +++ b/src/southbridge/amd/pi/hudson/soc/gpio.h @@ -6,4 +6,6 @@ /* <soc/gpio.h> must provide gpio_t. */ #include <amdblocks/gpio_banks.h> +#define SOC_GPIO_TOTAL_PINS 133 + #endif /* SOC_GPIO_H */ 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://review.coreboot.org/c/coreboot/+/56809 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I877d462c5e753c9bbb3461dbb10cde2adc2cb12c Gerrit-Change-Number: 56809 Gerrit-PatchSet: 3 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: device/dram: Add addtional LPDDR4 speed grades
by Felix Held (Code Review) 04 Sep '21

04 Sep '21

Attention is currently required from: Raul Rangel, Nikolai Vyssotski, Rob Barnes, Julian Schroeder. Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/57294 ) Change subject: device/dram: Add addtional LPDDR4 speed grades ...................................................................... Patch Set 2: (2 comments) File src/device/dram/lpddr4.c: https://review.coreboot.org/c/coreboot/+/57294/comment/f4a969cc_f562ca11 PS1, Line 51: 934 > Could go either way. JEDEC Standard No. 79-4C / Table 169 says DDR4-1866 tck(avg) min = 1.071ns. […] ok, since the nominal value should be within the range specified by min_clock_mhz and max_clock_mhz, we should probably go with 934 here to be on the safe side https://review.coreboot.org/c/coreboot/+/57294/comment/6bc304f1_81164e07 PS1, Line 81: 2137 > JEDEC Standard No. 209-4 Table 88 says LPDDR4-4266 tck(avg) min = 0.467ns. 1/0. […] 2134 sounds correct to me -- To view, visit https://review.coreboot.org/c/coreboot/+/57294 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ie7706fd4ad5a7df68c07b8ca43261429ba140c61 Gerrit-Change-Number: 57294 Gerrit-PatchSet: 2 Gerrit-Owner: Rob Barnes <robbarnes(a)google.com> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Julian Schroeder <julianmarcusschroeder(a)gmail.com> Gerrit-Reviewer: Nikolai Vyssotski <nikolai.vyssotski(a)amd.corp-partner.google.com> Gerrit-Reviewer: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Nikolai Vyssotski <nikolai.vyssotski(a)amd.corp-partner.google.com> Gerrit-Attention: Rob Barnes <robbarnes(a)google.com> Gerrit-Attention: Julian Schroeder <julianmarcusschroeder(a)gmail.com> Gerrit-Comment-Date: Sat, 04 Sep 2021 02:33:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Rob Barnes <robbarnes(a)google.com> Comment-In-Reply-To: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: mb/google/volteer: Move EC_HOST_EVENT_USB_MUX wake event to S0ix only
by Felix Held (Code Review) 04 Sep '21

04 Sep '21

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/57341 ) Change subject: mb/google/volteer: Move EC_HOST_EVENT_USB_MUX wake event to S0ix only ...................................................................... mb/google/volteer: Move EC_HOST_EVENT_USB_MUX wake event to S0ix only If a USB_MUX_EVENT happens while the AP is in S3 during powerdown transtion (S0->S3->S5), this will cause the device to boot again after it has finished sequencing down to S5. Since S3 is not POR for ChromeOS devices anymore, change this event to wake from S3 and S0ix to just S0ix. BUG=b:197039097 TEST=abuild Change-Id: I91e5e0ab8301377817875b6fa9e3c0e1f96c1465 Signed-off-by: Tim Wawrzynczak <twawrzynczak(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/57341 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Zhuohao Lee <zhuohao(a)google.com> Reviewed-by: Nick Vaccaro <nvaccaro(a)google.com> --- M src/mainboard/google/volteer/variants/baseboard/include/baseboard/ec.h 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Nick Vaccaro: Looks good to me, approved Zhuohao Lee: Looks good to me, approved diff --git a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/ec.h index 253ab68..5ae32fa 100644 --- a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/ec.h +++ b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/ec.h @@ -37,10 +37,11 @@ EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEY_PRESSED) |\ - EC_HOST_EVENT_MASK(EC_HOST_EVENT_USB_MUX) |\ EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE)) -#define MAINBOARD_EC_S0IX_WAKE_EVENTS (MAINBOARD_EC_S3_WAKE_EVENTS) +#define MAINBOARD_EC_S0IX_WAKE_EVENTS \ + (MAINBOARD_EC_S3_WAKE_EVENTS |\ + EC_HOST_EVENT_MASK(EC_HOST_EVENT_USB_MUX)) /* Log EC wake events plus EC shutdown events */ #define MAINBOARD_EC_LOG_EVENTS \ -- To view, visit https://review.coreboot.org/c/coreboot/+/57341 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I91e5e0ab8301377817875b6fa9e3c0e1f96c1465 Gerrit-Change-Number: 57341 Gerrit-PatchSet: 2 Gerrit-Owner: Tim Wawrzynczak <twawrzynczak(a)chromium.org> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)google.com> Gerrit-Reviewer: Zhuohao Lee <zhuohao(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: elogtool: add "add" command
by Ricardo Quesada (Code Review) 04 Sep '21

04 Sep '21

Attention is currently required from: Furquan Shaikh, Jack Rosenthal. Ricardo Quesada has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/57397 ) Change subject: elogtool: add "add" command ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Hi, could you PTAL? ty! -- To view, visit https://review.coreboot.org/c/coreboot/+/57397 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia6fdf4f951565f842d1bff52173811b52f617f66 Gerrit-Change-Number: 57397 Gerrit-PatchSet: 1 Gerrit-Owner: Ricardo Quesada <ricardoq(a)google.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Jack Rosenthal <jrosenth(a)chromium.org> Gerrit-Attention: Furquan Shaikh <furquan(a)google.com> Gerrit-Attention: Jack Rosenthal <jrosenth(a)chromium.org> Gerrit-Comment-Date: Sat, 04 Sep 2021 01:03:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in coreboot[master]: elogtool: add argc / argv support for commands
by Ricardo Quesada (Code Review) 04 Sep '21

04 Sep '21

Attention is currently required from: Furquan Shaikh, Jack Rosenthal. Ricardo Quesada has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/57396 ) Change subject: elogtool: add argc / argv support for commands ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Hi, could you PTAL? ty! -- To view, visit https://review.coreboot.org/c/coreboot/+/57396 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I50067567b60a955a5ea3aed7ae8ff4139852b808 Gerrit-Change-Number: 57396 Gerrit-PatchSet: 1 Gerrit-Owner: Ricardo Quesada <ricardoq(a)google.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Jack Rosenthal <jrosenth(a)chromium.org> Gerrit-Attention: Furquan Shaikh <furquan(a)google.com> Gerrit-Attention: Jack Rosenthal <jrosenth(a)chromium.org> Gerrit-Comment-Date: Sat, 04 Sep 2021 01:03:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in coreboot[master]: elogtool: add next_available_event_offset function
by Ricardo Quesada (Code Review) 04 Sep '21

04 Sep '21

Attention is currently required from: Furquan Shaikh, Jack Rosenthal. Ricardo Quesada has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/57395 ) Change subject: elogtool: add next_available_event_offset function ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Hi, could you PTAL? ty! -- To view, visit https://review.coreboot.org/c/coreboot/+/57395 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I0d8ecc893675758d7f90845282a588d367b55567 Gerrit-Change-Number: 57395 Gerrit-PatchSet: 1 Gerrit-Owner: Ricardo Quesada <ricardoq(a)google.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Jack Rosenthal <jrosenth(a)chromium.org> Gerrit-Attention: Furquan Shaikh <furquan(a)google.com> Gerrit-Attention: Jack Rosenthal <jrosenth(a)chromium.org> Gerrit-Comment-Date: Sat, 04 Sep 2021 01:02:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in coreboot[master]: elog: move MAX_EVENT_SIZE to commonlib/bsd/include
by Ricardo Quesada (Code Review) 04 Sep '21

04 Sep '21

Attention is currently required from: Furquan Shaikh, Jack Rosenthal. Ricardo Quesada has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/57394 ) Change subject: elog: move MAX_EVENT_SIZE to commonlib/bsd/include ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Hi, could you PTAL? ty! -- To view, visit https://review.coreboot.org/c/coreboot/+/57394 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I86b06d257dda5b325a8478a044045b2a63fb1a84 Gerrit-Change-Number: 57394 Gerrit-PatchSet: 1 Gerrit-Owner: Ricardo Quesada <ricardoq(a)google.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Jack Rosenthal <jrosenth(a)chromium.org> Gerrit-Attention: Furquan Shaikh <furquan(a)google.com> Gerrit-Attention: Jack Rosenthal <jrosenth(a)chromium.org> Gerrit-Comment-Date: Sat, 04 Sep 2021 01:02:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in coreboot[master]: elogtool: add "add" command
by Ricardo Quesada (Code Review) 04 Sep '21

04 Sep '21

Ricardo Quesada has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/57397 ) Change subject: elogtool: add "add" command ...................................................................... elogtool: add "add" command Adds "add" command to elogtool. This command allows adding elog events manually. It supports event type and, optionally, event data. If the free buffer space is < 1/4 of the total space, it shrinks the buffer, making sure that ~1/4 of the free space is available. BUG=b:172210863 TEST=./elogtool add 0x17 0101 ./elogtool add 0x18 Repeated the same tests on buffers that needed to be shrunk. Change-Id: Ia6fdf4f951565f842d1bff52173811b52f617f66 Signed-off-by: Ricardo Quesada <ricardoq(a)google.com> --- M util/cbfstool/elogtool.c 1 file changed, 148 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/57397/1 diff --git a/util/cbfstool/elogtool.c b/util/cbfstool/elogtool.c index 6a4a707..a5861c8 100644 --- a/util/cbfstool/elogtool.c +++ b/util/cbfstool/elogtool.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ +#include <assert.h> #include <getopt.h> #include <stdbool.h> #include <stdint.h> @@ -28,6 +29,7 @@ static int cmd_list(const struct buffer *, int, char **); static int cmd_clear(const struct buffer *, int, char **); +static int cmd_add(const struct buffer *, int, char **); static const struct { const char *name; @@ -37,6 +39,7 @@ } cmds[] = { {"list", cmd_list, false}, {"clear", cmd_clear, true}, + {"add", cmd_add, true}, }; static struct option long_options[] = { @@ -53,6 +56,7 @@ "where, COMMAND is:\n" " list lists all the event logs in human readable format\n" " clear clears all the event logs\n" + " add <event_type> [data] add an entry to the event log\n" "\n" "ARGS\n" "-f, --file <filename> File that holds event log partition.\n" @@ -134,6 +138,52 @@ return offset; } +/* + * Shrinks buffer by ~bytes_to_shrink, then appends a LOG_CLEAR event, + * and finally fills the remaining area with EOL events. + */ +static int shrink_buffer(const struct buffer *buf, int bytes_to_shrink, int *out_offset) +{ + int hdr_size = sizeof(struct elog_header); + const struct event_header *event; + struct buffer copy; + uint32_t cleared; + int remaining; + void *data; + int offset; + + offset = sizeof(struct elog_header); + data = buffer_get(buf); + + /* Point to the first event */ + event = data + offset; + + while (offset < bytes_to_shrink) { + assert(!(event->type == ELOG_TYPE_EOL || event->length == 0) && + "Unexpected premature end of buffer"); + offset += event->length; + event = elog_get_next_event(event); + } + cleared = offset - sizeof(struct elog_header); + remaining = buffer_size(buf) - offset; + + /* Overlapping copy */ + memmove(data + hdr_size, data + hdr_size + cleared, remaining); + memset(data + hdr_size + remaining, ELOG_TYPE_EOL, cleared); + + offset = next_available_event_offset(buf); + + buffer_clone(&copy, buf); + buffer_seek(&copy, offset); + + if (!eventlog_init_event(&copy, ELOG_TYPE_LOG_CLEAR, &cleared, sizeof(cleared))) + return ELOGTOOL_EXIT_NOT_ENOUGH_BUFFER_SPACE; + + /* Points to the next available event: offset + header + data + checksum */ + *out_offset = offset + sizeof(struct event_header) + sizeof(cleared) + 1; + return ELOGTOOL_EXIT_SUCCESS; +} + static int cmd_list(const struct buffer *buf, int argc, char **argv) { const struct event_header *event; @@ -192,6 +242,104 @@ return ELOGTOOL_EXIT_SUCCESS; } +static void cmd_add_usage(void) +{ + fprintf(stderr, "USAGE: add <event type> [event data]\n" + "\n" + "event type: is an hexadecimal number. Prefix '0x' is optional\n" + "event data: is a series of hexadecimal numbers. Must be:\n" + " - len(event data) %% 2 == 0\n" + " - len(event data) < 247\n" + "\n" + "Example:\n" + "add 0x16 1289AB # 1289AB is actually three bytes: 0x12, 0x89 and 0xab\n" + "add 19 # 19 is in hexa\n" + ); +} + +static int cmd_add_parse_args(int argc, char **argv, uint8_t *type, + uint8_t *data, int *data_size) +{ + char byte[3] = {0}; + char *endptr; + long value; + int len; + + if (argc != 1 && argc != 2) + return ELOGTOOL_EXIT_BAD_ARGS; + + /* Force type to be an hexa value to be consistent with the data values */ + value = strtol(argv[0], NULL, 16); + if (value > 255) + return ELOGTOOL_EXIT_BAD_ARGS; + + *type = value; + + if (argc == 1) + return ELOGTOOL_EXIT_SUCCESS; + + /* Assuming argc == 2 */ + len = strlen(argv[1]); + + /* Needs 2 bytes per number */ + if (len % 2 != 0) + return ELOGTOOL_EXIT_BAD_ARGS; + + *data_size = len / 2; + + /* Header + data + checksum can be bigger than max size */ + if (sizeof(struct elog_header) + *data_size + 1 > ELOG_MAX_EVENT_SIZE) + return ELOGTOOL_EXIT_BAD_ARGS; + + for (int i = 0; i < *data_size; i++) { + byte[0] = *argv[1]++; + byte[1] = *argv[1]++; + data[i] = strtol(byte, &endptr, 16); + if (endptr != &byte[2]) + return ELOGTOOL_EXIT_BAD_ARGS; + } + + return ELOGTOOL_EXIT_SUCCESS; +} + +/* Appends an elog entry to EventLog buffer. */ +static int cmd_add(const struct buffer *b, int argc, char **argv) +{ + uint8_t data[ELOG_MAX_EVENT_SIZE]; + struct buffer copy; + int data_size = 0; + uint8_t type = 0; + int threshold; + int next = 0; + int offset; + int ret; + + if (cmd_add_parse_args(argc, argv, &type, data, &data_size) != ELOGTOOL_EXIT_SUCCESS) { + cmd_add_usage(); + return ELOGTOOL_EXIT_BAD_ARGS; + } + + buffer_clone(&copy, b); + + threshold = buffer_size(b) * 3 / 4; + + offset = next_available_event_offset(b); + if (offset > threshold) { + /* Shrink ~ 1/4 of the size */ + ret = shrink_buffer(b, buffer_size(b) - threshold, &next); + if (ret != ELOGTOOL_EXIT_SUCCESS) + return ret; + buffer_seek(&copy, next); + } else { + buffer_seek(&copy, offset); + } + + if (!eventlog_init_event(&copy, type, data, data_size)) + return ELOGTOOL_EXIT_NOT_ENOUGH_BUFFER_SPACE; + + return ELOGTOOL_EXIT_SUCCESS; +} + int main(int argc, char **argv) { char *filename = NULL; -- To view, visit https://review.coreboot.org/c/coreboot/+/57397 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia6fdf4f951565f842d1bff52173811b52f617f66 Gerrit-Change-Number: 57397 Gerrit-PatchSet: 1 Gerrit-Owner: Ricardo Quesada <ricardoq(a)google.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: elogtool: add argc / argv support for commands
by Ricardo Quesada (Code Review) 04 Sep '21

04 Sep '21

Ricardo Quesada has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/57396 ) Change subject: elogtool: add argc / argv support for commands ...................................................................... elogtool: add argc / argv support for commands Adds argc/argv argumentso the available commands. This is needed for the future command "cmd_add" that will parse its own arguments (see CL in the chain). BUG=b:172210863 TEST=elogtool list && elogtool clear Change-Id: I50067567b60a955a5ea3aed7ae8ff4139852b808 Signed-off-by: Ricardo Quesada <ricardoq(a)google.com> --- M util/cbfstool/elogtool.c 1 file changed, 15 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/57396/1 diff --git a/util/cbfstool/elogtool.c b/util/cbfstool/elogtool.c index a3cd9de..6a4a707 100644 --- a/util/cbfstool/elogtool.c +++ b/util/cbfstool/elogtool.c @@ -14,6 +14,8 @@ #include "eventlog.h" +#define UNUSED(_x) (void)(_x) + enum elogtool_return { ELOGTOOL_EXIT_SUCCESS = 0, ELOGTOOL_EXIT_BAD_ARGS, @@ -24,12 +26,12 @@ ELOGTOOL_EXIT_NOT_ENOUGH_BUFFER_SPACE, }; -static int cmd_list(const struct buffer *); -static int cmd_clear(const struct buffer *); +static int cmd_list(const struct buffer *, int, char **); +static int cmd_clear(const struct buffer *, int, char **); static const struct { const char *name; - int (*func)(const struct buffer *buf); + int (*func)(const struct buffer *buf, int argc, char **argv); /* Whether it requires to write the buffer back */ bool write_back; } cmds[] = { @@ -132,11 +134,14 @@ return offset; } -static int cmd_list(const struct buffer *buf) +static int cmd_list(const struct buffer *buf, int argc, char **argv) { const struct event_header *event; unsigned int count = 0; + UNUSED(argc); + UNUSED(argv); + /* Point to the first event */ event = buffer_get(buf) + sizeof(struct elog_header); @@ -156,12 +161,15 @@ * Clears the elog events from the given buffer, which is a valid RW_ELOG region. * A LOG_CLEAR event is appended. */ -static int cmd_clear(const struct buffer *b) +static int cmd_clear(const struct buffer *b, int argc, char **argv) { uint32_t offset; struct buffer buf; void *start; + UNUSED(argc); + UNUSED(argv); + start = buffer_get(b); /* * Calculate the size of the "used" buffer, needed for ELOG_TYPE_LOG_CLEAR. @@ -236,7 +244,8 @@ for (i = 0; i < ARRAY_SIZE(cmds); i++) { if (!strcmp(cmds[i].name, argv[optind])) { - ret = cmds[i].func(&buf); + /* Only pass the non-processed arguments */ + ret = cmds[i].func(&buf, argc-optind-1, &argv[optind+1]); break; } } -- To view, visit https://review.coreboot.org/c/coreboot/+/57396 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I50067567b60a955a5ea3aed7ae8ff4139852b808 Gerrit-Change-Number: 57396 Gerrit-PatchSet: 1 Gerrit-Owner: Ricardo Quesada <ricardoq(a)google.com> Gerrit-MessageType: newchange

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit September 2021