Commit 6b26e1bf authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/microcode: Remove modularization leftovers 



Remove the remaining module functionality leftovers. Make
"dis_ucode_ldr" an early_param and make it static again. Drop
module aliases, autoloading table, description, etc.

Bump version number, while at it.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Link: http://lkml.kernel.org/r/1445334889-300-4-git-send-email-bp@alien8.de


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

arch/x86/include/asm/microcode.h

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ struct cpu_signature { 
struct device;



enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };

extern bool dis_ucode_ldr;



struct microcode_ops {

	enum ucode_state (*request_microcode_user) (int cpu,

arch/x86/kernel/cpu/microcode/amd.c

+1 −6
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
 *  Licensed under the terms of the GNU General Public

 *  License version 2. See file COPYING for details.

 */

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define pr_fmt(fmt) "microcode: " fmt



#include <linux/earlycpio.h>

#include <linux/firmware.h>
@@ -32,7 +32,6 @@ 
#include <linux/vmalloc.h>

#include <linux/initrd.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/pci.h>



#include <asm/microcode_amd.h>
@@ -42,10 +41,6 @@ 
#include <asm/cpu.h>

#include <asm/msr.h>



MODULE_DESCRIPTION("AMD Microcode Update Driver");

MODULE_AUTHOR("Peter Oruba");

MODULE_LICENSE("GPL v2");



static struct equiv_cpu_entry *equiv_cpu_table;



struct ucode_patch {

arch/x86/kernel/cpu/microcode/core.c

+10 −26
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 * 2 of the License, or (at your option) any later version.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define pr_fmt(fmt) "microcode: " fmt



#include <linux/platform_device.h>

#include <linux/syscore_ops.h>
@@ -27,7 +27,6 @@ 
#include <linux/capability.h>

#include <linux/firmware.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/cpu.h>

#include <linux/fs.h>
@@ -41,16 +40,18 @@ 
#include <asm/processor.h>

#include <asm/cmdline.h>



MODULE_DESCRIPTION("Microcode Update Driver");

MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");

MODULE_LICENSE("GPL");



#define MICROCODE_VERSION	"2.00"

#define MICROCODE_VERSION	"2.01"



static struct microcode_ops	*microcode_ops;



bool dis_ucode_ldr;

module_param(dis_ucode_ldr, bool, 0);

static bool dis_ucode_ldr;



static int __init disable_loader(char *str)

{

	dis_ucode_ldr = true;

	return 1;

}

__setup("dis_ucode_ldr", disable_loader);



/*

 * Synchronization.
@@ -364,9 +365,6 @@ static void __exit microcode_dev_exit(void) 
{

	misc_deregister(&microcode_dev);

}



MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);

MODULE_ALIAS("devname:cpu/microcode");

#else

#define microcode_dev_init()	0

#define microcode_dev_exit()	do { } while (0)
@@ -617,20 +615,6 @@ static struct notifier_block mc_cpu_notifier = { 
	.notifier_call	= mc_cpu_callback,

};



#ifdef MODULE

/* Autoload on Intel and AMD systems */

static const struct x86_cpu_id __initconst microcode_id[] = {

#ifdef CONFIG_MICROCODE_INTEL

	{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, },

#endif

#ifdef CONFIG_MICROCODE_AMD

	{ X86_VENDOR_AMD, X86_FAMILY_ANY, X86_MODEL_ANY, },

#endif

	{}

};

MODULE_DEVICE_TABLE(x86cpu, microcode_id);

#endif



static struct attribute *cpu_root_microcode_attrs[] = {

	&dev_attr_reload.attr,

	NULL

arch/x86/kernel/cpu/microcode/intel.c

+1 −6
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 *

 *#define DEBUG

 */

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define pr_fmt(fmt) "microcode: " fmt



#include <linux/earlycpio.h>

#include <linux/firmware.h>
@@ -29,7 +29,6 @@ 
#include <linux/vmalloc.h>

#include <linux/initrd.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/cpu.h>

#include <linux/mm.h>
@@ -40,10 +39,6 @@ 
#include <asm/setup.h>

#include <asm/msr.h>



MODULE_DESCRIPTION("Microcode Update Driver");

MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");

MODULE_LICENSE("GPL");



static unsigned long mc_saved_in_initrd[MAX_UCODE_COUNT];

static struct mc_saved_data {

	unsigned int mc_saved_count;

arch/x86/kernel/cpu/microcode/intel_lib.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/firmware.h>

#include <linux/uaccess.h>

#include <linux/kernel.h>

#include <linux/module.h>



#include <asm/microcode_intel.h>

#include <asm/processor.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE