From ffbbecc9eed9705d7fdb9f6825ab7ccd9224fb09 Mon Sep 17 00:00:00 2001 From: Anton Kochkov Date: Wed, 4 Jul 2012 07:31:37 +0400 Subject: msrtool: Fix Intel CPUs detection Added vendor check in sys.c file and fixed models checking in intel targets files. Change-Id: I1ce52bbce431dea79e903d6bc7a12e5b9ad061be Signed-off-by: Anton Kochkov Reviewed-on: http://review.coreboot.org/1169 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- util/msrtool/intel_pentium4_later.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'util/msrtool/intel_pentium4_later.c') diff --git a/util/msrtool/intel_pentium4_later.c b/util/msrtool/intel_pentium4_later.c index 6bb6ebea43..7c077eef49 100644 --- a/util/msrtool/intel_pentium4_later.c +++ b/util/msrtool/intel_pentium4_later.c @@ -21,7 +21,10 @@ int intel_pentium4_later_probe(const struct targetdef *target) { struct cpuid_t *id = cpuid(); - return ((0xf == id->family)&((0x3 == id->model)|(0x4 == id->model))); + return ((0xf == id->family) && ( + (0x3 == id->model) || + (0x4 == id->model) + )); } const struct msrdef intel_pentium4_later_msrs[] = { -- cgit v1.2.3