Staging commits for v540tu/v560tu/ns50/n4x_adl: pr0 patch missing, ME HAP bit, s3, review + unify #1871

tlaurion · 2024-12-04T14:57:30Z

input for #1846

2024-12-04:

review of coreboot configs to HAP disable, s3 preferred, missing bits for PR0, oldconfig saved format
unification of ns50/nv4x_adl v560tu v540tu coreboot config and boards configs

If builds and doesn't cause brick, should be base for testing after @mkopec corrections from b78c174 state

Old:

Ci : adds v560tu
CI: have all boards depending on Dasharo fork built atop x230-hotp-maximized workspace cache (24.02.01 coreboot's crossgc pinned buildstack)
modules/coreboot: readd dasharo-coreboot-unreleased patch dir containing pr0 patch, since not in dasharo fork tree pointed by commit

@mkopec :
This shows PR0 patch not applying, see last commit log. CI will fail for same reason building this PR.
Once all pending patches are gone under patches/coreboot-dasahro-unreleased, then modules/coreboot can have that patch dir removed and patches needed between dasahro coreboot release and upstream fixes will land in that directory until dasharo coreboot fork git hash is updated to contain content of patches under that directory.

Co-authored-by: Michał Kopeć <[email protected]> Co-authored-by: Thierry Laurion <[email protected]> Signed-off-by: Michał Kopeć <[email protected]> Signed-off-by: Thierry Laurion <[email protected]>

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

Signed-off-by: Michał Kopeć <[email protected]>

…bug options Signed-off-by: Michał Kopeć <[email protected]>

Signed-off-by: Michał Kopeć <[email protected]>

as a copy of V540TU Signed-off-by: Michał Kopeć <[email protected]>

modules/coreboot

tlaurion · 2024-12-04T15:11:07Z

Once patch added, can help uniform coreboot configs against n4x_adl to prepare for pr0, and then board configs to add same tooling related changes to apply pr0 prior of kexec call.

@mkopec see https://github.com/linuxboot/heads/compare/70bed5f659be985c31cd348793ae74b04620ddcb..0f339496a715db4a44629854b8d208b7b010ad12

mkopec · 2024-12-04T17:10:04Z

@tlaurion here's the pr0 patch Dasharo/coreboot@3fcffce

Signed-off-by: Michał Kopeć <[email protected]>

…ximized to reuse coreboot 24.02.01 utils/crossgcc buildstack build for x230-hotp-maximized to skip rebuilding buildstack for novacustom boards Signed-off-by: Thierry Laurion <[email protected]>

… (might not show much more gain then if based on x230-hotp-maximized) Signed-off-by: Thierry Laurion <[email protected]>

…pport for PRR/PR0 remove patches/coreboot-dasharo-unreleased/0002-pr0_chipset_locking-post_skylake.patch Note: modules/coreboot commented the patchdir, but left exisiting under Heads tree so state no patches added on that fork Signed-off-by: Thierry Laurion <[email protected]>

…ig with helper, adding some missing PR0 settings Repro ./docker_repro.sh make BOARD=novacustom-v560tu coreboot.save_in_oldconfig_format_in_place ./docker_repro.sh make BOARD=novacustom-v540tu coreboot.save_in_oldconfig_format_in_place git status | grep modified | awk -F ":" {'print $2'}| xargs git add Signed-off-by: Thierry Laurion <[email protected]>

@mkopec

…with helper Repro: ./docker_repro.sh make BOARD=novacustom-nv4x_adl coreboot.save_in_oldconfig_format_in_place ./docker_repro.sh make BOARD=nitropad-ns50 coreboot.save_in_oldconfig_format_in_place git add config/coreboot-novacustom-v540tu.config config/coreboot-novacustom-v560tu.config Important changes there to review @mkopec Signed-off-by: Thierry Laurion <[email protected]>

…sabling ME, saved in oldconfig Signed-off-by: Thierry Laurion <[email protected]>

tlaurion · 2024-12-04T18:47:00Z

@mkopec see https://github.com/linuxboot/heads/compare/93100fcade2e7de6c21119dc400b3a5709cc41fa..b78c1745f94f479dae262488f0bbc22f027b4ddb and their associated commit messages, most importantly b78c174: no bootsplash, ME Enabled, s3 wasn't preferred and LOCALVERSION fixed (not rebrandeable)

tlaurion

To be reviewed, commits stolen/modified/cherry-picked @mkopec :)

tlaurion · 2024-12-04T19:01:19Z

config/coreboot-novacustom-v560tu.config

+# General setup
+#
+CONFIG_COREBOOT_BUILD=y
+CONFIG_LOCALVERSION=""


Rebranding related. Maybe Dasharo wants to fixate this so LOCALVERSION is defined across all branding, but otherwise branding related snippets to understand:

Heads branding if not defined:

heads/Makefile

Line 13 in 99157f2

BRAND_NAME ?= Heads

Override by localsite

heads/Makefile

Lines 92 to 97 in 99157f2

# Include site-local/config only if it exists, downstreams can set configs for

# all boards, including overriding values specified by boards. site-local is

# not a part of the upstream distribution but is for downstreams to insert

# customizations at well-defined points, like in coreboot:

# https://doc.coreboot.org/tutorial/managing_local_additions.html

-include $(pwd)/site-local/config

And then if not defined, populated

heads/modules/coreboot

Lines 115 to 119 in 99157f2

# coreboot builds are specialized on a per-target basis.

# The builds are done in a per-target subdirectory

CONFIG_COREBOOT_CONFIG ?= config/coreboot-$(BOARD).config

CONFIG_COREBOOT_LOCALVERSION ?= "$(BRAND_NAME)-$(HEADS_GIT_VERSION)"

CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME ?= $(BOARD)

tlaurion · 2024-12-04T19:02:46Z

config/coreboot-novacustom-v560tu.config

+CONFIG_TSEG_STAGE_CACHE=y
+# CONFIG_UPDATE_IMAGE is not set
+CONFIG_BOOTSPLASH_IMAGE=y
+CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash.jpg"


bootsplash related stuff missing

tlaurion · 2024-12-04T19:03:36Z

config/coreboot-novacustom-v560tu.config

+CONFIG_DRIVERS_INTEL_WIFI=y
+CONFIG_IFD_BIN_PATH="3rdparty/dasharo-blobs/novacustom/v5x0tu/descriptor.bin"
+CONFIG_ME_BIN_PATH="3rdparty/dasharo-blobs/novacustom/v5x0tu/me.bin"
+CONFIG_GBE_BIN_PATH="3rdparty/dasharo-blobs/novacustom/v5x0tu/gbe.bin"


mac address? DE:AD:C0:FF:EE?

It's a clean NVM from Intel, the default MAC is 88:88:88:88:87:88. It's expected that this region is not flashed during regular firmware deployment or update.

If someone accidentally overwrites or wipes their GbE region, they can recover their mac using https://github.com/dasharo/dcu?tab=readme-ov-file#usage

tlaurion · 2024-12-04T19:03:49Z

config/coreboot-novacustom-v560tu.config

+#
+# Dasharo Configuration
+#
+CONFIG_DASHARO_PREFER_S3_SLEEP=y


No, there's no S3 support on Meteor Lake :(

@mkopec confused: #1801 (comment)

@mkopec updates on this? That would be the first Heads platform with ME enabled, that was not expected/planned #1801 (comment)

S3 enabled now

tlaurion · 2024-12-04T19:05:18Z

config/coreboot-novacustom-v560tu.config

+# CONFIG_STITCH_ME_BIN is not set
+# CONFIG_ME_REGION_ALLOW_CPU_READ_ACCESS is not set
+CONFIG_HAVE_INTEL_ME_HAP=y
+# CONFIG_INTEL_ME_DISABLED_HECI is not set


HAP disabled?

with ME disabled, S0ix will stop working correctly (CPU won't enter deepest sleepstates and fans will stay on), and there's no S3, so I think it has to stay enabled for now.

@mkopec confused: #1801 (comment)

@mkopec updates on this? That would be the first Heads platform with ME enabled, that was not expected/planned #1801 (comment)

I'm not sure what happened here, summoning @macpijan for help

Indeed, we have supported/tested S0ix only in UEFI firmware, which was the reference here. I think this is now clarified: #1871 (comment)

I hope this thread can be resolved once @mkopec changes these settings

ME disabled, S3 enabled in commit b5fe899

tlaurion · 2024-12-06T17:54:24Z

Added comment at #1801 (comment) for ME being now required, wasn't planned/expected @macpijan

tlaurion · 2024-12-09T03:44:53Z

@mkopec

Found ref from @marmarek stating s3 works, meaning ME can be disabled with HAP on this Heads Matrix room permalink

mkopec · 2024-12-10T15:21:42Z

S3 seems to be working correctly, at least with Qubes, with ~10 cycles so far, and using various wake sources (pwrbtn, lid, keyboard)

If that is sufficient then we may enable it for Heads indeed. There's still a risk that some future ucode / pmc / me / fsp / board revision breaks it but at this point it appears to be working correctly

@tlaurion @macpijan

macpijan · 2024-12-10T15:35:26Z

@mkopec Let's proceed with this change. If anything changes in the future, we will retest/explain/inform what broke it and inform that it simply there is no suspend on given board, or it can be optionally enabled by user as @tlaurion has suggested, but that is another thread.

I think it's clear for now for everyone that each new Intel board should come with ME HAP-disabled in first PR. Thanks for raising this @tlaurion

Redoing diffs already proposed under linuxboot#1871 but not taken yet.... Signed-off-by: Thierry Laurion <[email protected]>

…inuxboot#1871 for linuxboot#1846 Signed-off-by: Thierry Laurion <[email protected]>

…linuxboot#1871 but not yet taken under linuxboot#1846 BOOTSPLASH section missing, as well as ME still enabled... Signed-off-by: Thierry Laurion <[email protected]>

tlaurion · 2024-12-11T20:03:07Z

Closing in favor of staging #1876

Redoing diffs already proposed under linuxboot#1871 but not taken yet.... Signed-off-by: Thierry Laurion <[email protected]>

…inuxboot#1871 for linuxboot#1846 Signed-off-by: Thierry Laurion <[email protected]>

…linuxboot#1871 but not yet taken under linuxboot#1846 BOOTSPLASH section missing, as well as ME still enabled... Signed-off-by: Thierry Laurion <[email protected]>

mkopec and others added 9 commits December 4, 2024 12:46

Add NovaCustom V540TU board

ce2b051

Co-authored-by: Michał Kopeć <[email protected]> Co-authored-by: Thierry Laurion <[email protected]> Signed-off-by: Michał Kopeć <[email protected]> Signed-off-by: Thierry Laurion <[email protected]>

modules/linux: add Linux 6.11.9

4394052

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

.circleci/config.yml nitropad-nv41 name changed -> novacustom_nv4x_adl

059a60e

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

config/coreboot-novacustom-v540tu.config: disable debug console

cf02a29

Signed-off-by: Michał Kopeć <[email protected]>

boards/novacustom-v540tu/novacustom-v540tu.config: remove unneeded de…

4a3667b

…bug options Signed-off-by: Michał Kopeć <[email protected]>

modules/coreboot: update comment about Dasharo coreboot fork

b6f5c6d

Signed-off-by: Michał Kopeć <[email protected]>

modules/coreboot: dasharo: reuse 24.02.1 toolchain

0cdba41

Signed-off-by: Michał Kopeć <[email protected]>

config/coreboot-novacustom-v540tu.config: set version to rc1

ad6605d

Signed-off-by: Michał Kopeć <[email protected]>

Add NovaCustom V560TU

0f33949

as a copy of V540TU Signed-off-by: Michał Kopeć <[email protected]>

tlaurion marked this pull request as draft December 4, 2024 14:57

tlaurion mentioned this pull request Dec 4, 2024

Add NovaCustom V560TU board #1846

Merged

tlaurion commented Dec 4, 2024

View reviewed changes

modules/coreboot Outdated Show resolved Hide resolved

mkopec and others added 5 commits December 4, 2024 18:11

modules/coreboot: bump dasharo fork for PRR lockdown

34ee256

Signed-off-by: Michał Kopeć <[email protected]>

modules/coreboot: add commented out patch version

bb6c83d

Signed-off-by: Michał Kopeć <[email protected]>

.circleci/config.yml: have novacustom_nv4x_adl depend on x230-hotp-ma…

f1a9f5c

…ximized to reuse coreboot 24.02.01 utils/crossgcc buildstack build for x230-hotp-maximized to skip rebuilding buildstack for novacustom boards Signed-off-by: Thierry Laurion <[email protected]>

.circleci/config.yml: build v560TU, reusing novacustom_nv4x_adl cache…

a3732cb

… (might not show much more gain then if based on x230-hotp-maximized) Signed-off-by: Thierry Laurion <[email protected]>

tlaurion force-pushed the dasharo-fork_pr0_missing branch from 93100fc to ea22fae Compare December 4, 2024 18:23

tlaurion added 3 commits December 4, 2024 13:32

novacustom-v540tu/novacustom-v560tu: add s3 preferred, bootsplash, di…

b78c174

…sabling ME, saved in oldconfig Signed-off-by: Thierry Laurion <[email protected]>

tlaurion force-pushed the dasharo-fork_pr0_missing branch from ea22fae to b78c174 Compare December 4, 2024 18:43

tlaurion assigned mkopec Dec 4, 2024

This comment was marked as off-topic.

Sign in to view

tlaurion commented Dec 4, 2024

View reviewed changes

tlaurion changed the title ~~Dasharo fork pr0 missing~~ Staging commits for v540tu/v560tu/ns50/n4x_adl: Dasharo fork pr0 missing, ME HAP bit, s3 etc Dec 5, 2024

tlaurion changed the title ~~Staging commits for v540tu/v560tu/ns50/n4x_adl: Dasharo fork pr0 missing, ME HAP bit, s3 etc~~ Staging commits for v540tu/v560tu/ns50/n4x_adl: pr0 patch missing, ME HAP bit, s3 etc Dec 5, 2024

tlaurion mentioned this pull request Dec 5, 2024

Intel gen 14th+ (Meteor Lake) strong dependencies against ME/CSME (s0ix requiring ME, s3 deprecated, ME not HAP disabled) #1801

Open

tlaurion changed the title ~~Staging commits for v540tu/v560tu/ns50/n4x_adl: pr0 patch missing, ME HAP bit, s3 etc~~ Staging commits for v540tu/v560tu/ns50/n4x_adl: pr0 patch missing, ME HAP bit, s3, review + unify Dec 5, 2024

tlaurion added a commit to tlaurion/heads that referenced this pull request Dec 10, 2024

CircleCI: Add v560tu missing into linuxboot#1846

30951a7

Redoing diffs already proposed under linuxboot#1871 but not taken yet.... Signed-off-by: Thierry Laurion <[email protected]>

tlaurion added a commit to tlaurion/heads that referenced this pull request Dec 10, 2024

v540tu/v560tu: remove MSRTOOL, reuse proposed changes not taken from l…

698222c

…inuxboot#1871 for linuxboot#1846 Signed-off-by: Thierry Laurion <[email protected]>

tlaurion closed this Dec 11, 2024

tlaurion mentioned this pull request Dec 11, 2024

V560tu/v540tu/nv4x_adl/ns50 needed staging fixups #1876

Closed

mkopec pushed a commit to Dasharo/heads that referenced this pull request Dec 18, 2024

CircleCI: Add v560tu missing into linuxboot#1846

6ee05c3

Redoing diffs already proposed under linuxboot#1871 but not taken yet.... Signed-off-by: Thierry Laurion <[email protected]>

mkopec pushed a commit to Dasharo/heads that referenced this pull request Dec 18, 2024

v540tu/v560tu: remove MSRTOOL, reuse proposed changes not taken from l…

fffc3a8

…inuxboot#1871 for linuxboot#1846 Signed-off-by: Thierry Laurion <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Staging commits for v540tu/v560tu/ns50/n4x_adl: pr0 patch missing, ME HAP bit, s3, review + unify #1871

Staging commits for v540tu/v560tu/ns50/n4x_adl: pr0 patch missing, ME HAP bit, s3, review + unify #1871

tlaurion commented Dec 4, 2024 •

edited

Loading

tlaurion commented Dec 4, 2024

mkopec commented Dec 4, 2024

tlaurion commented Dec 4, 2024 •

edited

Loading

This comment was marked as off-topic.

tlaurion left a comment

tlaurion Dec 4, 2024

tlaurion Dec 4, 2024

tlaurion Dec 4, 2024

mkopec Dec 5, 2024

tlaurion Dec 4, 2024

mkopec Dec 5, 2024

tlaurion Dec 5, 2024

tlaurion Dec 6, 2024 •

edited

Loading

mkopec Dec 11, 2024

tlaurion Dec 4, 2024

mkopec Dec 5, 2024

tlaurion Dec 5, 2024

tlaurion Dec 6, 2024 •

edited

Loading

mkopec Dec 6, 2024

macpijan Dec 10, 2024 •

edited

Loading

mkopec Dec 10, 2024 •

edited

Loading

tlaurion commented Dec 6, 2024

tlaurion commented Dec 9, 2024

mkopec commented Dec 10, 2024 •

edited

Loading

macpijan commented Dec 10, 2024

tlaurion commented Dec 11, 2024

	# Include site-local/config only if it exists, downstreams can set configs for
	# all boards, including overriding values specified by boards. site-local is
	# not a part of the upstream distribution but is for downstreams to insert
	# customizations at well-defined points, like in coreboot:
	# https://doc.coreboot.org/tutorial/managing_local_additions.html
	-include $(pwd)/site-local/config

	# coreboot builds are specialized on a per-target basis.
	# The builds are done in a per-target subdirectory
	CONFIG_COREBOOT_CONFIG ?= config/coreboot-$(BOARD).config
	CONFIG_COREBOOT_LOCALVERSION ?= "$(BRAND_NAME)-$(HEADS_GIT_VERSION)"
	CONFIG_COREBOOT_SMBIOS_PRODUCT_NAME ?= $(BOARD)

Staging commits for v540tu/v560tu/ns50/n4x_adl: pr0 patch missing, ME HAP bit, s3, review + unify #1871

Staging commits for v540tu/v560tu/ns50/n4x_adl: pr0 patch missing, ME HAP bit, s3, review + unify #1871

Conversation

tlaurion commented Dec 4, 2024 • edited Loading

tlaurion commented Dec 4, 2024

mkopec commented Dec 4, 2024

tlaurion commented Dec 4, 2024 • edited Loading

This comment was marked as off-topic.

tlaurion 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tlaurion Dec 6, 2024 • edited Loading

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

tlaurion Dec 6, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

macpijan Dec 10, 2024 • edited Loading

Choose a reason for hiding this comment

mkopec Dec 10, 2024 • edited Loading

Choose a reason for hiding this comment

tlaurion commented Dec 6, 2024

tlaurion commented Dec 9, 2024

mkopec commented Dec 10, 2024 • edited Loading

macpijan commented Dec 10, 2024

tlaurion commented Dec 11, 2024

tlaurion commented Dec 4, 2024 •

edited

Loading

tlaurion commented Dec 4, 2024 •

edited

Loading

tlaurion Dec 6, 2024 •

edited

Loading

tlaurion Dec 6, 2024 •

edited

Loading

macpijan Dec 10, 2024 •

edited

Loading

mkopec Dec 10, 2024 •

edited

Loading

mkopec commented Dec 10, 2024 •

edited

Loading