November 2021 - flashrom-gerrit

Change in flashrom[master]: tests: Add wraps for __xstat variants of stat
by Anastasia Klimchuk (Code Review) 08 Nov '21

08 Nov '21

Attention is currently required from: Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58103 ) Change subject: tests: Add wraps for __xstat variants of stat ...................................................................... Patch Set 5: (1 comment) Patchset: PS5: I decided to re-test once again after the patch got approved, and discovered that now the same thing is needed for fstat :\ Specifically for read_chip and read_chip_with_dummyflasher, the same situation: fstat64 is invoked when running ninja test, and __fxstat64 is invoked when emerge with tests under chroot. Are stat and fstat sufficiently close to each other so they can be counted as solution to the same problem? Because Nico said: > I hope this will not turn into a cat-and-mouse game where we'd have to add more wraps > in the future. But if it does: we could try to mock the header file as well. I don't know whether this moment has happened or not yet. Leaving comment unresolved. -- To view, visit https://review.coreboot.org/c/flashrom/+/58103 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4c5c243acde09dc5bb6b2a14042fcd23a49707db Gerrit-Change-Number: 58103 Gerrit-PatchSet: 5 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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Mon, 08 Nov 2021 05:08:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Add wraps for __xstat variants of stat
by Edward O'Callaghan (Code Review) 08 Nov '21

08 Nov '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/+/58103 ) Change subject: tests: Add wraps for __xstat variants of stat ...................................................................... Patch Set 4: Code-Review+2 (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/58103/comment/69f6f32c_0aca8e07 PS2, Line 17: TEST=running tests on two different environments, : with 1) stat64 and 2) __xstat64 invoked > I looked into all potentially relevant minijail policies, could not find any recent policy change th […] Ack -- To view, visit https://review.coreboot.org/c/flashrom/+/58103 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4c5c243acde09dc5bb6b2a14042fcd23a49707db Gerrit-Change-Number: 58103 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Mon, 08 Nov 2021 03:53:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes 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]: tests: Rename flash context in chip tests to flashctx
by Edward O'Callaghan (Code Review) 08 Nov '21

08 Nov '21

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58596 ) Change subject: tests: Rename flash context in chip tests to flashctx ...................................................................... tests: Rename flash context in chip tests to flashctx Flash context used to be named `flash` which was missing the context part of it. Now it is renamed into flashctx for clarity. BUG=b:181803212 TEST=ninja test Change-Id: I3f4d9c4fe85752e16bab71ad22b0135a96cac28a Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58596 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M tests/chip.c 1 file changed, 22 insertions(+), 22 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved diff --git a/tests/chip.c b/tests/chip.c index 4181aed..9c06fe7 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -86,10 +86,10 @@ return 0; } -static void setup_chip(struct flashrom_flashctx *flash, struct flashrom_layout **layout, +static void setup_chip(struct flashrom_flashctx *flashctx, struct flashrom_layout **layout, struct flashchip *chip, const char *programmer_param) { - flash->chip = chip; + flashctx->chip = chip; g_chip_state.unlock_calls = 0; @@ -99,7 +99,7 @@ assert_int_equal(0, flashrom_layout_add_region(*layout, 0, chip->total_size * KiB - 1, "region")); assert_int_equal(0, flashrom_layout_include_region(*layout, "region")); - flashrom_layout_set(flash, *layout); + flashrom_layout_set(flashctx, *layout); printf("done\n"); /* @@ -110,7 +110,7 @@ printf("Dummyflasher initialising with param=\"%s\"... ", programmer_param); assert_int_equal(0, programmer_init(&programmer_dummy, programmer_param)); /* Assignment below normally happens while probing, but this test is not probing. */ - flash->mst = &registered_masters[0]; + flashctx->mst = &registered_masters[0]; printf("done\n"); } @@ -174,15 +174,15 @@ { (void) state; /* unused */ - struct flashrom_flashctx flash = { 0 }; + struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; const char *param = ""; /* Default values for all params. */ - setup_chip(&flash, &layout, &mock_chip, param); + setup_chip(&flashctx, &layout, &mock_chip, param); printf("Erase chip operation started.\n"); - assert_int_equal(0, do_erase(&flash)); + assert_int_equal(0, do_erase(&flashctx)); printf("Erase chip operation done.\n"); teardown(&layout); @@ -192,7 +192,7 @@ { (void) state; /* unused */ - struct flashrom_flashctx flash = { 0 }; + struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_W25Q128_V; /* @@ -201,10 +201,10 @@ */ char *param_dup = strdup("bus=spi,emulate=W25Q128FV"); - setup_chip(&flash, &layout, &mock_chip, param_dup); + setup_chip(&flashctx, &layout, &mock_chip, param_dup); printf("Erase chip operation started.\n"); - assert_int_equal(0, do_erase(&flash)); + assert_int_equal(0, do_erase(&flashctx)); printf("Erase chip operation done.\n"); teardown(&layout); @@ -216,17 +216,17 @@ { (void) state; /* unused */ - struct flashrom_flashctx flash = { 0 }; + struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; const char *param = ""; /* Default values for all params. */ - setup_chip(&flash, &layout, &mock_chip, param); + setup_chip(&flashctx, &layout, &mock_chip, param); const char *const filename = "read_chip.test"; printf("Read chip operation started.\n"); - assert_int_equal(0, do_read(&flash, filename)); + assert_int_equal(0, do_read(&flashctx, filename)); printf("Read chip operation done.\n"); teardown(&layout); @@ -236,7 +236,7 @@ { (void) state; /* unused */ - struct flashrom_flashctx flash = { 0 }; + struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_W25Q128_V; /* @@ -245,12 +245,12 @@ */ char *param_dup = strdup("bus=spi,emulate=W25Q128FV"); - setup_chip(&flash, &layout, &mock_chip, param_dup); + setup_chip(&flashctx, &layout, &mock_chip, param_dup); const char *const filename = "read_chip.test"; printf("Read chip operation started.\n"); - assert_int_equal(0, do_read(&flash, filename)); + assert_int_equal(0, do_read(&flashctx, filename)); printf("Read chip operation done.\n"); teardown(&layout); @@ -262,12 +262,12 @@ { (void) state; /* unused */ - struct flashrom_flashctx flash = { 0 }; + struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_8MiB; const char *param = ""; /* Default values for all params. */ - setup_chip(&flash, &layout, &mock_chip, param); + setup_chip(&flashctx, &layout, &mock_chip, param); /* * Providing filename "-" means content is taken from standard input. @@ -285,7 +285,7 @@ const char *const filename = "-"; printf("Write chip operation started.\n"); - assert_int_equal(0, do_write(&flash, filename, NULL)); + assert_int_equal(0, do_write(&flashctx, filename, NULL)); printf("Write chip operation done.\n"); teardown(&layout); @@ -295,7 +295,7 @@ { (void) state; /* unused */ - struct flashrom_flashctx flash = { 0 }; + struct flashrom_flashctx flashctx = { 0 }; struct flashrom_layout *layout; struct flashchip mock_chip = chip_W25Q128_V; /* @@ -304,13 +304,13 @@ */ char *param_dup = strdup("bus=spi,emulate=W25Q128FV"); - setup_chip(&flash, &layout, &mock_chip, param_dup); + setup_chip(&flashctx, &layout, &mock_chip, param_dup); /* See comment in write_chip_test_success */ const char *const filename = "-"; printf("Write chip operation started.\n"); - assert_int_equal(0, do_write(&flash, filename, NULL)); + assert_int_equal(0, do_write(&flashctx, filename, NULL)); printf("Write chip operation done.\n"); teardown(&layout); -- To view, visit https://review.coreboot.org/c/flashrom/+/58596 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3f4d9c4fe85752e16bab71ad22b0135a96cac28a Gerrit-Change-Number: 58596 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-MessageType: merged

1 0

Change in flashrom[master]: tests: Rename flash context in chip tests to flashctx
by Edward O'Callaghan (Code Review) 08 Nov '21

08 Nov '21

Attention is currently required from: Nico Huber, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58596 ) Change subject: tests: Rename flash context in chip tests to flashctx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/58596 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3f4d9c4fe85752e16bab71ad22b0135a96cac28a Gerrit-Change-Number: 58596 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-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Mon, 08 Nov 2021 03:52:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Add tests to write on chip
by Edward O'Callaghan (Code Review) 08 Nov '21

08 Nov '21

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58357 ) Change subject: tests: Add tests to write on chip ...................................................................... tests: Add tests to write on chip This patch adds two tests and initialises page_size in mock chip chip_W25Q128_V. page_size was not needed for previous tests (erase and read). page_size only needed to execute writing on chip with dummyflasher, so it is added here. BUG=b:181803212 TEST=ninja test Change-Id: I6f0336613ab16a7e59857006496e3590ddb14d00 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58357 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M tests/chip.c M tests/meson.build M tests/tests.c M tests/tests.h 4 files changed, 72 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved diff --git a/tests/chip.c b/tests/chip.c index 54e14d2..4181aed 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -148,6 +148,7 @@ .read = spi_chip_read, .write = spi_chip_write_256, .unlock = spi_disable_blockprotect, + .page_size = 256, .block_erasers = { { @@ -256,3 +257,63 @@ free(param_dup); } + +void write_chip_test_success(void **state) +{ + (void) state; /* unused */ + + struct flashrom_flashctx flash = { 0 }; + struct flashrom_layout *layout; + struct flashchip mock_chip = chip_8MiB; + const char *param = ""; /* Default values for all params. */ + + setup_chip(&flash, &layout, &mock_chip, param); + + /* + * Providing filename "-" means content is taken from standard input. + * This doesn't change much because all file operations are mocked. + * However filename "-" makes a difference for + * flashrom.c#read_buf_from_file and allows to avoid mocking + * image_stat.st_size. + * + * Now this does mean test covers successful path only, but this test + * is designed to cover only successful write operation anyway. + * + * To cover error path of image_stat.st_size != flash size, filename + * needs to be provided and image_stat.st_size needs to be mocked. + */ + const char *const filename = "-"; + + printf("Write chip operation started.\n"); + assert_int_equal(0, do_write(&flash, filename, NULL)); + printf("Write chip operation done.\n"); + + teardown(&layout); +} + +void write_chip_with_dummyflasher_test_success(void **state) +{ + (void) state; /* unused */ + + struct flashrom_flashctx flash = { 0 }; + struct flashrom_layout *layout; + struct flashchip mock_chip = chip_W25Q128_V; + /* + * Dummyflasher is capable to emulate W25Q128.V, so we ask it to do this. + * Nothing to mock, dummy is taking care of this already. + */ + char *param_dup = strdup("bus=spi,emulate=W25Q128FV"); + + setup_chip(&flash, &layout, &mock_chip, param_dup); + + /* See comment in write_chip_test_success */ + const char *const filename = "-"; + + printf("Write chip operation started.\n"); + assert_int_equal(0, do_write(&flash, filename, NULL)); + printf("Write chip operation done.\n"); + + teardown(&layout); + + free(param_dup); +} diff --git a/tests/meson.build b/tests/meson.build index 30b1e78..ebfbaef 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -41,6 +41,7 @@ '-Wl,--wrap=write', '-Wl,--wrap=fopen', '-Wl,--wrap=fopen64', + '-Wl,--wrap=fdopen', '-Wl,--wrap=fwrite', '-Wl,--wrap=fflush', '-Wl,--wrap=stat', diff --git a/tests/tests.c b/tests/tests.c index d3df356..e3ad241 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -136,6 +136,12 @@ return not_null(); } +FILE *__wrap_fdopen(int fd, const char *mode) +{ + LOG_ME; + return not_null(); +} + int __wrap_stat(const char *path, void *buf) { LOG_ME; @@ -343,6 +349,8 @@ cmocka_unit_test(erase_chip_with_dummyflasher_test_success), cmocka_unit_test(read_chip_test_success), cmocka_unit_test(read_chip_with_dummyflasher_test_success), + cmocka_unit_test(write_chip_test_success), + cmocka_unit_test(write_chip_with_dummyflasher_test_success), }; ret |= cmocka_run_group_tests_name("chip.c tests", chip_tests, NULL, NULL); diff --git a/tests/tests.h b/tests/tests.h index c142b45..732920a 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -61,5 +61,7 @@ void erase_chip_with_dummyflasher_test_success(void **state); void read_chip_test_success(void **state); void read_chip_with_dummyflasher_test_success(void **state); +void write_chip_test_success(void **state); +void write_chip_with_dummyflasher_test_success(void **state); #endif /* TESTS_H */ 2 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/flashrom/+/58357 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I6f0336613ab16a7e59857006496e3590ddb14d00 Gerrit-Change-Number: 58357 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: pci.h: move include into own wrapper
by Thomas Heijligen (Code Review) 07 Nov '21

07 Nov '21

Attention is currently required from: Nico Huber, Angel Pons. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58883 ) Change subject: pci.h: move include into own wrapper ...................................................................... Patch Set 1: (1 comment) File hwaccess.h: https://review.coreboot.org/c/flashrom/+/58883/comment/6dd70bcf_a4936163 PS1, Line 36: #define pci_mmio_writeb mmio_le_writeb : #define pci_mmio_writew mmio_le_writew : #define pci_mmio_writel mmio_le_writel : #define pci_mmio_readb mmio_le_readb : #define pci_mmio_readw mmio_le_readw : #define pci_mmio_readl mmio_le_readl > You mean replacing "calls" to pci_mmio* with the underlying function name? Yes > Hmm, I would prefer to keep `mmio` in the name, how about `mmio_read_le8`? That's fine for me. I'll do this in the updated patch -- To view, visit https://review.coreboot.org/c/flashrom/+/58883 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibf00356f0ef5cc92e0ec99f8fe5cdda56f47b166 Gerrit-Change-Number: 58883 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Sun, 07 Nov 2021 17:14:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: pci.h: move include into own wrapper
by Nico Huber (Code Review) 07 Nov '21

07 Nov '21

Attention is currently required from: Thomas Heijligen, Angel Pons. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58883 ) Change subject: pci.h: move include into own wrapper ...................................................................... Patch Set 1: (1 comment) File hwaccess.h: https://review.coreboot.org/c/flashrom/+/58883/comment/40afbd8a_bd371407 PS1, Line 36: #define pci_mmio_writeb mmio_le_writeb : #define pci_mmio_writew mmio_le_writew : #define pci_mmio_writel mmio_le_writel : #define pci_mmio_readb mmio_le_readb : #define pci_mmio_readw mmio_le_readw : #define pci_mmio_readl mmio_le_readl > Since these are only aliases of the mmio_le/be_readX/writeX we could use the mmio_le/be_readX/writeX functions in every part of the code. You mean replacing "calls" to pci_mmio* with the underlying function name? > Maybe syncing the name scheme with the (not yet merged) read_le8 type of functions. as read_volatile_le8 Hmm, I would prefer to keep `mmio` in the name, how about `mmio_read_le8`? -- To view, visit https://review.coreboot.org/c/flashrom/+/58883 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibf00356f0ef5cc92e0ec99f8fe5cdda56f47b166 Gerrit-Change-Number: 58883 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Sun, 07 Nov 2021 17:10:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: hwaccess.c: move function declarations from programmer.h to hwaccess.h
by Nico Huber (Code Review) 07 Nov '21

07 Nov '21

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/58865 ) Change subject: hwaccess.c: move function declarations from programmer.h to hwaccess.h ...................................................................... hwaccess.c: move function declarations from programmer.h to hwaccess.h Move declarations for functions implemented in hwaccess.c from programmer.h to hwaccess.h. Change-Id: I075fd86211c766ae3d5f29c76adbd7c5b9bdbd80 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/58865 Reviewed-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M dmi.c M hwaccess.h M ich_descriptors.c M programmer.h 4 files changed, 34 insertions(+), 33 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Angel Pons: Looks good to me, but someone else must approve diff --git a/dmi.c b/dmi.c index 5d709f1..d2e149d 100644 --- a/dmi.c +++ b/dmi.c @@ -31,6 +31,7 @@ #include <stdlib.h> #include "flash.h" +#include "hwaccess.h" #include "programmer.h" /* Enable SMBIOS decoding. Currently legacy DMI decoding is enough. */ diff --git a/hwaccess.h b/hwaccess.h index 56c2d1e..46335f3 100644 --- a/hwaccess.h +++ b/hwaccess.h @@ -37,6 +37,38 @@ #undef index #endif /* NEED_PCI == 1 */ +void mmio_writeb(uint8_t val, void *addr); +void mmio_writew(uint16_t val, void *addr); +void mmio_writel(uint32_t val, void *addr); +uint8_t mmio_readb(const void *addr); +uint16_t mmio_readw(const void *addr); +uint32_t mmio_readl(const void *addr); +void mmio_readn(const void *addr, uint8_t *buf, size_t len); +void mmio_le_writeb(uint8_t val, void *addr); +void mmio_le_writew(uint16_t val, void *addr); +void mmio_le_writel(uint32_t val, void *addr); +uint8_t mmio_le_readb(const void *addr); +uint16_t mmio_le_readw(const void *addr); +uint32_t mmio_le_readl(const void *addr); +#define pci_mmio_writeb mmio_le_writeb +#define pci_mmio_writew mmio_le_writew +#define pci_mmio_writel mmio_le_writel +#define pci_mmio_readb mmio_le_readb +#define pci_mmio_readw mmio_le_readw +#define pci_mmio_readl mmio_le_readl +void rmmio_writeb(uint8_t val, void *addr); +void rmmio_writew(uint16_t val, void *addr); +void rmmio_writel(uint32_t val, void *addr); +void rmmio_le_writeb(uint8_t val, void *addr); +void rmmio_le_writew(uint16_t val, void *addr); +void rmmio_le_writel(uint32_t val, void *addr); +#define pci_rmmio_writeb rmmio_le_writeb +#define pci_rmmio_writew rmmio_le_writew +#define pci_rmmio_writel rmmio_le_writel +void rmmio_valb(void *addr); +void rmmio_valw(void *addr); +void rmmio_vall(void *addr); + #define ___constant_swab8(x) ((uint8_t) ( \ (((uint8_t)(x) & (uint8_t)0xffU)))) diff --git a/ich_descriptors.c b/ich_descriptors.c index 7927493..5edaaf4 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -16,6 +16,7 @@ */ #include "ich_descriptors.h" +#include "hwaccess.h" #ifdef ICH_DESCRIPTORS_FROM_DUMP_ONLY #include <stdio.h> diff --git a/programmer.h b/programmer.h index 81086a8..ec9503c 100644 --- a/programmer.h +++ b/programmer.h @@ -282,39 +282,6 @@ extern enum chipbustype internal_buses_supported; #endif -/* hwaccess.c */ -void mmio_writeb(uint8_t val, void *addr); -void mmio_writew(uint16_t val, void *addr); -void mmio_writel(uint32_t val, void *addr); -uint8_t mmio_readb(const void *addr); -uint16_t mmio_readw(const void *addr); -uint32_t mmio_readl(const void *addr); -void mmio_readn(const void *addr, uint8_t *buf, size_t len); -void mmio_le_writeb(uint8_t val, void *addr); -void mmio_le_writew(uint16_t val, void *addr); -void mmio_le_writel(uint32_t val, void *addr); -uint8_t mmio_le_readb(const void *addr); -uint16_t mmio_le_readw(const void *addr); -uint32_t mmio_le_readl(const void *addr); -#define pci_mmio_writeb mmio_le_writeb -#define pci_mmio_writew mmio_le_writew -#define pci_mmio_writel mmio_le_writel -#define pci_mmio_readb mmio_le_readb -#define pci_mmio_readw mmio_le_readw -#define pci_mmio_readl mmio_le_readl -void rmmio_writeb(uint8_t val, void *addr); -void rmmio_writew(uint16_t val, void *addr); -void rmmio_writel(uint32_t val, void *addr); -void rmmio_le_writeb(uint8_t val, void *addr); -void rmmio_le_writew(uint16_t val, void *addr); -void rmmio_le_writel(uint32_t val, void *addr); -#define pci_rmmio_writeb rmmio_le_writeb -#define pci_rmmio_writew rmmio_le_writew -#define pci_rmmio_writel rmmio_le_writel -void rmmio_valb(void *addr); -void rmmio_valw(void *addr); -void rmmio_vall(void *addr); - /* bitbang_spi.c */ int register_spi_bitbang_master(const struct bitbang_spi_master *master, void *spi_data); -- To view, visit https://review.coreboot.org/c/flashrom/+/58865 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I075fd86211c766ae3d5f29c76adbd7c5b9bdbd80 Gerrit-Change-Number: 58865 Gerrit-PatchSet: 3 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in flashrom[master]: Makefile: Use pkg-config to find libftdi1
by Nico Huber (Code Review) 07 Nov '21

07 Nov '21

Attention is currently required from: Thomas Heijligen, Angel Pons. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58623 ) Change subject: Makefile: Use pkg-config to find libftdi1 ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/58623/comment/8ee2cb50_cae09e5f PS2, Line 7: Makefile: Use pkg-config to find libftdi1 This was already the case before. Maybe something like Make pkg-config mandatory to find libftdi1 ? Patchset: PS2: Can we assume that the detection didn't work before without pkg-config? -- To view, visit https://review.coreboot.org/c/flashrom/+/58623 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I41f5186d9f3e063c12c8c6eea888d0b0bf534259 Gerrit-Change-Number: 58623 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Sun, 07 Nov 2021 17:06:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Makefile: Use pkg-config to find libftdi1
by Nico Huber (Code Review) 07 Nov '21

07 Nov '21

Attention is currently required from: Thomas Heijligen, Angel Pons. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/58623 ) Change subject: Makefile: Use pkg-config to find libftdi1 ...................................................................... Patch Set 2: -Code-Review (1 comment) Patchset: PS2: Sorry misclicked -- To view, visit https://review.coreboot.org/c/flashrom/+/58623 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I41f5186d9f3e063c12c8c6eea888d0b0bf534259 Gerrit-Change-Number: 58623 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Sun, 07 Nov 2021 17:01:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit November 2021