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>

21 files changed, 1 insertions, 82 deletions

diff --git a/src/Kconfig b/src/Kconfig
index 5cb9a1a0ed..7867f44e96 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -759,8 +759,7 @@ config RTC
 
 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 f3e2c4cea9..0fa999e1ac 100644
--- a/src/cpu/qemu-x86/Kconfig
+++ b/src/cpu/qemu-x86/Kconfig
@@ -35,7 +35,4 @@ config MAX_CPUS
 	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 7f9300f2a7..7bc3b0bcbb 100644
--- a/src/mainboard/sifive/hifive-unleashed/Kconfig
+++ b/src/mainboard/sifive/hifive-unleashed/Kconfig
@@ -10,9 +10,6 @@ config BOARD_SPECIFIC_OPTIONS
 	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 322219860d..57426b8420 100644
--- a/src/northbridge/amd/pi/Kconfig
+++ b/src/northbridge/amd/pi/Kconfig
@@ -25,8 +25,4 @@ config S3_VGA_ROM_RUN
 
 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 09e04f3e57..8a738cf588 100644
--- a/src/soc/amd/genoa_poc/Kconfig
+++ b/src/soc/amd/genoa_poc/Kconfig
@@ -182,11 +182,6 @@ config SMM_TSEG_SIZE
 	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 f501398729..42fe66fa46 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -266,10 +266,6 @@ config S3_VGA_ROM_RUN
 	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 b823d026e3..e94c2f9760 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -158,10 +158,6 @@ config S3_VGA_ROM_RUN
 	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 5593685a37..7e48b5f877 100644
--- a/src/soc/cavium/cn81xx/Kconfig
+++ b/src/soc/cavium/cn81xx/Kconfig
@@ -30,9 +30,6 @@ config ARCH_ARMV8_EXTENSION
 	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 fd95f9e06c..e63bcd2228 100644
--- a/src/soc/intel/alderlake/Kconfig
+++ b/src/soc/intel/alderlake/Kconfig
@@ -216,11 +216,6 @@ config IED_REGION_SIZE
 	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 b22382b18e..aef9d85234 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -255,10 +255,6 @@ config IFWI_FILE_NAME
 	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 a506b1ba59..92a99c43a3 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -177,10 +177,6 @@ config IED_REGION_SIZE
 	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 7f1c767379..3361c0ddb9 100644
--- a/src/soc/intel/elkhartlake/Kconfig
+++ b/src/soc/intel/elkhartlake/Kconfig
@@ -104,10 +104,6 @@ config IED_REGION_SIZE
 	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 624e362954..9f70177ce6 100644
--- a/src/soc/intel/jasperlake/Kconfig
+++ b/src/soc/intel/jasperlake/Kconfig
@@ -106,10 +106,6 @@ config IED_REGION_SIZE
 	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 6dd62732e2..a47176917a 100644
--- a/src/soc/intel/meteorlake/Kconfig
+++ b/src/soc/intel/meteorlake/Kconfig
@@ -199,11 +199,6 @@ config IED_REGION_SIZE
 	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 d6a11363ee..e0df501460 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -151,10 +151,6 @@ config EXCLUDE_NATIVE_SD_INTERFACE
 	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 2c4715a113..2d5cf08a48 100644
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@@ -152,10 +152,6 @@ config IED_REGION_SIZE
 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 09310300dc..db3e5ad5eb 100644
--- a/src/soc/intel/xeon_sp/Kconfig
+++ b/src/soc/intel/xeon_sp/Kconfig
@@ -94,10 +94,6 @@ config ECAM_MMCONF_BUS_NUMBER
 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 f54f7716b6..ac166c3038 100644
--- a/src/soc/intel/xeon_sp/cpx/Kconfig
+++ b/src/soc/intel/xeon_sp/cpx/Kconfig
@@ -71,10 +71,6 @@ config CPU_MICROCODE_CBFS_LEN
 	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 c2c3d4e2e8..5d843878e1 100644
--- a/src/soc/intel/xeon_sp/skx/Kconfig
+++ b/src/soc/intel/xeon_sp/skx/Kconfig
@@ -55,10 +55,6 @@ config CPU_MICROCODE_CBFS_LEN
 	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 5a21f47b43..bb88becaa7 100644
--- a/src/soc/intel/xeon_sp/spr/Kconfig
+++ b/src/soc/intel/xeon_sp/spr/Kconfig
@@ -80,10 +80,6 @@ config CPU_MICROCODE_CBFS_LEN
 	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 0eabb00752..0ce92731c0 100644
--- a/src/soc/qualcomm/ipq40xx/Kconfig
+++ b/src/soc/qualcomm/ipq40xx/Kconfig
@@ -57,8 +57,4 @@ config SBL_UTIL_PATH
 	help
 	  Path for utils to combine SBL_ELF and bootblock
 
-config HEAP_SIZE
-	hex
-	default 0x8000
-
 endif