<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29529">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cpu/intel/socket_*/Kconfig: [WIP] Add CPU_SOCKET_TYPE<br><br>CPU_SOCKET_TYPE values added in accordance with<br>SMBIOS Reference Specification Version: 3.2.0<br>AMD's have CPU_SOCKET_TYPE but are not a same as SMBIOS spec.<br><br>Change-Id: I1bf5ac6c411720d349df8fd706015c6835758cd0<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/arch/x86/smbios.c<br>M src/cpu/intel/socket_441/Kconfig<br>M src/cpu/intel/socket_BGA1284/Kconfig<br>M src/cpu/intel/socket_BGA956/Kconfig<br>M src/cpu/intel/socket_FCBGA1023/Kconfig<br>M src/cpu/intel/socket_FCBGA559/Kconfig<br>M src/cpu/intel/socket_LGA1155/Kconfig<br>M src/cpu/intel/socket_LGA775/Kconfig<br>M src/cpu/intel/socket_mFCPGA478/Kconfig<br>M src/cpu/intel/socket_mPGA478MN/Kconfig<br>M src/cpu/intel/socket_mPGA604/Kconfig<br>M src/cpu/intel/socket_rPGA988B/Kconfig<br>M src/cpu/intel/socket_rPGA989/Kconfig<br>13 files changed, 49 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/29529/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c</span><br><span>index c0545ce..b6337f2 100644</span><br><span>--- a/src/arch/x86/smbios.c</span><br><span>+++ b/src/arch/x86/smbios.c</span><br><span>@@ -555,12 +555,11 @@</span><br><span> t->processor_version = smbios_processor_name(t->eos);</span><br><span> t->processor_family = (res.eax > 0) ? 0x0c : 0x6;</span><br><span> t->processor_type = 3; /* System Processor */</span><br><span style="color: hsl(0, 100%, 40%);">- t->processor_upgrade = 0x06;</span><br><span> t->core_count = (res.ebx >> 16) & 0xff;</span><br><span> t->l1_cache_handle = 0xffff;</span><br><span> t->l2_cache_handle = 0xffff;</span><br><span> t->l3_cache_handle = 0xffff;</span><br><span style="color: hsl(0, 100%, 40%);">- t->processor_upgrade = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ t->processor_upgrade = CONFIG_CPU_SOCKET_TYPE;</span><br><span> len = t->length + smbios_string_table_len(t->eos);</span><br><span> *current += len;</span><br><span> return len;</span><br><span>diff --git a/src/cpu/intel/socket_441/Kconfig b/src/cpu/intel/socket_441/Kconfig</span><br><span>index ac249c5..66761f5 100644</span><br><span>--- a/src/cpu/intel/socket_441/Kconfig</span><br><span>+++ b/src/cpu/intel/socket_441/Kconfig</span><br><span>@@ -3,6 +3,10 @@</span><br><span> </span><br><span> if CPU_INTEL_SOCKET_441</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config CPU_SOCKET_TYPE</span><br><span style="color: hsl(120, 100%, 40%);">+ hex</span><br><span style="color: hsl(120, 100%, 40%);">+ default 0x04</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config SOCKET_SPECIFIC_OPTIONS # dummy</span><br><span> def_bool y</span><br><span> select CPU_INTEL_MODEL_106CX</span><br><span>diff --git a/src/cpu/intel/socket_BGA1284/Kconfig b/src/cpu/intel/socket_BGA1284/Kconfig</span><br><span>index 402dc5c..5fef2ba 100644</span><br><span>--- a/src/cpu/intel/socket_BGA1284/Kconfig</span><br><span>+++ b/src/cpu/intel/socket_BGA1284/Kconfig</span><br><span>@@ -3,6 +3,10 @@</span><br><span> </span><br><span> if CPU_INTEL_SOCKET_BGA1284</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config CPU_SOCKET_TYPE</span><br><span style="color: hsl(120, 100%, 40%);">+ hex</span><br><span style="color: hsl(120, 100%, 40%);">+ default 0x01 # Other</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config SOCKET_SPECIFIC_OPTIONS # dummy</span><br><span> def_bool y</span><br><span> select MMX</span><br><span>diff --git a/src/cpu/intel/socket_BGA956/Kconfig b/src/cpu/intel/socket_BGA956/Kconfig</span><br><span>index 6c5e414..91c1039 100644</span><br><span>--- a/src/cpu/intel/socket_BGA956/Kconfig</span><br><span>+++ b/src/cpu/intel/socket_BGA956/Kconfig</span><br><span>@@ -6,6 +6,10 @@</span><br><span> </span><br><span> if CPU_INTEL_SOCKET_BGA956</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config CPU_SOCKET_TYPE</span><br><span style="color: hsl(120, 100%, 40%);">+ hex</span><br><span style="color: hsl(120, 100%, 40%);">+ default 0x01 # Other</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config DCACHE_RAM_BASE</span><br><span> hex</span><br><span> default 0xfefc0000</span><br><span>diff --git a/src/cpu/intel/socket_FCBGA1023/Kconfig b/src/cpu/intel/socket_FCBGA1023/Kconfig</span><br><span>index 3c6e2bf..206e5d9ec3 100644</span><br><span>--- a/src/cpu/intel/socket_FCBGA1023/Kconfig</span><br><span>+++ b/src/cpu/intel/socket_FCBGA1023/Kconfig</span><br><span>@@ -3,6 +3,10 @@</span><br><span> </span><br><span> if CPU_INTEL_SOCKET_FCBGA1023</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config CPU_SOCKET_TYPE</span><br><span style="color: hsl(120, 100%, 40%);">+ hex</span><br><span style="color: hsl(120, 100%, 40%);">+ default 0x22</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config SOCKET_SPECIFIC_OPTIONS # dummy</span><br><span> def_bool y</span><br><span> select MMX</span><br><span>diff --git a/src/cpu/intel/socket_FCBGA559/Kconfig b/src/cpu/intel/socket_FCBGA559/Kconfig</span><br><span>index d1cc80f..f7aaca3 100644</span><br><span>--- a/src/cpu/intel/socket_FCBGA559/Kconfig</span><br><span>+++ b/src/cpu/intel/socket_FCBGA559/Kconfig</span><br><span>@@ -3,6 +3,10 @@</span><br><span> </span><br><span> if CPU_INTEL_SOCKET_FCBGA559</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config CPU_SOCKET_TYPE</span><br><span style="color: hsl(120, 100%, 40%);">+ hex</span><br><span style="color: hsl(120, 100%, 40%);">+ default 0x01 # Other</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config SOCKET_SPECIFIC_OPTIONS</span><br><span> def_bool y</span><br><span> select CPU_INTEL_MODEL_106CX</span><br><span>diff --git a/src/cpu/intel/socket_LGA1155/Kconfig b/src/cpu/intel/socket_LGA1155/Kconfig</span><br><span>index 35aac3c..46e7509 100644</span><br><span>--- a/src/cpu/intel/socket_LGA1155/Kconfig</span><br><span>+++ b/src/cpu/intel/socket_LGA1155/Kconfig</span><br><span>@@ -3,6 +3,10 @@</span><br><span> </span><br><span> if CPU_INTEL_SOCKET_LGA1155</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config CPU_SOCKET_TYPE</span><br><span style="color: hsl(120, 100%, 40%);">+ hex</span><br><span style="color: hsl(120, 100%, 40%);">+ default 0x24</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config SOCKET_SPECIFIC_OPTIONS # dummy</span><br><span> def_bool y</span><br><span> select MMX</span><br><span>diff --git a/src/cpu/intel/socket_LGA775/Kconfig b/src/cpu/intel/socket_LGA775/Kconfig</span><br><span>index 8b227bd..3d61ac3 100644</span><br><span>--- a/src/cpu/intel/socket_LGA775/Kconfig</span><br><span>+++ b/src/cpu/intel/socket_LGA775/Kconfig</span><br><span>@@ -3,6 +3,10 @@</span><br><span> </span><br><span> if CPU_INTEL_SOCKET_LGA775</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config CPU_SOCKET_TYPE</span><br><span style="color: hsl(120, 100%, 40%);">+ hex</span><br><span style="color: hsl(120, 100%, 40%);">+ default 0x15</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config SOCKET_SPECIFIC_OPTIONS # dummy</span><br><span> def_bool y</span><br><span> select CPU_INTEL_MODEL_6FX</span><br><span>diff --git a/src/cpu/intel/socket_mFCPGA478/Kconfig b/src/cpu/intel/socket_mFCPGA478/Kconfig</span><br><span>index 075abad..83b3e8b 100644</span><br><span>--- a/src/cpu/intel/socket_mFCPGA478/Kconfig</span><br><span>+++ b/src/cpu/intel/socket_mFCPGA478/Kconfig</span><br><span>@@ -3,6 +3,10 @@</span><br><span> </span><br><span> if CPU_INTEL_SOCKET_MFCPGA478</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config CPU_SOCKET_TYPE</span><br><span style="color: hsl(120, 100%, 40%);">+ hex</span><br><span style="color: hsl(120, 100%, 40%);">+ default 0x01 # Other</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config SOCKET_SPECIFIC_OPTIONS # dummy</span><br><span> def_bool y</span><br><span> select CPU_INTEL_MODEL_6EX</span><br><span>diff --git a/src/cpu/intel/socket_mPGA478MN/Kconfig b/src/cpu/intel/socket_mPGA478MN/Kconfig</span><br><span>index 7d97022..aa0c7d7 100644</span><br><span>--- a/src/cpu/intel/socket_mPGA478MN/Kconfig</span><br><span>+++ b/src/cpu/intel/socket_mPGA478MN/Kconfig</span><br><span>@@ -7,6 +7,10 @@</span><br><span> </span><br><span> if CPU_INTEL_SOCKET_MPGA478MN</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config CPU_SOCKET_TYPE</span><br><span style="color: hsl(120, 100%, 40%);">+ hex</span><br><span style="color: hsl(120, 100%, 40%);">+ default 0x01 # Other</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config DCACHE_RAM_BASE</span><br><span> hex</span><br><span> default 0xfefc0000</span><br><span>diff --git a/src/cpu/intel/socket_mPGA604/Kconfig b/src/cpu/intel/socket_mPGA604/Kconfig</span><br><span>index ab0cf8a..206382e 100644</span><br><span>--- a/src/cpu/intel/socket_mPGA604/Kconfig</span><br><span>+++ b/src/cpu/intel/socket_mPGA604/Kconfig</span><br><span>@@ -3,6 +3,10 @@</span><br><span> </span><br><span> if CPU_INTEL_SOCKET_MPGA604</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config CPU_SOCKET_TYPE</span><br><span style="color: hsl(120, 100%, 40%);">+ hex</span><br><span style="color: hsl(120, 100%, 40%);">+ default 0x13</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config SOCKET_SPECIFIC_OPTIONS # dummy</span><br><span> def_bool y</span><br><span> select CPU_INTEL_MODEL_F2X</span><br><span>diff --git a/src/cpu/intel/socket_rPGA988B/Kconfig b/src/cpu/intel/socket_rPGA988B/Kconfig</span><br><span>index 753cfb3..f53491e 100644</span><br><span>--- a/src/cpu/intel/socket_rPGA988B/Kconfig</span><br><span>+++ b/src/cpu/intel/socket_rPGA988B/Kconfig</span><br><span>@@ -3,6 +3,10 @@</span><br><span> </span><br><span> if CPU_INTEL_SOCKET_RPGA988B</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config CPU_SOCKET_TYPE</span><br><span style="color: hsl(120, 100%, 40%);">+ hex</span><br><span style="color: hsl(120, 100%, 40%);">+ default 0x21</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config SOCKET_SPECIFIC_OPTIONS # dummy</span><br><span> def_bool y</span><br><span> select MMX</span><br><span>diff --git a/src/cpu/intel/socket_rPGA989/Kconfig b/src/cpu/intel/socket_rPGA989/Kconfig</span><br><span>index 1d1f64f..8094221 100644</span><br><span>--- a/src/cpu/intel/socket_rPGA989/Kconfig</span><br><span>+++ b/src/cpu/intel/socket_rPGA989/Kconfig</span><br><span>@@ -3,6 +3,10 @@</span><br><span> </span><br><span> if CPU_INTEL_SOCKET_RPGA989</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config CPU_SOCKET_TYPE</span><br><span style="color: hsl(120, 100%, 40%);">+ hex</span><br><span style="color: hsl(120, 100%, 40%);">+ default 0x01 # Other</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config SOCKET_SPECIFIC_OPTIONS # dummy</span><br><span> def_bool y</span><br><span> select MMX</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29529">change 29529</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/29529"/><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: I1bf5ac6c411720d349df8fd706015c6835758cd0 </div>
<div style="display:none"> Gerrit-Change-Number: 29529 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>