soc/intel/xeon_sp: Report platform cpu info

Add platform cpu info for known microcode, print cpuid & processor
branding string. This will print as in the following example:

CPU: Intel(R) Xeon(R) Platinum 8468H
CPU: ID 806f6, Sapphire Rapids E3, ucode: 2b000130
CPU: AES supported, TXT supported, VT supported

Change-Id: I9c08fb924aad81608f554523432ab6a549b1b75f
Signed-off-by: Naresh Solanki <Naresh.Solanki@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/73391
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

5 files changed, 80 insertions, 2 deletions

diff --git a/src/include/cpu/intel/cpu_ids.h b/src/include/cpu/intel/cpu_ids.h
index 863dc8b3a587..ff1525200b7e 100644
--- a/src/include/cpu/intel/cpu_ids.h
+++ b/src/include/cpu/intel/cpu_ids.h
@@ -53,6 +53,15 @@
 #define CPUID_TIGERLAKE_A0		0x806c0
 #define CPUID_TIGERLAKE_B0		0x806c1
 #define CPUID_TIGERLAKE_R0		0x806d1
+#define CPUID_SAPPHIRERAPIDS_SP_A	0x806f0
+#define CPUID_SAPPHIRERAPIDS_SP_B	0x806f1
+#define CPUID_SAPPHIRERAPIDS_SP_C	0x806f2
+#define CPUID_SAPPHIRERAPIDS_SP_D	0x806f3
+#define CPUID_SAPPHIRERAPIDS_SP_E0	0x806f4
+#define CPUID_SAPPHIRERAPIDS_SP_E2	0x806f5
+#define CPUID_SAPPHIRERAPIDS_SP_E3	0x806f6
+#define CPUID_SAPPHIRERAPIDS_SP_E4	0x806f7
+#define CPUID_SAPPHIRERAPIDS_SP_Ex	0x806f8
 #define CPUID_ELKHARTLAKE_A0		0x90660
 #define CPUID_ELKHARTLAKE_B0		0x90661
 #define CPUID_ALDERLAKE_S_A0		0x90670
diff --git a/src/soc/intel/xeon_sp/Makefile.inc b/src/soc/intel/xeon_sp/Makefile.inc
index 69792c486c94..a46b93e71a0b 100644
--- a/src/soc/intel/xeon_sp/Makefile.inc
+++ b/src/soc/intel/xeon_sp/Makefile.inc
@@ -6,7 +6,7 @@ subdirs-$(CONFIG_SOC_INTEL_SKYLAKE_SP) += skx lbg
 subdirs-$(CONFIG_SOC_INTEL_COOPERLAKE_SP) += cpx lbg
 subdirs-$(CONFIG_SOC_INTEL_SAPPHIRERAPIDS_SP) += spr ebg
 
-bootblock-y += bootblock.c spi.c lpc.c pch.c
+bootblock-y += bootblock.c spi.c lpc.c pch.c report_platform.c
 romstage-y += romstage.c reset.c util.c spi.c pmutil.c memmap.c
 romstage-y += ../../../cpu/intel/car/romstage.c
 ramstage-y += uncore.c reset.c util.c lpc.c spi.c ramstage.c chip_common.c
diff --git a/src/soc/intel/xeon_sp/bootblock.c b/src/soc/intel/xeon_sp/bootblock.c
index ba215d8f8495..cc839efc5736 100644
--- a/src/soc/intel/xeon_sp/bootblock.c
+++ b/src/soc/intel/xeon_sp/bootblock.c
@@ -77,4 +77,6 @@ void bootblock_soc_init(void)
 
 	/* Programming TCO_BASE_ADDRESS and TCO Timer Halt */
 	tco_configure();
+
+	report_platform_info();
 }
diff --git a/src/soc/intel/xeon_sp/include/soc/bootblock.h b/src/soc/intel/xeon_sp/include/soc/bootblock.h
index 6be437045475..0fdb6057dc15 100644
--- a/src/soc/intel/xeon_sp/include/soc/bootblock.h
+++ b/src/soc/intel/xeon_sp/include/soc/bootblock.h
@@ -7,5 +7,5 @@
 
 /* Bootblock post console init programming */
 void bootblock_pch_init(void);
-
+void report_platform_info(void);
 #endif
diff --git a/src/soc/intel/xeon_sp/report_platform.c b/src/soc/intel/xeon_sp/report_platform.c
new file mode 100644
index 000000000000..874ff45d8198
--- /dev/null
+++ b/src/soc/intel/xeon_sp/report_platform.c
@@ -0,0 +1,67 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <arch/cpu.h>
+#include <console/console.h>
+#include <cpu/intel/cpu_ids.h>
+#include <cpu/intel/microcode.h>
+#include <cpu/x86/msr.h>
+#include <cpu/x86/name.h>
+#include <soc/bootblock.h>
+
+static struct {
+	u32 cpuid;
+	const char *name;
+} cpu_table[] = {
+	{ CPUID_COOPERLAKE_SP_A0, "Cooper Lake A0" },
+	{ CPUID_COOPERLAKE_SP_A1, "Cooper Lake A1" },
+	{ CPUID_SKYLAKE_SP_A0_A1, "SkyLake-SP A0/A1" },
+	{ CPUID_SKYLAKE_SP_B0,    "SkyLake-SP B0" },
+	{ CPUID_SKYLAKE_SP_4,     "SkyLake-SP 4" },
+	{ CPUID_SAPPHIRERAPIDS_SP_A,  "Sapphire Rapids A" },
+	{ CPUID_SAPPHIRERAPIDS_SP_B,  "Sapphire Rapids B" },
+	{ CPUID_SAPPHIRERAPIDS_SP_C,  "Sapphire Rapids C" },
+	{ CPUID_SAPPHIRERAPIDS_SP_D,  "Sapphire Rapids D" },
+	{ CPUID_SAPPHIRERAPIDS_SP_E0, "Sapphire Rapids E0" },
+	{ CPUID_SAPPHIRERAPIDS_SP_E2, "Sapphire Rapids E2" },
+	{ CPUID_SAPPHIRERAPIDS_SP_E3, "Sapphire Rapids E3" },
+	{ CPUID_SAPPHIRERAPIDS_SP_E4, "Sapphire Rapids E4" },
+	{ CPUID_SAPPHIRERAPIDS_SP_Ex, "Sapphire Rapids Ex" },
+};
+
+static void report_cpu_info(void)
+{
+	u32 cpu_id, cpu_feature_flag;
+	char cpu_name[49];
+	int vt, txt, aes;
+	static const char *const mode[] = {"NOT ", ""};
+	const char *cpu_type = "Unknown";
+	size_t i;
+
+	fill_processor_name(cpu_name);
+	cpu_id = cpu_get_cpuid();
+
+	/* Look for string to match the name */
+	for (i = 0; i < ARRAY_SIZE(cpu_table); i++) {
+		if (cpu_table[i].cpuid == cpu_id) {
+			cpu_type = cpu_table[i].name;
+			break;
+		}
+	}
+
+	printk(BIOS_DEBUG, "CPU: %s\n", cpu_name);
+	printk(BIOS_DEBUG, "CPU: ID %x, %s, ucode: %08x\n",
+	       cpu_id, cpu_type, get_current_microcode_rev());
+
+	cpu_feature_flag = cpu_get_feature_flags_ecx();
+	aes = (cpu_feature_flag & CPUID_AES) ? 1 : 0;
+	txt = (cpu_feature_flag & CPUID_SMX) ? 1 : 0;
+	vt = (cpu_feature_flag & CPUID_VMX) ? 1 : 0;
+	printk(BIOS_DEBUG,
+		"CPU: AES %ssupported, TXT %ssupported, VT %ssupported\n",
+		mode[aes], mode[txt], mode[vt]);
+}
+
+void report_platform_info(void)
+{
+	report_cpu_info();
+}