lkml.org 
[lkml]   [2014]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] early microcode: extend the ramdisk address to 64bit
Date
From: Harald Hoyer <harald@redhat.com>

commit 4bf7111f50167133a71c23530ca852a41355e739 enabled loading of the
initramfs above 4G addresses. So I was wondering, if the early microcode
code might want to honor the upper 32bit of the 64bit address.

Signed-off-by: Harald Hoyer <harald@redhat.com>
---
arch/x86/kernel/cpu/microcode/amd_early.c | 1 +
arch/x86/kernel/cpu/microcode/intel_early.c | 1 +
2 files changed, 2 insertions(+)

diff --git a/arch/x86/kernel/cpu/microcode/amd_early.c b/arch/x86/kernel/cpu/microcode/amd_early.c
index 617a9e2..5b71346 100644
--- a/arch/x86/kernel/cpu/microcode/amd_early.c
+++ b/arch/x86/kernel/cpu/microcode/amd_early.c
@@ -56,6 +56,7 @@ static struct cpio_data __init find_ucode_in_initrd(void)
#else
path = ucode_path;
start = (void *)(boot_params.hdr.ramdisk_image + PAGE_OFFSET);
+ start |= (void *)boot_params.ext_ramdisk_image << 32;
size = boot_params.hdr.ramdisk_size;
#endif

diff --git a/arch/x86/kernel/cpu/microcode/intel_early.c b/arch/x86/kernel/cpu/microcode/intel_early.c
index 18f7391..d2a9e1e 100644
--- a/arch/x86/kernel/cpu/microcode/intel_early.c
+++ b/arch/x86/kernel/cpu/microcode/intel_early.c
@@ -744,6 +744,7 @@ load_ucode_intel_bsp(void)
initrd_start_early, initrd_end_early, &uci);
#else
ramdisk_image = boot_params.hdr.ramdisk_image;
+ ramdisk_image |= (u64)boot_params.ext_ramdisk_image << 32;
ramdisk_size = boot_params.hdr.ramdisk_size;
initrd_start_early = ramdisk_image + PAGE_OFFSET;
initrd_end_early = initrd_start_early + ramdisk_size;
--
2.1.0


\
 
 \ /
  Last update: 2014-08-22 16:41    [W:0.027 / U:0.516 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site