Change in coreboot[master]: src/cpu,soc/amd/common/block/cpu: Add preload_microcode

[Raul Rangel (Code Review)]

Raul Rangel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/58963 )

Change subject: src/cpu,soc/amd/common/block/cpu: Add preload_microcode
......................................................................

src/cpu,soc/amd/common/block/cpu: Add preload_microcode

This will enable preloading the microcode.

BUG=b:179699789
TEST=Boot guybrush with CL chain and see microcode preloading

Signed-off-by: Raul E Rangel 
Change-Id: If0c634c692c97769e71acd1175fc464dc592c356
---
M src/cpu/Makefile.inc
M src/include/cpu/amd/microcode.h
M src/soc/amd/common/block/cpu/update_microcode.c
3 files changed, 20 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/58963/1

diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc
index ec2f19f..9f1e6c4 100644
--- a/src/cpu/Makefile.inc
+++ b/src/cpu/Makefile.inc
@@ -56,7 +56,12 @@

cpu_microcode_blob.bin-file ?= $(obj)/cpu_microcode_blob.bin
 cpu_microcode_blob.bin-type := microcode
+# The AMD LPC SPI DMA controller requires source files to be 64 byte aligned.
+ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_LPC_SPI_DMA),y)
+cpu_microcode_blob.bin-align := 64
+else
 cpu_microcode_blob.bin-align := 16
+endif

ifneq ($(CONFIG_CPU_MICROCODE_CBFS_LOC),)
 cpu_microcode_blob.bin-COREBOOT-position := $(CONFIG_CPU_MICROCODE_CBFS_LOC)
diff --git a/src/include/cpu/amd/microcode.h b/src/include/cpu/amd/microcode.h
index 800661b..7407594 100644
--- a/src/include/cpu/amd/microcode.h
+++ b/src/include/cpu/amd/microcode.h
@@ -2,5 +2,6 @@
 #define CPU_AMD_MICROCODE_H

void amd_update_microcode_from_cbfs(void);
+void preload_microcode(void);

#endif /* CPU_AMD_MICROCODE_H */
diff --git a/src/soc/amd/common/block/cpu/update_microcode.c b/src/soc/amd/common/block/cpu/update_microcode.c
index e6a57f5..9a89c55 100644
--- a/src/soc/amd/common/block/cpu/update_microcode.c
+++ b/src/soc/amd/common/block/cpu/update_microcode.c
@@ -10,6 +10,8 @@
 #include <cbfs.h>
 #include <timestamp.h>

+#define CPU_MICROCODE_BLOB_NAME "cpu_microcode_blob.bin"
+
 _Static_assert(CONFIG_SOC_AMD_COMMON_BLOCK_UCODE_SIZE > 0,
           "SOC_AMD_COMMON_BLOCK_UCODE_SIZE is not set");

@@ -97,9 +99,10 @@
    /* Cache the buffer so each CPU doesn't need to read the uCode from flash */
    if (!cache_valid) {
    	timestamp_add_now(TS_READ_UCODE_START);
-		ucode_list = cbfs_map("cpu_microcode_blob.bin", &ucode_len);
+		ucode_list = cbfs_map(CPU_MICROCODE_BLOB_NAME, &ucode_len);
    	if (!ucode_list) {
-			printk(BIOS_WARNING, "cpu_microcode_blob.bin not found. Skipping updates.\n");
+			printk(BIOS_WARNING,
+			       CPU_MICROCODE_BLOB_NAME " not found. Skipping updates.\n");
    		return;
    	}

@@ -120,3 +123,12 @@

apply_microcode_patch(&ucode_cache);
 }
+
+void preload_microcode(void)
+{
+	if (!CONFIG(CBFS_PRELOAD))
+		return;
+
+	printk(BIOS_DEBUG, "Preloading microcode\n");
+	cbfs_preload(CPU_MICROCODE_BLOB_NAME);
+}