summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorUsha P <usha.p@intel.com>2019-11-28 10:21:02 +0530
committerPatrick Georgi <pgeorgi@google.com>2019-12-26 10:44:43 +0000
commite15087691064157532410050c87f6a27f9b85353 (patch)
tree92e7996b03644fb843532408359d1157c5243922 /src/soc
parent33ff4cc137e501b14859bc67cc7e85dd60a863cc (diff)
downloadcoreboot-e15087691064157532410050c87f6a27f9b85353.tar.xz
soc/intel/cannonlake: Clean up report_cpu_info() function
This patch makes below clean-up for report_cpu_info() function. 1. Remove unused variables. 3. Reuse fill_processor_name. TEST = Successfully able to boot hatch and verify the cpu_name "CPU: Intel(R) Core(TM) i5-10210U CPU @ 1.60GHz" Change-Id: I41c76eb93f0c5229c4a49ab041339b6ad51ad24a Signed-off-by: Usha P <usha.p@intel.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/37309 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/cannonlake/bootblock/report_platform.c28
1 files changed, 4 insertions, 24 deletions
diff --git a/src/soc/intel/cannonlake/bootblock/report_platform.c b/src/soc/intel/cannonlake/bootblock/report_platform.c
index 8cdf38e64b..523c1a8f7f 100644
--- a/src/soc/intel/cannonlake/bootblock/report_platform.c
+++ b/src/soc/intel/cannonlake/bootblock/report_platform.c
@@ -18,6 +18,7 @@
#include <device/pci_ops.h>
#include <console/console.h>
#include <cpu/x86/msr.h>
+#include <cpu/x86/name.h>
#include <device/pci.h>
#include <device/pci_ids.h>
#include <intelblocks/mp_init.h>
@@ -178,35 +179,14 @@ static uint16_t get_dev_id(pci_devfn_t dev)
static void report_cpu_info(void)
{
- struct cpuid_result cpuidr;
- u32 i, index, cpu_id, cpu_feature_flag;
- char cpu_string[50], *cpu_name = cpu_string; /* 48 bytes are reported */
+ 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";
- u32 p[13];
- index = 0x80000000;
- cpuidr = cpuid(index);
- if (cpuidr.eax < 0x80000004) {
- strcpy(cpu_string, "Platform info not available");
- } else {
- int j=0;
-
- for (i = 2; i <= 4; i++) {
- cpuidr = cpuid(index + i);
- p[j++] = cpuidr.eax;
- p[j++] = cpuidr.ebx;
- p[j++] = cpuidr.ecx;
- p[j++] = cpuidr.edx;
- }
- p[12]=0;
- cpu_name = (char *)p;
- }
- /* Skip leading spaces in CPU name string */
- while (cpu_name[0] == ' ')
- cpu_name++;
+ fill_processor_name(cpu_name);
microcode_ver.lo = 0;
microcode_ver.hi = 0;