4.22.01 fhd patch merged upstream (4.24) + bump all 4.19 boards to 4.22.01 #1604

tlaurion · 2024-02-05T16:56:54Z

Revisiting 4.22 coreboot bump with fhd patch (superseeds and replaces #1524), Might fix #1603)

- patches/coreboot-4.22.01/0001-x230-fhd-variant.patch created per
  - git fetch https://review.coreboot.org/coreboot refs/changes/50/28950/27 && git format-patch -1 --stdout FETCH_HEAD > ~/heads/patches/coreboot-4.22.01/0001-x230-fhd-variant.patch
- all boards configs bumped with:
  - sed 's/4.19/4.22.01/g' boards/*/*.config -i
  - grep -Rn 4.22 boards/ | awk -F "/" {'print $2'}| while read line; do make BOARD=$line coreboot.save_in_oldconfig_format_in_place ; done
  - sed 's/4.19/4.22.01/g' .circleci/config.yml -i
- CircleCI caches updated
- modules/coreboot: remove 4.19 references
- All 4.19 boards switched to TCG event log format which segfaults `cbmem -L` https://github.com/linuxboot/heads/issues/1608#issuecomment-1953036042
  - Note that Purism boards already switched to TCG format where https://github.com/linuxboot/heads/pull/1609 doesn't fix anything (coreboot custom event log format is broken since 4.21
    - **More details under https://github.com/linuxboot/heads/issues/1608 which isn't blocking this PR**

Testing report at #1604 (comment)

4.22 didn't include the patchset in time as #1523 related.
~~Hopefully this is the last time we pick a patchset. Please board owners, report your edp/fhd kit (PRECISELY) and passing/failing results under https://review.coreboot.org/c/coreboot/+/28950~~ EDIT: https://review.coreboot.org/coreboot refs/changes/50/28950/27 was merged.

tlaurion · 2024-02-05T17:47:17Z

Testing https://output.circle-artifacts.com/output/job/921af8c2-40cd-4b91-886b-f48c99d8749e/artifacts/0/build/x86/x230-hotp-maximized/heads-x230-hotp-maximized-v0.2.0-2023-g1a6aacb.zip which passed to 4.22.

cbmem states Unknown TPM log specification. Something changed there...

JonathonHall-Purism · 2024-02-05T17:53:09Z

(realize it's WIP but took a quick look 🙂 ) Do any boards remain on 4.19 after this change? If not, IMO we should remove it from modules/coreboot.

pcm720 · 2024-02-05T18:00:35Z

Works perfectly on eDP 4.0-modded X230 with 1440p display.
"Unknown TPM log specification" doesn't prevent TPM from unlocking encrypted root partition.

tlaurion · 2024-02-05T18:12:20Z

Works perfectly on eDP 4.0-modded X230 with 1440p display. "Unknown TPM log specification" doesn't prevent TPM from unlocking encrypted root partition.

Cannot replicate with qemu-coreboot-whpitail-tpm1/tpm2 boards, this is weird.

tlaurion · 2024-02-05T20:03:14Z

Passing to tpm 1.2 event log format makes cbmem crash... Something has not followed upstream changes inside of cbmem?!?!

Another rabbit hole.

JonathonHall-Purism · 2024-02-05T20:25:37Z

@tlaurion I'm working on PureBoot 29 release candidates now (updating coreboot to 4.22.01 there as well) and I get something similar with cbmem -L, but I'm not sure it's exactly the same.

It does appear to show the TPM log correctly, but then it shows a huge garbage entry and crashes. Sealing still works because the correct part of the log is interpreted correctly by tpmr. It looks like cbmem is wandering off into uninitialized space following the TPM log (but haven't confirmed that).

Is that similar to what you see?

Next steps IMO would be to build cbmem in the host OS see if it's the same (see if it's specific to the Heads build/environment or not, since it would surprise me if it was doing this across the board upstream), then probably bisect coreboot and/or cbmem based on that result.

tlaurion · 2024-02-05T20:45:38Z

Checking at history of cbmem https://github.com/coreboot/coreboot/commits/7201602a18b63fc5236f025d22dc726637866cb6/util/cbmem/cbmem.c, it seems something went wrong either at coreboot/coreboot@6da6268 when supporting tpm1.2/tpm2.0 format or coreboot/coreboot@fc2f304 when attempting to standardize c99 arrays.

@tlaurion I'm working on PureBoot 29 release candidates now (updating coreboot to 4.22.01 there as well) and I get something similar with cbmem -L, but I'm not sure it's exactly the same.

On x230 I only get "Unknown TPM log specification:" (note the ':' and nothing else) at
https://github.com/coreboot/coreboot/blob/fc2f304f062bc51cf51ad999caf13a6acc64a1b3/util/cbmem/cbmem.c#L1059-L1061

It does appear to show the TPM log correctly, but then it shows a huge garbage entry and crashes. Sealing still works because the correct part of the log is interpreted correctly by tpmr. It looks like cbmem is wandering off into uninitialized space following the TPM log (but haven't confirmed that).

Is that similar to what you see?

No. I get this when I switch the TPM log format to 1.2 though, not when using coreboot custom format that we currently use.

Next steps IMO would be to build cbmem in the host OS see if it's the same (see if it's specific to the Heads build/environment or not, since it would surprise me if it was doing this across the board upstream), then probably bisect coreboot and/or cbmem based on that result.

Well, TBH I'm not sure a lot of other use so much measured boot outside of Heads @JonathonHall-Purism ?
This shows its not tested a lot, or as you said, since cbmem is built by musl-cross-make, that might as well be an undesired artifact of those?

tlaurion · 2024-02-05T22:23:26Z

@JonathonHall-Purism tested bumping musl-cross-make to latest avail commit but same error on x230-maximized and clean built: "Unknown TPM log specification:"

https://github.com/tlaurion/heads/tree/422_fhd_newer-musl

tlaurion · 2024-02-13T17:43:36Z

@JonathonHall-Purism

Well, TBH I'm not sure a lot of other use so much measured boot outside of Heads @JonathonHall-Purism ?
This shows its not tested a lot, or as you said, since cbmem is built by musl-cross-make related doubts, which is compiler buillding everything tools.cpio related under Heads, including cbmem here), that might as well be an undesired artifact of those? (modified quote)

I took the time to use rom produced here (4.22.01 tag release codebase built with measured boot and coreboot custom event log format) and test cbmem built on top of ubuntu 23.10/debian trixie OS (to remove musl-cross-make doubts).

Interestingly enough:

sudo ~/Downloada/coreboot-4.22.01/util/cbmem/cbmem -L : Unknown TPM log specification: : FAIL
sudo ~/Downloada/coreboot-4.19/util/cbmem/cbmem -L : coreboot TPM log: [...] : OK

So now, let's test cbmem behavior in between those release versions:

sudo ~/Downloada/coreboot-4.21/util/cbmem/cbmem -L : Unknown TPM log specification: : FAIL
sudo ~/Downloada/coreboot-4.20.1/util/cbmem/cbmem -L : coreboot TPM log: [...] : OK

So cbmem -L broke somewhere between 4.20.1 and 4.21.

Raised awareness under #coreboot channel at https://matrix.to/#/!EhaGFZyYcbyhdSgStq:matrix.org/$DJW_mF5d1PfhJIvoM-_HvX8s3BpzNvtNu77auhvKBo0?via=matrix.org&via=sibnsk.net&via=datanauten.de. @miczyg1 said he would take a look at https://matrix.to/#/!EhaGFZyYcbyhdSgStq:matrix.org/$34SHe96Ef5Qrv2pIXtmi2lqpSwnh1GsKXlZCR9I7PpY?via=matrix.org&via=sibnsk.net&via=datanauten.de

tlaurion · 2024-02-14T02:54:40Z

Thanks to you all, edp/fhd was merged upstream (~4.24 to be)

EDIT: coreboot switches to date based releases. So coreboot 24.02 it will be...

tlaurion · 2024-02-14T20:23:17Z

Testing FHD+4.23 coreboot is under https://github.com/tlaurion/heads/tree/pre423-edp_fhd_in-tpm_tcg_event_log-CircleCi_coreboot_cache_fixed

As of now, the branch is just to show that cbmem -L fails (just as here) but for fixes to be made upstream as reported at #1609 (comment)

tlaurion · 2024-02-19T16:53:05Z

Updated to match coreboot merged https://review.coreboot.org/c/coreboot/+/28950. Might need manual fix (since other things changed for 4.23)

EDIT: yep. Manual fixes needed for 4.22

tlaurion · 2024-02-19T18:18:09Z

Traces to debug coreboot custom TPM event log for 4bb8317 at #1608 (comment)

Switching to TPM TCG event log format on next commit

tlaurion · 2024-02-19T19:21:52Z

Logs for 6b61f61 segfaulting TCG event log cbmem -L output under #1608 (comment)

Not a blocker: tpmr (pcr replay) works, but dmesg will show segfault until fixed.

tlaurion · 2024-02-19T19:27:14Z

@pcm720 can you confirm upstream merged+modified(minimal: only filename changes) edp/fhd patchset works as expected here? Should.

tlaurion · 2024-02-19T19:48:05Z

@lethedata: #1603 (comment) "reboot issue" might not be fixed by this and as of today, is outside of my comprehension.

tlaurion · 2024-02-19T20:34:15Z

pcm720 · 2024-02-19T20:59:29Z

@pcm720 can you confirm upstream merged+modified(minimal: only filename changes) edp/fhd patchset works as expected here? Should.

Yes, everything works as expected, no issues with disk decryption or OS reboots.

tlaurion · 2024-02-21T21:20:56Z

Testing needed, everyone!

tlaurion · 2024-02-21T21:30:30Z

Untested boards will move to UNTESTED.
UNTESTED boards that were untested prior of this PR will go to UNMAINTAINED in future commit prior of merging.

natterangell · 2024-02-22T09:12:42Z

t420-hotp-maximized tested and works!

d-wid · 2024-02-23T20:23:51Z

I'll get to it next Wednesday or, if you don't mind

…

On 21 February 2024 21:18:25 UTC, Thierry Laurion ***@***.***> wrote: Tested: - [x] w530-hotp-maximized ***@***.*** main station: iGPU only) - [x] x230-maximized ***@***.*** testing station) - [x] x230-maximized-fhd_edp (thanks @pcm720) Needs testing: - [ ] x220 (xx20): @Thrilleratplay @BlackMaria @srgrint - [ ] [t420](https://doc.coreboot.org/mainboard/lenovo/t420.html) (xx20): @alexmaloteaux @natterangell (iGPU) @akfhasodh @doob85 - [ ] [t430](https://doc.coreboot.org/mainboard/lenovo/t430.html) (xx30): @nestire(t430-legacy, t430-maximized) @Thrilleratplay @alexmaloteaux @lsafd @bwachter(iGPU maximized) @shamen123 @eganonoa(iGPU) @nitrosimon @jans23 @icequbes1 (iGPU) @weyounsix ([t430-dgpu](https://doc.coreboot.org/mainboard/lenovo/t430.html)) - [ ] t430-dgpu (xx30): @weyounsix (t430-dgpu) - [ ] [t520](https://doc.coreboot.org/mainboard/lenovo/t520.html) (xx30): NOBODY - [ ] [t530](https://doc.coreboot.org/mainboard/lenovo/t530.html) (xx30): @3hhh - [ ] [w530-dgpu](https://doc.coreboot.org/mainboard/lenovo/w530.html) (xx30): @weyounsix (dGPU: w530-k2000m) @jnscmns (dGPU K1000M) @computer-user123 (w530 / & w530 k2000 : prefers iGPU) - [ ] x230 (xx30): @nestire(x230-legacy, x230-maximized) @tlaurion(maximized) @osresearch @merge @jan23 @MrChromebox @shamen123 @eganonoa @bwachter @Thrilleratplay @jnscmns @doob85 - [ ] X230i (x230): @natterangell - [ ] x230-fhd/edp variant: @n4ru @computer-user123 (nitro caster board) @Tonux599 @househead @pcm720 (eDP 4.0 board and 1440p display) - [ ] [t440p](https://doc.coreboot.org/mainboard/lenovo/t440p.html): @ThePlexus @srgrint @akunterkontrolle @rbreslow - [ ] w541 (similar to [t440p](https://doc.coreboot.org/mainboard/lenovo/t440p.html)): @resende-gustavo @gaspar-ilom - [ ] [ASUS P8Z77 M PRO (Ivy bridge)](https://doc.coreboot.org/mainboard/asus/p8z77-m_pro.html): @ThePlexus - [ ] [HP Z220 CMT (Ivy bridge)](#1399): @d-wid As of now, HOTP+TPM DUK+suspend+resume works as expected and no regression reported on tested boards above. -- Reply to this email directly or view it on GitHub: #1604 (comment) You are receiving this because you were mentioned. Message ID: ***@***.***>

JonathonHall-Purism · 2024-02-23T20:40:07Z

I'll get to it next Wednesday or, if you don't mind

tlaurion is away until March 20th, so no rush 👍

tlaurion · 2024-02-24T03:08:09Z

I'll get to it next Wednesday or, if you don't mind

tlaurion is away until March 20th, so no rush 👍

@d-wid @JonathonHall-Purism it was intentional to push for testing before leaving on my side. Last time I asked for testing, it took more then 3weeks to get the results.

So @d-wid and others: please have your testing reports before march 20th. Happy testing!

srgrint · 2024-02-24T21:46:57Z

Have tested heads-x220-maximized-v0.2.0-2027-g6b61f61.rom Seems to work fine.

gaspar-ilom · 2024-02-25T19:33:45Z

I have regression tested W541 (heads-w541-hotp-maximized-v0.2.0-2027-g6b61f61.rom). No findings. You may mark it as tested.

srgrint · 2024-02-26T08:22:51Z

Have also tested t440p - also seems to work fine.

srgrint · 2024-02-29T13:51:50Z

Tested on my intel graphics T430. Seems to work fine.

d-wid · 2024-03-01T15:03:40Z

Seems to work fine on the HP Z220 too.

tlaurion · 2024-03-22T21:46:22Z

Thanks to all testing reports per #1604 (comment), last call for testing for :

t430-dgpu (xx30): @weyounsix (t430-dgpu)
t520 (xx30): NOBODY
t530 (xx30): @3hhh
w530-dgpu (xx30): @weyounsix (dGPU: w530-k2000m) @jnscmns (dGPU K1000M) @computer-user123 (w530 / & w530 k2000 : prefers iGPU)
X230i (x230): @natterangell
ASUS P8Z77 M PRO (Ivy bridge): @ThePlexus

Some boards will go to UNTESTED, and current UNTESTED boards will go UNMAINTAINTED.

natterangell · 2024-03-23T07:55:34Z

X230i tested and works 👍🏻

- patches/coreboot-4.22.01/0001-x230-fhd-variant.patch created per - git fetch https://review.coreboot.org/coreboot refs/changes/50/28950/23 && git format-patch -1 --stdout FETCH_HEAD > ~/heads/patches/coreboot-4.22.01/0001-x230-fhd-variant.patch - all boards configs bumped with: - grep -Rn 4.22 boards/ | awk -F "/" {'print $2'}| while read line; do make BOARD=$line coreboot.save_in_oldconfig_format_in_place ; done Signed-off-by: Thierry Laurion <[email protected]>

…eam merged state git fetch https://review.coreboot.org/coreboot refs/changes/50/28950/27 && git format-patch -1 --stdout FETCH_HEAD > ~/heads/patches/coreboot-4.22.01/0001-x230-fhd-variant.patch Signed-off-by: Thierry Laurion <[email protected]>

Signed-off-by: Thierry Laurion <[email protected]>

… Makefile.inc (Makefile.mk doesn't exist under 4.22) Signed-off-by: Thierry Laurion <[email protected]>

… to TCG Signed-off-by: Thierry Laurion <[email protected]>

…ve them from CircleCI, add Makefile helper and document untested_boards/README.md Signed-off-by: Thierry Laurion <[email protected]>

tlaurion · 2024-03-25T20:12:32Z

Rebased on master and moved boards from boards/UNTESTED_* to unmaintained_boards/UNMAINTAINED_* per added Makefile helper, removed them from CircleCI.

If there is interest for those boards, they will need to be brought back with proper testing and board owner willingness to maintain/at least test when needed.

See 9fcd5f8 related changes.

@JonathonHall-Purism : merge?

JonathonHall-Purism · 2024-03-25T20:19:11Z

Thanks @tlaurion , yes looks good to me for merge 👍

…o more boards can be built reusing cache and where nv41 will be rebuilt if coreboot level cache was not saved) Signed-off-by: Thierry Laurion <[email protected]>

tlaurion force-pushed the 422_fhd branch from 80868a4 to 1a6aacb Compare February 5, 2024 16:58

This was referenced Feb 5, 2024

OS Reboot with i915 Enabled Disables Internal Display - x230 fhd_edp (a.gain) #1603

Closed

PoC: x230-fhd_edp (on top of efifb next steps) [coreboot 4.22+) #1524

Closed

tlaurion marked this pull request as draft February 5, 2024 18:03

tlaurion mentioned this pull request Feb 13, 2024

cbmem -L broken under coreboot 4.21+ #1608

Closed

JonathonHall-Purism mentioned this pull request Feb 14, 2024

config/coreboot-librem: Use coreboot's custom TPM event log #1609

Closed

tlaurion changed the title ~~WiP 4.22.01 fhd patch test + bump all 4.19 boards to 4.22.01~~ 4.22.01 fhd patch test + bump all 4.19 boards to 4.22.01 Feb 19, 2024

tlaurion changed the title ~~4.22.01 fhd patch test + bump all 4.19 boards to 4.22.01~~ 4.22.01 fhd patch merged upstream (4.24) + bump all 4.19 boards to 4.22.01 Feb 19, 2024

tlaurion marked this pull request as ready for review February 19, 2024 19:49

tlaurion added 6 commits March 25, 2024 15:14

modules/coreboot CircleCI: adapt to coreboot version bumps

673b2f1

Signed-off-by: Thierry Laurion <[email protected]>

patches/coreboot-4.22.01/0001-x230-fhd-variant.patch: adapt patch for…

6d89399

… Makefile.inc (Makefile.mk doesn't exist under 4.22) Signed-off-by: Thierry Laurion <[email protected]>

boards aimed to bump at coreboot 4.22.01: switch TPM event log format…

b91eaed

… to TCG Signed-off-by: Thierry Laurion <[email protected]>

Move boards/UNTESTED_* boards to untested_boards/UNMAINTAINED_*, remo…

9fcd5f8

…ve them from CircleCI, add Makefile helper and document untested_boards/README.md Signed-off-by: Thierry Laurion <[email protected]>

tlaurion force-pushed the 422_fhd branch from 6b61f61 to 9fcd5f8 Compare March 25, 2024 20:06

JonathonHall-Purism approved these changes Mar 25, 2024

View reviewed changes

tlaurion mentioned this pull request Mar 25, 2024

CircleCI: add layer2 cache of newly added coreboot git forks to speedup builds from cache #1555

Closed

CircleCI: save_cache depends on librem_14 instead of nitropad-nv41 (s…

7fe2f9d

…o more boards can be built reusing cache and where nv41 will be rebuilt if coreboot level cache was not saved) Signed-off-by: Thierry Laurion <[email protected]>

This was referenced Mar 25, 2024

WiP: current kgpe-d16 boards against dasharo/coreboot (kgpe-d16 dasharo release 0.4) #1303

Draft

Add t430-dgpu support #1219

Draft

tlaurion merged commit 05289c0 into linuxboot:master Mar 26, 2024
36 checks passed

tlaurion mentioned this pull request May 25, 2024

Build unmaintained t530 maximized #1673

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

4.22.01 fhd patch merged upstream (4.24) + bump all 4.19 boards to 4.22.01 #1604

4.22.01 fhd patch merged upstream (4.24) + bump all 4.19 boards to 4.22.01 #1604

tlaurion commented Feb 5, 2024 •

edited

Loading

tlaurion commented Feb 5, 2024 •

edited

Loading

JonathonHall-Purism commented Feb 5, 2024

pcm720 commented Feb 5, 2024 •

edited

Loading

tlaurion commented Feb 5, 2024 •

edited

Loading

tlaurion commented Feb 5, 2024

JonathonHall-Purism commented Feb 5, 2024 •

edited

Loading

tlaurion commented Feb 5, 2024

tlaurion commented Feb 5, 2024

tlaurion commented Feb 13, 2024 •

edited

Loading

tlaurion commented Feb 14, 2024 •

edited

Loading

tlaurion commented Feb 14, 2024

tlaurion commented Feb 19, 2024 •

edited

Loading

tlaurion commented Feb 19, 2024 •

edited

Loading

tlaurion commented Feb 19, 2024 •

edited

Loading

tlaurion commented Feb 19, 2024

tlaurion commented Feb 19, 2024 •

edited

Loading

tlaurion commented Feb 19, 2024 •

edited

Loading

pcm720 commented Feb 19, 2024

tlaurion commented Feb 21, 2024

tlaurion commented Feb 21, 2024

natterangell commented Feb 22, 2024 via email •

edited

Loading

d-wid commented Feb 23, 2024 via email

JonathonHall-Purism commented Feb 23, 2024

tlaurion commented Feb 24, 2024

srgrint commented Feb 24, 2024

gaspar-ilom commented Feb 25, 2024

srgrint commented Feb 26, 2024

srgrint commented Feb 29, 2024

d-wid commented Mar 1, 2024 via email

tlaurion commented Mar 22, 2024 •

edited

Loading

natterangell commented Mar 23, 2024 via email

tlaurion commented Mar 25, 2024 •

edited

Loading

JonathonHall-Purism commented Mar 25, 2024

4.22.01 fhd patch merged upstream (4.24) + bump all 4.19 boards to 4.22.01 #1604

4.22.01 fhd patch merged upstream (4.24) + bump all 4.19 boards to 4.22.01 #1604

Conversation

tlaurion commented Feb 5, 2024 • edited Loading

tlaurion commented Feb 5, 2024 • edited Loading

JonathonHall-Purism commented Feb 5, 2024

pcm720 commented Feb 5, 2024 • edited Loading

tlaurion commented Feb 5, 2024 • edited Loading

tlaurion commented Feb 5, 2024

JonathonHall-Purism commented Feb 5, 2024 • edited Loading

tlaurion commented Feb 5, 2024

tlaurion commented Feb 5, 2024

tlaurion commented Feb 13, 2024 • edited Loading

tlaurion commented Feb 14, 2024 • edited Loading

tlaurion commented Feb 14, 2024

tlaurion commented Feb 19, 2024 • edited Loading

tlaurion commented Feb 19, 2024 • edited Loading

tlaurion commented Feb 19, 2024 • edited Loading

tlaurion commented Feb 19, 2024

tlaurion commented Feb 19, 2024 • edited Loading

tlaurion commented Feb 19, 2024 • edited Loading

pcm720 commented Feb 19, 2024

tlaurion commented Feb 21, 2024

tlaurion commented Feb 21, 2024

natterangell commented Feb 22, 2024 via email • edited Loading

d-wid commented Feb 23, 2024 via email

JonathonHall-Purism commented Feb 23, 2024

tlaurion commented Feb 24, 2024

srgrint commented Feb 24, 2024

gaspar-ilom commented Feb 25, 2024

srgrint commented Feb 26, 2024

srgrint commented Feb 29, 2024

d-wid commented Mar 1, 2024 via email

tlaurion commented Mar 22, 2024 • edited Loading

natterangell commented Mar 23, 2024 via email

tlaurion commented Mar 25, 2024 • edited Loading

JonathonHall-Purism commented Mar 25, 2024

tlaurion commented Feb 5, 2024 •

edited

Loading

tlaurion commented Feb 5, 2024 •

edited

Loading

pcm720 commented Feb 5, 2024 •

edited

Loading

tlaurion commented Feb 5, 2024 •

edited

Loading

JonathonHall-Purism commented Feb 5, 2024 •

edited

Loading

tlaurion commented Feb 13, 2024 •

edited

Loading

tlaurion commented Feb 14, 2024 •

edited

Loading

tlaurion commented Feb 19, 2024 •

edited

Loading

tlaurion commented Feb 19, 2024 •

edited

Loading

tlaurion commented Feb 19, 2024 •

edited

Loading

tlaurion commented Feb 19, 2024 •

edited

Loading

tlaurion commented Feb 19, 2024 •

edited

Loading

natterangell commented Feb 22, 2024 via email •

edited

Loading

tlaurion commented Mar 22, 2024 •

edited

Loading

tlaurion commented Mar 25, 2024 •

edited

Loading