summaryrefslogtreecommitdiff
path: root/util/msrtool/msrtool.c
diff options
context:
space:
mode:
authorAnton Kochkov <anton.kochkov@gmail.com>2012-07-21 07:29:48 +0400
committerPeter Stuge <peter@stuge.se>2012-07-21 17:35:46 +0200
commit59b36f1026090ea9b39ca2bc8386c8addf1b03d6 (patch)
tree544cf2d39f7bd51c7004aa0a8e133def13e52a0e /util/msrtool/msrtool.c
parentc7fc4422a0039b6fd6c44bd98050ec648ee0312a (diff)
msrtool: Factor out cpuid() from target probe functions into main()
Almost all probe functions called cpuid(). Those calls are replaced by a single cpuid() call in main() and a new parameter to the target probe functions with the cpuid() result. The vendor_t and struct cpuid_t definitions are moved closer to the top of msrtool.h and the vendor_t enum is reformatted to simplify addition of further values. Change-Id: Icd615636207499cfa46b8b99bf819ef8ca2d97c0 Signed-off-by: Anton Kochkov <anton.kochkov@gmail.com> Signed-off-by: Peter Stuge <peter@stuge.se> Reviewed-on: http://review.coreboot.org/1259 Tested-by: build bot (Jenkins)
Diffstat (limited to 'util/msrtool/msrtool.c')
-rw-r--r--util/msrtool/msrtool.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/msrtool/msrtool.c b/util/msrtool/msrtool.c
index 433fc32e43..434d332126 100644
--- a/util/msrtool/msrtool.c
+++ b/util/msrtool/msrtool.c
@@ -270,6 +270,7 @@ int main(int argc, char *argv[]) {
int ret = 1;
const struct sysdef *s;
const struct targetdef *t;
+ const struct cpuid_t *id = cpuid();
uint8_t tn, listmsrs = 0, listknown = 0, input = 0;
uint32_t addr = 0;
const char *streamfn = NULL, *difffn = NULL;
@@ -357,7 +358,7 @@ int main(int argc, char *argv[]) {
else
for (t = alltargets; !TARGET_ISEOT(*t); t++) {
printf_verbose("Probing for target %s: %s\n", t->name, t->prettyname);
- if (!t->probe(t))
+ if (!t->probe(t, id))
continue;
printf_quiet("Detected target %s: %s\n", t->name, t->prettyname);
add_target(t);