summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/apollolake/report_platform.c10
-rw-r--r--src/soc/intel/broadwell/romstage/report_platform.c8
-rw-r--r--src/soc/intel/cannonlake/bootblock/report_platform.c11
-rw-r--r--src/soc/intel/icelake/bootblock/report_platform.c10
-rw-r--r--src/soc/intel/jasperlake/bootblock/report_platform.c11
-rw-r--r--src/soc/intel/skylake/bootblock/report_platform.c9
-rw-r--r--src/soc/intel/tigerlake/bootblock/report_platform.c10
7 files changed, 15 insertions, 54 deletions
diff --git a/src/soc/intel/apollolake/report_platform.c b/src/soc/intel/apollolake/report_platform.c
index a7b58731dd..e79e28a059 100644
--- a/src/soc/intel/apollolake/report_platform.c
+++ b/src/soc/intel/apollolake/report_platform.c
@@ -3,6 +3,7 @@
#include <arch/cpu.h>
#include <device/pci_ops.h>
#include <console/console.h>
+#include <cpu/intel/microcode.h>
#include <cpu/x86/msr.h>
#include <cpu/x86/name.h>
#include <device/pci.h>
@@ -64,18 +65,12 @@ static void report_cpu_info(void)
{
uint32_t i, cpu_id, cpu_feature_flag;
char cpu_name[49];
- msr_t microcode_ver;
const char *support = "Supported";
const char *no_support = "Not Supported";
const char *cpu_type = "Unknown";
fill_processor_name(cpu_name);
-
- microcode_ver.lo = 0;
- microcode_ver.hi = 0;
- wrmsr(IA32_BIOS_SIGN_ID, microcode_ver);
cpu_id = cpu_get_cpuid();
- microcode_ver = rdmsr(IA32_BIOS_SIGN_ID);
/* Look for string to match the name */
for (i = 0; i < ARRAY_SIZE(cpu_table); i++) {
@@ -86,7 +81,8 @@ static void report_cpu_info(void)
}
printk(BIOS_INFO, "CPU: %s\n", cpu_name);
- printk(BIOS_INFO, "CPU: ID %x, %s, ucode: %08x\n", cpu_id, cpu_type, microcode_ver.hi);
+ printk(BIOS_INFO, "CPU: ID %x, %s, ucode: %08x\n", cpu_id, cpu_type,
+ get_current_microcode_rev());
cpu_feature_flag = cpu_get_feature_flags_ecx();
printk(BIOS_INFO, "CPU: AES %s, TXT %s, VT %s\n",
diff --git a/src/soc/intel/broadwell/romstage/report_platform.c b/src/soc/intel/broadwell/romstage/report_platform.c
index 1029395bf2..938f3ebd37 100644
--- a/src/soc/intel/broadwell/romstage/report_platform.c
+++ b/src/soc/intel/broadwell/romstage/report_platform.c
@@ -5,6 +5,7 @@
#include <console/console.h>
#include <device/pci.h>
#include <string.h>
+#include <cpu/intel/microcode.h>
#include <cpu/x86/msr.h>
#include <soc/cpu.h>
#include <soc/pch.h>
@@ -76,7 +77,6 @@ static void report_cpu_info(void)
u32 i, index, cpu_id, cpu_feature_flag;
char cpu_string[50], *cpu_name = cpu_string; /* 48 bytes are reported */
int vt, txt, aes;
- msr_t microcode_ver;
const char *mode[] = {"NOT ", ""};
const char *cpu_type = "Unknown";
@@ -98,11 +98,7 @@ static void report_cpu_info(void)
while (cpu_name[0] == ' ')
cpu_name++;
- microcode_ver.lo = 0;
- microcode_ver.hi = 0;
- wrmsr(IA32_BIOS_SIGN_ID, microcode_ver);
cpu_id = cpu_get_cpuid();
- microcode_ver = rdmsr(IA32_BIOS_SIGN_ID);
/* Look for string to match the name */
for (i = 0; i < ARRAY_SIZE(cpu_table); i++) {
@@ -114,7 +110,7 @@ static void report_cpu_info(void)
printk(BIOS_DEBUG, "CPU: %s\n", cpu_name);
printk(BIOS_DEBUG, "CPU: ID %x, %s, ucode: %08x\n",
- cpu_id, cpu_type, microcode_ver.hi);
+ cpu_id, cpu_type, get_current_microcode_rev());
cpu_feature_flag = cpu_get_feature_flags_ecx();
aes = (cpu_feature_flag & CPUID_AES) ? 1 : 0;
diff --git a/src/soc/intel/cannonlake/bootblock/report_platform.c b/src/soc/intel/cannonlake/bootblock/report_platform.c
index b29cf7dd9e..87b4be7844 100644
--- a/src/soc/intel/cannonlake/bootblock/report_platform.c
+++ b/src/soc/intel/cannonlake/bootblock/report_platform.c
@@ -3,6 +3,7 @@
#include <arch/cpu.h>
#include <device/pci_ops.h>
#include <console/console.h>
+#include <cpu/intel/microcode.h>
#include <cpu/x86/msr.h>
#include <cpu/x86/name.h>
#include <device/pci.h>
@@ -12,8 +13,6 @@
#include <soc/pch.h>
#include <soc/pci_devs.h>
-#define BIOS_SIGN_ID 0x8B
-
static struct {
u32 cpuid;
const char *name;
@@ -170,17 +169,11 @@ static void report_cpu_info(void)
u32 i, cpu_id, cpu_feature_flag;
char cpu_name[49];
int vt, txt, aes;
- msr_t microcode_ver;
static const char *const mode[] = {"NOT ", ""};
const char *cpu_type = "Unknown";
fill_processor_name(cpu_name);
-
- microcode_ver.lo = 0;
- microcode_ver.hi = 0;
- wrmsr(BIOS_SIGN_ID, microcode_ver);
cpu_id = cpu_get_cpuid();
- microcode_ver = rdmsr(BIOS_SIGN_ID);
/* Look for string to match the name */
for (i = 0; i < ARRAY_SIZE(cpu_table); i++) {
@@ -192,7 +185,7 @@ static void report_cpu_info(void)
printk(BIOS_DEBUG, "CPU: %s\n", cpu_name);
printk(BIOS_DEBUG, "CPU: ID %x, %s, ucode: %08x\n",
- cpu_id, cpu_type, microcode_ver.hi);
+ cpu_id, cpu_type, get_current_microcode_rev());
cpu_feature_flag = cpu_get_feature_flags_ecx();
aes = (cpu_feature_flag & CPUID_AES) ? 1 : 0;
diff --git a/src/soc/intel/icelake/bootblock/report_platform.c b/src/soc/intel/icelake/bootblock/report_platform.c
index f001e3b72c..898b0e3b28 100644
--- a/src/soc/intel/icelake/bootblock/report_platform.c
+++ b/src/soc/intel/icelake/bootblock/report_platform.c
@@ -3,6 +3,7 @@
#include <arch/cpu.h>
#include <device/pci_ops.h>
#include <console/console.h>
+#include <cpu/intel/microcode.h>
#include <cpu/x86/msr.h>
#include <device/pci.h>
#include <device/pci_ids.h>
@@ -12,8 +13,6 @@
#include <soc/pci_devs.h>
#include <string.h>
-#define BIOS_SIGN_ID 0x8B
-
static struct {
u32 cpuid;
const char *name;
@@ -83,7 +82,6 @@ static void report_cpu_info(void)
const char cpu_not_found[] = "Platform info not available";
const char *cpu_name = cpu_not_found; /* 48 bytes are reported */
int vt, txt, aes;
- msr_t microcode_ver;
static const char *const mode[] = {"NOT ", ""};
const char *cpu_type = "Unknown";
u32 p[13];
@@ -108,11 +106,7 @@ static void report_cpu_info(void)
cpu_name++;
}
- microcode_ver.lo = 0;
- microcode_ver.hi = 0;
- wrmsr(BIOS_SIGN_ID, microcode_ver);
cpu_id = cpu_get_cpuid();
- microcode_ver = rdmsr(BIOS_SIGN_ID);
/* Look for string to match the name */
for (i = 0; i < ARRAY_SIZE(cpu_table); i++) {
@@ -124,7 +118,7 @@ static void report_cpu_info(void)
printk(BIOS_DEBUG, "CPU: %s\n", cpu_name);
printk(BIOS_DEBUG, "CPU: ID %x, %s, ucode: %08x\n",
- cpu_id, cpu_type, microcode_ver.hi);
+ cpu_id, cpu_type, get_current_microcode_rev());
cpu_feature_flag = cpu_get_feature_flags_ecx();
aes = (cpu_feature_flag & CPUID_AES) ? 1 : 0;
diff --git a/src/soc/intel/jasperlake/bootblock/report_platform.c b/src/soc/intel/jasperlake/bootblock/report_platform.c
index 10d7b0da1d..8f1318d8d2 100644
--- a/src/soc/intel/jasperlake/bootblock/report_platform.c
+++ b/src/soc/intel/jasperlake/bootblock/report_platform.c
@@ -3,6 +3,7 @@
#include <arch/cpu.h>
#include <device/pci_ops.h>
#include <console/console.h>
+#include <cpu/intel/microcode.h>
#include <cpu/x86/msr.h>
#include <cpu/x86/name.h>
#include <device/pci.h>
@@ -13,8 +14,6 @@
#include <soc/pci_devs.h>
#include <string.h>
-#define BIOS_SIGN_ID 0x8B
-
static struct {
u32 cpuid;
const char *name;
@@ -62,17 +61,11 @@ static void report_cpu_info(void)
u32 i, cpu_id, cpu_feature_flag;
char cpu_name[49];
int vt, txt, aes;
- msr_t microcode_ver;
static const char *const mode[] = {"NOT ", ""};
const char *cpu_type = "Unknown";
fill_processor_name(cpu_name);
-
- microcode_ver.lo = 0;
- microcode_ver.hi = 0;
- wrmsr(BIOS_SIGN_ID, microcode_ver);
cpu_id = cpu_get_cpuid();
- microcode_ver = rdmsr(BIOS_SIGN_ID);
/* Look for string to match the name */
for (i = 0; i < ARRAY_SIZE(cpu_table); i++) {
@@ -84,7 +77,7 @@ static void report_cpu_info(void)
printk(BIOS_DEBUG, "CPU: %s\n", cpu_name);
printk(BIOS_DEBUG, "CPU: ID %x, %s, ucode: %08x\n",
- cpu_id, cpu_type, microcode_ver.hi);
+ cpu_id, cpu_type, get_current_microcode_rev());
cpu_feature_flag = cpu_get_feature_flags_ecx();
aes = (cpu_feature_flag & CPUID_AES) ? 1 : 0;
diff --git a/src/soc/intel/skylake/bootblock/report_platform.c b/src/soc/intel/skylake/bootblock/report_platform.c
index d306879ae8..957b4c2a5d 100644
--- a/src/soc/intel/skylake/bootblock/report_platform.c
+++ b/src/soc/intel/skylake/bootblock/report_platform.c
@@ -3,6 +3,7 @@
#include <arch/cpu.h>
#include <device/pci_ops.h>
#include <console/console.h>
+#include <cpu/intel/microcode.h>
#include <cpu/x86/msr.h>
#include <cpu/x86/name.h>
#include <device/pci.h>
@@ -153,17 +154,11 @@ static void report_cpu_info(void)
u32 i, cpu_id, cpu_feature_flag;
char cpu_name[49];
int vt, txt, aes;
- msr_t microcode_ver;
static const char *const mode[] = {"NOT ", ""};
const char *cpu_type = "Unknown";
fill_processor_name(cpu_name);
-
- microcode_ver.lo = 0;
- microcode_ver.hi = 0;
- wrmsr(IA32_BIOS_SIGN_ID, microcode_ver);
cpu_id = cpu_get_cpuid();
- microcode_ver = rdmsr(IA32_BIOS_SIGN_ID);
/* Look for string to match the name */
for (i = 0; i < ARRAY_SIZE(cpu_table); i++) {
@@ -175,7 +170,7 @@ static void report_cpu_info(void)
printk(BIOS_DEBUG, "CPU: %s\n", cpu_name);
printk(BIOS_DEBUG, "CPU: ID %x, %s, ucode: %08x\n",
- cpu_id, cpu_type, microcode_ver.hi);
+ cpu_id, cpu_type, get_current_microcode_rev());
cpu_feature_flag = cpu_get_feature_flags_ecx();
aes = (cpu_feature_flag & CPUID_AES) ? 1 : 0;
diff --git a/src/soc/intel/tigerlake/bootblock/report_platform.c b/src/soc/intel/tigerlake/bootblock/report_platform.c
index 6acc0c3959..03d65a4b1c 100644
--- a/src/soc/intel/tigerlake/bootblock/report_platform.c
+++ b/src/soc/intel/tigerlake/bootblock/report_platform.c
@@ -9,6 +9,7 @@
#include <arch/cpu.h>
#include <device/pci_ops.h>
#include <console/console.h>
+#include <cpu/intel/microcode.h>
#include <cpu/x86/msr.h>
#include <device/pci.h>
#include <device/pci_ids.h>
@@ -18,8 +19,6 @@
#include <soc/pci_devs.h>
#include <string.h>
-#define BIOS_SIGN_ID 0x8B
-
static struct {
u32 cpuid;
const char *name;
@@ -104,7 +103,6 @@ static void report_cpu_info(void)
const char cpu_not_found[] = "Platform info not available";
const char *cpu_name = cpu_not_found; /* 48 bytes are reported */
int vt, txt, aes;
- msr_t microcode_ver;
static const char *const mode[] = {"NOT ", ""};
const char *cpu_type = "Unknown";
u32 p[13];
@@ -129,11 +127,7 @@ static void report_cpu_info(void)
cpu_name++;
}
- microcode_ver.lo = 0;
- microcode_ver.hi = 0;
- wrmsr(BIOS_SIGN_ID, microcode_ver);
cpu_id = cpu_get_cpuid();
- microcode_ver = rdmsr(BIOS_SIGN_ID);
/* Look for string to match the name */
for (i = 0; i < ARRAY_SIZE(cpu_table); i++) {
@@ -145,7 +139,7 @@ static void report_cpu_info(void)
printk(BIOS_DEBUG, "CPU: %s\n", cpu_name);
printk(BIOS_DEBUG, "CPU: ID %x, %s, ucode: %08x\n",
- cpu_id, cpu_type, microcode_ver.hi);
+ cpu_id, cpu_type, get_current_microcode_rev());
cpu_feature_flag = cpu_get_feature_flags_ecx();
aes = (cpu_feature_flag & CPUID_AES) ? 1 : 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 12:28:24 +0000