From c53ab57017eba5346f3b2f6d2aa46ba16d18ab86 Mon Sep 17 00:00:00 2001 From: Fred Reitberger Date: Mon, 17 Jul 2023 08:31:45 -0400 Subject: [PATCH] mb/google/myst: Disable APOB NV Disable the APOB cache for only Myst, and re-enable APOB for other Phoenix SOC mainboards. BUG=b:290763369 TEST=verify APOB cache is disabled Signed-off-by: Fred Reitberger Change-Id: Ie611e0b84611b2f50c989c75612fc2186b2dbfdf Reviewed-on: https://review.coreboot.org/c/coreboot/+/76567 Reviewed-by: Martin L Roth Tested-by: build bot (Jenkins) Reviewed-by: Karthik Ramasubramanian --- src/mainboard/google/myst/Kconfig | 2 ++ src/soc/amd/phoenix/Kconfig | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mainboard/google/myst/Kconfig b/src/mainboard/google/myst/Kconfig index 3680e18e6b..281c59c6eb 100644 --- a/src/mainboard/google/myst/Kconfig +++ b/src/mainboard/google/myst/Kconfig @@ -27,6 +27,8 @@ config BOARD_SPECIFIC_OPTIONS select I2C_TPM select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_TPM2 + # TODO (b/290763369): Enable APOB after resolving data_abort in ABL + select SOC_AMD_COMMON_BLOCK_APOB_NV_DISABLE select SOC_AMD_COMMON_BLOCK_USE_ESPI select SOC_AMD_PHOENIX select SPI_FLASH_EXIT_4_BYTE_ADDR_MODE diff --git a/src/soc/amd/phoenix/Kconfig b/src/soc/amd/phoenix/Kconfig index 8c4280bbc6..5f4e5d174e 100644 --- a/src/soc/amd/phoenix/Kconfig +++ b/src/soc/amd/phoenix/Kconfig @@ -42,9 +42,8 @@ config SOC_AMD_PHOENIX select SOC_AMD_COMMON_BLOCK_ACPI_GPIO # TODO: Check if this is still correct select SOC_AMD_COMMON_BLOCK_ACPI_IVRS # TODO: Check if this is still correct select SOC_AMD_COMMON_BLOCK_AOAC - # TODO (b/290763369): Enable APOB after resolving data_abort in ABL - # select SOC_AMD_COMMON_BLOCK_APOB - # select SOC_AMD_COMMON_BLOCK_APOB_HASH + select SOC_AMD_COMMON_BLOCK_APOB + select SOC_AMD_COMMON_BLOCK_APOB_HASH select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS select SOC_AMD_COMMON_BLOCK_CPUFREQ_FAM17H_19H select SOC_AMD_COMMON_BLOCK_DATA_FABRIC