Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging branch for merging 5.10 kernel changes, gnupg2.4 and flashrom 1.3 (testing needed) #1398

Merged
merged 37 commits into from
Jul 4, 2023

Conversation

tlaurion
Copy link
Collaborator

@tlaurion tlaurion commented May 7, 2023

This is a merger of #1422 #1381 and #1423 to facilitate testing. No point really asking board owners to test 3 PRs individually where they need to coexist to make things go forward and coexist in SPI space. This took a loooooong time (xx20/xx30 were still on 4.14 kernel) to happen. Hopefully, this will be easier in the future with the work that happened here. Its way easier to compare kernel configs and coreboot configs in oldconfig format, and helpers finally help comparing size differences of pull requests, and move from defconfig to oldconfig and see new kernel configuration options at version bumps to create diffs and apply to other board configs as patches.


THIS PR ALSO RENAMED THE FOLLOWING UNTESTED BOARDS https://github.com/osresearch/heads/compare/92e29c4..56a312e8edb91e773a0bbe0670af1574ca6ac274

Putting back boards from UNTESTED to normal will continue under #1421.

TLDR changeset:


Tested: oem-factory-reset, internal firmware upgrade, seal/unseal TOTP, sealing disk unlock key and kexec'ing into Qubes 4.2.

Will add all boards touched by the merger so that board owners can test this instead of other PRs.


Also delays #1421 a little bit more.

tlaurion

This comment was marked as resolved.

@pcm720
Copy link

pcm720 commented May 8, 2023

Tested out x230-maximized-fhd_edp CI build on my X230 with 1440p LCD upgrade, everything seems to work fine, including cryptsetup and its PBKDF2 functions.

@tlaurion
Copy link
Collaborator Author

tlaurion commented May 8, 2023

@pcm720 this is awesome news, meaning that libgfxinit is not needed to apply vbt magic on coreboot side for the edp mod to work!!!

This means that https://github.com/osresearch/heads/pull/1398/files#diff-6d0b40c74d1c5ee9e26189f7420a2e8a61aef86dbafb3f846f238c8f5aad4bd3R395-R398
https://github.com/osresearch/heads/pull/1398/files#diff-6d0b40c74d1c5ee9e26189f7420a2e8a61aef86dbafb3f846f238c8f5aad4bd3R419-R420

And most importantly https://github.com/osresearch/heads/pull/1398/files#diff-6d0b40c74d1c5ee9e26189f7420a2e8a61aef86dbafb3f846f238c8f5aad4bd3R123 is still working as expected!!!!

I do not want to abuse of your time, but if you could confirm that #1381 works for your edp variant?

@srgrint
Copy link
Contributor

srgrint commented May 11, 2023

Just adding another data point - flashed heads-t440p-maximized-v0.2.0-1571-g307f75d.rom on my t440p.

Seems to work fine - boots both debian installer from USB and installed version of debian from hard drive. No obvious regressions.

@tlaurion
Copy link
Collaborator Author

tlaurion commented Jun 22, 2023

Needs to be rebased after #1381 is merged

@tlaurion
Copy link
Collaborator Author

tlaurion commented Jun 23, 2023

@tlaurion
Copy link
Collaborator Author

tlaurion commented Jun 23, 2023

@tlaurion tlaurion force-pushed the staging_all branch 5 times, most recently from 4ec152c to 6603fc5 Compare June 26, 2023 17:10
@tlaurion tlaurion changed the title Staging branch for merging 5.10 kernel changes, gnupg2.4 and dasharoflashrom (testing needed) Staging branch for merging 5.10 kernel changes, gnupg2.4 and flashrom 1.3 (testing needed) Jun 26, 2023
@tlaurion
Copy link
Collaborator Author

tlaurion commented Jun 26, 2023

Staging modified PRs:

Goal is to see if #1381 has liberated enough space for those to be merged as is later on.

@tlaurion
Copy link
Collaborator Author

tlaurion commented Jun 26, 2023

Images available through CircleCI for 30 days. Just click the green checkmark next to last commit, select board, go into artifacts on the board CircleCI options, and download the full rom image for your board.

Of course, make sure the hash for the board ROM matches what is reported under BOARD output/hashes.txt. And flash internally as you do normally.

Please tag me directly if there is any issue/success. I will update OP accordingly.
Finally: this is moving forward and next steps can happen.

…_LEAK_PHYS_SMEM=y

It was impossible to use directly 4.14 defconfig and apply it to 5.10.
Saving 4.14 in oldconfig, then editing in 5.10 was necessary.
- E1000E module (as kernel module support...) was lost in conversion and needed to be added back.

Also tuned things up:
- legacy-flash has no RETPOLINE, no security policy at all. Has expected usb controllers modules, exFAT and bare minimal support for flashrom.
  - IMPORTANT: CONFIG_X86_IOPL_IOPERM kernel option is required by flashrom
- legacy adds sata, retpoline, additional modules (ethernet), security policy related material on top of legacy-flash config
- maximized adds MMC card support, mousedev+synaptic (to report presence through oem-system-info-xx30), thin provisioning+snapshot support
- tuned with linux.prompt_for_new_config_options_for_kernel_version_bump

Current storage format is oldconfig from now on for proper analysis. If needed, once can save back in defconfig prior of bumping to newer version.
…E=y for basic qemu-coreboot board config

advanced qemu-coreboot-*-tpm*-* boards enables virtio qemu/kvm through command line option.
qemu-coreboot-* (whiptail or fbwhiptail) basic boards are using bochs gpu emulation, provided through qemu

linux-qemu.config, if shared as of now, needs to provide both virtio (no need of FB_SIMPLE because DRM) and BOCHS+SIMPLE_FB
@natterangell
Copy link
Contributor

Tested heads-t420-hotp-maximized-v0.2.0-1613-g92e29c4.rom and everything seems to be working perfectly. Nice bootsplash 😊

@nestire
Copy link
Contributor

nestire commented Jul 4, 2023

tested heads-t430-hotp-maximized-v0.2.0-1613-g92e29c4.rom -> worked

tested heads-t430-hotp-legacy-v0.2.0-1613-g92e29c4.rom:

  • splash image -> works
  • this "finalizing chipset" does not show up before booting Qubes 4.1
  • firmware upgrade/oem reset/ Booting Qubes -> works

tlaurion added a commit to tlaurion/heads that referenced this pull request Jul 4, 2023
…g them with CircleCI if they were currently built.

Non-impactful action, frist step for linuxboot#1421 based on participation in testing linuxboot#1398

----

Traces of commands used:
ls qemu-linuxboot* leopard* r630* s2600wf* tioga* winterfell* t420* t520* t440p* w530* kgpe* p8z77* x220* x230-maximized-fhd_edp* | grep ":" | awk -F ":" {'print $1'}| while read board; do mv $board/$board.config $board/UNTESTED_$board.config; done
ls qemu-linuxboot* leopard* r630* s2600wf* tioga* winterfell* t420* t520* t440p* w530* kgpe* p8z77* x220* x230-maximized-fhd_edp* | grep ":" | awk -F ":" {'print $1'}| while read dir; do mv $dir UNTESTED_$dir; done
ls UNTESTED* | grep ":" | awk -F ":" {'print $1'}| awk -F "UNTESTED_" {'print $2'} | while read line; do sed 's/'"$line"'/UNTESTED_'"$line"'/g' ../.circleci/config.yml -i ; done

quick fix of circleci:
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
tlaurion added a commit to tlaurion/heads that referenced this pull request Jul 4, 2023
…g them with CircleCI if they were currently built.

Non-impactful action, first step for linuxboot#1421 based on participation in testing of linuxboot#1398 and prior non-tested PRs.

----

Traces of commands used:
ls qemu-linuxboot* leopard* r630* s2600wf* tioga* winterfell* t420* t520* t440p* w530* kgpe* p8z77* x220* x230-maximized-fhd_edp* | grep ":" | awk -F ":" {'print $1'}| while read board; do mv $board/$board.config $board/UNTESTED_$board.config; done
ls qemu-linuxboot* leopard* r630* s2600wf* tioga* winterfell* t420* t520* t440p* w530* kgpe* p8z77* x220* x230-maximized-fhd_edp* | grep ":" | awk -F ":" {'print $1'}| while read dir; do mv $dir UNTESTED_$dir; done
ls UNTESTED* | grep ":" | awk -F ":" {'print $1'}| awk -F "UNTESTED_" {'print $2'} | while read line; do sed 's/'"$line"'/UNTESTED_'"$line"'/g' ../.circleci/config.yml -i ; done

quick fix of circleci:
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
tlaurion added a commit to tlaurion/heads that referenced this pull request Jul 4, 2023
…g them with CircleCI if they were currently built.

Non-impactful action, first step for linuxboot#1421 based on participation in testing of linuxboot#1398 and prior non-tested PRs.

----

Traces of commands used:
ls qemu-linuxboot* leopard* r630* s2600wf* tioga* winterfell* t420* t520* t440p* w530* kgpe* p8z77* x220* x230-maximized-fhd_edp* | grep ":" | awk -F ":" {'print $1'}| while read board; do mv $board/$board.config $board/UNTESTED_$board.config; done
ls qemu-linuxboot* leopard* r630* s2600wf* tioga* winterfell* t420* t520* t440p* w530* kgpe* p8z77* x220* x230-maximized-fhd_edp* | grep ":" | awk -F ":" {'print $1'}| while read dir; do mv $dir UNTESTED_$dir; done
ls UNTESTED* | grep ":" | awk -F ":" {'print $1'}| awk -F "UNTESTED_" {'print $2'} | while read line; do sed 's/'"$line"'/UNTESTED_'"$line"'/g' ../.circleci/config.yml -i ; done

quick fix of circleci:
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml

Modify t440p and p8z77-m_pro-tpm1 hotp board configs to included to their maximized counterpart
@tlaurion
Copy link
Collaborator Author

tlaurion commented Jul 4, 2023

A decision has been taken.
The following boards have been renamed to UNTESTED_* per 1576381 since nobody tested this PR and previous ones.

Please participate under #1421 or open an issue saying the following boards have been tested and working on daily usage to revive them individually:

Waiting for all boards to build successfully prior of merging.
Replaces #1381 #1422 and #1423

@tlaurion
Copy link
Collaborator Author

tlaurion commented Jul 4, 2023

Board owners reported testing 92e29c4, not a51143a which is here by error. Rebasing.

tlaurion added a commit to tlaurion/heads that referenced this pull request Jul 4, 2023
…g them with CircleCI if they were currently built.

Non-impactful action, first step for linuxboot#1421 based on participation in testing of linuxboot#1398 and prior non-tested PRs.

----

Traces of commands used:
ls qemu-linuxboot* leopard* r630* s2600wf* tioga* winterfell* t420* t520* t440p* w530* kgpe* p8z77* x220* x230-maximized-fhd_edp* | grep ":" | awk -F ":" {'print $1'}| while read board; do mv $board/$board.config $board/UNTESTED_$board.config; done
ls qemu-linuxboot* leopard* r630* s2600wf* tioga* winterfell* t420* t520* t440p* w530* kgpe* p8z77* x220* x230-maximized-fhd_edp* | grep ":" | awk -F ":" {'print $1'}| while read dir; do mv $dir UNTESTED_$dir; done
ls UNTESTED* | grep ":" | awk -F ":" {'print $1'}| awk -F "UNTESTED_" {'print $2'} | while read line; do sed 's/'"$line"'/UNTESTED_'"$line"'/g' ../.circleci/config.yml -i ; done

quick fix of circleci:
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml

Modify t440p and p8z77-m_pro-tpm1 hotp board configs to included to their maximized counterpart
@srgrint
Copy link
Contributor

srgrint commented Jul 4, 2023

Have tested heads-x220-maximized-v0.2.0-1613-g92e29c4.rom on my x220. No problems.

tlaurion added a commit to tlaurion/heads that referenced this pull request Jul 4, 2023
…g them with CircleCI if they were currently built.

Non-impactful action, first step for linuxboot#1421 based on participation in testing of linuxboot#1398 and prior non-tested PRs.

EDIT: last minute readd of x220-maximized boards (x220-maximized and x220-hotp-maximized boards).
 x220 is still UNTESTED (legacy, manually extracting ifs, me and gbe).
----

Traces of commands used:
ls qemu-linuxboot* leopard* r630* s2600wf* tioga* winterfell* t420* t520* t440p* w530* kgpe* p8z77* x220* x230-maximized-fhd_edp* | grep ":" | awk -F ":" {'print $1'}| while read board; do mv $board/$board.config $board/UNTESTED_$board.config; done
ls qemu-linuxboot* leopard* r630* s2600wf* tioga* winterfell* t420* t520* t440p* w530* kgpe* p8z77* x220* x230-maximized-fhd_edp* | grep ":" | awk -F ":" {'print $1'}| while read dir; do mv $dir UNTESTED_$dir; done
ls UNTESTED* | grep ":" | awk -F ":" {'print $1'}| awk -F "UNTESTED_" {'print $2'} | while read line; do sed 's/'"$line"'/UNTESTED_'"$line"'/g' ../.circleci/config.yml -i ; done

quick fix of circleci:
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml

Modify t440p and p8z77-m_pro-tpm1 hotp board configs to included to their maximized counterpart
@tlaurion
Copy link
Collaborator Author

tlaurion commented Jul 4, 2023

Have tested heads-x220-maximized-v0.2.0-1613-g92e29c4.rom on my x220. No problems.

Just remove x220-hotp-maximized and x220-maximized boards from UNTESTED.
Also updating #1421

@srgrint
Copy link
Contributor

srgrint commented Jul 4, 2023

Shouldn't t440p also be removed from UNTESTED? I tested it a few days ago.

tlaurion added a commit to tlaurion/heads that referenced this pull request Jul 4, 2023
…g them with CircleCI if they were currently built.

Non-impactful action, first step for linuxboot#1421 based on participation in testing of linuxboot#1398 and prior non-tested PRs.

EDIT: last minute readd of x220-maximized boards (x220-maximized and x220-hotp-maximized boards).
 x220 is still UNTESTED (legacy, manually extracting ifs, me and gbe).

EDIT: last minute readd of t440p-maximized boards (t440p-maximized and t440p-hotp-maximized boards).

Thanks to @srgrint for lat minute report that t440p and x220 were tested
----

Traces of commands used:
ls qemu-linuxboot* leopard* r630* s2600wf* tioga* winterfell* t420* t520* t440p* w530* kgpe* p8z77* x220* x230-maximized-fhd_edp* | grep ":" | awk -F ":" {'print $1'}| while read board; do mv $board/$board.config $board/UNTESTED_$board.config; done
ls qemu-linuxboot* leopard* r630* s2600wf* tioga* winterfell* t420* t520* t440p* w530* kgpe* p8z77* x220* x230-maximized-fhd_edp* | grep ":" | awk -F ":" {'print $1'}| while read dir; do mv $dir UNTESTED_$dir; done
ls UNTESTED* | grep ":" | awk -F ":" {'print $1'}| awk -F "UNTESTED_" {'print $2'} | while read line; do sed 's/'"$line"'/UNTESTED_'"$line"'/g' ../.circleci/config.yml -i ; done

quick fix of circleci:
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml

Modify p8z77-m_pro-tpm1 hotp board config to include to their maximized counterpart
@tlaurion
Copy link
Collaborator Author

tlaurion commented Jul 4, 2023

Shouldn't t440p also be removed from UNTESTED? I tested it a few days ago.
Sorry about that, human error.

Readded t440p-maximized and t440p-hotp-maximized. Will update #1421 as well.
Thanks @srgrint for flagging.

@tlaurion

This comment was marked as outdated.

…g them with CircleCI if they were currently built.

Non-impactful action, first step for linuxboot#1421 based on participation in testing of linuxboot#1398 and prior non-tested PRs.

EDIT: last minute readd of x220-maximized boards (x220-maximized and x220-hotp-maximized boards).
 x220 is still UNTESTED (legacy, manually extracting ifs, me and gbe).

EDIT: last minute readd of t440p-maximized boards (t440p-maximized and t440p-hotp-maximized boards).

Thanks to @srgrint for lat minute report that t440p and x220 were tested
----

Traces of commands used:
ls qemu-linuxboot* leopard* r630* s2600wf* tioga* winterfell* t420* t520* t440p* w530* kgpe* p8z77* x220* x230-maximized-fhd_edp* | grep ":" | awk -F ":" {'print $1'}| while read board; do mv $board/$board.config $board/UNTESTED_$board.config; done
ls qemu-linuxboot* leopard* r630* s2600wf* tioga* winterfell* t420* t520* t440p* w530* kgpe* p8z77* x220* x230-maximized-fhd_edp* | grep ":" | awk -F ":" {'print $1'}| while read dir; do mv $dir UNTESTED_$dir; done
ls UNTESTED* | grep ":" | awk -F ":" {'print $1'}| awk -F "UNTESTED_" {'print $2'} | while read line; do sed 's/'"$line"'/UNTESTED_'"$line"'/g' ../.circleci/config.yml -i ; done

quick fix of circleci:
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml
sed -i 's/UNTESTED_UNTESTED/UNTESTED/g' ../.circleci/config.yml

Modify p8z77-m_pro-tpm1 hotp board config to include to their maximized counterpart
@tlaurion
Copy link
Collaborator Author

tlaurion commented Jul 4, 2023

Other boards specified under #1421 OP wlll be revived by other individual raised issues and cooresponding PRs.

Waiting for f8cb3db build to be successfully build prior of merging.

Thanks all.


Sorry for the noise, if you want to inspect final changes prior of staging PR and final PR that would be here:
https://github.com/osresearch/heads/compare/92e29c4..f8cb3db

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants