msrtool: added support for Intel CPUs

[coreboot.git] / util / msrtool / msrtool.c

diff --git a/util/msrtool/msrtool.c b/util/msrtool/msrtool.c
index 47b4938739afcb94c0c548ae13b26617b87ea14f..21f9c9d8fd305ae10ea16739672fa7fb1d8484f4 100644 (file)
--- a/util/msrtool/msrtool.c
+++ b/util/msrtool/msrtool.c
@@ -44,12 +44,19 @@ static struct targetdef alltargets[] = {
        { "geodelx", "AMD Geode(tm) LX", geodelx_probe, geodelx_msrs },
        { "cs5536", "AMD Geode(tm) CS5536", cs5536_probe, cs5536_msrs },
        { "K8", "AMD K8 Family", k8_probe, k8_msrs },
+       { "intel_pentium3_early", "Intel Pentium III family", intel_pentium3_early_probe, intel_pentium3_early_msrs },
+       { "intel_pentium3", "Intel Pentium III Xeon Processor, Intel Pentium III Processor", intel_pentium3_probe, intel_pentium3_msrs },
+       { "intel_core1", "Intel Core Duo, Intel Core Solo processors", intel_core1_probe, intel_core1_msrs },
+       { "intel_core2_early", "Intel Xeon Processor 3000, 3200, 5100, 5300, 7300 series, Intel Core 2 Quad processor 6000 series, Intel Core 2 Extreme 6000    series, Intel Core 2 Duo 4000, 5000, 6000, 7000 series processors, Intel Pentium dual-core processors", intel_core2_early_probe, intel_core2_early_msrs },
+       { "intel_core2_later", "Intel Xeon Processor 5200, 5400 series, Intel Core 2 Quad       processors 8000, 9000 series", intel_core2_later_probe, intel_core2_later_msrs },
+       { "intel_pentium4_early", "Intel Xeon Processor, Intel Xeon Processor MP, Intel Pentium 4 processors", intel_pentium4_early_probe, intel_pentium4_early_msrs },
+       { "intel_pentium4_later", "Intel Xeon Processor, Intel Xeon Processor MP, Intel Pentium 4, Pentium D processors", intel_pentium4_later_probe, intel_pentium4_later_msrs },
        { TARGET_EOT }
 };
 
 static struct sysdef allsystems[] = {
        { "linux", "Linux with /dev/cpu/*/msr", linux_probe, linux_open, linux_close, linux_rdmsr },
-       { "darwin", "OS X with DirectIO", darwin_probe, darwin_open, darwin_close, darwin_rdmsr },
+       { "darwin", "Mac OS X with DirectHW", darwin_probe, darwin_open, darwin_close, darwin_rdmsr },
        { "freebsd", "FreeBSD with /dev/cpuctl*", freebsd_probe, freebsd_open, freebsd_close, freebsd_rdmsr },
        { SYSTEM_EOT }
 };
@@ -346,7 +353,7 @@ int main(int argc, char *argv[]) {
        if (targets)
                for (tn = 0; tn < targets_found; tn++)
                        printf_quiet("Forced target %s: %s\n", targets[tn]->name, targets[tn]->prettyname);
-       else 
+       else
                for (t = alltargets; !TARGET_ISEOT(*t); t++) {
                        printf_verbose("Probing for target %s: %s\n", t->name, t->prettyname);
                        if (!t->probe(t))