diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-08-22 04:32:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-22 04:43:21 -0400 |
commit | b05f78f5c713eda2c34e495d92495ee4f1c3b5e1 (patch) | |
tree | 87dd57341abc375131d3268d33c504e3eb609462 /arch/x86/kernel/cpu/common_64.c | |
parent | c9c3dddd8f9a05b25d4ce53e8e80cc0ea1759d18 (diff) |
x86_64: printout msr -v2
commandline show_msr=1 for bsp, show_msr=32 for all 32 cpus.
[ mingo@elte.hu: added documentation ]
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/common_64.c')
-rw-r--r-- | arch/x86/kernel/cpu/common_64.c | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c index dd6e3f15017e..bca2d6980e82 100644 --- a/arch/x86/kernel/cpu/common_64.c +++ b/arch/x86/kernel/cpu/common_64.c | |||
@@ -394,6 +394,49 @@ static __init int setup_noclflush(char *arg) | |||
394 | } | 394 | } |
395 | __setup("noclflush", setup_noclflush); | 395 | __setup("noclflush", setup_noclflush); |
396 | 396 | ||
397 | struct msr_range { | ||
398 | unsigned min; | ||
399 | unsigned max; | ||
400 | }; | ||
401 | |||
402 | static struct msr_range msr_range_array[] __cpuinitdata = { | ||
403 | { 0x00000000, 0x00000418}, | ||
404 | { 0xc0000000, 0xc000040b}, | ||
405 | { 0xc0010000, 0xc0010142}, | ||
406 | { 0xc0011000, 0xc001103b}, | ||
407 | }; | ||
408 | |||
409 | static void __cpuinit print_cpu_msr(void) | ||
410 | { | ||
411 | unsigned index; | ||
412 | u64 val; | ||
413 | int i; | ||
414 | unsigned index_min, index_max; | ||
415 | |||
416 | for (i = 0; i < ARRAY_SIZE(msr_range_array); i++) { | ||
417 | index_min = msr_range_array[i].min; | ||
418 | index_max = msr_range_array[i].max; | ||
419 | for (index = index_min; index < index_max; index++) { | ||
420 | if (rdmsrl_amd_safe(index, &val)) | ||
421 | continue; | ||
422 | printk(KERN_INFO " MSR%08x: %016llx\n", index, val); | ||
423 | } | ||
424 | } | ||
425 | } | ||
426 | |||
427 | static int show_msr __cpuinitdata; | ||
428 | static __init int setup_show_msr(char *arg) | ||
429 | { | ||
430 | int num; | ||
431 | |||
432 | get_option(&arg, &num); | ||
433 | |||
434 | if (num > 0) | ||
435 | show_msr = num; | ||
436 | return 1; | ||
437 | } | ||
438 | __setup("show_msr=", setup_show_msr); | ||
439 | |||
397 | void __cpuinit print_cpu_info(struct cpuinfo_x86 *c) | 440 | void __cpuinit print_cpu_info(struct cpuinfo_x86 *c) |
398 | { | 441 | { |
399 | if (c->x86_model_id[0]) | 442 | if (c->x86_model_id[0]) |
@@ -403,6 +446,14 @@ void __cpuinit print_cpu_info(struct cpuinfo_x86 *c) | |||
403 | printk(KERN_CONT " stepping %02x\n", c->x86_mask); | 446 | printk(KERN_CONT " stepping %02x\n", c->x86_mask); |
404 | else | 447 | else |
405 | printk(KERN_CONT "\n"); | 448 | printk(KERN_CONT "\n"); |
449 | |||
450 | #ifdef CONFIG_SMP | ||
451 | if (c->cpu_index < show_msr) | ||
452 | print_cpu_msr(); | ||
453 | #else | ||
454 | if (show_msr) | ||
455 | print_cpu_msr(); | ||
456 | #endif | ||
406 | } | 457 | } |
407 | 458 | ||
408 | static __init int setup_disablecpuid(char *arg) | 459 | static __init int setup_disablecpuid(char *arg) |