September 2022 - flashrom-gerrit

[M] Change in flashrom[master]: flashrom.c:Add function to get a flattened view of the chip erase blocks
by Paul Menzel (Code Review) 09 Sep '22

09 Sep '22

Attention is currently required from: Simon Buhrow, Nico Huber, Aarya. Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/65879 ) Change subject: flashrom.c:Add function to get a flattened view of the chip erase blocks ...................................................................... Patch Set 29: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/65879/comment/e0a12ea4_a582dc97 PS29, Line 7: flashrom.c:Add Please add a space after the colon. (Also in other commits in the series.) -- To view, visit https://review.coreboot.org/c/flashrom/+/65879 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iafe78de00daa55f7114bd4ce09465dd88074ece4 Gerrit-Change-Number: 65879 Gerrit-PatchSet: 29 Gerrit-Owner: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Reviewer: Simon Buhrow Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Simon Buhrow Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Comment-Date: Fri, 09 Sep 2022 11:58:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: flashrom.c: Make programmer_{un}map_flash_region() static
by Thomas Heijligen (Code Review) 09 Sep '22

09 Sep '22

Attention is currently required from: Edward O'Callaghan. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/66677 ) Change subject: flashrom.c: Make programmer_{un}map_flash_region() static ...................................................................... Patch Set 6: Code-Review+1 (1 comment) Patchset: PS6: We can go on from this and remove fallback_(un)map because this it is an empty function -- To view, visit https://review.coreboot.org/c/flashrom/+/66677 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic02092ce23c5b3233aad38343b888e3fa7e5bcf9 Gerrit-Change-Number: 66677 Gerrit-PatchSet: 6 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: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Fri, 09 Sep 2022 10:57:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: drivers/: Make 'internal_delay' the default unless defined
by Thomas Heijligen (Code Review) 09 Sep '22

09 Sep '22

Attention is currently required from: Edward O'Callaghan, Nikolai Artemiev. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67391 ) Change subject: drivers/: Make 'internal_delay' the default unless defined ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/67391 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I17460bc2c0aebcbb48c8dfa052b260991525cc49 Gerrit-Change-Number: 67391 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Fri, 09 Sep 2022 10:53:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: drivers/: Make 'fallback_{un}map' the default unless defined
by Thomas Heijligen (Code Review) 09 Sep '22

09 Sep '22

Attention is currently required from: Edward O'Callaghan, Nikolai Artemiev. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67404 ) Change subject: drivers/: Make 'fallback_{un}map' the default unless defined ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/67404 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5ea7bd68f7ae2cd4af9902ef07255ab6ce0bfdb3 Gerrit-Change-Number: 67404 Gerrit-PatchSet: 2 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Fri, 09 Sep 2022 10:53:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: tests: Add workaround to allow tests mock fileno on FreeBSD
by Thomas Heijligen (Code Review) 09 Sep '22

09 Sep '22

Attention is currently required from: Edward O'Callaghan, Anastasia Klimchuk, Peter Marheine. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67312 ) Change subject: tests: Add workaround to allow tests mock fileno on FreeBSD ...................................................................... Patch Set 6: Code-Review+2 (1 comment) File tests/chip.c: https://review.coreboot.org/c/flashrom/+/67312/comment/162be264_f949a20d PS2, Line 161: __isthreaded = 0; > I did 2) in the latest patchset. […] Ok. I'm sure there will appear a new problem that require the same libc fix and it will remind you :) -- To view, visit https://review.coreboot.org/c/flashrom/+/67312 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3789ea9107a4cf8033cf59bb96d3c82aa58de026 Gerrit-Change-Number: 67312 Gerrit-PatchSet: 6 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> 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-CC: Idwer Vollering <vidwer(a)gmail.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Fri, 09 Sep 2022 10:25:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Comment-In-Reply-To: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: tests: Add workaround to allow tests mock fileno on FreeBSD
by Anastasia Klimchuk (Code Review) 09 Sep '22

09 Sep '22

Attention is currently required from: Thomas Heijligen, Edward O'Callaghan, Peter Marheine. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67312 ) Change subject: tests: Add workaround to allow tests mock fileno on FreeBSD ...................................................................... Patch Set 6: (1 comment) File tests/chip.c: https://review.coreboot.org/c/flashrom/+/67312/comment/9b6793f4_15f64d56 PS2, Line 161: __isthreaded = 0; > 2) that is correct. […] I did 2) in the latest patchset. About 3) , Thomas is it okay to leave it for future, what do you think? -- To view, visit https://review.coreboot.org/c/flashrom/+/67312 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3789ea9107a4cf8033cf59bb96d3c82aa58de026 Gerrit-Change-Number: 67312 Gerrit-PatchSet: 6 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> 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-CC: Idwer Vollering <vidwer(a)gmail.com> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Fri, 09 Sep 2022 10:14:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Comment-In-Reply-To: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: spi.c: Add erasefn and opcodes for AT45 and S25F to lookup list
by Thomas Heijligen (Code Review) 09 Sep '22

09 Sep '22

Attention is currently required from: Simon Buhrow, Aarya. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/67354 ) Change subject: spi.c: Add erasefn and opcodes for AT45 and S25F to lookup list ...................................................................... Patch Set 8: (6 comments) Patchset: PS8: Can you reorder the commits that this patch comes after the other spi.c patch File spi.c: https://review.coreboot.org/c/flashrom/+/67354/comment/0f45e269_9b692de9 PS8, Line 31: uint8_t opcode[MAX_OPCODE]; Please add a comment how the array is working https://review.coreboot.org/c/flashrom/+/67354/comment/3ce6fd07_f6694ea7 PS8, Line 31: [MAX_OPCODE This can be an inline number or defined locally. https://review.coreboot.org/c/flashrom/+/67354/comment/57eb8d7b_15d7d210 PS8, Line 49: 0x00} Just use `0` to make clear it's a terminator https://review.coreboot.org/c/flashrom/+/67354/comment/5d8cc249_f1af46f3 PS8, Line 70: ) Would be good to have the length of the list (`opcode_count`) as parameter. Then the caller does not need to care about the number of opcodes in the list. https://review.coreboot.org/c/flashrom/+/67354/comment/026b366e_1a353ead PS8, Line 85: Please add documentation about the function that everyone who want's to use or work with it understands what it will return and how to use the result. Have a look at the function doc in include/libflashrom.h -- To view, visit https://review.coreboot.org/c/flashrom/+/67354 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ief25932120f940dea0ffe161a79219deecb2e8ab Gerrit-Change-Number: 67354 Gerrit-PatchSet: 8 Gerrit-Owner: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Simon Buhrow Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Simon Buhrow Gerrit-Attention: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Comment-Date: Fri, 09 Sep 2022 10:07:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: tests: Add workaround to allow tests mock fileno on FreeBSD
by Anastasia Klimchuk (Code Review) 09 Sep '22

09 Sep '22

Attention is currently required from: Thomas Heijligen, Anastasia Klimchuk. Hello Felix Singer, build bot (Jenkins), Thomas Heijligen, Peter Marheine, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/67312 to look at the new patch set (#5). Change subject: tests: Add workaround to allow tests mock fileno on FreeBSD ...................................................................... tests: Add workaround to allow tests mock fileno on FreeBSD fileno can be a function and a macro in FreeBSD, depending on whether the environment in multi-threaded or single-threaded. For single thread, macro is used. Macro is expanded into a inline code which accesses private field of file descriptor. This is impossible to mock in tests. Pretending that environment is multi-threaded makes fileno function to be called instead of a macro. Function can be mocked for tests. BUG=b:237606255 TEST=ninja test tests pass on two environments: 1) FreeBSD 13.1-RELEASE-p2 GENERIC amd64 2) Debian 5.17.11 x86_64 GNU/Linux Change-Id: I3789ea9107a4cf8033cf59bb96d3c82aa58de026 TICKET: https://ticket.coreboot.org/issues/411 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/tests.c 1 file changed, 37 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/12/67312/5 -- To view, visit https://review.coreboot.org/c/flashrom/+/67312 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3789ea9107a4cf8033cf59bb96d3c82aa58de026 Gerrit-Change-Number: 67312 Gerrit-PatchSet: 5 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> 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-CC: Idwer Vollering <vidwer(a)gmail.com> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in flashrom[master]: TEST_ERASE_ALGO: A list of test cases (patch not to be merged)
by Thomas Heijligen (Code Review) 09 Sep '22

09 Sep '22

Attention is currently required from: Simon Buhrow, Aarya. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/66718 ) Change subject: TEST_ERASE_ALGO: A list of test cases (patch not to be merged) ...................................................................... Patch Set 44: (2 comments) File Makefile: https://review.coreboot.org/c/flashrom/+/66718/comment/08cc0a45_90e26fc7 PS44, Line 33: -g This is not part of the patch. Please remove it. File TEST_ERASE_ALGO.md: https://review.coreboot.org/c/flashrom/+/66718/comment/e3640974_91af6617 PS44, Line 3: </br> please remove those -- To view, visit https://review.coreboot.org/c/flashrom/+/66718 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5e961752b9d24d28fdd3487a1a121391f149928b Gerrit-Change-Number: 66718 Gerrit-PatchSet: 44 Gerrit-Owner: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Reviewer: Simon Buhrow Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Simon Buhrow Gerrit-Attention: Aarya <aarya.chaumal(a)gmail.com> Gerrit-Comment-Date: Fri, 09 Sep 2022 09:56:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: tree/: Move {un}map_flash_region out of programmer state machine
by Edward O'Callaghan (Code Review) 09 Sep '22

09 Sep '22

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67478 ) Change subject: tree/: Move {un}map_flash_region out of programmer state machine ...................................................................... tree/: Move {un}map_flash_region out of programmer state machine Change-Id: I9f011736681481c464946386b196c9ec2e9d7e29 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M atapromise.c M atavia.c M dummyflasher.c M flashrom.c M include/programmer.h M internal.c M serprog.c 7 files changed, 79 insertions(+), 33 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/78/67478/1 diff --git a/atapromise.c b/atapromise.c index ffa4698..acd98d5 100644 --- a/atapromise.c +++ b/atapromise.c @@ -127,6 +127,7 @@ .chip_writel = fallback_chip_writel, .chip_writen = fallback_chip_writen, .shutdown = atapromise_shutdown, + .map_flash_region = atapromise_map, }; static int atapromise_init(const struct programmer_cfg *cfg) @@ -190,5 +191,4 @@ .type = PCI, .devs.dev = ata_promise, .init = atapromise_init, - .map_flash_region = atapromise_map, }; diff --git a/atavia.c b/atavia.c index a0a0547..6e25e2c 100644 --- a/atavia.c +++ b/atavia.c @@ -141,6 +141,7 @@ .chip_writew = fallback_chip_writew, .chip_writel = fallback_chip_writel, .chip_writen = fallback_chip_writen, + .map_flash_region = atavia_map, }; static int atavia_init(const struct programmer_cfg *cfg) @@ -189,5 +190,4 @@ .type = PCI, .devs.dev = ata_via, .init = atavia_init, - .map_flash_region = atavia_map, }; diff --git a/dummyflasher.c b/dummyflasher.c index 40f22d9..16ce986 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -929,6 +929,8 @@ .write_256 = dummy_spi_write_256, .write_aai = default_spi_write_aai, .probe_opcode = dummy_spi_probe_opcode, + .map_flash_region = dummy_map, + .unmap_flash_region = dummy_unmap, }; static const struct par_master par_master_dummyflasher = { @@ -940,6 +942,8 @@ .chip_writew = dummy_chip_writew, .chip_writel = dummy_chip_writel, .chip_writen = dummy_chip_writen, + .map_flash_region = dummy_map, + .unmap_flash_region = dummy_unmap, }; static const struct opaque_master opaque_master_dummyflasher = { @@ -947,6 +951,8 @@ .read = dummy_opaque_read, .write = dummy_opaque_write, .erase = dummy_opaque_erase, + .map_flash_region = dummy_map, + .unmap_flash_region = dummy_unmap, }; static int init_data(const struct programmer_cfg *cfg, @@ -1424,6 +1430,4 @@ /* FIXME */ .devs.note = "Dummy device, does nothing and logs all accesses\n", .init = dummy_init, - .map_flash_region = dummy_map, - .unmap_flash_region = dummy_unmap, }; diff --git a/flashrom.c b/flashrom.c index 8d08341..605d0ae 100644 --- a/flashrom.c +++ b/flashrom.c @@ -197,10 +197,17 @@ static void *programmer_map_flash_region(const struct flashctx *flash, const char *descr, uintptr_t phys_addr, size_t len) { - void *ret; - if (programmer->map_flash_region) - ret = programmer->map_flash_region(descr, phys_addr, len); - else + void *ret = NULL; + if (flash->mst->buses_supported & BUS_SPI) { + if (flash->mst->spi.map_flash_region) + ret = flash->mst->spi.map_flash_region(descr, phys_addr, len); + } else if (flash->mst->buses_supported & BUS_PROG) { + if (flash->mst->par.map_flash_region) + ret = flash->mst->opaque.map_flash_region(descr, phys_addr, len); + } else if (flash->mst->buses_supported & BUS_PARALLEL) { + if (flash->mst->par.map_flash_region) + ret = flash->mst->par.map_flash_region(descr, phys_addr, len); + } else ret = fallback_map(descr, phys_addr, len); msg_gspew("%s: mapping %s from 0x%0*" PRIxPTR " to 0x%0*" PRIxPTR "\n", __func__, descr, PRIxPTR_WIDTH, phys_addr, PRIxPTR_WIDTH, (uintptr_t) ret); @@ -209,13 +216,35 @@ static void programmer_unmap_flash_region(const struct flashctx *flash, void *virt_addr, size_t len) { - if (programmer->unmap_flash_region) - programmer->unmap_flash_region(virt_addr, len); - else + if (flash->mst->buses_supported & BUS_SPI) { + if (flash->mst->spi.unmap_flash_region) + flash->mst->spi.unmap_flash_region(virt_addr, len); + } else if (flash->mst->buses_supported & BUS_PROG) { + if (flash->mst->par.unmap_flash_region) + flash->mst->opaque.unmap_flash_region(virt_addr, len); + } else if (flash->mst->buses_supported & BUS_PARALLEL) { + if (flash->mst->par.unmap_flash_region) + flash->mst->par.unmap_flash_region(virt_addr, len); + } else fallback_unmap(virt_addr, len); msg_gspew("%s: unmapped 0x%0*" PRIxPTR "\n", __func__, PRIxPTR_WIDTH, (uintptr_t)virt_addr); } +static bool is_physmap(const struct flashctx *flash) +{ + if (flash->mst->buses_supported & BUS_SPI) { + if (flash->mst->spi.map_flash_region) + return flash->mst->spi.map_flash_region == physmap; + } else if (flash->mst->buses_supported & BUS_PROG) { + if (flash->mst->par.map_flash_region) + return flash->mst->opaque.map_flash_region == physmap; + } else if (flash->mst->buses_supported & BUS_PARALLEL) { + if (flash->mst->par.map_flash_region) + return flash->mst->par.map_flash_region == physmap; + } + return false; +} + void programmer_delay(const struct flashctx *flash, unsigned int usecs) { if (usecs > 0) { @@ -828,7 +857,7 @@ flash->chip->vendor, flash->chip->name, flash->chip->total_size, tmp); free(tmp); #if CONFIG_INTERNAL == 1 - if (programmer->map_flash_region == physmap) + if (is_physmap(flash)) msg_cinfo("mapped at physical address 0x%0*" PRIxPTR ".\n", PRIxPTR_WIDTH, flash->physical_memory); else diff --git a/include/programmer.h b/include/programmer.h index cfd8d08..2971f79 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -49,9 +49,6 @@ } devs; int (*init) (const struct programmer_cfg *cfg); - - void *(*map_flash_region) (const char *descr, uintptr_t phys_addr, size_t len); - void (*unmap_flash_region) (void *virt_addr, size_t len); }; extern const struct programmer_entry *const programmer_table[]; @@ -313,6 +310,8 @@ int (*shutdown)(void *data); bool (*probe_opcode)(struct flashctx *flash, uint8_t opcode); void (*delay) (unsigned int usecs); + void *(*map_flash_region) (const char *descr, uintptr_t phys_addr, size_t len); + void (*unmap_flash_region) (void *virt_addr, size_t len); void *data; }; @@ -413,6 +412,8 @@ enum flashrom_wp_result (*wp_write_cfg)(struct flashctx *, const struct flashrom_wp_cfg *); enum flashrom_wp_result (*wp_read_cfg)(struct flashrom_wp_cfg *, struct flashctx *); enum flashrom_wp_result (*wp_get_ranges)(struct flashrom_wp_ranges **, struct flashctx *); + void *(*map_flash_region) (const char *descr, uintptr_t phys_addr, size_t len); + void (*unmap_flash_region) (void *virt_addr, size_t len); int (*shutdown)(void *data); void *data; }; @@ -430,6 +431,8 @@ void (*chip_readn) (const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len); int (*shutdown)(void *data); void (*delay) (unsigned int usecs); + void *(*map_flash_region) (const char *descr, uintptr_t phys_addr, size_t len); + void (*unmap_flash_region) (void *virt_addr, size_t len); void *data; }; int register_par_master(const struct par_master *mst, const enum chipbustype buses, void *data); diff --git a/internal.c b/internal.c index a20c539..cf719a4 100644 --- a/internal.c +++ b/internal.c @@ -115,6 +115,8 @@ .chip_writew = internal_chip_writew, .chip_writel = internal_chip_writel, .chip_writen = fallback_chip_writen, + .map_flash_region = physmap, + .unmap_flash_region = physunmap, }; static int get_params(const struct programmer_cfg *cfg, @@ -347,6 +349,4 @@ .type = OTHER, .devs.note = NULL, .init = internal_init, - .map_flash_region = physmap, - .unmap_flash_region = physunmap, }; diff --git a/serprog.c b/serprog.c index ee4a010..441b8a0 100644 --- a/serprog.c +++ b/serprog.c @@ -573,6 +573,21 @@ sp_prev_was_write = 0; } +static void *serprog_map(const char *descr, uintptr_t phys_addr, size_t len) +{ + /* Serprog transmits 24 bits only and assumes the underlying implementation handles any remaining bits + * correctly (usually setting them to one either in software (for FWH/LPC) or relying on the fact that + * the hardware observes a subset of the address bits only). Combined with the standard mapping of + * flashrom this creates a 16 MB-wide window just below the 4 GB boundary where serprog can operate (as + * needed for non-SPI chips). Below we make sure that the requested range is within this window. */ + if ((phys_addr & 0xFF000000) == 0xFF000000) { + return (void*)phys_addr; + } + msg_pwarn(MSGHEADER "requested mapping %s is incompatible: 0x%zx bytes at 0x%0*" PRIxPTR ".\n", + descr, len, PRIxPTR_WIDTH, phys_addr); + return NULL; +} + static const struct par_master par_master_serprog = { .chip_readb = serprog_chip_readb, .chip_readw = fallback_chip_readw, @@ -583,6 +598,7 @@ .chip_writel = fallback_chip_writel, .chip_writen = fallback_chip_writen, .delay = serprog_delay, + .map_flash_region = serprog_map, }; static enum chipbustype serprog_buses_supported = BUS_NONE; @@ -946,26 +962,10 @@ return 1; } -static void *serprog_map(const char *descr, uintptr_t phys_addr, size_t len) -{ - /* Serprog transmits 24 bits only and assumes the underlying implementation handles any remaining bits - * correctly (usually setting them to one either in software (for FWH/LPC) or relying on the fact that - * the hardware observes a subset of the address bits only). Combined with the standard mapping of - * flashrom this creates a 16 MB-wide window just below the 4 GB boundary where serprog can operate (as - * needed for non-SPI chips). Below we make sure that the requested range is within this window. */ - if ((phys_addr & 0xFF000000) == 0xFF000000) { - return (void*)phys_addr; - } - msg_pwarn(MSGHEADER "requested mapping %s is incompatible: 0x%zx bytes at 0x%0*" PRIxPTR ".\n", - descr, len, PRIxPTR_WIDTH, phys_addr); - return NULL; -} - const struct programmer_entry programmer_serprog = { .name = "serprog", .type = OTHER, /* FIXME */ .devs.note = "All programmer devices speaking the serprog protocol\n", .init = serprog_init, - .map_flash_region = serprog_map, }; -- To view, visit https://review.coreboot.org/c/flashrom/+/67478 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9f011736681481c464946386b196c9ec2e9d7e29 Gerrit-Change-Number: 67478 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit September 2022