Attachment 952535 Details for Bug 1158204 – test patch

[patch] test patch

diff (text/plain), 1.42 KB, created by Borislav Petkov on 2014-10-31 16:05:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Borislav Petkov

Created: 2014-10-31 16:05:13 UTC

Size: 1.42 KB

patch

obsolete

>diff --git a/arch/x86/kernel/cpu/microcode/amd_early.c b/arch/x86/kernel/cpu/microcode/amd_early.c
>index 617a9e284245..36225c455f75 100644
>--- a/arch/x86/kernel/cpu/microcode/amd_early.c
>+++ b/arch/x86/kernel/cpu/microcode/amd_early.c
>@@ -348,6 +348,7 @@ int __init save_microcode_in_initrd_amd(void)
> {
> 	unsigned long cont;
> 	enum ucode_state ret;
>+	u8 *cont_va;
> 	u32 eax;
> 
> 	if (!container)
>@@ -355,15 +356,20 @@ int __init save_microcode_in_initrd_amd(void)
> 
> #ifdef CONFIG_X86_32
> 	get_bsp_sig();
>-	cont = (unsigned long)container;
>+	cont	= (unsigned long)container;
>+	cont_va = __va(container);
> #else
> 	/*
> 	 * We need the physical address of the container for both bitness since
> 	 * boot_params.hdr.ramdisk_image is a physical address.
> 	 */
>-	cont = __pa(container);
>+	cont    = __pa(container);
>+	cont_va = container;
> #endif
> 
>+	printk("cont: 0x%lx, cont_va: 0x%p, ramdisk: 0x%llx\n",
>+		cont, cont_va, relocated_ramdisk);
>+
> 	/*
> 	 * Take into account the fact that the ramdisk might get relocated and
> 	 * therefore we need to recompute the container's position in virtual
>@@ -372,6 +378,10 @@ int __init save_microcode_in_initrd_amd(void)
> 	if (relocated_ramdisk)
> 		container = (u8 *)(__va(relocated_ramdisk) +
> 			     (cont - boot_params.hdr.ramdisk_image));
>+	else
>+		container = cont_va;
>+
>+	printk("final container: 0x%p\n", container);
> 
> 	if (ucode_new_rev)
> 		pr_info("microcode: updated early to new patch_level=0x%08x\n",

Actions: View | Diff

Attachments on bug 1158204: 951519 | 952289 | 952290 | 952526 | 952527 | 952535 | 952587