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

Commit 6b3389ac authored by Jacob Shin's avatar Jacob Shin Committed by H. Peter Anvin
Browse files

x86, microcode, amd: Fix warnings and errors on with CONFIG_MICROCODE=m 



Fix section mismatch warnings on microcode_amd_early.
Compile error occurs when CONFIG_MICROCODE=m, change so that early
loading depends on microcode_core.

Reported-by: default avatarYinghai Lu <yinghai@kernel.org>
Reported-by: default avatarBorislav Petkov <bp@alien8.de>
Signed-off-by: default avatarJacob Shin <jacob.shin@amd.com>
Link: http://lkml.kernel.org/r/20130531150241.GA12006@jshin-Toonie


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 757885e9

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ config MICROCODE_AMD_EARLY 


config MICROCODE_EARLY

	bool "Early load microcode"

	depends on (MICROCODE_INTEL || MICROCODE_AMD) && BLK_DEV_INITRD

	depends on MICROCODE=y && BLK_DEV_INITRD

	select MICROCODE_INTEL_EARLY if MICROCODE_INTEL

	select MICROCODE_AMD_EARLY if MICROCODE_AMD

	default y

arch/x86/include/asm/microcode_amd.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ extern enum ucode_state load_microcode_amd(int cpu, const u8 *data, size_t size) 
#ifdef CONFIG_MICROCODE_AMD_EARLY

#ifdef CONFIG_X86_32

#define MPB_MAX_SIZE PAGE_SIZE

extern u8 __cpuinitdata amd_bsp_mpb[MPB_MAX_SIZE];

extern u8 amd_bsp_mpb[MPB_MAX_SIZE];

#endif

extern void __init load_ucode_amd_bsp(void);

extern void __cpuinit load_ucode_amd_ap(void);

arch/x86/kernel/microcode_amd_early.c

+4 −4
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ static u32 ucode_new_rev; 
 * Microcode patch container file is prepended to the initrd in cpio format.

 * See Documentation/x86/early-microcode.txt

 */

static __initdata char ucode_path[] = "kernel/x86/microcode/AuthenticAMD.bin";

static __cpuinitdata char ucode_path[] = "kernel/x86/microcode/AuthenticAMD.bin";



static struct cpio_data __init find_ucode_in_initrd(void)

static struct cpio_data __cpuinit find_ucode_in_initrd(void)

{

	long offset = 0;

	struct cpio_data cd;
@@ -62,7 +62,7 @@ static struct cpio_data __init find_ucode_in_initrd(void) 
 * load_microcode_amd() to save equivalent cpu table and microcode patches in

 * kernel heap memory.

 */

static void __init apply_ucode_in_initrd(void)

static void __cpuinit apply_ucode_in_initrd(void)

{

	struct cpio_data cd;

	struct equiv_cpu_entry *eq;
@@ -133,7 +133,7 @@ void __init load_ucode_amd_bsp(void) 
}



#ifdef CONFIG_X86_32

u8 __cpuinitdata amd_bsp_mpb[MPB_MAX_SIZE];

u8 amd_bsp_mpb[MPB_MAX_SIZE];



/*

 * On 32-bit, since AP's early load occurs before paging is turned on, we