<p>Philipp Deppenwiese <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/18256">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mstrool: only use intel targets for actual intel CPUs<br><br>VIA c3 & C7 use the the family of 0x6 and model 10, but are not quite<br>Pentium III.<br><br>Change-Id: I85e9853b42cfd20db46db0bd244620d6813bc826<br>Signed-off-by: Lubomir Rintel <lkundrak@v3.sk><br>Reviewed-on: https://review.coreboot.org/18256<br>Reviewed-by: Martin Roth <martinroth@google.com><br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>---<br>M util/msrtool/intel_atom.c<br>M util/msrtool/intel_core1.c<br>M util/msrtool/intel_core2_early.c<br>M util/msrtool/intel_core2_later.c<br>M util/msrtool/intel_nehalem.c<br>M util/msrtool/intel_pentium3.c<br>M util/msrtool/intel_pentium3_early.c<br>M util/msrtool/intel_pentium4_early.c<br>M util/msrtool/intel_pentium4_later.c<br>9 files changed, 23 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/msrtool/intel_atom.c b/util/msrtool/intel_atom.c</span><br><span>index c055f4c..2d89c9c 100644</span><br><span>--- a/util/msrtool/intel_atom.c</span><br><span>+++ b/util/msrtool/intel_atom.c</span><br><span>@@ -16,8 +16,9 @@</span><br><span> #include "msrtool.h"</span><br><span> </span><br><span> int intel_atom_probe(const struct targetdef *target, const struct cpuid_t *id) {</span><br><span style="color: hsl(0, 100%, 40%);">-  return (0x6 == id->family) &&</span><br><span style="color: hsl(0, 100%, 40%);">-                (0x1c == id->model);</span><br><span style="color: hsl(120, 100%, 40%);">+       return ((VENDOR_INTEL == id->vendor) &&</span><br><span style="color: hsl(120, 100%, 40%);">+            (0x6 == id->family) &&</span><br><span style="color: hsl(120, 100%, 40%);">+             (0x1c == id->model));</span><br><span> }</span><br><span> </span><br><span> const struct msrdef intel_atom_msrs[] = {</span><br><span>diff --git a/util/msrtool/intel_core1.c b/util/msrtool/intel_core1.c</span><br><span>index ef2b660..039a2f8 100644</span><br><span>--- a/util/msrtool/intel_core1.c</span><br><span>+++ b/util/msrtool/intel_core1.c</span><br><span>@@ -16,7 +16,9 @@</span><br><span> #include "msrtool.h"</span><br><span> </span><br><span> int intel_core1_probe(const struct targetdef *target, const struct cpuid_t *id) {</span><br><span style="color: hsl(0, 100%, 40%);">-      return ((0x6 == id->family) && (0xe == id->model));</span><br><span style="color: hsl(120, 100%, 40%);">+     return ((VENDOR_INTEL == id->vendor) &&</span><br><span style="color: hsl(120, 100%, 40%);">+            (0x6 == id->family) &&</span><br><span style="color: hsl(120, 100%, 40%);">+             (0xe == id->model));</span><br><span> }</span><br><span> </span><br><span> const struct msrdef intel_core1_msrs[] = {</span><br><span>diff --git a/util/msrtool/intel_core2_early.c b/util/msrtool/intel_core2_early.c</span><br><span>index a9b742f..1072624 100644</span><br><span>--- a/util/msrtool/intel_core2_early.c</span><br><span>+++ b/util/msrtool/intel_core2_early.c</span><br><span>@@ -16,7 +16,9 @@</span><br><span> #include "msrtool.h"</span><br><span> </span><br><span> int intel_core2_early_probe(const struct targetdef *target, const struct cpuid_t *id) {</span><br><span style="color: hsl(0, 100%, 40%);">-        return ((0x6 == id->family) && (0xf == id->model));</span><br><span style="color: hsl(120, 100%, 40%);">+     return ((VENDOR_INTEL == id->vendor) &&</span><br><span style="color: hsl(120, 100%, 40%);">+            (0x6 == id->family) &&</span><br><span style="color: hsl(120, 100%, 40%);">+             (0xf == id->model));</span><br><span> }</span><br><span> </span><br><span> const struct msrdef intel_core2_early_msrs[] = {</span><br><span>diff --git a/util/msrtool/intel_core2_later.c b/util/msrtool/intel_core2_later.c</span><br><span>index 3cb28c6..ad353eb 100644</span><br><span>--- a/util/msrtool/intel_core2_later.c</span><br><span>+++ b/util/msrtool/intel_core2_later.c</span><br><span>@@ -16,7 +16,9 @@</span><br><span> #include "msrtool.h"</span><br><span> </span><br><span> int intel_core2_later_probe(const struct targetdef *target, const struct cpuid_t *id) {</span><br><span style="color: hsl(0, 100%, 40%);">-  return ((0x6 == id->family)&(0x17 == id->model));</span><br><span style="color: hsl(120, 100%, 40%);">+   return ((VENDOR_INTEL == id->vendor) &&</span><br><span style="color: hsl(120, 100%, 40%);">+            (0x6 == id->family) &&</span><br><span style="color: hsl(120, 100%, 40%);">+             (0x17 == id->model));</span><br><span> }</span><br><span> </span><br><span> const struct msrdef intel_core2_later_msrs[] = {</span><br><span>diff --git a/util/msrtool/intel_nehalem.c b/util/msrtool/intel_nehalem.c</span><br><span>index c133653..679efb5 100644</span><br><span>--- a/util/msrtool/intel_nehalem.c</span><br><span>+++ b/util/msrtool/intel_nehalem.c</span><br><span>@@ -16,7 +16,8 @@</span><br><span> #include "msrtool.h"</span><br><span> </span><br><span> int intel_nehalem_probe(const struct targetdef *target, const struct cpuid_t *id) {</span><br><span style="color: hsl(0, 100%, 40%);">-     return ((0x6 == id->family) && (</span><br><span style="color: hsl(120, 100%, 40%);">+   return ((VENDOR_INTEL == id->vendor) &&</span><br><span style="color: hsl(120, 100%, 40%);">+            (0x6 == id->family) && (</span><br><span>          (0x1a == id->model) ||</span><br><span>            (0x1e == id->model) ||</span><br><span>            (0x1f == id->model) ||</span><br><span>diff --git a/util/msrtool/intel_pentium3.c b/util/msrtool/intel_pentium3.c</span><br><span>index 456963f..6b12428 100644</span><br><span>--- a/util/msrtool/intel_pentium3.c</span><br><span>+++ b/util/msrtool/intel_pentium3.c</span><br><span>@@ -16,7 +16,8 @@</span><br><span> #include "msrtool.h"</span><br><span> </span><br><span> int intel_pentium3_probe(const struct targetdef *target, const struct cpuid_t *id) {</span><br><span style="color: hsl(0, 100%, 40%);">-    return ((0x6 == id->family) && (</span><br><span style="color: hsl(120, 100%, 40%);">+   return ((VENDOR_INTEL == id->vendor) &&</span><br><span style="color: hsl(120, 100%, 40%);">+            (0x6 == id->family) && (</span><br><span>          (0xa == id->model) ||</span><br><span>             (0xb == id->model)</span><br><span>                ));</span><br><span>diff --git a/util/msrtool/intel_pentium3_early.c b/util/msrtool/intel_pentium3_early.c</span><br><span>index 925b24f..afdc62e 100644</span><br><span>--- a/util/msrtool/intel_pentium3_early.c</span><br><span>+++ b/util/msrtool/intel_pentium3_early.c</span><br><span>@@ -16,7 +16,8 @@</span><br><span> #include "msrtool.h"</span><br><span> </span><br><span> int intel_pentium3_early_probe(const struct targetdef *target, const struct cpuid_t *id) {</span><br><span style="color: hsl(0, 100%, 40%);">-    return ((0x6 == id->family) && (</span><br><span style="color: hsl(120, 100%, 40%);">+   return ((VENDOR_INTEL == id->vendor) &&</span><br><span style="color: hsl(120, 100%, 40%);">+            (0x6 == id->family) && (</span><br><span>          (0x7 == id->model) ||</span><br><span>             (0x8 == id->model)</span><br><span>                ));</span><br><span>diff --git a/util/msrtool/intel_pentium4_early.c b/util/msrtool/intel_pentium4_early.c</span><br><span>index 537d9e3..649be04 100644</span><br><span>--- a/util/msrtool/intel_pentium4_early.c</span><br><span>+++ b/util/msrtool/intel_pentium4_early.c</span><br><span>@@ -16,7 +16,9 @@</span><br><span> #include "msrtool.h"</span><br><span> </span><br><span> int intel_pentium4_early_probe(const struct targetdef *target, const struct cpuid_t *id) {</span><br><span style="color: hsl(0, 100%, 40%);">-    return ((0xf == id->family) && (0x2 == id->model));</span><br><span style="color: hsl(120, 100%, 40%);">+     return ((VENDOR_INTEL == id->vendor) &&</span><br><span style="color: hsl(120, 100%, 40%);">+            (0xf == id->family) &&</span><br><span style="color: hsl(120, 100%, 40%);">+             (0x2 == id->model));</span><br><span> }</span><br><span> </span><br><span> const struct msrdef intel_pentium4_early_msrs[] = {</span><br><span>diff --git a/util/msrtool/intel_pentium4_later.c b/util/msrtool/intel_pentium4_later.c</span><br><span>index cc85f65..5444161 100644</span><br><span>--- a/util/msrtool/intel_pentium4_later.c</span><br><span>+++ b/util/msrtool/intel_pentium4_later.c</span><br><span>@@ -16,7 +16,8 @@</span><br><span> #include "msrtool.h"</span><br><span> </span><br><span> int intel_pentium4_later_probe(const struct targetdef *target, const struct cpuid_t *id) {</span><br><span style="color: hsl(0, 100%, 40%);">-        return ((0xf == id->family) && (</span><br><span style="color: hsl(120, 100%, 40%);">+   return ((VENDOR_INTEL == id->vendor) &&</span><br><span style="color: hsl(120, 100%, 40%);">+            (0xf == id->family) && (</span><br><span>          (0x3 == id->model) ||</span><br><span>             (0x4 == id->model)</span><br><span>                ));</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/18256">change 18256</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/18256"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I85e9853b42cfd20db46db0bd244620d6813bc826 </div>
<div style="display:none"> Gerrit-Change-Number: 18256 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Lubomir Rintel <lkundrak@v3.sk> </div>
<div style="display:none"> Gerrit-Reviewer: Martin Roth <martinroth@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net> </div>
<div style="display:none"> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>