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

Change in flashrom[master]: programmer_table: Remove space between address operator and variable
by Thomas Heijligen (Code Review) 21 Jul '21

21 Jul '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Angel Pons, Anastasia Klimchuk. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56469 ) Change subject: programmer_table: Remove space between address operator and variable ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File programmer_table.c: https://review.coreboot.org/c/flashrom/+/56469/comment/99d467cb_b7b9a075 PS1, Line 176: const size_t programmer_table_size = ARRAY_SIZE(programmer_table); > Oh, first time new line thing happened to me :( I don't remember seeing this on other files. […] I was told to avoid new lines at the end. But don't know if there are fixed style guidelines. -- To view, visit https://review.coreboot.org/c/flashrom/+/56469 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iba29b1bc3d77b8c17c51fc0552c129e6965fa308 Gerrit-Change-Number: 56469 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: Thomas Heijligen <src(a)posteo.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-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Wed, 21 Jul 2021 06:49:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: programmer_table: Remove space between address operator and variable
by Anastasia Klimchuk (Code Review) 21 Jul '21

21 Jul '21

Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56469 ) Change subject: programmer_table: Remove space between address operator and variable ...................................................................... Patch Set 1: (1 comment) File programmer_table.c: https://review.coreboot.org/c/flashrom/+/56469/comment/339c6f1d_2b19edea PS1, Line 176: const size_t programmer_table_size = ARRAY_SIZE(programmer_table); Oh, first time new line thing happened to me :( I don't remember seeing this on other files. Do we have a standard on this? -- To view, visit https://review.coreboot.org/c/flashrom/+/56469 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iba29b1bc3d77b8c17c51fc0552c129e6965fa308 Gerrit-Change-Number: 56469 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 21 Jul 2021 05:09:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Add init-shutdown test for nicrealtek
by Anastasia Klimchuk (Code Review) 21 Jul '21

21 Jul '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/56470 ) Change subject: tests: Add init-shutdown test for nicrealtek ...................................................................... tests: Add init-shutdown test for nicrealtek This patch adds a test and mocks for two pci functions that nicreltek is using. Main reason for this is to have at least one test for par master (currently there are none), in preparation for a change like CB:56103 but for par masters. BUG=b:181803212 TEST=ninja test Change-Id: Iaed14fe1d83c8eb45ec185ebd3f1c97cb81941f4 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/init_shutdown.c M tests/io_mock.h M tests/meson.build M tests/tests.c M tests/tests.h 5 files changed, 34 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/70/56470/1 diff --git a/tests/init_shutdown.c b/tests/init_shutdown.c index 79918e6..eeea3cc 100644 --- a/tests/init_shutdown.c +++ b/tests/init_shutdown.c @@ -89,6 +89,15 @@ #endif } +void nicrealtek_init_and_shutdown_test_success(void **state) +{ +#if CONFIG_NICREALTEK == 1 + run_lifecycle(state, &programmer_nicrealtek, ""); +#else + skip(); +#endif +} + int dediprog_libusb_control_transfer(void *state, libusb_device_handle *devh, uint8_t bmRequestType, diff --git a/tests/io_mock.h b/tests/io_mock.h index 72d89c5..5cddca0 100644 --- a/tests/io_mock.h +++ b/tests/io_mock.h @@ -37,6 +37,11 @@ struct libusb_context; typedef struct libusb_context libusb_context; +/* Define struct pci_dev to avoid dependency on pci.h */ +struct pci_dev { + unsigned int device_id; +}; + struct io_mock { void *state; diff --git a/tests/meson.build b/tests/meson.build index 5776862..9fb86c7 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -26,6 +26,8 @@ '-Wl,--wrap=strdup', '-Wl,--wrap=physunmap', '-Wl,--wrap=physmap', + '-Wl,--wrap=pcidev_init', + '-Wl,--wrap=pcidev_readbar', '-Wl,--wrap=spi_send_command', '-Wl,--wrap=sio_write', '-Wl,--wrap=sio_read', diff --git a/tests/tests.c b/tests/tests.c index 78258b0..3c05250 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -53,6 +53,22 @@ return NULL; } +struct pci_dev mock_pci_dev = { + .device_id = MOCK_HANDLE, +}; + +struct pci_dev *__wrap_pcidev_init(void *devs, int bar) +{ + LOG_ME; + return &mock_pci_dev; +} + +uintptr_t __wrap_pcidev_readbar(void *dev, int bar) +{ + LOG_ME; + return MOCK_HANDLE; +} + void __wrap_sio_write(uint16_t port, uint8_t reg, uint8_t data) { LOG_ME; @@ -230,6 +246,7 @@ const struct CMUnitTest init_shutdown_tests[] = { cmocka_unit_test(dummy_init_and_shutdown_test_success), cmocka_unit_test(mec1308_init_and_shutdown_test_success), + cmocka_unit_test(nicrealtek_init_and_shutdown_test_success), cmocka_unit_test(dediprog_init_and_shutdown_test_success), cmocka_unit_test(ene_lpc_init_and_shutdown_test_success), cmocka_unit_test(linux_spi_init_and_shutdown_test_success), diff --git a/tests/tests.h b/tests/tests.h index eccc05f..165c326 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -43,6 +43,7 @@ /* init_shutdown.c */ void dummy_init_and_shutdown_test_success(void **state); void mec1308_init_and_shutdown_test_success(void **state); +void nicrealtek_init_and_shutdown_test_success(void **state); void dediprog_init_and_shutdown_test_success(void **state); void ene_lpc_init_and_shutdown_test_success(void **state); void linux_spi_init_and_shutdown_test_success(void **state); -- To view, visit https://review.coreboot.org/c/flashrom/+/56470 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iaed14fe1d83c8eb45ec185ebd3f1c97cb81941f4 Gerrit-Change-Number: 56470 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: programmer_table: Remove space between address operator and variable
by Anastasia Klimchuk (Code Review) 21 Jul '21

21 Jul '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/56469 ) Change subject: programmer_table: Remove space between address operator and variable ...................................................................... programmer_table: Remove space between address operator and variable BUG=none TEST=builds Change-Id: Iba29b1bc3d77b8c17c51fc0552c129e6965fa308 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M programmer_table.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/69/56469/1 diff --git a/programmer_table.c b/programmer_table.c index e7f2c98..6eb6b77 100644 --- a/programmer_table.c +++ b/programmer_table.c @@ -33,7 +33,7 @@ #endif #if CONFIG_NICREALTEK == 1 - & programmer_nicrealtek, + &programmer_nicrealtek, #endif #if CONFIG_NICNATSEMI == 1 @@ -173,4 +173,4 @@ #endif }; -const size_t programmer_table_size = ARRAY_SIZE(programmer_table); \ No newline at end of file +const size_t programmer_table_size = ARRAY_SIZE(programmer_table); -- To view, visit https://review.coreboot.org/c/flashrom/+/56469 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iba29b1bc3d77b8c17c51fc0552c129e6965fa308 Gerrit-Change-Number: 56469 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: programmer.h: Allow compilation without dummyflasher
by Edward O'Callaghan (Code Review) 21 Jul '21

21 Jul '21

Attention is currently required from: Nico Huber. Hello build bot (Jenkins), Namyoon Woo, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/56467 to look at the new patch set (#2). Change subject: programmer.h: Allow compilation without dummyflasher ...................................................................... programmer.h: Allow compilation without dummyflasher Fix a regression introduced when variable sized chips was added to dummyflasher that prevented flashrom from compiling without dummyflasher. The purposed solution is neither ideal nor egregious however there is no clear way to handle this specialiation of the probe function pointer. BUG=none BRANCH=none TEST=builds Change-Id: I5d1d42628519861c9cd28c96d5c49fa4f6b229ef Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M programmer.h 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/67/56467/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56467 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5d1d42628519861c9cd28c96d5c49fa4f6b229ef Gerrit-Change-Number: 56467 Gerrit-PatchSet: 2 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Namyoon Woo <namyoon(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: programmer.h: Minor tidy up
by Edward O'Callaghan (Code Review) 21 Jul '21

21 Jul '21

Attention is currently required from: Nico Huber. Hello build bot (Jenkins), Nico Huber, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/56466 to look at the new patch set (#2). Change subject: programmer.h: Minor tidy up ...................................................................... programmer.h: Minor tidy up Align comments and #ifdef terminations to be clear. BUG=none BRANCH=none TEST=builds Change-Id: I7ceda32b66d17318d42b94a1fab621a9a926fa77 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M programmer.h 1 file changed, 29 insertions(+), 35 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/66/56466/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56466 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7ceda32b66d17318d42b94a1fab621a9a926fa77 Gerrit-Change-Number: 56466 Gerrit-PatchSet: 2 Gerrit-Owner: 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-MessageType: newpatchset

1 0

Change in flashrom[master]: programmer.h: Allow compilation without dummyflasher
by Edward O'Callaghan (Code Review) 21 Jul '21

21 Jul '21

Attention is currently required from: Nico Huber. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56467 ) Change subject: programmer.h: Allow compilation without dummyflasher ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: never mind, life didn't let me off that easy. -- To view, visit https://review.coreboot.org/c/flashrom/+/56467 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5d1d42628519861c9cd28c96d5c49fa4f6b229ef Gerrit-Change-Number: 56467 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Namyoon Woo <namyoon(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Comment-Date: Wed, 21 Jul 2021 01:04:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: programmer.h: Allow compilation without dummyflasher
by Edward O'Callaghan (Code Review) 21 Jul '21

21 Jul '21

Attention is currently required from: Nico Huber. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56467 ) Change subject: programmer.h: Allow compilation without dummyflasher ...................................................................... Patch Set 1: Code-Review-2 -- To view, visit https://review.coreboot.org/c/flashrom/+/56467 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5d1d42628519861c9cd28c96d5c49fa4f6b229ef Gerrit-Change-Number: 56467 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Namyoon Woo <namyoon(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Comment-Date: Wed, 21 Jul 2021 00:56:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: programmer.h: Allow compilation without dummyflasher
by Namyoon Woo (Code Review) 21 Jul '21

21 Jul '21

Attention is currently required from: Nico Huber, Edward O'Callaghan. Namyoon Woo has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/56467 ) Change subject: programmer.h: Allow compilation without dummyflasher ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/56467 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5d1d42628519861c9cd28c96d5c49fa4f6b229ef Gerrit-Change-Number: 56467 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Namyoon Woo <namyoon(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Wed, 21 Jul 2021 00:56:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: programmer.h: Allow compilation without dummyflasher
by Edward O'Callaghan (Code Review) 21 Jul '21

21 Jul '21

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/56467 ) Change subject: programmer.h: Allow compilation without dummyflasher ...................................................................... programmer.h: Allow compilation without dummyflasher Fix a regression introduced when variable sized chips was added to dummyflasher that prevented flashrom from compiling without dummyflasher. The purposed solution is neither ideal nor egregious however there is no clear way to handle this specialiation of the probe function pointer. BUG=none BRANCH=none TEST=builds Change-Id: I5d1d42628519861c9cd28c96d5c49fa4f6b229ef Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M programmer.h 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/67/56467/1 diff --git a/programmer.h b/programmer.h index 61673a8..d1c5ab3 100644 --- a/programmer.h +++ b/programmer.h @@ -211,6 +211,10 @@ void internal_sleep(unsigned int usecs); void internal_delay(unsigned int usecs); +#if CONFIG_DUMMY == 0 +int probe_variable_size(struct flashctx *flash) { return 1; } +#endif + #if CONFIG_INTERNAL == 1 /* board_enable.c */ int selfcheck_board_enables(void); -- To view, visit https://review.coreboot.org/c/flashrom/+/56467 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5d1d42628519861c9cd28c96d5c49fa4f6b229ef Gerrit-Change-Number: 56467 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 July 2021