renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 09:13:55 +08:00
Code

i386: msr.h: be paranoid about types and parentheses

Browse Source 
When implementing things as macros, make sure we use typecasts and
parentheses where needed.  The macros as defined were vulnerable to
surreptitious promotion causing problems.

Avoid macros where practical; e.g. wrmsr() can be an inline instead.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
H. Peter Anvin 2007-05-09 00:02:11 -07:00 committed by Linus Torvalds
parent 29bd443377
commit b0b73cb41d
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
include/asm-i386/msr.h
View File

@ -86,55 +86,50 @@ static inline unsigned long long native_read_pmc(void)
#define rdmsr(msr,val1,val2) \ #define rdmsr(msr,val1,val2) \
do { \ do { \
unsigned long long __val = native_read_msr(msr); \ u64 __val = native_read_msr(msr); \
val1 = __val; \ (val1) = (u32)__val; \
val2 = __val >> 32; \ (val2) = (u32)(__val >> 32); \
} while(0) } while(0)
#define wrmsr(msr,val1,val2) \ static inline void wrmsr(u32 __msr, u32 __low, u32 __high)
native_write_msr(msr, ((unsigned long long)val2 << 32) | val1)
#define rdmsrl(msr,val) \
do { \
(val) = native_read_msr(msr); \
} while(0)
static inline void wrmsrl (unsigned long msr, unsigned long long val)
{ {
unsigned long lo, hi; native_write_msr(__msr, ((u64)__high << 32) | __low);
lo = (unsigned long) val;
hi = val >> 32;
wrmsr (msr, lo, hi);
} }
#define rdmsrl(msr,val) \
((val) = native_read_msr(msr))
#define wrmsrl(msr,val) native_write_msr(msr, val)
/* wrmsr with exception handling */ /* wrmsr with exception handling */
#define wrmsr_safe(msr,val1,val2) \ static inline int wrmsr_safe(u32 __msr, u32 __low, u32 __high)
(native_write_msr_safe(msr, ((unsigned long long)val2 << 32) | val1)) {
return native_write_msr_safe(__msr, ((u64)__high << 32) | __low);
}
/* rdmsr with exception handling */ /* rdmsr with exception handling */
#define rdmsr_safe(msr,p1,p2) \ #define rdmsr_safe(msr,p1,p2) \
({ \ ({ \
int __err; \ int __err; \
unsigned long long __val = native_read_msr_safe(msr, &__err);\ u64 __val = native_read_msr_safe(msr, &__err); \
(*p1) = __val; \ (*p1) = (u32)__val; \
(*p2) = __val >> 32; \ (*p2) = (u32)(__val >> 32); \
__err; \ __err; \
}) })
#define rdtscl(low) \ #define rdtscl(low) \
do { \ ((low) = (u32)native_read_tsc())
(low) = native_read_tsc(); \
} while(0)
#define rdtscll(val) ((val) = native_read_tsc()) #define rdtscll(val) \
((val) = native_read_tsc())
#define write_tsc(val1,val2) wrmsr(0x10, val1, val2) #define write_tsc(val1,val2) wrmsr(0x10, val1, val2)
#define rdpmc(counter,low,high) \ #define rdpmc(counter,low,high) \
do { \ do { \
u64 _l = native_read_pmc(); \ u64 _l = native_read_pmc(); \
low = (u32)_l; \ (low) = (u32)_l; \
high = _l >> 32; \ (high) = (u32)(_l >> 32); \
} while(0) } while(0)
#endif /* !CONFIG_PARAVIRT */ #endif /* !CONFIG_PARAVIRT */