<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27666">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nb/intel/sandybridge: Move CPU report to cpu folder<br><br>Change-Id: Ie973923b90eca0bfabd474fed85a6cc33fce7e19<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>---<br>M src/cpu/intel/model_206ax/model_206ax_init.c<br>M src/northbridge/intel/sandybridge/report_platform.c<br>2 files changed, 27 insertions(+), 46 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/27666/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c</span><br><span>index 4be3d87..75631c1 100644</span><br><span>--- a/src/cpu/intel/model_206ax/model_206ax_init.c</span><br><span>+++ b/src/cpu/intel/model_206ax/model_206ax_init.c</span><br><span>@@ -498,9 +498,33 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void model_206ax_report(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ static const char *const mode[] = {"NOT ", ""};</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cpuid_result cpuidr;</span><br><span style="color: hsl(120, 100%, 40%);">+ char processor_name[49];</span><br><span style="color: hsl(120, 100%, 40%);">+ int vt, txt, aes;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Print processor name */</span><br><span style="color: hsl(120, 100%, 40%);">+ fill_processor_name(processor_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_INFO, "CPU: %s.\n", processor_name);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Print platform ID */</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_INFO, "CPU: platform id %x\n", get_platform_id());</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* CPUID and features */</span><br><span style="color: hsl(120, 100%, 40%);">+ cpuidr = cpuid(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_INFO, "CPU: cpuid(1) 0x%x\n", cpuidr.eax);</span><br><span style="color: hsl(120, 100%, 40%);">+ aes = (cpuidr.ecx & (1 << 25)) ? 1 : 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ txt = (cpuidr.ecx & (1 << 6)) ? 1 : 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ vt = (cpuidr.ecx & (1 << 5)) ? 1 : 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_INFO, "CPU: AES %ssupported\n", mode[aes]);</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_INFO, "CPU: TXT %ssupported\n", mode[txt]);</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_INFO, "CPU: VT %ssupported\n", mode[vt]);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void model_206ax_init(struct device *cpu)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- char processor_name[49];</span><br><span> </span><br><span> /* Turn on caching if we haven't already */</span><br><span> x86_enable_cache();</span><br><span>@@ -510,12 +534,8 @@</span><br><span> /* Clear out pending MCEs */</span><br><span> configure_mca();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Print processor name */</span><br><span style="color: hsl(0, 100%, 40%);">- fill_processor_name(processor_name);</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_INFO, "CPU: %s.\n", processor_name);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Print platform ID */</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_INFO, "CPU: platform id %x\n", get_platform_id());</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Print infos */</span><br><span style="color: hsl(120, 100%, 40%);">+ model_206ax_report();</span><br><span> </span><br><span> /* Setup MTRRs based on physical address size */</span><br><span> x86_setup_mtrrs_with_detect();</span><br><span>diff --git a/src/northbridge/intel/sandybridge/report_platform.c b/src/northbridge/intel/sandybridge/report_platform.c</span><br><span>index 6dd760d..7e647d8 100644</span><br><span>--- a/src/northbridge/intel/sandybridge/report_platform.c</span><br><span>+++ b/src/northbridge/intel/sandybridge/report_platform.c</span><br><span>@@ -14,47 +14,9 @@</span><br><span> */</span><br><span> </span><br><span> #include <console/console.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <arch/cpu.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <string.h></span><br><span> #include <southbridge/intel/bd82x6x/pch.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <arch/io.h></span><br><span> #include "sandybridge.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void report_cpu_info(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct cpuid_result cpuidr;</span><br><span style="color: hsl(0, 100%, 40%);">- u32 i, index;</span><br><span style="color: hsl(0, 100%, 40%);">- char cpu_string[50], *cpu_name = cpu_string; /* 48 bytes are reported */</span><br><span style="color: hsl(0, 100%, 40%);">- int vt, txt, aes;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *mode[] = {"NOT ", ""};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- index = 0x80000000;</span><br><span style="color: hsl(0, 100%, 40%);">- cpuidr = cpuid(index);</span><br><span style="color: hsl(0, 100%, 40%);">- if (cpuidr.eax < 0x80000004) {</span><br><span style="color: hsl(0, 100%, 40%);">- strcpy(cpu_string, "Platform info not available");</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- u32 *p = (u32*) cpu_string;</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 2; i <= 4; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- cpuidr = cpuid(index + i);</span><br><span style="color: hsl(0, 100%, 40%);">- *p++ = cpuidr.eax;</span><br><span style="color: hsl(0, 100%, 40%);">- *p++ = cpuidr.ebx;</span><br><span style="color: hsl(0, 100%, 40%);">- *p++ = cpuidr.ecx;</span><br><span style="color: hsl(0, 100%, 40%);">- *p++ = cpuidr.edx;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- /* Skip leading spaces in CPU name string */</span><br><span style="color: hsl(0, 100%, 40%);">- while (cpu_name[0] == ' ')</span><br><span style="color: hsl(0, 100%, 40%);">- cpu_name++;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- cpuidr = cpuid(1);</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_DEBUG, "CPU id(%x): %s\n", cpuidr.eax, cpu_name);</span><br><span style="color: hsl(0, 100%, 40%);">- aes = (cpuidr.ecx & (1 << 25)) ? 1 : 0;</span><br><span style="color: hsl(0, 100%, 40%);">- txt = (cpuidr.ecx & (1 << 6)) ? 1 : 0;</span><br><span style="color: hsl(0, 100%, 40%);">- vt = (cpuidr.ecx & (1 << 5)) ? 1 : 0;</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_DEBUG, "AES %ssupported, TXT %ssupported, VT %ssupported\n",</span><br><span style="color: hsl(0, 100%, 40%);">- mode[aes], mode[txt], mode[vt]);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static struct {</span><br><span> u16 dev_id;</span><br><span> const char *dev_name;</span><br><span>@@ -125,6 +87,5 @@</span><br><span> </span><br><span> void report_platform_info(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- report_cpu_info();</span><br><span> report_pch_info();</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27666">change 27666</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27666"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ie973923b90eca0bfabd474fed85a6cc33fce7e19 </div>
<div style="display:none"> Gerrit-Change-Number: 27666 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>