October 2022 - flashrom-gerrit

[XL] Change in flashrom[master]: tree/: Convert flashchip erase_block func ptr to enumerate
by Edward O'Callaghan (Code Review) Oct. 31, 2022

Oct. 31, 2022

Attention is currently required from: Felix Singer, Edward O'Callaghan. Hello Felix Singer, build bot (Jenkins), Anastasia Klimchuk, Nikolai Artemiev, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/67240 to look at the new patch set (#10). Change subject: tree/: Convert flashchip erase_block func ptr to enumerate ...................................................................... tree/: Convert flashchip erase_block func ptr to enumerate This forges the way for flashchips.c to be pure declarative data and lookup functions for dispatch to be pure. This means that the flashchips data could be extracted out to be agnostic data of the flashrom code and algorithms. Change-Id: I58415a4f2589812b26d284c96876e88f8d9acf52 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M at45db.c M atapromise.c M flashchips.c M flashrom.c M include/chipdrivers.h M include/flash.h M sfdp.c M spi25.c M tests/chip.c M tests/chip_wp.c 10 files changed, 2,103 insertions(+), 1,982 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/40/67240/10 -- To view, visit https://review.coreboot.org/c/flashrom/+/67240 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I58415a4f2589812b26d284c96876e88f8d9acf52 Gerrit-Change-Number: 67240 Gerrit-PatchSet: 10 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: writeprotect: Add some debug logging if wp_verify fails
by Anastasia Klimchuk (Code Review) Oct. 31, 2022

Oct. 31, 2022

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/67720 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: writeprotect: Add some debug logging if wp_verify fails ...................................................................... writeprotect: Add some debug logging if wp_verify fails Change-Id: I5fcaf767570418f90ae44826a1135d9b49653033 Signed-off-by: Evan Benn <evanbenn(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/67720 Reviewed-by: Nikolai Artemiev <nartemiev(a)google.com> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> Reviewed-by: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M writeprotect.c 1 file changed, 23 insertions(+), 3 deletions(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved Nikolai Artemiev: Looks good to me, but someone else must approve Sergii Dmytruk: Looks good to me, but someone else must approve diff --git a/writeprotect.c b/writeprotect.c index dcffe03..f72c362 100644 --- a/writeprotect.c +++ b/writeprotect.c @@ -155,6 +155,7 @@ return FLASHROM_WP_ERR_WRITE_FAILED; } + enum flashrom_wp_result ret = FLASHROM_WP_OK; /* Verify each register */ for (enum flash_reg reg = STATUS1; reg < MAX_REGISTERS; reg++) { if (!write_masks[reg]) @@ -164,14 +165,18 @@ if (wp_read_register(flash, reg, &value)) return FLASHROM_WP_ERR_READ_FAILED; + msg_cdbg2("%s: wp_verify reg:%u value:0x%x\n", __func__, reg, value); uint8_t actual = value & write_masks[reg]; uint8_t expected = reg_values[reg] & write_masks[reg]; - if (actual != expected) - return FLASHROM_WP_ERR_VERIFY_FAILED; + if (actual != expected) { + msg_cdbg("%s: wp_verify failed: reg:%u actual:0x%x expected:0x%x\n", + __func__, reg, actual, expected); + ret = FLASHROM_WP_ERR_VERIFY_FAILED; + } } - return FLASHROM_WP_OK; + return ret; } static decode_range_func_t *lookup_decode_range_func_ptr(const struct flashchip *chip) -- To view, visit https://review.coreboot.org/c/flashrom/+/67720 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5fcaf767570418f90ae44826a1135d9b49653033 Gerrit-Change-Number: 67720 Gerrit-PatchSet: 4 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[M] Change in flashrom[master]: flashrom_tester: Use Path type for test data
by Edward O'Callaghan (Code Review) Oct. 31, 2022

Oct. 31, 2022

Attention is currently required from: Angel Pons, Anastasia Klimchuk, Evan Benn. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68643 ) Change subject: flashrom_tester: Use Path type for test data ...................................................................... Patch Set 3: (3 comments) Commit Message: https://review.coreboot.org/c/flashrom/+/68643/comment/c07fafc8_30e0e9ab PS3, Line 9: Update many str types to Path. this commit does more than just re-type data, it refactors too. refactor then re-type. File util/flashrom_tester/src/tester.rs: https://review.coreboot.org/c/flashrom/+/68643/comment/0dcc3081_a5b4f2be PS3, Line 86: layout_file: create_layout_file(rom_sz, Path::new("/tmp/"), print_layout), adding to the TestEnv state is its own commit. File util/flashrom_tester/src/tests.rs: https://review.coreboot.org/c/flashrom/+/68643/comment/67137df0_36cccede PS3, Line 94: info!("Calculate ROM partition sizes & Create the layout file."); : let rom_sz: i64 = cmd.get_size()?; : let layout_sizes = utils::get_layout_sizes(rom_sz)?; : { : let mut f = File::create(LAYOUT_FILE)?; : let mut buf: Vec<u8> = vec![]; : utils::construct_layout_file(&mut buf, &layout_sizes)?; : : f.write_all(&buf)?; : if print_layout { : info!( : "Dumping layout file as requested:\n{}", : String::from_utf8_lossy(&buf) : ); : } : } moving this should be it's own commit. -- To view, visit https://review.coreboot.org/c/flashrom/+/68643 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4a0b25c8c70fa6dfd682fba3db7d3bf06b2eb7ac Gerrit-Change-Number: 68643 Gerrit-PatchSet: 3 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Evan Benn <evanbenn(a)google.com> Gerrit-Comment-Date: Mon, 31 Oct 2022 22:15:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: cli_classic.c: Factor out rom bus limits exceeded validation
by Felix Singer (Code Review) Oct. 31, 2022

Oct. 31, 2022

Attention is currently required from: Edward O'Callaghan, Angel Pons. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68661 ) Change subject: cli_classic.c: Factor out rom bus limits exceeded validation ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/68661 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iba1c3c8ab2edc094ede59156ae5e846900fc0777 Gerrit-Change-Number: 68661 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Mon, 31 Oct 2022 20:17:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: cli_classic.c: Make count_max_decode_exceedings() pure
by Felix Singer (Code Review) Oct. 31, 2022

Oct. 31, 2022

Attention is currently required from: Edward O'Callaghan, Angel Pons. Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68479 ) Change subject: cli_classic.c: Make count_max_decode_exceedings() pure ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/68479 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia01f77993deab68e251850008e885828e55b9462 Gerrit-Change-Number: 68479 Gerrit-PatchSet: 4 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Mon, 31 Oct 2022 20:17:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: chipset_enable.c: Mark Intel C246 as DEP
by Felix Singer (Code Review) Oct. 31, 2022

Oct. 31, 2022

Felix Singer has submitted this change. ( https://review.coreboot.org/c/flashrom/+/68594 ) Change subject: chipset_enable.c: Mark Intel C246 as DEP ...................................................................... chipset_enable.c: Mark Intel C246 as DEP Tested reading, writing and erasing the flash chip of a Prodrive Hermes mainboard with an Intel C246 PCH. However, since ME-enabled chipsets are marked as DEP instead of OK, this one shall also be. Change-Id: I07d6c4a60e468c61eba836db91e1335f4a762048 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/68594 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Felix Singer <felixsinger(a)posteo.net> --- M chipset_enable.c 1 file changed, 18 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved diff --git a/chipset_enable.c b/chipset_enable.c index d6103c1..60b82df 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -2145,7 +2145,7 @@ {0x8086, 0xa305, B_S, DEP, "Intel", "Z390", enable_flash_pch300}, {0x8086, 0xa306, B_S, NT, "Intel", "Q370", enable_flash_pch300}, {0x8086, 0xa308, B_S, NT, "Intel", "B360", enable_flash_pch300}, - {0x8086, 0xa309, B_S, NT, "Intel", "C246", enable_flash_pch300}, + {0x8086, 0xa309, B_S, DEP, "Intel", "C246", enable_flash_pch300}, {0x8086, 0xa30a, B_S, NT, "Intel", "C242", enable_flash_pch300}, {0x8086, 0xa30c, B_S, NT, "Intel", "QM370", enable_flash_pch300}, {0x8086, 0xa30d, B_S, NT, "Intel", "HM370", enable_flash_pch300}, -- To view, visit https://review.coreboot.org/c/flashrom/+/68594 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I07d6c4a60e468c61eba836db91e1335f4a762048 Gerrit-Change-Number: 68594 Gerrit-PatchSet: 2 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[M] Change in flashrom[master]: util: add bash completion script
by Anastasia Klimchuk (Code Review) Oct. 31, 2022

Oct. 31, 2022

Attention is currently required from: Felix Singer, Thomas Heijligen, Alexander Goncharov. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/68247 ) Change subject: util: add bash completion script ...................................................................... Patch Set 7: (1 comment) Patchset: PS7: > The patch is merge-ready :) I just looked, there are unresolved comments. Especially one of them on the topic of "getting the path from a pkgconfig variable" , it does look like waiting for reply and/or action? am I right or not? The second one about vertical list is less important. -- To view, visit https://review.coreboot.org/c/flashrom/+/68247 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie68bc91c3cea4de2ffdbeffd07e48edd8d5590e1 Gerrit-Change-Number: 68247 Gerrit-PatchSet: 7 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Comment-Date: Mon, 31 Oct 2022 05:33:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: nicintel_eeprom.c: Fix typo
by Anastasia Klimchuk (Code Review) Oct. 31, 2022

Oct. 31, 2022

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/68582 ) Change subject: nicintel_eeprom.c: Fix typo ...................................................................... nicintel_eeprom.c: Fix typo `done_i20_write` is meant to be `done_i210_write`. Fix that. Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: Idc0a0c475e891fc8538a7a81093520e01e1b25bf Reviewed-on: https://review.coreboot.org/c/flashrom/+/68582 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Alexander Goncharov <chat(a)joursoir.net> --- M nicintel_eeprom.c 1 file changed, 20 insertions(+), 4 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Alexander Goncharov: Looks good to me, but someone else must approve diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index d93f8e0..ff2c3ce 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -81,7 +81,7 @@ uint32_t eec; /* Intel I210 variable(s) */ - bool done_i20_write; + bool done_i210_write; }; /* @@ -225,7 +225,7 @@ unsigned int addr, unsigned int len) { struct nicintel_eeprom_data *opaque_data = flash->mst->opaque.data; - opaque_data->done_i20_write = true; + opaque_data->done_i210_write = true; if (addr & 1) { uint16_t data; @@ -414,7 +414,7 @@ struct nicintel_eeprom_data *data = opaque_data; int ret = 0; - if (!data->done_i20_write) + if (!data->done_i210_write) goto out; uint32_t flup = pci_mmio_readl(data->nicintel_eebar + EEC); @@ -528,7 +528,7 @@ data->nicintel_pci = dev; data->nicintel_eebar = eebar; data->eec = eec; - data->done_i20_write = false; + data->done_i210_write = false; return register_opaque_master(mst, data); } -- To view, visit https://review.coreboot.org/c/flashrom/+/68582 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Idc0a0c475e891fc8538a7a81093520e01e1b25bf Gerrit-Change-Number: 68582 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: MAINTAINERS: Add Felix Singer for test_build.sh
by Anastasia Klimchuk (Code Review) Oct. 31, 2022

Oct. 31, 2022

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/67269 ) Change subject: MAINTAINERS: Add Felix Singer for test_build.sh ...................................................................... MAINTAINERS: Add Felix Singer for test_build.sh Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I36267e6c080b14e90e820d3e26abaefe642f9c65 Reviewed-on: https://review.coreboot.org/c/flashrom/+/67269 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M MAINTAINERS 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved diff --git a/MAINTAINERS b/MAINTAINERS index d72c170..0f9e91a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -142,6 +142,11 @@ # UTILS ################################################################################ +TEST BUILD SCRIPT +M: Felix Singer <felixsinger(a)posteo.net> +S: Supported +F: test_build.sh + FLASHROM TESTER M: Evan Benn <evanbenn(a)chromium.org> S: Supported -- To view, visit https://review.coreboot.org/c/flashrom/+/67269 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I36267e6c080b14e90e820d3e26abaefe642f9c65 Gerrit-Change-Number: 67269 Gerrit-PatchSet: 4 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[M] Change in flashrom[master]: flashrom.c: Move count_max_decode_exceeding() to cli
by Anastasia Klimchuk (Code Review) Oct. 31, 2022

Oct. 31, 2022

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/68438 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: flashrom.c: Move count_max_decode_exceeding() to cli ...................................................................... flashrom.c: Move count_max_decode_exceeding() to cli The count_max_decode_exceeding() function is only ever called within the cli_classic logic so move it there and make it static. This further cleans up the flashrom.c symbol namespace. Change-Id: If050eab7db8560676c03d5005a2b391313a0d642 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/68438 Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M cli_classic.c M flashrom.c M include/programmer.h 3 files changed, 60 insertions(+), 44 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved diff --git a/cli_classic.c b/cli_classic.c index d258cb4..b66094c 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -516,6 +516,49 @@ return ret; } +/* Returns the number of buses commonly supported by the current programmer and flash chip where the latter + * can not be completely accessed due to size/address limits of the programmer. */ +static unsigned int count_max_decode_exceedings(const struct flashctx *flash) +{ + unsigned int limitexceeded = 0; + uint32_t size = flash->chip->total_size * 1024; + enum chipbustype buses = flash->mst->buses_supported & flash->chip->bustype; + + if ((buses & BUS_PARALLEL) && (max_rom_decode.parallel < size)) { + limitexceeded++; + msg_pdbg("Chip size %u kB is bigger than supported " + "size %u kB of chipset/board/programmer " + "for %s interface, " + "probe/read/erase/write may fail. ", size / 1024, + max_rom_decode.parallel / 1024, "Parallel"); + } + if ((buses & BUS_LPC) && (max_rom_decode.lpc < size)) { + limitexceeded++; + msg_pdbg("Chip size %u kB is bigger than supported " + "size %u kB of chipset/board/programmer " + "for %s interface, " + "probe/read/erase/write may fail. ", size / 1024, + max_rom_decode.lpc / 1024, "LPC"); + } + if ((buses & BUS_FWH) && (max_rom_decode.fwh < size)) { + limitexceeded++; + msg_pdbg("Chip size %u kB is bigger than supported " + "size %u kB of chipset/board/programmer " + "for %s interface, " + "probe/read/erase/write may fail. ", size / 1024, + max_rom_decode.fwh / 1024, "FWH"); + } + if ((buses & BUS_SPI) && (max_rom_decode.spi < size)) { + limitexceeded++; + msg_pdbg("Chip size %u kB is bigger than supported " + "size %u kB of chipset/board/programmer " + "for %s interface, " + "probe/read/erase/write may fail. ", size / 1024, + max_rom_decode.spi / 1024, "SPI"); + } + return limitexceeded; +} + int main(int argc, char *argv[]) { const struct flashchip *chip = NULL; diff --git a/flashrom.c b/flashrom.c index 624c463..0f982c9 100644 --- a/flashrom.c +++ b/flashrom.c @@ -630,49 +630,6 @@ return first_len; } -/* Returns the number of buses commonly supported by the current programmer and flash chip where the latter - * can not be completely accessed due to size/address limits of the programmer. */ -unsigned int count_max_decode_exceedings(const struct flashctx *flash) -{ - unsigned int limitexceeded = 0; - uint32_t size = flash->chip->total_size * 1024; - enum chipbustype buses = flash->mst->buses_supported & flash->chip->bustype; - - if ((buses & BUS_PARALLEL) && (max_rom_decode.parallel < size)) { - limitexceeded++; - msg_pdbg("Chip size %u kB is bigger than supported " - "size %u kB of chipset/board/programmer " - "for %s interface, " - "probe/read/erase/write may fail. ", size / 1024, - max_rom_decode.parallel / 1024, "Parallel"); - } - if ((buses & BUS_LPC) && (max_rom_decode.lpc < size)) { - limitexceeded++; - msg_pdbg("Chip size %u kB is bigger than supported " - "size %u kB of chipset/board/programmer " - "for %s interface, " - "probe/read/erase/write may fail. ", size / 1024, - max_rom_decode.lpc / 1024, "LPC"); - } - if ((buses & BUS_FWH) && (max_rom_decode.fwh < size)) { - limitexceeded++; - msg_pdbg("Chip size %u kB is bigger than supported " - "size %u kB of chipset/board/programmer " - "for %s interface, " - "probe/read/erase/write may fail. ", size / 1024, - max_rom_decode.fwh / 1024, "FWH"); - } - if ((buses & BUS_SPI) && (max_rom_decode.spi < size)) { - limitexceeded++; - msg_pdbg("Chip size %u kB is bigger than supported " - "size %u kB of chipset/board/programmer " - "for %s interface, " - "probe/read/erase/write may fail. ", size / 1024, - max_rom_decode.spi / 1024, "SPI"); - } - return limitexceeded; -} - void unmap_flash(struct flashctx *flash) { if (flash->virtual_registers != (chipaddr)ERROR_PTR) { diff --git a/include/programmer.h b/include/programmer.h index 9603443..386e6ec 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -286,7 +286,6 @@ extern struct decode_sizes max_rom_decode; extern bool programmer_may_write; extern unsigned long flashbase; -unsigned int count_max_decode_exceedings(const struct flashctx *flash); char *extract_programmer_param_str(const struct programmer_cfg *cfg, const char *param_name); /* spi.c */ -- To view, visit https://review.coreboot.org/c/flashrom/+/68438 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If050eab7db8560676c03d5005a2b391313a0d642 Gerrit-Change-Number: 68438 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0