summaryrefslogtreecommitdiff
path: root/util/inteltool/cpu.c
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2011-11-14 12:40:34 -0800
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-03-30 20:26:50 +0200
commita7b296d450c5d948b95c1342f726334b4e5a4c68 (patch)
tree2e4939509d1ba3f74fd460a152cfa84c2b4b96f5 /util/inteltool/cpu.c
parent8acbc2a8865ca74f0f80c51c6511b9ab4c03d552 (diff)
Fix warnings in coreboot utilities.
- Fix some poor programming practice (breaks of strict aliasing as well as not checking the return value of read) - Use PRIx64 instead of %llx to prevent compilation warnings with both 32bit and 64bit compilers - Use same compiler command options when linking inteltool and when detecting libpci for inteltool Change-Id: I08b2e8d1bbc908f6b1f26d25cb3a4b03d818e124 Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/752 Tested-by: build bot (Jenkins) Reviewed-by: Mathias Krause <minipli@googlemail.com>
Diffstat (limited to 'util/inteltool/cpu.c')
-rw-r--r--util/inteltool/cpu.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/util/inteltool/cpu.c b/util/inteltool/cpu.c
index 20748bda44..f0183816f7 100644
--- a/util/inteltool/cpu.c
+++ b/util/inteltool/cpu.c
@@ -57,7 +57,7 @@ int msr_readerror = 0;
msr_t rdmsr(int addr)
{
- uint8_t buf[8];
+ uint32_t buf[2];
msr_t msr = { 0xffffffff, 0xffffffff };
if (lseek(fd_msr, (off_t) addr, SEEK_SET) == -1) {
@@ -67,9 +67,8 @@ msr_t rdmsr(int addr)
}
if (read(fd_msr, buf, 8) == 8) {
- msr.lo = *(uint32_t *)buf;
- msr.hi = *(uint32_t *)(buf + 4);
-
+ msr.lo = buf[0];
+ msr.hi = buf[1];
return msr;
}