Bring dasharo+heads MSI boards from downstream Dasharo/heads to upstream #1753

tlaurion · 2024-08-09T13:28:42Z

files: boards + coreboot + linux, borrowed directly from Dasharo@cb43039 tip
cbfs-init modified as per downstream fork dasharo+heads used modifications (flashrom)
ash_functions modified as per downstream fork dasharo+heads used modifications (CBFS)
network-init-recovery modified as per downstream fork dasharo+heads used modifications (igc)
modules/linux modified as per downstream fork dasharo+heads used modifications (igc)
modules/coreboot modified as per downstream fork dasharo+heads used modifications (also impact nv41/ns50: coreboot version bump)
modules/flashrom modified to user flashrom 1.4 + https://review.coreboot.org/c/flashrom/+/83854
Circleci: added boards being dependent of nv41

NOTES:

This requires Nk3 firmware to be 1.7.1+
Requires external programmer in case of bricking, untested and not owning the platforms.
dGPU support known problematic
kgpe-d16 patch that was still under master was unapplied on master (permitting to flash openbmc from Heads)

DISCLAIMER: UNTESTED
Sorry, not gonna cherry-pick commits from dahsharo/heads here, way too messy.

after merge, WILL superseed #1489 abandonned effort.

TODO:

kgpe-d16 misses a working patch for internal flashing? In this PR, unapplied patch deleted. issue Bring dasharo+heads MSI boards from downstream Dasharo/heads to upstream #1753 created

OLD
~~DO NOT FLASH YET IF NO EXTERNAL PROGRAMMER. THIS VERSION BUMP FLASHROM SO FLASHING MASTER FROM THIS IS NEEDED~~ Edit: fixed with #1755 commit cherry-picked.

tlaurion · 2024-08-09T13:54:21Z

@macpijan and others: not sure what this CONFIG_CBFS_VIA_FLASHROM in board configs is about as of now, most probably this PR totally invalid as of now, have not followed that white rabbit yet.

1- @macpijan : commit log should be clear enough: Please validate this matches all required changes downstream please.
2- Also, can you tell why/what version of flashrom this is based on? 1.3.0+ with all WP + needed chipsets/spi chips needed? Is this expected to create regression on other boards support?

tlaurion · 2024-08-09T14:03:35Z

@macpijan I see this contains a coreboot version bump impacting nv41/ns50/MSI.

tlaurion · 2024-08-09T14:06:19Z

I think I picked all files based changes from master...Dasharo:heads:master visual queues, without rebasing nor cherry-picking, simply applying changes directly in files

Not gentle reminder, but requirement: changes should be proposed upstream, not forced like that or for upstream to pick up, even less when security vuln lingering

mkopec · 2024-08-09T14:08:14Z

2- Also, can you tell why/what version of flashrom this is based on?

The flashrom fork is based from this version: flashrom/flashrom@053d319

with added:

support for ITE EC running closed source firmware (irrelevant)
miscellaneous improvements for APU2 (irrelevant)
fixes for yocto? @macpijan if you could confirm.
RaptorPoint PCH support (relevant for MSI Z790)

tlaurion · 2024-08-09T14:11:21Z

@macpijan updated op with commit logs sourced info, need comment on those changes and insights on impacts for other boards, most specifically:

coreboot version bump: nv41/ns50 tested for regressions?
flashrom: regressionss expected for other Heads supported boards: version based? Do we finally have a --progress bar? What's in it?

tlaurion · 2024-08-09T14:11:44Z

@JonathonHall-Purism would need your eyes on this too, including regression testing for your boards since flashrom version bump

tlaurion · 2024-08-09T14:36:22Z

053d319

So flashrom 1.3.0-rc1 + patches, dating from upstream commit of ~2 years ago (cc @mkopec)

commit 053d319141db5954ab1ad34cb9db61983d238134
Author: Edward O'Callaghan quasisec@google.com
Date: Fri Aug 12 21:27:41 2022 +1000

@JonathonHall-Purism: is this a problem?
Seems like we could hit regressions here... Heads master was more recent.

@mkopec patches were not merged upstream in 1.4.0 now released? @macpijan ?

tlaurion · 2024-08-09T14:43:14Z

053d319

So flashrom 1.3.0-rc1 + patches, dating from upstream commit of ~2 years ago (cc @mkopec)

commit 053d319141db5954ab1ad34cb9db61983d238134
Author: Edward O'Callaghan quasisec@google.com
Date: Fri Aug 12 21:27:41 2022 +1000

@JonathonHall-Purism: is this a problem? Seems like we could hit regressions here... Heads master was more recent.

@mkopec patches were not merged upstream in 1.4.0 now released? @macpijan ?

1.4.0 was released 2 weeks ago https://github.com/flashrom/flashrom/releases/tag/v1.4.0

@mkopec @macpijan is everything you need under 1.4.0?
See flashrom/flashrom@053d319...eace095

macpijan · 2024-08-09T14:49:40Z

@mkopec @macpijan is everything you need under 1.4.0?

I think the Dasharo/flashrom@24b8fcf will be missing. I cannot see it being submitted into upstream, can you confirm @miczyg1 ?

miczyg1 · 2024-08-09T14:52:23Z

@mkopec @macpijan is everything you need under 1.4.0?

I think the Dasharo/flashrom@24b8fcf will be missing. I cannot see it being submitted into upstream, can you confirm @miczyg1 ?

I think it is not in upstream flashrom (I believe we didn't even send a patch)

tlaurion · 2024-08-09T14:56:48Z

@mkopec @macpijan is everything you need under 1.4.0?

I think the Dasharo/flashrom@24b8fcf will be missing. I cannot see it being submitted into upstream, can you confirm @miczyg1 ?

I think it is not in upstream flashrom (I believe we didn't even send a patch)

@miczyg1 thats problematic.
Bumped to 1.4.0 at 445d70f will try to put your unupstreamed patch into a Head patch. There is no way Head can regress to 2 years ago flashrom version since other stakeholders need flashrom too.

macpijan · 2024-08-09T14:59:49Z

@tlaurion Updated patch: Dasharo/flashrom@7db77d3

https://review.coreboot.org/c/flashrom/+/83854

tlaurion · 2024-08-09T15:11:38Z

@tlaurion Updated patch: Dasharo/flashrom@7db77d3

https://review.coreboot.org/c/flashrom/+/83854

EDITED: @macpijan fails to build see e8aaaab

EDITED2: @miczyg1 patch won't build see above

macpijan · 2024-08-09T15:37:19Z

Another rev (the same link: https://review.coreboot.org/c/flashrom/+/83854) builds, tested to probe the chip on MSI.

patches/flashrom-b1f858f65b2abd276542650d8cb9e382da258967/0100-enable-kgpe-d16.patch

modules/coreboot

tlaurion · 2024-08-09T16:28:38Z

@macpijan please review ab74127

macpijan

@macpijan please review ab74127

Reviewed, could not spot any obvious problems in the configs ordering.

tlaurion · 2024-08-09T16:40:38Z

boards/msi_z690a_ddr4/msi_z690a_ddr4.config

+export CONFIG_BOOT_DEV="/dev/nvme0n1"
+export CONFIG_BOOT_KERNEL_ADD=""
+export CONFIG_BOOT_KERNEL_REMOVE=""
+export CONFIG_BOARD_NAME="MSI PRO Z690-A DDR4"


@macpijan that's ok? used in config overrides and dmidecode output for branding

tlaurion · 2024-08-09T16:40:49Z

boards/msi_z690a_ddr5/msi_z690a_ddr5.config

+export CONFIG_BOOT_DEV="/dev/nvme0n1"
+export CONFIG_BOOT_KERNEL_ADD=""
+export CONFIG_BOOT_KERNEL_REMOVE=""
+export CONFIG_BOARD_NAME="MSI PRO Z690-A DDR5"


@macpijan that's ok? used in config overrides and dmidecode output for branding

tlaurion · 2024-08-09T16:41:00Z

boards/msi_z790p_ddr4/msi_z790p_ddr4.config

+export CONFIG_BOOT_DEV="/dev/nvme0n1"
+export CONFIG_BOOT_KERNEL_ADD=""
+export CONFIG_BOOT_KERNEL_REMOVE=""
+export CONFIG_BOARD_NAME="MSI PRO Z790-P DDR4"


@macpijan that's ok? used in config overrides and dmidecode output for branding

tlaurion · 2024-08-09T16:41:07Z

boards/msi_z790p_ddr5/msi_z790p_ddr5.config

+export CONFIG_BOOT_DEV="/dev/nvme0n1"
+export CONFIG_BOOT_KERNEL_ADD=""
+export CONFIG_BOOT_KERNEL_REMOVE=""
+export CONFIG_BOARD_NAME="MSI PRO Z790-P DDR5"


@macpijan that's ok? used in config overrides and dmidecode output for branding

i-c-o-n · 2024-08-30T00:30:47Z

WP is a huge topic, what do you need specifically?

Raw braindump.
As of today, only thing used in the wild (known to be used) is for d16:
...

That's the topic that would need the aforementioned CLI update. Patches are written for flashprog, but only been rebased in the past 18 months. I'll give them a look and a little testing later.

Still working fine 😄 Added a few bits for the chips I had at hand. More testing welcome!

tlaurion · 2024-08-30T22:25:03Z

WP is a huge topic, what do you need specifically?

Raw braindump.
As of today, only thing used in the wild (known to be used) is for d16:
...

That's the topic that would need the aforementioned CLI update. Patches are written for flashprog, but only been rebased in the past 18 months. I'll give them a look and a little testing later.

Still working fine 😄 Added a few bits for the chips I had at hand. More testing welcome!

@i-c-o-n I see you worked on this yersterday!!!! Busy bee! Issue to be tracked would be #1546

tlaurion · 2024-08-30T22:28:26Z

@macpijan @SergiiDmytruk @i-c-o-n : What would be missing from flashrom today to be a direct replacement of flashrom? Please detail under #1546. Not sure flashrom deserves the energy needed to be fixed at this point, but you know way better then I do so please continue under #1546 tagging where/if needed.

We need

current platforms supported
WP missing, and clarifications on SPI not supporting what we need and needing resoldering, that was not clear before but now it is
Switch to flashprog
Be happier.

tlaurion · 2024-09-02T17:53:31Z

#1251 resolves the issue.

@macpijan opinions?

tlaurion · 2024-09-02T17:53:57Z

Can be tested under #1773. Worked great on x230 and nv41

tlaurion · 2024-09-09T15:10:06Z

#1251 resolves the issue.

@macpijan opinions?

#1769 (flashprog) is way better fit. Would dasharo consider switching to flashprog?

tlaurion · 2024-09-09T20:15:43Z

Rebased on master, needs cleanup (come commits unrelevant as of now) but will wait for decision on flashrom/flashprog and letting it bitrot until then.

tlaurion · 2024-10-22T17:20:16Z

@SergiiDmytruk : #1753 (comment) https://review.coreboot.org/c/flashrom/+/84102 is still not merged.

Do we go #1769 ?

SergiiDmytruk · 2024-10-23T21:48:30Z

@SergiiDmytruk : #1753 (comment) https://review.coreboot.org/c/flashrom/+/84102 is still not merged.

I just gave it +2 after Anastasia has finished the work, so the change will probably be merged soon.

Do we go #1769 ?

Up to you :)

tlaurion · 2024-10-30T19:35:55Z

Todo: rebase on master and make sure everything followed for msi. (switched to flashprog, kernel version bump and cryptsetup toolstack upgraded with proper luksv2 support)

…/heads fork to upstream - files: boards + coreboot + linux, borrowed directly from Dasharo@cb43039 tip - cbfs-init modified as per downstream fork dasharo+heads used modifications (flashrom) - ash_functions modified as per downstream fork dasharo+heads used modifications (CBFS) - network-init-recovery modified as per downstream fork dasharo+heads used modifications (igc) - modules/linux modified as per downstream fork dasharo+heads used modifications (igc) - modules/coreboot modified as per downstream fork dasharo+heads used modifications (also impact nv41/ns50: coreboot version bump) - Circleci: added boards being dependent of nv41 This requires Nk3 firmware to be 1.7.1+ as per https://www.nitrokey.com/blog/2024/heads-v25-and-nitrokey-3-firmware-v171-security-updatehttps://www.nitrokey.com/blog/2024/heads-v25-and-nitrokey-3-firmware-v171-security-update DISCLAIMER: UNTESTED Sorry, not gonna cherry-pick commits here, way too messy. Signed-off-by: Thierry Laurion <insurgo@riseup.net>

Signed-off-by: Thierry Laurion <insurgo@riseup.net>

… released 2 weeks ago. Expected that patches from 2 years ago were merged upstream - delete unapplied kgpe-d16 patch (will need to be brought back, was not applied currently on master - add patches/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/0001-Add_RaptorPoint_PCH_support.patch which was not submitted to flashrom and needed by MSI - point modules/flashrom to release 1.4.0 commit FAILED: https://github.com/Dasharo/flashrom/commit/24b8fcfccef31fbb95bc1dd308180f57d5cdb64c.patch Cannot be applied over 1.4.0: if [ -d patches/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38 ] && [ -r patches/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38 ] ; then for patch in patches/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/*.patch ; do echo "Applying patch file : $patch " ; ( git apply --verbose --reject --binary --directory build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38 ) < $patch || exit 1 ; done ; fi Applying patch file : patches/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/0001-Add_RaptorPoint_PCH_support.patch Checking patch build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/chipset_enable.c... error: while searching for: case CHIPSET_400_SERIES_COMET_POINT: case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: case CHIPSET_ELKHART_LAKE: case CHIPSET_APOLLO_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/chipset_enable.c:607 error: while searching for: break; case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: boot_straps = boot_straps_pch500; break; error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/chipset_enable.c:714 error: while searching for: case CHIPSET_400_SERIES_COMET_POINT: case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: case CHIPSET_APOLLO_LAKE: case CHIPSET_GEMINI_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/chipset_enable.c:749 Hunk #4 succeeded at 1017 (offset 5 lines). error: while searching for: {0x8086, 0x7a83, B_S, NT, "Intel", "Q670", enable_flash_pch600}, {0x8086, 0x7a84, B_S, DEP, "Intel", "Z690", enable_flash_pch600}, {0x8086, 0x7a88, B_S, NT, "Intel", "W680", enable_flash_pch600}, {0x8086, 0x7a8a, B_S, NT, "Intel", "W685", enable_flash_pch600}, {0x8086, 0x7a8d, B_S, NT, "Intel", "WM690", enable_flash_pch600}, {0x8086, 0x7a8c, B_S, NT, "Intel", "HM670", enable_flash_pch600}, {0x8086, 0x7e23, B_S, DEP, "Intel", "Meteor Lake-P/M", enable_flash_mtl}, {0}, error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/chipset_enable.c:2175 Checking patch build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ich_descriptors.c... error: while searching for: case CHIPSET_400_SERIES_COMET_POINT: case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: case CHIPSET_ELKHART_LAKE: case CHIPSET_JASPER_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ich_descriptors.c:48 error: while searching for: case CHIPSET_C620_SERIES_LEWISBURG: case CHIPSET_APOLLO_LAKE: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: case CHIPSET_GEMINI_LAKE: case CHIPSET_JASPER_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ich_descriptors.c:77 error: while searching for: case CHIPSET_400_SERIES_COMET_POINT: case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: case CHIPSET_APOLLO_LAKE: case CHIPSET_GEMINI_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ich_descriptors.c:215 error: while searching for: return freq_str[2][value]; case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: return freq_str[3][value]; case CHIPSET_ELKHART_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ich_descriptors.c:313 error: while searching for: case CHIPSET_400_SERIES_COMET_POINT: case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: case CHIPSET_APOLLO_LAKE: case CHIPSET_GEMINI_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ich_descriptors.c:361 error: while searching for: cs == CHIPSET_400_SERIES_COMET_POINT || cs == CHIPSET_500_SERIES_TIGER_POINT || cs == CHIPSET_600_SERIES_ALDER_POINT || cs == CHIPSET_JASPER_LAKE || cs == CHIPSET_METEOR_LAKE) { const char *const master_names[] = { "BIOS", "ME", "GbE", "unknown", "EC", error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ich_descriptors.c:489 error: while searching for: case CHIPSET_400_SERIES_COMET_POINT: case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: case CHIPSET_GEMINI_LAKE: case CHIPSET_JASPER_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ich_descriptors.c:1087 error: while searching for: case CHIPSET_400_SERIES_COMET_POINT: case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: case CHIPSET_APOLLO_LAKE: case CHIPSET_GEMINI_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ich_descriptors.c:1246 error: while searching for: case CHIPSET_400_SERIES_COMET_POINT: case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: case CHIPSET_APOLLO_LAKE: case CHIPSET_GEMINI_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ich_descriptors.c:1291 Checking patch build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ichspi.c... error: while searching for: case CHIPSET_400_SERIES_COMET_POINT: case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: case CHIPSET_APOLLO_LAKE: case CHIPSET_GEMINI_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ichspi.c:1884 error: while searching for: case CHIPSET_400_SERIES_COMET_POINT: case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: case CHIPSET_APOLLO_LAKE: case CHIPSET_GEMINI_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ichspi.c:1923 error: while searching for: case CHIPSET_400_SERIES_COMET_POINT: case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: case CHIPSET_APOLLO_LAKE: case CHIPSET_GEMINI_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ichspi.c:1984 error: while searching for: case CHIPSET_400_SERIES_COMET_POINT: case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: case CHIPSET_APOLLO_LAKE: case CHIPSET_GEMINI_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ichspi.c:2064 error: while searching for: case CHIPSET_400_SERIES_COMET_POINT: case CHIPSET_500_SERIES_TIGER_POINT: case CHIPSET_600_SERIES_ALDER_POINT: case CHIPSET_METEOR_LAKE: case CHIPSET_APOLLO_LAKE: case CHIPSET_GEMINI_LAKE: error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ichspi.c:2103 error: while searching for: ich_gen == CHIPSET_300_SERIES_CANNON_POINT || ich_gen == CHIPSET_400_SERIES_COMET_POINT || ich_gen == CHIPSET_500_SERIES_TIGER_POINT || ich_gen == CHIPSET_600_SERIES_ALDER_POINT)) { msg_pdbg("Enabling hardware sequencing by default for 100+ series PCH.\n"); ich_spi_mode = ich_hwseq; } error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ichspi.c:2140 Checking patch build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/include/programmer.h... error: while searching for: CHIPSET_400_SERIES_COMET_POINT, CHIPSET_500_SERIES_TIGER_POINT, CHIPSET_600_SERIES_ALDER_POINT, CHIPSET_METEOR_LAKE, CHIPSET_APOLLO_LAKE, CHIPSET_GEMINI_LAKE, error: patch failed: build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/include/programmer.h:376 Checking patch build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/util/ich_descriptors_tool/ich_descriptors_tool.c... Hunk #1 succeeded at 239 (offset 1 line). Applying patch build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/chipset_enable.c with 4 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. Hunk #4 applied cleanly. Rejected hunk #5. Applying patch build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ich_descriptors.c with 9 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. Rejected hunk #4. Rejected hunk #5. Rejected hunk #6. Rejected hunk linuxboot#7. Rejected hunk #8. Rejected hunk #9. Applying patch build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/ichspi.c with 6 rejects... Rejected hunk #1. Rejected hunk #2. Rejected hunk #3. Rejected hunk #4. Rejected hunk #5. Rejected hunk #6. Applying patch build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/include/programmer.h with 1 reject... Rejected hunk #1. Applied patch build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/util/ich_descriptors_tool/ich_descriptors_tool.c cleanly. make: *** [Makefile:565: /home/user/heads/build/x86/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/.canary] Error 1 Signed-off-by: Thierry Laurion <insurgo@riseup.net>

…upstream fails to build on 1.4.0 2024-08-09 15:08:07+00:00 MAKE flashrom tail /home/user/heads/build/x86/log/flashrom.log ----- ichspi.c:2152:2: note: previously used here case CHIPSET_METEOR_LAKE: ^~~~ /home/user/heads/crossgcc/x86/bin/x86_64-linux-musl-gcc -fdebug-prefix-map=/home/user/heads=heads -gno-record-gcc-switches -D__MUSL__ --sysroot /home/user/heads/install/x86 -isystem /home/user/heads/install/x86/include -L/home/user/heads/install/x86/lib -MMD -Os -I/home/user/heads/install/x86/include/pci -Iinclude -I/home/user/heads/install/x86//include -D'HAVE_GETOPT_H=1' -D'IS_WINDOWS=0' -D'__FLASHROM_LITTLE_ENDIAN__=1' -D'CONFIG_DEFAULT_PROGRAMMER_NAME=NULL' -D'CONFIG_DEFAULT_PROGRAMMER_ARGS=""' -D'CONFIG_DELAY_MINIMUM_SLEEP_US=100000' -D'CONFIG_INTERNAL=1' -D'CONFIG_INTERNAL_DMI=1' -D'__FLASHROM_HAVE_OUTB__=1' -D'HAVE_UTSNAME=1' -D'HAVE_CLOCK_GETTIME=1' -D'FLASHROM_VERSION="1.4.0 (git:v0.2.0-2284-g88513e3f06)"' -o hwaccess_x86_io.o -c hwaccess_x86_io.c ichspi.c: In function 'init_ich_default': ichspi.c:2381:48: error: expected ';' before ')' token ich_gen == CHIPSET_C740_SERIES_EMMITSBURG)) { ^ ; ichspi.c:2381:48: error: expected statement before ')' token ichspi.c:2381:49: error: expected statement before ')' token ich_gen == CHIPSET_C740_SERIES_EMMITSBURG)) { ^ ichspi.c:2504:1: error: expected declaration or statement at end of input } ^ /home/user/heads/crossgcc/x86/bin/x86_64-linux-musl-gcc -fdebug-prefix-map=/home/user/heads=heads -gno-record-gcc-switches -D__MUSL__ --sysroot /home/user/heads/install/x86 -isystem /home/user/heads/install/x86/include -L/home/user/heads/install/x86/lib -MMD -Os -I/home/user/heads/install/x86/include/pci -Iinclude -I/home/user/heads/install/x86//include -D'HAVE_GETOPT_H=1' -D'IS_WINDOWS=0' -D'__FLASHROM_LITTLE_ENDIAN__=1' -D'CONFIG_DEFAULT_PROGRAMMER_NAME=NULL' -D'CONFIG_DEFAULT_PROGRAMMER_ARGS=""' -D'CONFIG_DELAY_MINIMUM_SLEEP_US=100000' -D'CONFIG_INTERNAL=1' -D'CONFIG_INTERNAL_DMI=1' -D'__FLASHROM_HAVE_OUTB__=1' -D'HAVE_UTSNAME=1' -D'HAVE_CLOCK_GETTIME=1' -D'FLASHROM_VERSION="1.4.0 (git:v0.2.0-2284-g88513e3f06)"' -o hwaccess_physmap.o -c hwaccess_physmap.c make[1]: *** [Makefile:1050: ichspi.o] Error 1 Signed-off-by: Thierry Laurion <insurgo@riseup.net>

…nder Heads repro: git fetch https://review.coreboot.org/flashrom refs/changes/54/83854/3 && git format-patch -1 --stdout FETCH_HEAD > patches/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/0001-Add_RaptorPoint_PCH_support.patch Signed-off-by: Thierry Laurion <insurgo@riseup.net>

tlaurion · 2024-10-30T20:56:24Z

Rebasing on master

… config layout against qemu-coreboot-fbwhiptail-tpm2 Signed-off-by: Thierry Laurion <insurgo@riseup.net>

…ess workaround works in absence of flashrom --progress Respin of https://github.com/Dasharo/flashrom/commit/6b2061bc0699202f81aeb782f301f1bba9f8a826.patch which cannot be cherry-picked See Dasharo/flashrom#11 (comment) Signed-off-by: Thierry Laurion <insurgo@riseup.net>

Signed-off-by: Thierry Laurion <insurgo@riseup.net>

tlaurion · 2024-10-30T21:04:59Z

boards/msi_z790p_ddr5/msi_z790p_ddr5.config

+export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+
+# Workaround to access > 16MiB BIOS region on ADL+
+export CONFIG_CBFS_VIA_FLASHROM=y


@macpijan this is ugly hack combined with cbfs-init changes. Something cleaner/compatible with flashprog?

tlaurion · 2024-10-30T21:06:17Z

initrd/bin/cbfs-init

@@ -9,12 +9,20 @@ if [ -z "$CONFIG_PCR" ]; then
 	CONFIG_PCR=7
 fi

+if [ "$CONFIG_CBFS_VIA_FLASHROM" = "y" ]; then
+	# Use flashrom directly, because we don't have /tmp/config with params for flash.sh yet
+	/bin/flashrom -p internal --fmap -i COREBOOT -i FMAP -r /tmp/cbfs-init.rom > /dev/null 2>&1 \


Ideally we implement something that can reuse FLASH_OPTIONS fromm other boards configs and uses flashprog as of master now. What is this 16MB limitation from CBFS?

tlaurion · 2024-10-30T21:06:38Z

...hes/flashrom-eace095b15eb034e42d97202cad70ce979d8ca38/0001-Add_RaptorPoint_PCH_support.patch

@@ -0,0 +1,237 @@
+From 99d16ef516b6080ceaaa866984b7e7fb471eaef0 Mon Sep 17 00:00:00 2001


@i-c-o-n : under flashprog? I think yes.

Different patch, but yes. It should work. Untested, though.

tlaurion · 2024-10-30T21:08:42Z

Needs hotp/non-hotp variants
clarifications on what to do with cbfs >16mb limitation and current hacks using flashrom
- implement something cleaner if possible/usable by flashprog under cbfs-init
@i-c-o-n confirmation patch to flashrom is under flashprog

tlaurion marked this pull request as draft August 9, 2024 13:28

This comment was marked as outdated.

Sign in to view

tlaurion force-pushed the bring_downstream_Dasharo-Heads_msi_to_upstream branch 2 times, most recently from c02898d to 785d4e3 Compare August 9, 2024 13:51

tlaurion force-pushed the bring_downstream_Dasharo-Heads_msi_to_upstream branch from 785d4e3 to b2c4351 Compare August 9, 2024 14:02

tlaurion force-pushed the bring_downstream_Dasharo-Heads_msi_to_upstream branch 2 times, most recently from ba477ab to 88513e3 Compare August 9, 2024 15:05

tlaurion commented Aug 9, 2024

View reviewed changes

patches/flashrom-b1f858f65b2abd276542650d8cb9e382da258967/0100-enable-kgpe-d16.patch Outdated Show resolved Hide resolved

tlaurion commented Aug 9, 2024

View reviewed changes

modules/coreboot Show resolved Hide resolved

tlaurion mentioned this pull request Aug 9, 2024

flashrom patch for kpge-d16 missing: internal flashing probably broken #1754

Open

macpijan reviewed Aug 9, 2024

View reviewed changes

tlaurion commented Aug 9, 2024

View reviewed changes

tlaurion mentioned this pull request Aug 30, 2024

Consider flashprog #1546

Closed

tlaurion mentioned this pull request Sep 2, 2024

PoC : Flashprog, cryptsetup, msi board, basic introspection: staging all pending PRs for testing #1773

Closed

2 tasks

tlaurion mentioned this pull request Sep 9, 2024

Switch from flashrom to flashprog #1769

Merged

15 tasks

tlaurion force-pushed the bring_downstream_Dasharo-Heads_msi_to_upstream branch from 1a8fe4d to 83fe731 Compare September 9, 2024 20:15

tlaurion added 5 commits October 30, 2024 16:55

flashrom: switch to Dasharo fork

58017e3

Signed-off-by: Thierry Laurion <insurgo@riseup.net>

tlaurion added 3 commits October 30, 2024 16:56

MSI board configs: clarify requirements, DDR4/DDR5 board names, unify…

c3e138c

… config layout against qemu-coreboot-fbwhiptail-tpm2 Signed-off-by: Thierry Laurion <insurgo@riseup.net>

flashrom 1.4: remove verbose output patch that was not working anyway

9f0fbb6

Signed-off-by: Thierry Laurion <insurgo@riseup.net>

tlaurion force-pushed the bring_downstream_Dasharo-Heads_msi_to_upstream branch from 83fe731 to 9f0fbb6 Compare October 30, 2024 20:56

tlaurion commented Oct 30, 2024

View reviewed changes

tlaurion added help wanted release cycle - 2024-11-20 labels Oct 30, 2024

		@@ -0,0 +1,237 @@
		From 99d16ef516b6080ceaaa866984b7e7fb471eaef0 Mon Sep 17 00:00:00 2001

Bring dasharo+heads MSI boards from downstream Dasharo/heads to upstream #1753

Are you sure you want to change the base?

Bring dasharo+heads MSI boards from downstream Dasharo/heads to upstream #1753

Conversation

tlaurion commented Aug 9, 2024 • edited Loading

This comment was marked as outdated.

tlaurion commented Aug 9, 2024

tlaurion commented Aug 9, 2024

tlaurion commented Aug 9, 2024 • edited Loading

mkopec commented Aug 9, 2024

tlaurion commented Aug 9, 2024

tlaurion commented Aug 9, 2024

tlaurion commented Aug 9, 2024 • edited Loading

tlaurion commented Aug 9, 2024

macpijan commented Aug 9, 2024

miczyg1 commented Aug 9, 2024

tlaurion commented Aug 9, 2024

macpijan commented Aug 9, 2024 • edited Loading

tlaurion commented Aug 9, 2024 • edited Loading

macpijan commented Aug 9, 2024

tlaurion commented Aug 9, 2024

macpijan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

i-c-o-n commented Aug 30, 2024

tlaurion commented Aug 30, 2024

tlaurion commented Aug 30, 2024

tlaurion commented Sep 2, 2024

tlaurion commented Sep 2, 2024

tlaurion commented Sep 9, 2024

tlaurion commented Sep 9, 2024

tlaurion commented Oct 22, 2024

SergiiDmytruk commented Oct 23, 2024

tlaurion commented Oct 30, 2024 • edited Loading

tlaurion commented Oct 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tlaurion commented Oct 30, 2024 • edited Loading

tlaurion commented Aug 9, 2024 •

edited

Loading

tlaurion commented Aug 9, 2024 •

edited

Loading

tlaurion commented Aug 9, 2024 •

edited

Loading

macpijan commented Aug 9, 2024 •

edited

Loading

tlaurion commented Aug 9, 2024 •

edited

Loading

tlaurion commented Oct 30, 2024 •

edited

Loading

tlaurion commented Oct 30, 2024 •

edited

Loading