Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59c6f278 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/cpu: Get rid of the show_msr= boot option 



It is useless as it dumps the MSRs too early BUT(!) we do set MSRs later too.
Also, it dumps only BSP MSRs as it gets called only for CPU 0.

And the MSR range array would need constant updating anyway, and so on
and so on...

Oh, and we have msr.ko and msr-tools which are the much better solution
anyway. So off it goes...

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20161024173844.23038-4-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 62a67e12

Documentation/kernel-parameters.txt

+0 −6
Original line number Diff line number Diff line
@@ -3824,12 +3824,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	shapers=	[NET]

			Maximal number of shapers.



	show_msr=	[x86] show boot-time MSR settings

			Format: { <integer> }

			Show boot-time (BIOS-initialized) MSR settings.

			The parameter means the number of CPUs to show,

			for example 1 means boot CPU only.



	simeth=		[IA-64]

	simscsi=

arch/x86/kernel/cpu/common.c

+0 −53
Original line number Diff line number Diff line
@@ -1162,51 +1162,6 @@ void identify_secondary_cpu(struct cpuinfo_x86 *c) 
	mtrr_ap_init();

}



struct msr_range {

	unsigned	min;

	unsigned	max;

};



static const struct msr_range msr_range_array[] = {

	{ 0x00000000, 0x00000418},

	{ 0xc0000000, 0xc000040b},

	{ 0xc0010000, 0xc0010142},

	{ 0xc0011000, 0xc001103b},

};



static void __print_cpu_msr(void)

{

	unsigned index_min, index_max;

	unsigned index;

	u64 val;

	int i;



	for (i = 0; i < ARRAY_SIZE(msr_range_array); i++) {

		index_min = msr_range_array[i].min;

		index_max = msr_range_array[i].max;



		for (index = index_min; index < index_max; index++) {

			if (rdmsrl_safe(index, &val))

				continue;

			pr_info(" MSR%08x: %016llx\n", index, val);

		}

	}

}



static int show_msr;



static __init int setup_show_msr(char *arg)

{

	int num;



	get_option(&arg, &num);



	if (num > 0)

		show_msr = num;

	return 1;

}

__setup("show_msr=", setup_show_msr);



static __init int setup_noclflush(char *arg)

{

	setup_clear_cpu_cap(X86_FEATURE_CLFLUSH);
@@ -1240,14 +1195,6 @@ void print_cpu_info(struct cpuinfo_x86 *c) 
		pr_cont(", stepping: 0x%x)\n", c->x86_mask);

	else

		pr_cont(")\n");



	print_cpu_msr(c);

}



void print_cpu_msr(struct cpuinfo_x86 *c)

{

	if (c->cpu_index < show_msr)

		__print_cpu_msr();

}



static __init int setup_disablecpuid(char *arg)