Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80023?usp=email )
Change subject: Reland "Kconfig: Bring HEAP_SIZE to a common, large value" ......................................................................
Reland "Kconfig: Bring HEAP_SIZE to a common, large value"
This reverts commit acbc4912375085a099c2427def464d6e481f2a90.
Reason for revert: CB:79525 fixes the issue that led to the revert by not maintaining the heap in the SMM-stored copy of ramstage at all.
Change-Id: I3c8ef785486d275c9341859d34fce12253bd2bb9 Signed-off-by: Patrick Georgi patrick@coreboot.org Reviewed-on: https://review.coreboot.org/c/coreboot/+/80023 Reviewed-by: Sean Rhodes sean@starlabs.systems Reviewed-by: Subrata Banik subratabanik@google.com Reviewed-by: Julius Werner jwerner@chromium.org Reviewed-by: Matt DeVillier matt.devillier@amd.corp-partner.google.com Reviewed-by: Arthur Heymans arthur@aheymans.xyz Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/Kconfig M src/cpu/qemu-x86/Kconfig M src/mainboard/sifive/hifive-unleashed/Kconfig M src/northbridge/amd/pi/Kconfig M src/soc/amd/genoa_poc/Kconfig M src/soc/amd/picasso/Kconfig M src/soc/amd/stoneyridge/Kconfig M src/soc/cavium/cn81xx/Kconfig M src/soc/intel/alderlake/Kconfig M src/soc/intel/apollolake/Kconfig M src/soc/intel/cannonlake/Kconfig M src/soc/intel/elkhartlake/Kconfig M src/soc/intel/jasperlake/Kconfig M src/soc/intel/meteorlake/Kconfig M src/soc/intel/skylake/Kconfig M src/soc/intel/tigerlake/Kconfig M src/soc/intel/xeon_sp/Kconfig M src/soc/intel/xeon_sp/cpx/Kconfig M src/soc/intel/xeon_sp/skx/Kconfig M src/soc/intel/xeon_sp/spr/Kconfig M src/soc/qualcomm/ipq40xx/Kconfig 21 files changed, 1 insertion(+), 82 deletions(-)
Approvals: Julius Werner: Looks good to me, approved Arthur Heymans: Looks good to me, approved Sean Rhodes: Looks good to me, but someone else must approve Matt DeVillier: Looks good to me, but someone else must approve Subrata Banik: Looks good to me, approved build bot (Jenkins): Verified
diff --git a/src/Kconfig b/src/Kconfig index 5cb9a1a..7867f44 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -759,8 +759,7 @@
config HEAP_SIZE hex - default 0x100000 if FLATTENED_DEVICE_TREE - default 0x4000 + default 0x100000
config STACK_SIZE hex diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig index f3e2c4c..0fa999e 100644 --- a/src/cpu/qemu-x86/Kconfig +++ b/src/cpu/qemu-x86/Kconfig @@ -35,7 +35,4 @@ default 32 if SMM_TSEG default 4
-config HEAP_SIZE - default 0x8000 - endif diff --git a/src/mainboard/sifive/hifive-unleashed/Kconfig b/src/mainboard/sifive/hifive-unleashed/Kconfig index 7f9300f..7bc3b0b 100644 --- a/src/mainboard/sifive/hifive-unleashed/Kconfig +++ b/src/mainboard/sifive/hifive-unleashed/Kconfig @@ -10,9 +10,6 @@ select FLATTENED_DEVICE_TREE select SPI_SDCARD
-config HEAP_SIZE - default 0x10000 - config MAINBOARD_DIR default "sifive/hifive-unleashed"
diff --git a/src/northbridge/amd/pi/Kconfig b/src/northbridge/amd/pi/Kconfig index 3222198..57426b8 100644 --- a/src/northbridge/amd/pi/Kconfig +++ b/src/northbridge/amd/pi/Kconfig @@ -25,8 +25,4 @@
source "src/northbridge/amd/pi/00730F01/Kconfig"
-config HEAP_SIZE - hex - default 0xc0000 - endif # NORTHBRIDGE_AMD_PI diff --git a/src/soc/amd/genoa_poc/Kconfig b/src/soc/amd/genoa_poc/Kconfig index 09e04f3..8a738cf 100644 --- a/src/soc/amd/genoa_poc/Kconfig +++ b/src/soc/amd/genoa_poc/Kconfig @@ -182,11 +182,6 @@ hex default 0x800000
-#TODO: Check if the value of HEAP_SIZE is optimal -config HEAP_SIZE - hex - default 0x200000 - config ACPI_SSDT_PSD_INDEPENDENT bool "Allow core p-state independent transitions" default y diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index f501398..42fe66f 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -266,10 +266,6 @@ bool default n
-config HEAP_SIZE - hex - default 0xc0000 - config SERIRQ_CONTINUOUS_MODE bool default n diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index b823d02..e94c2f9 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -158,10 +158,6 @@ bool default n
-config HEAP_SIZE - hex - default 0xc0000 - config EHCI_BAR hex default 0xfef00000 diff --git a/src/soc/cavium/cn81xx/Kconfig b/src/soc/cavium/cn81xx/Kconfig index 5593685..7e48b5f 100644 --- a/src/soc/cavium/cn81xx/Kconfig +++ b/src/soc/cavium/cn81xx/Kconfig @@ -30,9 +30,6 @@ int default 1
-config HEAP_SIZE - default 0x10000 - config STACK_SIZE default 0x2000
diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index fd95f9e..e63bcd2 100644 --- a/src/soc/intel/alderlake/Kconfig +++ b/src/soc/intel/alderlake/Kconfig @@ -216,11 +216,6 @@ hex default 0x400000
-config HEAP_SIZE - hex - default 0x80000 if BMP_LOGO - default 0x10000 - config GFX_GMA_DEFAULT_MMIO default 0xaf000000 if MAINBOARD_HAS_EARLY_LIBGFXINIT
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index b22382b..aef9d85 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -255,10 +255,6 @@ help Name of file to store in the IFWI region.
-config HEAP_SIZE - hex - default 0x8000 - config MAX_ROOT_PORTS int default 6 diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index a506b1b..92a99c4 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -177,10 +177,6 @@ hex default 0x400000
-config HEAP_SIZE - hex - default 0x8000 - config NHLT_DMIC_1CH_16B bool depends on ACPI_NHLT diff --git a/src/soc/intel/elkhartlake/Kconfig b/src/soc/intel/elkhartlake/Kconfig index 7f1c767..3361c0d 100644 --- a/src/soc/intel/elkhartlake/Kconfig +++ b/src/soc/intel/elkhartlake/Kconfig @@ -104,10 +104,6 @@ hex default 0x0
-config HEAP_SIZE - hex - default 0x8000 - config MAX_ROOT_PORTS int default 7 diff --git a/src/soc/intel/jasperlake/Kconfig b/src/soc/intel/jasperlake/Kconfig index 624e362..9f70177 100644 --- a/src/soc/intel/jasperlake/Kconfig +++ b/src/soc/intel/jasperlake/Kconfig @@ -106,10 +106,6 @@ hex default 0x400000
-config HEAP_SIZE - hex - default 0x8000 - config MAX_ROOT_PORTS int default 8 diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig index 6dd6273..a471769 100644 --- a/src/soc/intel/meteorlake/Kconfig +++ b/src/soc/intel/meteorlake/Kconfig @@ -199,11 +199,6 @@ hex default 0x400000
-config HEAP_SIZE - hex - default 0x80000 if BMP_LOGO - default 0x10000 - # Intel recommends reserving the PCIe TBT root port resources as below: # - 42 buses # - 194 MiB Non-prefetchable memory diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index d6a11363e..e0df501 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -151,10 +151,6 @@ help If you set this option to n, will not use native SD controller.
-config HEAP_SIZE - hex - default 0x80000 - config IED_REGION_SIZE hex default 0x400000 diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig index 2c4715a..2d5cf08 100644 --- a/src/soc/intel/tigerlake/Kconfig +++ b/src/soc/intel/tigerlake/Kconfig @@ -152,10 +152,6 @@ config INTEL_TME default n
-config HEAP_SIZE - hex - default 0x10000 - config MAX_ROOT_PORTS int default 24 if SOC_INTEL_TIGERLAKE_PCH_H diff --git a/src/soc/intel/xeon_sp/Kconfig b/src/soc/intel/xeon_sp/Kconfig index 0931030..db3e5ad 100644 --- a/src/soc/intel/xeon_sp/Kconfig +++ b/src/soc/intel/xeon_sp/Kconfig @@ -94,10 +94,6 @@ config ALWAYS_ALLOW_ABOVE_4G_ALLOCATION default y
-config HEAP_SIZE - hex - default 0x80000 - config HPET_MIN_TICKS hex default 0x80 diff --git a/src/soc/intel/xeon_sp/cpx/Kconfig b/src/soc/intel/xeon_sp/cpx/Kconfig index f54f771..ac166c3 100644 --- a/src/soc/intel/xeon_sp/cpx/Kconfig +++ b/src/soc/intel/xeon_sp/cpx/Kconfig @@ -71,10 +71,6 @@ hex default 0x7C00
-config HEAP_SIZE - hex - default 0x80000 - config STACK_SIZE hex default 0x4000 diff --git a/src/soc/intel/xeon_sp/skx/Kconfig b/src/soc/intel/xeon_sp/skx/Kconfig index c2c3d4e..5d84387 100644 --- a/src/soc/intel/xeon_sp/skx/Kconfig +++ b/src/soc/intel/xeon_sp/skx/Kconfig @@ -55,10 +55,6 @@ hex default 0x7C00
-config HEAP_SIZE - hex - default 0x80000 - config IED_REGION_SIZE hex default 0x400000 diff --git a/src/soc/intel/xeon_sp/spr/Kconfig b/src/soc/intel/xeon_sp/spr/Kconfig index 5a21f47..bb88bec 100644 --- a/src/soc/intel/xeon_sp/spr/Kconfig +++ b/src/soc/intel/xeon_sp/spr/Kconfig @@ -80,10 +80,6 @@ hex default 0x8c00
-config HEAP_SIZE - hex - default 0x80000 - config STACK_SIZE hex default 0x4000 diff --git a/src/soc/qualcomm/ipq40xx/Kconfig b/src/soc/qualcomm/ipq40xx/Kconfig index 0eabb00..0ce9273 100644 --- a/src/soc/qualcomm/ipq40xx/Kconfig +++ b/src/soc/qualcomm/ipq40xx/Kconfig @@ -57,8 +57,4 @@ help Path for utils to combine SBL_ELF and bootblock
-config HEAP_SIZE - hex - default 0x8000 - endif