diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-10-31 08:11:53 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-10-31 08:27:37 +0000 |
| commit | 29e9c32e32f8e947f51a3efe375dab3ef8e1987e (patch) | |
| tree | 65cbdeae7ed5639deaa5294bd40c01788be0cd1e /config/coreboot/default/patches/0028-Kconfig-Decrease-default-HEAP_SIZE-from-1-MiB-to-512.patch | |
| parent | 9606c68c5b5becfb09da45e027e2398e5ff33dfa (diff) | |
coreboot/default: use alternative heap size fix
My previous fix to revert didn't fix S3 on GM45, one
of the platforms reported fixed by 78263; I'm merging
that instead, at patch set 10.
It is referenced by 78815/1 which was split from it,
so merge that too (restores overrides of higher values,
on certain platforms that we don't use yet).
https://review.coreboot.org/c/coreboot/+/78623/10
https://review.coreboot.org/c/coreboot/+/78815/1
Accordingly, update configs to match the new default.
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'config/coreboot/default/patches/0028-Kconfig-Decrease-default-HEAP_SIZE-from-1-MiB-to-512.patch')
| -rw-r--r-- | config/coreboot/default/patches/0028-Kconfig-Decrease-default-HEAP_SIZE-from-1-MiB-to-512.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/config/coreboot/default/patches/0028-Kconfig-Decrease-default-HEAP_SIZE-from-1-MiB-to-512.patch b/config/coreboot/default/patches/0028-Kconfig-Decrease-default-HEAP_SIZE-from-1-MiB-to-512.patch new file mode 100644 index 00000000..31e86e86 --- /dev/null +++ b/config/coreboot/default/patches/0028-Kconfig-Decrease-default-HEAP_SIZE-from-1-MiB-to-512.patch @@ -0,0 +1,41 @@ +From 7eda35a9b63d070ede24b32253855ce07c6c7d13 Mon Sep 17 00:00:00 2001 +From: Bill XIE <persmule@hardenedlinux.org> +Date: Tue, 24 Oct 2023 13:56:16 +0800 +Subject: [PATCH 1/2] Kconfig: Decrease default HEAP_SIZE from 1 MiB to 512 KiB + +Commit 44a48ce7a46c ("Kconfig: Bring HEAP_SIZE to a common, large +value") breaks S3 resume from TSEG stage cache on many platforms, +including GM45 and Ivy Bridge, so limit it to 512 KiB. + +Please test this against other platforms before merging! + +Tested: Setting it to 0x80000 results a working S3 resume on Thinkpad + X200 and T430, with log in cbmem for S3 resume, while 0xa0000 + breaks it. coreboot log during failed resume when (HEAP_SIZE + >= 0xa0000) cannot be obtained from EHCI debug, while log in + cbmem shows that ramstage is failed to be found in TSEG stage + cache, as shown in https://ticket.coreboot.org/issues/512 . + +Resolves: https://ticket.coreboot.org/issues/512 +Signed-off-by: Bill XIE <persmule@hardenedlinux.org> +Change-Id: Ib1de1eb8487df5bdf004e544d40667833a291515 +--- + src/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Kconfig b/src/Kconfig +index ae8024089e..6db0736715 100644 +--- a/src/Kconfig ++++ b/src/Kconfig +@@ -751,7 +751,7 @@ config RTC + + config HEAP_SIZE + hex +- default 0x100000 ++ default 0x80000 + + config STACK_SIZE + hex +-- +2.39.2 + |