November 2021 - flashrom-gerrit

Change in flashrom[master]: pcidev: Move pci_get_dev() logic into canonical place
by Edward O'Callaghan (Code Review) 13 Nov '21

13 Nov '21

Attention is currently required from: Peter Marheine. Hello build bot (Jenkins), Peter Marheine, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/59276 to look at the new patch set (#2). Change subject: pcidev: Move pci_get_dev() logic into canonical place ...................................................................... pcidev: Move pci_get_dev() logic into canonical place BUG=none TEST=builds Change-Id: Id9ce055d5e5d347520ec5002b8c6548e60eaa0a7 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M board_enable.c M pcidev.c M programmer.h 3 files changed, 15 insertions(+), 9 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/76/59276/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/59276 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id9ce055d5e5d347520ec5002b8c6548e60eaa0a7 Gerrit-Change-Number: 59276 Gerrit-PatchSet: 2 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: pcidev: Avoid internal relying on pacc global
by Edward O'Callaghan (Code Review) 13 Nov '21

13 Nov '21

Attention is currently required from: Peter Marheine. Hello build bot (Jenkins), Peter Marheine, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/59275 to look at the new patch set (#2). Change subject: pcidev: Avoid internal relying on pacc global ...................................................................... pcidev: Avoid internal relying on pacc global Make progress towards the goal of removing pacc from global state as noted in the FIXME of programmer.h BUG=none TEST=builds Change-Id: Id83bfd41f785f907e52a65a6689e8c7016fc1b77 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M internal.c M pcidev.c M programmer.h 3 files changed, 25 insertions(+), 21 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/75/59275/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/59275 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id83bfd41f785f907e52a65a6689e8c7016fc1b77 Gerrit-Change-Number: 59275 Gerrit-PatchSet: 2 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: programmer.h: Make pacc global state static local
by Edward O'Callaghan (Code Review) 13 Nov '21

13 Nov '21

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/59278 ) Change subject: programmer.h: Make pacc global state static local ...................................................................... programmer.h: Make pacc global state static local TODO: Fix chipset_enable.c ?? Change-Id: I3bea1b93a7ca81dd42a64eec1e49a10f1fbda850 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M pcidev.c M programmer.h 2 files changed, 1 insertion(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/78/59278/1 diff --git a/pcidev.c b/pcidev.c index e57b90c..ddd13e9 100644 --- a/pcidev.c +++ b/pcidev.c @@ -21,7 +21,7 @@ #include "programmer.h" #include "hwaccess.h" -struct pci_access *pacc; +static struct pci_access *pacc; enum pci_bartype { TYPE_MEMBAR, diff --git a/programmer.h b/programmer.h index 41dc240..80bf3b7 100644 --- a/programmer.h +++ b/programmer.h @@ -119,8 +119,6 @@ struct pci_filter; /* pcidev.c */ -// FIXME: This needs to be local, not global(?) -extern struct pci_access *pacc; int pci_init_common(void); uintptr_t pcidev_readbar(struct pci_dev *dev, int bar); struct pci_dev *pcidev_init(const struct dev_entry *devs, int bar); -- To view, visit https://review.coreboot.org/c/flashrom/+/59278 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3bea1b93a7ca81dd42a64eec1e49a10f1fbda850 Gerrit-Change-Number: 59278 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: pcidev: scandev_inclass WIP
by Edward O'Callaghan (Code Review) 13 Nov '21

13 Nov '21

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/59277 ) Change subject: pcidev: scandev_inclass WIP ...................................................................... pcidev: scandev_inclass WIP more than one ISA bridge?? Change-Id: I1978e178fb73485f1c5c7e732853522847267cee Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M board_enable.c M pcidev.c M programmer.h 3 files changed, 25 insertions(+), 16 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/77/59277/1 diff --git a/board_enable.c b/board_enable.c index ae8ce2c..f3e8718 100644 --- a/board_enable.c +++ b/board_enable.c @@ -1551,26 +1551,20 @@ int i, allowed; /* First, look for a known LPC bridge */ - for (dev = pacc->devices; dev; dev = dev->next) { - uint16_t device_class; - /* libpci before version 2.2.4 does not store class info. */ - device_class = pci_read_word(dev, PCI_CLASS_DEVICE); - if ((dev->vendor_id == 0x8086) && - (device_class == 0x0601)) { /* ISA bridge */ - /* Is this device in our list? */ - for (i = 0; intel_ich_gpio_table[i].id; i++) - if (dev->device_id == intel_ich_gpio_table[i].id) - break; - - if (intel_ich_gpio_table[i].id) - break; - } - } - + dev = pcidev_scandev_inclass(0x0601, 0x8086); /* ISA bridge */ if (!dev) { msg_perr("\nERROR: No known Intel LPC bridge found.\n"); return -1; } + /* Is this device in our list? */ + for (i = 0; intel_ich_gpio_table[i].id; i++) + if (dev->device_id == intel_ich_gpio_table[i].id) + break; + + if (!intel_ich_gpio_table[i].id) { + msg_perr("\nERROR: No known Intel LPC bridge found.\n"); + return -1; + } /* * According to the datasheets, all Intel ICHs have the GPIO bar 5:1 diff --git a/pcidev.c b/pcidev.c index c9c86b8..e57b90c 100644 --- a/pcidev.c +++ b/pcidev.c @@ -157,6 +157,20 @@ return NULL; } +struct pci_dev *pcidev_scandev_inclass(uint16_t class, uint16_t vid) +{ + struct pci_dev *dev; + /* First, look for a known LPC bridge */ + for (dev = pacc->devices; dev; dev = dev->next) { + uint16_t device_class; + /* libpci before version 2.2.4 does not store class info. */ + device_class = pci_read_word(dev, PCI_CLASS_DEVICE); + if ((dev->vendor_id == vid) && (device_class == class)) + return dev; + } + return NULL; +} + struct pci_dev *pcidev_getdev(struct pci_dev *dev) { #if !defined(OLD_PCI_GET_DEV) diff --git a/programmer.h b/programmer.h index a78ee2a..41dc240 100644 --- a/programmer.h +++ b/programmer.h @@ -125,6 +125,7 @@ uintptr_t pcidev_readbar(struct pci_dev *dev, int bar); struct pci_dev *pcidev_init(const struct dev_entry *devs, int bar); struct pci_dev *pcidev_scandev(struct pci_filter *filter); +struct pci_dev *pcidev_scandev_inclass(uint16_t class, uint16_t vid); struct pci_dev *pcidev_getdev(struct pci_dev *dev); /* rpci_write_* are reversible writes. The original PCI config space register * contents will be restored on shutdown. -- To view, visit https://review.coreboot.org/c/flashrom/+/59277 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1978e178fb73485f1c5c7e732853522847267cee Gerrit-Change-Number: 59277 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: pcidev: Move pci_get_dev() logic into canonical place
by Edward O'Callaghan (Code Review) 13 Nov '21

13 Nov '21

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/59276 ) Change subject: pcidev: Move pci_get_dev() logic into canonical place ...................................................................... pcidev: Move pci_get_dev() logic into canonical place Change-Id: Id9ce055d5e5d347520ec5002b8c6548e60eaa0a7 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M board_enable.c M pcidev.c M programmer.h 3 files changed, 15 insertions(+), 9 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/76/59276/1 diff --git a/board_enable.c b/board_enable.c index 9cf0103..ae8ce2c 100644 --- a/board_enable.c +++ b/board_enable.c @@ -1090,15 +1090,7 @@ return -1; } -#if !defined(OLD_PCI_GET_DEV) - dev = pci_get_dev(pacc, dev->domain, dev->bus, dev->dev, 1); -#else - /* pciutils/libpci before version 2.2 is too old to support - * PCI domains. Such old machines usually don't have domains - * besides domain 0, so this is not a problem. - */ - dev = pci_get_dev(pacc, dev->bus, dev->dev, 1); -#endif + dev = pcidev_getdev(dev); if (!dev) { msg_perr("MCP SMBus controller could not be found\n"); return -1; diff --git a/pcidev.c b/pcidev.c index 32c6d30..c9c86b8 100644 --- a/pcidev.c +++ b/pcidev.c @@ -157,6 +157,19 @@ return NULL; } +struct pci_dev *pcidev_getdev(struct pci_dev *dev) +{ +#if !defined(OLD_PCI_GET_DEV) + return pci_get_dev(pacc, dev->domain, dev->bus, dev->dev, 1); +#else + /* pciutils/libpci before version 2.2 is too old to support + * PCI domains. Such old machines usually don't have domains + * besides domain 0, so this is not a problem. + */ + return pci_get_dev(pacc, dev->bus, dev->dev, 1); +#endif +} + static int pcidev_shutdown(void *data) { if (pacc == NULL) { diff --git a/programmer.h b/programmer.h index d6de7bc..a78ee2a 100644 --- a/programmer.h +++ b/programmer.h @@ -125,6 +125,7 @@ uintptr_t pcidev_readbar(struct pci_dev *dev, int bar); struct pci_dev *pcidev_init(const struct dev_entry *devs, int bar); struct pci_dev *pcidev_scandev(struct pci_filter *filter); +struct pci_dev *pcidev_getdev(struct pci_dev *dev); /* rpci_write_* are reversible writes. The original PCI config space register * contents will be restored on shutdown. * To clone the pci_dev instances internally, the `pacc` global -- To view, visit https://review.coreboot.org/c/flashrom/+/59276 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id9ce055d5e5d347520ec5002b8c6548e60eaa0a7 Gerrit-Change-Number: 59276 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: pcidev: Avoid internal relying on pacc global
by Edward O'Callaghan (Code Review) 13 Nov '21

13 Nov '21

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/59275 ) Change subject: pcidev: Avoid internal relying on pacc global ...................................................................... pcidev: Avoid internal relying on pacc global Make progress towards the goal of removing pacc from global state as noted in the FIXME of programmer.h BUG=none TEST=builds Change-Id: Id83bfd41f785f907e52a65a6689e8c7016fc1b77 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M internal.c M pcidev.c M programmer.h 3 files changed, 25 insertions(+), 21 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/75/59275/1 diff --git a/internal.c b/internal.c index 43bed9e..95ad5a4 100644 --- a/internal.c +++ b/internal.c @@ -38,31 +38,26 @@ pci_filter_init(NULL, &filter); filter.vendor = vendor; - for (temp = pacc->devices; temp; temp = temp->next) - if (pci_filter_match(&filter, temp)) { - /* Read PCI class */ - tmp2 = pci_read_word(temp, 0x0a); - if (tmp2 == devclass) - return temp; - } + temp = pcidev_scandev(&filter); + if (temp) { + /* Read PCI class */ + tmp2 = pci_read_word(temp, 0x0a); + if (tmp2 == devclass) + return temp; + } return NULL; } struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device) { - struct pci_dev *temp; struct pci_filter filter; pci_filter_init(NULL, &filter); filter.vendor = vendor; filter.device = device; - for (temp = pacc->devices; temp; temp = temp->next) - if (pci_filter_match(&filter, temp)) - return temp; - - return NULL; + return pcidev_scandev(&filter); } struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, @@ -75,14 +70,12 @@ filter.vendor = vendor; filter.device = device; - for (temp = pacc->devices; temp; temp = temp->next) - if (pci_filter_match(&filter, temp)) { - if ((card_vendor == - pci_read_word(temp, PCI_SUBSYSTEM_VENDOR_ID)) - && (card_device == - pci_read_word(temp, PCI_SUBSYSTEM_ID))) - return temp; - } + temp = pcidev_scandev(&filter); + if (temp) { + if ((card_vendor == pci_read_word(temp, PCI_SUBSYSTEM_VENDOR_ID)) + && (card_device == pci_read_word(temp, PCI_SUBSYSTEM_ID))) + return temp; + } return NULL; } diff --git a/pcidev.c b/pcidev.c index 9ffe05c..32c6d30 100644 --- a/pcidev.c +++ b/pcidev.c @@ -148,6 +148,15 @@ return (uintptr_t)addr; } +struct pci_dev *pcidev_scandev(struct pci_filter *filter) +{ + struct pci_dev *temp; + for (temp = pacc->devices; temp; temp = temp->next) + if (pci_filter_match(filter, temp)) + return temp; + return NULL; +} + static int pcidev_shutdown(void *data) { if (pacc == NULL) { diff --git a/programmer.h b/programmer.h index ec9503c..d6de7bc 100644 --- a/programmer.h +++ b/programmer.h @@ -116,6 +116,7 @@ #if NEED_PCI == 1 struct pci_dev; +struct pci_filter; /* pcidev.c */ // FIXME: This needs to be local, not global(?) @@ -123,6 +124,7 @@ int pci_init_common(void); uintptr_t pcidev_readbar(struct pci_dev *dev, int bar); struct pci_dev *pcidev_init(const struct dev_entry *devs, int bar); +struct pci_dev *pcidev_scandev(struct pci_filter *filter); /* rpci_write_* are reversible writes. The original PCI config space register * contents will be restored on shutdown. * To clone the pci_dev instances internally, the `pacc` global -- To view, visit https://review.coreboot.org/c/flashrom/+/59275 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id83bfd41f785f907e52a65a6689e8c7016fc1b77 Gerrit-Change-Number: 59275 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: [RFC] tests: test write protection
by Sergii Dmytruk (Code Review) 12 Nov '21

12 Nov '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk. Hello build bot (Jenkins), Nico Huber, Angel Pons, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/59075 to look at the new patch set (#4). Change subject: [RFC] tests: test write protection ...................................................................... [RFC] tests: test write protection Tests both WP implementation and its emulation in dummy programmer. Change-Id: I49af7f6d173eb4c56c22d80b01a473b8c499c0f8 Signed-off-by: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> --- M tests/meson.build M tests/tests.c M tests/tests.h A tests/write_protect.c 4 files changed, 314 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/75/59075/4 -- To view, visit https://review.coreboot.org/c/flashrom/+/59075 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I49af7f6d173eb4c56c22d80b01a473b8c499c0f8 Gerrit-Change-Number: 59075 Gerrit-PatchSet: 4 Gerrit-Owner: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> 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: Maciej Pijanowski <maciej.pijanowski(a)3mdeb.com> Gerrit-CC: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: [RFC] dummyflasher: support emulation of SR2
by Sergii Dmytruk (Code Review) 12 Nov '21

12 Nov '21

Attention is currently required from: Nico Huber, Angel Pons, Sergii Dmytruk. Hello build bot (Jenkins), Nico Huber, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/59072 to look at the new patch set (#4). Change subject: [RFC] dummyflasher: support emulation of SR2 ...................................................................... [RFC] dummyflasher: support emulation of SR2 This is needed for accessing second SRP bit which is involved in write protection. Change-Id: I177ae3f068f03380f5b3941d9996a07205672e59 Signed-off-by: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> --- M dummyflasher.c 1 file changed, 60 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/72/59072/4 -- To view, visit https://review.coreboot.org/c/flashrom/+/59072 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I177ae3f068f03380f5b3941d9996a07205672e59 Gerrit-Change-Number: 59072 Gerrit-PatchSet: 4 Gerrit-Owner: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.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: Maciej Pijanowski <maciej.pijanowski(a)3mdeb.com> Gerrit-CC: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: [RFC] flashchips: enable write-protection for W25Q128.V
by Sergii Dmytruk (Code Review) 12 Nov '21

12 Nov '21

Attention is currently required from: Nico Huber, Angel Pons, Sergii Dmytruk. Hello build bot (Jenkins), Nico Huber, Angel Pons, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/59071 to look at the new patch set (#4). Change subject: [RFC] flashchips: enable write-protection for W25Q128.V ...................................................................... [RFC] flashchips: enable write-protection for W25Q128.V Emulation of this chip will support WP. This and follow up patches are based on unmerged WP patches by Nikolai Artemiev: https://review.coreboot.org/c/flashrom/+/58474/7 Change-Id: Iccb69a8d3a0dd2192e2c938caddaf07b1889ed35 Signed-off-by: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> --- M flashchips.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/71/59071/4 -- To view, visit https://review.coreboot.org/c/flashrom/+/59071 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iccb69a8d3a0dd2192e2c938caddaf07b1889ed35 Gerrit-Change-Number: 59071 Gerrit-PatchSet: 4 Gerrit-Owner: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.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: Maciej Pijanowski <maciej.pijanowski(a)3mdeb.com> Gerrit-CC: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-MessageType: newpatchset

1 0

Change in flashrom[master]: tests: Add tests for verify operation
by Anastasia Klimchuk (Code Review) 12 Nov '21

12 Nov '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/59239 ) Change subject: tests: Add tests for verify operation ...................................................................... tests: Add tests for verify operation This patch adds two tests which run do_verify operation, and adds io_mock for fread. BUG=b:181803212 TEST=ninja test Change-Id: I1cc6f73f9b1e385eb963adccf20759c13a40ed3b Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/chip.c M tests/tests.c M tests/tests.h 3 files changed, 91 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/39/59239/1 diff --git a/tests/chip.c b/tests/chip.c index f5110c0..888b7db 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -19,6 +19,7 @@ #include "chipdrivers.h" #include "flash.h" +#include "io_mock.h" #include "programmer.h" #define MOCK_CHIP_SIZE (8*MiB) @@ -340,3 +341,89 @@ free(param_dup); } + +size_t verify_chip_fread(void *state, void *buf, size_t size, size_t len, FILE *fp) +{ + /* + * Verify operation compares contents of the file vs contents on the chip. + * To emulate successful verification we emulate file contents to be the + * same as what is on the chip. + */ + memset(buf, MOCK_CHIP_CONTENT, len); + return len; +} + +void verify_chip_test_success(void **state) +{ + (void) state; /* unused */ + + const struct io_mock verify_chip_io = { + .fread = verify_chip_fread, + }; + + io_mock_register(&verify_chip_io); + + 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(&flashctx, &layout, &mock_chip, param); + + /* See comment in write_chip_test_success */ + const char *const filename = "-"; + + printf("Verify chip operation started.\n"); + assert_int_equal(0, do_verify(&flashctx, filename)); + printf("Verify chip operation done.\n"); + + teardown(&layout); + + io_mock_register(NULL); +} + +void verify_chip_with_dummyflasher_test_success(void **state) +{ + (void) state; /* unused */ + + const struct io_mock verify_chip_io = { + .fread = verify_chip_fread, + }; + + io_mock_register(&verify_chip_io); + + struct flashrom_flashctx flashctx = { 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(&flashctx, &layout, &mock_chip, param_dup); + + /* See comment in write_chip_test_success */ + const char *const filename = "-"; + + /* + * Dummyflasher controls chip state and fully emulates reads and writes, + * so to set up initial chip state we need to write on chip. Write + * operation takes content from file and writes on chip. File content is + * emulated in verify_chip_fread mock. + */ + + printf("Write chip operation started.\n"); + assert_int_equal(0, do_write(&flashctx, filename, NULL)); + printf("Write chip operation done.\n"); + + printf("Verify chip operation started.\n"); + assert_int_equal(0, do_verify(&flashctx, filename)); + printf("Verify chip operation done.\n"); + + teardown(&layout); + + free(param_dup); + + io_mock_register(NULL); +} diff --git a/tests/tests.c b/tests/tests.c index e3ad241..5262076 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -351,6 +351,8 @@ 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), + cmocka_unit_test(verify_chip_test_success), + cmocka_unit_test(verify_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 732920a..1dab411 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -63,5 +63,7 @@ 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); +void verify_chip_test_success(void **state); +void verify_chip_with_dummyflasher_test_success(void **state); #endif /* TESTS_H */ -- To view, visit https://review.coreboot.org/c/flashrom/+/59239 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1cc6f73f9b1e385eb963adccf20759c13a40ed3b Gerrit-Change-Number: 59239 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 November 2021