September 2021 - flashrom-gerrit

Change in flashrom[master]: ft2232_spi: reintroduce generic GPIOL control
by Michael Niewöhner (Code Review) 24 Sep '21

24 Sep '21

Attention is currently required from: Felix Singer, Alan Green, Nico Huber, Angel Pons, Michael Niewöhner. Hello Felix Singer, build bot (Jenkins), Alan Green, Nico Huber, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/57810 to look at the new patch set (#15). Change subject: ft2232_spi: reintroduce generic GPIOL control ...................................................................... ft2232_spi: reintroduce generic GPIOL control This reintroduces a reworked version of the GPIOL pin control first introduced in commit 3207844 (CB:49637), which was reverted in commit 6518cf3 (CB:55692) due to breakage. This change introduces a new argument `gpiolX` to allow use of the four GPIOL pins either as generic gpios or as additional CS# signal(s). `X` specifies the GPIOL pin (0-3) to be set to one of [HLC] with the following meaning: * H - set the pin as output high * L - set the pin as output low * C - use the pin as additional CS# signal The third value, `C`, aims to replace the parameter `csgpiol`, that is now marked as deprecated and can be removed at some point in the future. `gpiol` and `csgpiol` are mutually exclusive and use of both results in an error. Multiple pins may be set by specifying the parameter multiple times. Documentation was updated/added accordingly. Change-Id: I3989f0f9596c090de52dca67183b1363dae59d3a Signed-off-by: Alan Green <avg(a)google.com> Signed-off-by: Michael Niewöhner <foss(a)mniewoehner.de> --- M flashrom.8.tmpl M ft2232_spi.c 2 files changed, 115 insertions(+), 9 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/10/57810/15 -- To view, visit https://review.coreboot.org/c/flashrom/+/57810 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3989f0f9596c090de52dca67183b1363dae59d3a Gerrit-Change-Number: 57810 Gerrit-PatchSet: 15 Gerrit-Owner: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Alan Green <avg(a)google.com> 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Alan Green <avg(a)google.com> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: flashrom.8: replace `svn changelog` with `git history`
by Angel Pons (Code Review) 24 Sep '21

24 Sep '21

Attention is currently required from: Felix Singer, Michael Niewöhner. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57811 ) Change subject: flashrom.8: replace `svn changelog` with `git history` ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/57811 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If8659dd603cbabdb8e20d89f818072986373e24f Gerrit-Change-Number: 57811 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Comment-Date: Fri, 24 Sep 2021 11:21:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: Remove preprocessor closing comments
by Angel Pons (Code Review) 24 Sep '21

24 Sep '21

Attention is currently required from: Felix Singer, Nico Huber. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57800 ) Change subject: Remove preprocessor closing comments ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: I'd say they're not useless (they indicate what guards the code), but I don't have a strong preference. -- To view, visit https://review.coreboot.org/c/flashrom/+/57800 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I74288afde108e764adc651039aae81857abffedf Gerrit-Change-Number: 57800 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> 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: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Comment-Date: Fri, 24 Sep 2021 11:18:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: remove compile guards
by Angel Pons (Code Review) 24 Sep '21

24 Sep '21

Attention is currently required from: Nico Huber, Thomas Heijligen, Paul Menzel. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57797 ) Change subject: remove compile guards ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/57797 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I76a76e05c7a7dd27637325ab1e9d8946fd5f9076 Gerrit-Change-Number: 57797 Gerrit-PatchSet: 4 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> 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: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Comment-Date: Fri, 24 Sep 2021 11:15:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: ch341a_spi: libusb functions can handle all platforms
by Angel Pons (Code Review) 24 Sep '21

24 Sep '21

Attention is currently required from: Felix Singer, Nico Huber, Thomas Heijligen. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57889 ) Change subject: ch341a_spi: libusb functions can handle all platforms ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/57889 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If6f19744503055ab8e22c863b31e696808e0407d Gerrit-Change-Number: 57889 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> 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: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Comment-Date: Fri, 24 Sep 2021 10:53:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: chipset_enable.c: Add Ids for recent Intel chipsets
by Angel Pons (Code Review) 24 Sep '21

24 Sep '21

Attention is currently required from: Bora Guvendik, Anil Kumar K, Nico Huber, Paul Menzel, Edward O'Callaghan, Anastasia Klimchuk. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57560 ) Change subject: chipset_enable.c: Add Ids for recent Intel chipsets ...................................................................... Patch Set 7: (1 comment) File chipset_enable.c: https://review.coreboot.org/c/flashrom/+/57560/comment/fca4bf38_08a65885 PS7, Line 2018: {0x8086, 0xa224, B_FS, OK, "Intel", "Lewisburg", enable_flash_pch100}, : {0x8086, 0x9da4, B_FS, OK, "Intel", "Cannonlake", enable_flash_pch100}, : {0x8086, 0x34a4, B_FS, OK, "Intel", "Icelake", enable_flash_pch100}, : {0x8086, 0x4da4, B_FS, OK, "Intel", "Jasperlake", enable_flash_pch100}, : {0x8086, 0xa0a4, B_FS, OK, "Intel", "Tigerlake", enable_flash_pch100}, : {0x8086, 0x7aa4, B_FS, OK, "Intel", "Alderlake-S", enable_flash_pch100}, : {0x8086, 0x51a4, B_FS, OK, "Intel", "Alderlake-P / M", enable_flash_pch100}, flashrom uses LPC/eSPI PCI IDs instead of SPI PCI IDs. The SPI PCI device is not always visible, and didn't exist before Sunrise Point. Adding these IDs will result in flashrom complaining about "unexpected second chipset match" in several cases, which is undesired. Note that Intel PCHs are never marked as `OK`, but `DEP` (config DEPendent) instead. This is because IFD/ME can prevent successful flashing in some cases: IFD can restrict region access, reflashing the ME region while the ME is active often ends up badly (data corruption). `B_FS` indicates that these chipsets support SPI and FWH. I'd say `B_S` is the correct choice. Also, none of these chipsets should use the `enable_flash_pch100` function. Upstream flashrom differentiates between PCH generations (there's some differences w.r.t. protected range registers and IFD regions). -- To view, visit https://review.coreboot.org/c/flashrom/+/57560 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iff387076567e639485ac15c25c1bcc8c37a07037 Gerrit-Change-Number: 57560 Gerrit-PatchSet: 7 Gerrit-Owner: Anil Kumar K <anil.kumar.k(a)intel.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: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Selma Bensaid <selma.bensaid(a)intel.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: AndreX Andraos <andrex.andraos(a)intel.com> Gerrit-CC: Anil Kumar K <anil.kumar.k(a)intel.corp-partner.google.com> Gerrit-CC: Bernardo Perez Priego <bernardo.perez.priego(a)intel.com> Gerrit-CC: Bora Guvendik <bora.guvendik(a)intel.com> Gerrit-CC: Cliff Huang <cliff.huang(a)intel.com> Gerrit-CC: Nikolai Artemiev <nartemiev(a)chromium.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Bora Guvendik <bora.guvendik(a)intel.com> Gerrit-Attention: Anil Kumar K <anil.kumar.k(a)intel.com> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Fri, 24 Sep 2021 10:43:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: ft2232_spi: reintroduce generic GPIOL control
by Michael Niewöhner (Code Review) 24 Sep '21

24 Sep '21

Attention is currently required from: Felix Singer, Alan Green, Nico Huber, Angel Pons, Michael Niewöhner. Hello Felix Singer, build bot (Jenkins), Alan Green, Nico Huber, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/57810 to look at the new patch set (#14). Change subject: ft2232_spi: reintroduce generic GPIOL control ...................................................................... ft2232_spi: reintroduce generic GPIOL control This reintroduces a reworked version of the GPIOL pin control first introduced in commit 3207844 (CB:49637), which was reverted in commit 6518cf3 (CB:55692) due to breakage. This change introduces a new argument `gpiolX` to allow use of the four GPIOL pins either as generic gpios or as additional CS# signal(s). `X` specifies the GPIOL pin (0-3) to be set to one of [HLC] with the following meaning: * H - set the pin as output high * L - set the pin as output low * C - use the pin as additional CS# signal The third value, `C`, aims to replace the parameter `csgpiol`, that is now marked as deprecated and can be removed at some point in the future. `gpiol` and `csgpiol` are mutually exclusive and use of both results in an error. Multiple pins may be set by specifying the parameter multiple times. Documentation was updated/added accordingly. Change-Id: I3989f0f9596c090de52dca67183b1363dae59d3a Signed-off-by: Alan Green <avg(a)google.com> Signed-off-by: Michael Niewöhner <foss(a)mniewoehner.de> --- M flashrom.8.tmpl M ft2232_spi.c 2 files changed, 112 insertions(+), 7 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/10/57810/14 -- To view, visit https://review.coreboot.org/c/flashrom/+/57810 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3989f0f9596c090de52dca67183b1363dae59d3a Gerrit-Change-Number: 57810 Gerrit-PatchSet: 14 Gerrit-Owner: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Alan Green <avg(a)google.com> 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-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Alan Green <avg(a)google.com> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: tests: Move current_io to io_mock.c be visible across tests
by Anastasia Klimchuk (Code Review) 24 Sep '21

24 Sep '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57915 ) Change subject: tests: Move current_io to io_mock.c be visible across tests ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Sorry for this big red -1, it is "curl: (7) Failed to connect to cmocka.org port 443: Connection refused". I don't know how to re-run, but I will be working on comments anyway, so maybe it goes away by itself with next version. -- To view, visit https://review.coreboot.org/c/flashrom/+/57915 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5327b5de430afe13a8cc931c8b4b188dcb8c8cf6 Gerrit-Change-Number: 57915 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: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Fri, 24 Sep 2021 06:35:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Add NON_ZERO macro and not_null function instead of MOCK_HANDLE
by Anastasia Klimchuk (Code Review) 24 Sep '21

24 Sep '21

Attention is currently required from: Nico Huber, Edward O'Callaghan, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/57269 ) Change subject: tests: Add NON_ZERO macro and not_null function instead of MOCK_HANDLE ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: Build fails because "curl: (7) Failed to connect to cmocka.org port 443: Connection refused" Ideally I would re-run, but not sure how to do this. Maybe if there are more comments, I will upload next patchset and it will happen by itself. (same situation for other patches in the chain) -- To view, visit https://review.coreboot.org/c/flashrom/+/57269 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5ad6ee4aa9091447c6c9108c92bf7f6e755fca48 Gerrit-Change-Number: 57269 Gerrit-PatchSet: 3 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.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-Comment-Date: Fri, 24 Sep 2021 06:30:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: [WIP] tests: Add init-shutdown test for raiden_debug_spi
by Anastasia Klimchuk (Code Review) 24 Sep '21

24 Sep '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/57918 ) Change subject: [WIP] tests: Add init-shutdown test for raiden_debug_spi ...................................................................... [WIP] tests: Add init-shutdown test for raiden_debug_spi This patch adds a test for raiden_debug_spi and lots of libusb wraps. Marked as WIP because I feel my approach to libusb symbols is questionable. The test is working though. Another thing less-than-ideal is USB_DEVICE_ADDRESS, can probably be done better. BUG=b:181803212 TEST=builds and ninja test Change-Id: I880a8637ab02de179df9169c1898230bce4dc1c7 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/init_shutdown.c M tests/io_mock.h M tests/libusb_wraps.c M tests/meson.build M tests/tests.c M tests/tests.h 6 files changed, 251 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/18/57918/1 diff --git a/tests/init_shutdown.c b/tests/init_shutdown.c index e64e58c..262c4c3 100644 --- a/tests/init_shutdown.c +++ b/tests/init_shutdown.c @@ -54,6 +54,97 @@ #endif } +ssize_t raiden_debug_libusb_get_device_list(void *state, libusb_context *ctx, libusb_device ***list) +{ + *list = calloc(1, sizeof(**list)); + **list = calloc(1, sizeof(*list)); + + const struct libusb_device tmp = {}; + + *((*list)[0]) = tmp; + + return 1; +} + +void raiden_debug_libusb_free_device_list(void *state, libusb_device **list, int unref_devices) +{ + free(*list); + free(list); +} + +int raiden_debug_libusb_get_device_descriptor( + void *state, libusb_device *dev, libusb_device_descriptor *desc) +{ + desc->idVendor = 0x18D1; /* GOOGLE_VID */ + desc->idProduct = 0; + desc->bNumConfigurations = 1; + + return 0; +} + +int raiden_debug_libusb_get_config_descriptor( + void *state, libusb_device *dev, uint8_t config_index, libusb_config_descriptor **config) +{ + *config = calloc(1, sizeof(**config)); + + struct libusb_endpoint_descriptor *tmp_endpoint = calloc(2, sizeof(*tmp_endpoint)); + struct libusb_interface_descriptor *tmp_interface_descriptor = calloc(1, sizeof(*tmp_interface_descriptor)); + struct libusb_interface *tmp_interface = calloc(1, sizeof(*tmp_interface)); + + /* in endpoint */ + tmp_endpoint[0].bEndpointAddress = 0x80; + tmp_endpoint[0].bmAttributes = 0x2; + /* out endpoint */ + tmp_endpoint[1].bEndpointAddress = 0x0; + tmp_endpoint[1].bmAttributes = 0x2; + + tmp_interface_descriptor->bInterfaceClass = 0xff; /* LIBUSB_CLASS_VENDOR_SPEC */ + tmp_interface_descriptor->bInterfaceSubClass = 0x51; /* GOOGLE_RAIDEN_SPI_SUBCLASS */ + tmp_interface_descriptor->bInterfaceProtocol = 0x01; /* GOOGLE_RAIDEN_SPI_PROTOCOL_V1 */ + tmp_interface_descriptor->bNumEndpoints = 2; /* in_endpoint and out_endpoint */ + tmp_interface_descriptor->endpoint = tmp_endpoint; + + tmp_interface->num_altsetting = 1; + tmp_interface->altsetting = tmp_interface_descriptor; + + (*config)->bConfigurationValue = 0; + (*config)->bNumInterfaces = 1; + (*config)->interface = tmp_interface; + + return 0; +} + +void raiden_debug_libusb_free_config_descriptor(void *state, libusb_config_descriptor *config) +{ + free(config->interface->altsetting->endpoint); + free(config->interface->altsetting); + free(config->interface); + free(config); +} + +void raiden_debug_init_and_shutdown_test_success(void **state) +{ +#if CONFIG_RAIDEN_DEBUG_SPI == 1 + const struct io_mock raiden_debug_io = { + .libusb_get_device_list = raiden_debug_libusb_get_device_list, + .libusb_free_device_list = raiden_debug_libusb_free_device_list, + .libusb_get_device_descriptor = raiden_debug_libusb_get_device_descriptor, + .libusb_get_config_descriptor = raiden_debug_libusb_get_config_descriptor, + .libusb_free_config_descriptor = raiden_debug_libusb_free_config_descriptor, + }; + + char raiden_debug_param[20]; + sprintf(raiden_debug_param, "address=%s", USB_DEVICE_ADDRESS); + + io_mock_register(&raiden_debug_io); + + run_lifecycle(state, &programmer_raiden_debug_spi, raiden_debug_param); + + io_mock_register(NULL); +#else + skip(); +#endif +} int dediprog_libusb_init(void *state, libusb_context **ctx) { diff --git a/tests/io_mock.h b/tests/io_mock.h index 237238c..425d9a9 100644 --- a/tests/io_mock.h +++ b/tests/io_mock.h @@ -43,8 +43,63 @@ void *not_null(void); /* Define libusb symbols to avoid dependency on libusb.h */ + +/* Address value needs fit into uint8_t, represented as string to use as programmer param. */ +#define USB_DEVICE_ADDRESS "19" + +struct libusb_endpoint_descriptor { + uint8_t offset1[2]; + uint8_t bEndpointAddress; + uint8_t bmAttributes; + uint8_t offset2[5]; + unsigned char *extra; + int extra_length; +}; +typedef struct libusb_endpoint_descriptor libusb_endpoint_descriptor; + +struct libusb_interface_descriptor { + uint8_t offset1[2]; + uint8_t bInterfaceNumber; + uint8_t bAlternateSetting; + uint8_t bNumEndpoints; + uint8_t bInterfaceClass; + uint8_t bInterfaceSubClass; + uint8_t bInterfaceProtocol; + uint8_t offset2; + struct libusb_endpoint_descriptor *endpoint; +}; +typedef struct libusb_interface_descriptor libusb_interface_descriptor; + +struct libusb_interface { + struct libusb_interface_descriptor *altsetting; + int num_altsetting; +}; +typedef struct libusb_interface libusb_interface; + +struct libusb_config_descriptor { + uint8_t offset1[4]; + uint8_t bNumInterfaces; + uint8_t bConfigurationValue; + uint8_t offset2[3]; + struct libusb_interface *interface; +}; +typedef struct libusb_config_descriptor libusb_config_descriptor; + +struct libusb_device {}; +typedef struct libusb_device libusb_device; + +struct libusb_device_descriptor { + uint8_t offset1[8]; + uint16_t idVendor; + uint16_t idProduct; + uint8_t offset2[5]; + uint8_t bNumConfigurations; +}; +typedef struct libusb_device_descriptor libusb_device_descriptor; + struct libusb_device_handle; typedef struct libusb_device_handle libusb_device_handle; + struct libusb_context; typedef struct libusb_context libusb_context; @@ -85,6 +140,14 @@ unsigned char *data, uint16_t wLength, unsigned int timeout); + ssize_t (*libusb_get_device_list)(void *state, libusb_context *ctx, libusb_device ***list); + void (*libusb_free_device_list)(void *state, libusb_device **list, int unref_devices); + int (*libusb_get_device_descriptor)(void *state, libusb_device *dev, libusb_device_descriptor *desc); + int (*libusb_get_config_descriptor)(void *state, + libusb_device *dev, + uint8_t config_index, + libusb_config_descriptor **config); + void (*libusb_free_config_descriptor)(void *state, libusb_config_descriptor *config); /* POSIX File I/O */ int (*open)(void *state, const char *pathname, int flags); diff --git a/tests/libusb_wraps.c b/tests/libusb_wraps.c index 978108e..2454921 100644 --- a/tests/libusb_wraps.c +++ b/tests/libusb_wraps.c @@ -13,6 +13,8 @@ * GNU General Public License for more details. */ +#include <stdlib.h> + #include <include/test.h> #include "io_mock.h" @@ -31,6 +33,76 @@ return 0; } +int __wrap_libusb_open(libusb_device *dev, libusb_device_handle **devh) +{ + LOG_ME; + return 0; +} + +int __wrap_libusb_set_auto_detach_kernel_driver(libusb_device_handle *devh, int enable) +{ + LOG_ME; + return 0; +} + +ssize_t __wrap_libusb_get_device_list(libusb_context *ctx, libusb_device ***list) +{ + LOG_ME; + if (get_io() && get_io()->libusb_get_device_list) + return get_io()->libusb_get_device_list(get_io()->state, ctx, list); + return 0; +} + +void __wrap_libusb_free_device_list(libusb_device **list, int unref_devices) +{ + LOG_ME; + if (get_io() && get_io()->libusb_free_device_list) + get_io()->libusb_free_device_list(get_io()->state, list, unref_devices); +} + +uint8_t __wrap_libusb_get_bus_number(libusb_device *dev) +{ + LOG_ME; + return 0; +} + +uint8_t __wrap_libusb_get_device_address(libusb_device *dev) +{ + LOG_ME; + return atoi(USB_DEVICE_ADDRESS); +} + +int __wrap_libusb_get_device_descriptor(libusb_device *dev, libusb_device_descriptor *desc) +{ + LOG_ME; + if (get_io() && get_io()->libusb_get_device_descriptor) + return get_io()->libusb_get_device_descriptor(get_io()->state, dev, desc); + return 0; +} + +int __wrap_libusb_get_config_descriptor( + libusb_device *dev, uint8_t config_index, libusb_config_descriptor **config) +{ + LOG_ME; + if (get_io() && get_io()->libusb_get_config_descriptor) + return get_io()->libusb_get_config_descriptor(get_io()->state, dev, config_index, config); + return 0; +} + +void __wrap_libusb_free_config_descriptor(libusb_config_descriptor *config) +{ + LOG_ME; + if (get_io() && get_io()->libusb_free_config_descriptor) + return get_io()->libusb_free_config_descriptor(get_io()->state, config); + return; +} + +int __wrap_libusb_get_configuration(libusb_device_handle *devh, int *config) +{ + LOG_ME; + return 0; +} + int __wrap_libusb_set_configuration(libusb_device_handle *devh, int config) { LOG_ME; @@ -65,6 +137,17 @@ LOG_ME; } +libusb_device *__wrap_libusb_ref_device(libusb_device *dev) +{ + LOG_ME; + return NULL; +} + +void __wrap_libusb_unref_device(libusb_device *dev) +{ + LOG_ME; +} + void __wrap_libusb_exit(libusb_context *ctx) { LOG_ME; diff --git a/tests/meson.build b/tests/meson.build index 9179258..587e7e2 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -59,10 +59,22 @@ '-Wl,--wrap=test_inl', '-Wl,--wrap=usb_dev_get_by_vid_pid_number', '-Wl,--wrap=libusb_init', + '-Wl,--wrap=libusb_open', + '-Wl,--wrap=libusb_set_auto_detach_kernel_driver', + '-Wl,--wrap=libusb_get_device_list', + '-Wl,--wrap=libusb_free_device_list', + '-Wl,--wrap=libusb_get_bus_number', + '-Wl,--wrap=libusb_get_device_address', + '-Wl,--wrap=libusb_get_device_descriptor', + '-Wl,--wrap=libusb_get_config_descriptor', + '-Wl,--wrap=libusb_free_config_descriptor', + '-Wl,--wrap=libusb_get_configuration', '-Wl,--wrap=libusb_set_configuration', '-Wl,--wrap=libusb_claim_interface', '-Wl,--wrap=libusb_control_transfer', '-Wl,--wrap=libusb_release_interface', + '-Wl,--wrap=libusb_ref_device', + '-Wl,--wrap=libusb_unref_device', '-Wl,--wrap=libusb_close', '-Wl,--wrap=libusb_exit', '-Wl,--gc-sections', diff --git a/tests/tests.c b/tests/tests.c index b59cb3c..cab093d 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -280,6 +280,7 @@ const struct CMUnitTest init_shutdown_tests[] = { cmocka_unit_test(dummy_init_and_shutdown_test_success), cmocka_unit_test(nicrealtek_init_and_shutdown_test_success), + cmocka_unit_test(raiden_debug_init_and_shutdown_test_success), cmocka_unit_test(dediprog_init_and_shutdown_test_success), cmocka_unit_test(linux_mtd_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 8e1b6da..b610315 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 nicrealtek_init_and_shutdown_test_success(void **state); +void raiden_debug_init_and_shutdown_test_success(void **state); void dediprog_init_and_shutdown_test_success(void **state); void linux_mtd_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/+/57918 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I880a8637ab02de179df9169c1898230bce4dc1c7 Gerrit-Change-Number: 57918 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit September 2021