From 321f30d89e2f7131e936932ca3207b8a3491b67a Mon Sep 17 00:00:00 2001 From: Felix Held Date: Tue, 15 Apr 2025 20:07:24 +0200 Subject: [PATCH] soc/amd: select RESET_VECTOR_IN_RAM from common non-CAR Kconfig Select RESET_VECTOR_IN_RAM from the common SOC_AMD_COMMON_BLOCK_NONCAR Kconfig option instead of selecting it in each AMD SoC's Kconfig which selects SOC_AMD_COMMON_BLOCK_NONCAR. From family 17h on, the AMD SoCs don't use cache as RAM (CAR) any more. In most cases, including the coreboot case, the PSP puts coreboot's bootblock into DRAM, thus RESET_VECTOR_IN_RAM needs to be selected. There might be a case where the RESET_VECTOR_IN_RAM part isn't true, but that isn't specific to a SoC generation, so even this unlikely case doesn't prevent us from moving the selection of the Kconfig option to the common non-CAR Kconfig option. Change-Id: I87d7908f94505647f504f9d214e3c52f9c3a3715 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/87322 Reviewed-by: Patrick Rudolph Tested-by: build bot (Jenkins) --- src/soc/amd/cezanne/Kconfig | 1 - src/soc/amd/common/block/cpu/Kconfig | 1 + src/soc/amd/genoa_poc/Kconfig | 1 - src/soc/amd/glinda/Kconfig | 1 - src/soc/amd/mendocino/Kconfig | 1 - src/soc/amd/phoenix/Kconfig | 1 - src/soc/amd/picasso/Kconfig | 1 - 7 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig index d0a2c5ec74..96e4f31e50 100644 --- a/src/soc/amd/cezanne/Kconfig +++ b/src/soc/amd/cezanne/Kconfig @@ -23,7 +23,6 @@ config SOC_AMD_CEZANNE select PROVIDES_ROM_SHARING select PSP_VERSTAGE_CCP_DMA if VBOOT_STARTS_BEFORE_BOOTBLOCK select PSP_VERSTAGE_MAP_ENTIRE_SPIROM if VBOOT_STARTS_BEFORE_BOOTBLOCK - select RESET_VECTOR_IN_RAM select RTC select SOC_AMD_COMMON select SOC_AMD_COMMON_BLOCK_ACP_GEN1 diff --git a/src/soc/amd/common/block/cpu/Kconfig b/src/soc/amd/common/block/cpu/Kconfig index 0b44c55649..44ea1eb844 100644 --- a/src/soc/amd/common/block/cpu/Kconfig +++ b/src/soc/amd/common/block/cpu/Kconfig @@ -16,6 +16,7 @@ config SOC_AMD_COMMON_BLOCK_CAR config SOC_AMD_COMMON_BLOCK_NONCAR bool select RESERVED_PHYSICAL_ADDRESS_BITS_SUPPORT + select RESET_VECTOR_IN_RAM help From family 17h on AMD CPUs/APUs don't use cache as RAM (CAR) any more, since the RAM initialization is already done by the PSP when diff --git a/src/soc/amd/genoa_poc/Kconfig b/src/soc/amd/genoa_poc/Kconfig index 503b9fd999..4754af185f 100644 --- a/src/soc/amd/genoa_poc/Kconfig +++ b/src/soc/amd/genoa_poc/Kconfig @@ -13,7 +13,6 @@ config SOC_SPECIFIC_OPTIONS select HAVE_ACPI_TABLES select HAVE_X86_64_SUPPORT select HAVE_SMI_HANDLER - select RESET_VECTOR_IN_RAM select SOC_AMD_COMMON select SOC_AMD_COMMON_BLOCK_ACPI select SOC_AMD_COMMON_BLOCK_ACPIMMIO diff --git a/src/soc/amd/glinda/Kconfig b/src/soc/amd/glinda/Kconfig index 17b349f071..9cc446c679 100644 --- a/src/soc/amd/glinda/Kconfig +++ b/src/soc/amd/glinda/Kconfig @@ -25,7 +25,6 @@ config SOC_AMD_GLINDA select PROVIDES_ROM_SHARING select PSP_SUPPORTS_EFS2_RELATIVE_ADDR if VBOOT_STARTS_BEFORE_BOOTBLOCK select PSP_VERSTAGE_CCP_DMA if VBOOT_STARTS_BEFORE_BOOTBLOCK - select RESET_VECTOR_IN_RAM select RTC select SOC_AMD_COMMON select SOC_AMD_COMMON_BLOCK_ACP_GEN2 # TODO: Check if this is still correct diff --git a/src/soc/amd/mendocino/Kconfig b/src/soc/amd/mendocino/Kconfig index b51e9e9f54..2adb012264 100644 --- a/src/soc/amd/mendocino/Kconfig +++ b/src/soc/amd/mendocino/Kconfig @@ -25,7 +25,6 @@ config SOC_AMD_REMBRANDT_BASE select PSP_INCLUDES_HSP select PSP_SUPPORTS_EFS2_RELATIVE_ADDR if VBOOT_STARTS_BEFORE_BOOTBLOCK select PSP_VERSTAGE_CCP_DMA if VBOOT_STARTS_BEFORE_BOOTBLOCK - select RESET_VECTOR_IN_RAM select RTC select SOC_AMD_COMMON select SOC_AMD_COMMON_BLOCK_ACP_GEN2 diff --git a/src/soc/amd/phoenix/Kconfig b/src/soc/amd/phoenix/Kconfig index 07b1bc0b83..995b1cc535 100644 --- a/src/soc/amd/phoenix/Kconfig +++ b/src/soc/amd/phoenix/Kconfig @@ -22,7 +22,6 @@ config SOC_AMD_PHOENIX_BASE select PSP_SUPPORTS_EFS2_RELATIVE_ADDR if VBOOT_STARTS_BEFORE_BOOTBLOCK # TODO: (b/303516266) Re-enable CCP DMA after addressing a stall # select PSP_VERSTAGE_CCP_DMA if VBOOT_STARTS_BEFORE_BOOTBLOCK - select RESET_VECTOR_IN_RAM select RTC select SOC_AMD_COMMON select SOC_AMD_COMMON_BLOCK_ACP_GEN2 diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index f450e294d7..5678aaf1fb 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -19,7 +19,6 @@ config SOC_AMD_PICASSO select PARALLEL_MP_AP_WORK select PLATFORM_USES_FSP2_0 select PROVIDES_ROM_SHARING - select RESET_VECTOR_IN_RAM select RTC select SOC_AMD_COMMON select SOC_AMD_COMMON_BLOCK_ACP_GEN1