diff options
author | Arthur Heymans <arthur@aheymans.xyz> | 2023-07-14 23:16:22 +0200 |
---|---|---|
committer | Felix Held <felix-coreboot@felixheld.de> | 2023-11-24 17:01:10 +0000 |
commit | 5ee1d23bcc9d1f0748c998d0f517acc219d84771 (patch) | |
tree | aafc0fd14e41d3a4dcbc161ad43c39bb8a1db6f8 | |
parent | 0a48cfa3a59fcacf170ad05d57ea2bd33d44c7c3 (diff) |
soc/amd/genoa: Hook up microcode updating
Also update the regular expression to find the genoa blobs.
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Change-Id: Iba0109c049019a22cba1e0358cedbd9c198c6569
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76525
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
-rw-r--r-- | src/soc/amd/common/Makefile.inc | 2 | ||||
-rw-r--r-- | src/soc/amd/genoa/Kconfig | 1 | ||||
-rw-r--r-- | src/soc/amd/genoa/cpu.c | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc index 1359166d70..626260f93e 100644 --- a/src/soc/amd/common/Makefile.inc +++ b/src/soc/amd/common/Makefile.inc @@ -38,7 +38,7 @@ AMDFW_CFG_WITH_PATH = $(shell echo "$(AMDFW_CFG_FILES)" | tr ' ' '\n' | grep "/" DEP_FILES = $(patsubst %,$(FIRMWARE_LOCATION)/%, $(AMDFW_CFG_IN_FW_LOC)) \ $(AMDFW_CFG_WITH_PATH) -amd_microcode_bins += $(wildcard ${FIRMWARE_LOCATION}/*UcodePatch_*.bin) +amd_microcode_bins += $(wildcard ${FIRMWARE_LOCATION}/*U?odePatch*.bin) ifeq ($(CONFIG_RESET_VECTOR_IN_RAM),y) $(objcbfs)/bootblock.bin: $(obj)/amdfw.rom $(obj)/fmap_config.h diff --git a/src/soc/amd/genoa/Kconfig b/src/soc/amd/genoa/Kconfig index cbf0ddd801..973677d538 100644 --- a/src/soc/amd/genoa/Kconfig +++ b/src/soc/amd/genoa/Kconfig @@ -34,6 +34,7 @@ config SOC_SPECIFIC_OPTIONS select SOC_AMD_COMMON_BLOCK_SMU_SX_ENTRY select SOC_AMD_COMMON_BLOCK_TSC select SOC_AMD_COMMON_BLOCK_UART + select SOC_AMD_COMMON_BLOCK_UCODE select SOC_AMD_COMMON_BLOCK_USE_ESPI select X86_CUSTOM_BOOTMEDIA diff --git a/src/soc/amd/genoa/cpu.c b/src/soc/amd/genoa/cpu.c index 6a07c34898..241bec21fd 100644 --- a/src/soc/amd/genoa/cpu.c +++ b/src/soc/amd/genoa/cpu.c @@ -2,6 +2,7 @@ #include <amdblocks/cpu.h> #include <amdblocks/mca.h> +#include <cpu/amd/microcode.h> #include <cpu/cpu.h> #include <device/device.h> #include <soc/cpu.h> @@ -10,6 +11,8 @@ static void model_19_init(struct device *dev) { check_mca(); set_cstate_io_addr(); + + amd_apply_microcode_patch(); } static struct device_operations cpu_dev_ops = { |