Subject: [PATCH v5 10/11] x86, boot: enable support load bzImage and ramdisk above 4G xloadflags bit1 is set if kernel is relocatable and 64bit. bootloader will check if xloadflags bit1 is set to decicde if it could load ramdisk and kernel high above 4G. bootloader will fill value to ext_ramdisk_image/size for high 32bits when it load ramdisk above 4G. kernel use get_ramdisk_image/size to use ext_ramdisk_image/size to get right positon for ramdisk. sentinel is used so kernel could find out if ext_* and other fields have valid values set in boot_params from bootloader. Signed-off-by: Yinghai Lu Cc: Rob Landley Cc: Matt Fleming Cc: Gokul Caushik Cc: Josh Triplett Cc: Joe Millenbach --- arch/x86/boot/compressed/cmdline.c | 2 ++ arch/x86/boot/compressed/misc.c | 19 +++++++++++++++++++ arch/x86/boot/header.S | 10 +++++++++- arch/x86/kernel/head64.c | 2 ++ arch/x86/kernel/setup.c | 4 ++++ 5 files changed, 36 insertions(+), 1 deletion(-) Index: linux-2.6/arch/x86/boot/header.S =================================================================== --- linux-2.6.orig/arch/x86/boot/header.S +++ linux-2.6/arch/x86/boot/header.S @@ -374,6 +374,14 @@ xloadflags: #else # define XLF0 0 #endif + +#if defined(CONFIG_RELOCATABLE) && defined(CONFIG_X86_64) + /* kernel/boot_param/ramdisk could be loaded above 4g */ +# define XLF1 XLF_CAN_BE_LOADED_ABOVE_4G +#else +# define XLF1 0 +#endif + #ifdef CONFIG_EFI_STUB # ifdef CONFIG_X86_64 # define XLF23 XLF_EFI_HANDOVER_64 /* 64-bit EFI handover ok */ @@ -383,7 +391,7 @@ xloadflags: #else # define XLF23 0 #endif - .word XLF0 | XLF23 + .word XLF0 | XLF1 | XLF23 cmdline_size: .long COMMAND_LINE_SIZE-1 #length of the command line, #added with boot protocol Index: linux-2.6/arch/x86/kernel/setup.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/setup.c +++ linux-2.6/arch/x86/kernel/setup.c @@ -298,12 +298,16 @@ static u64 __init get_ramdisk_image(void { u64 ramdisk_image = boot_params.hdr.ramdisk_image; + ramdisk_image |= (u64)boot_params.ext_ramdisk_image << 32; + return ramdisk_image; } static u64 __init get_ramdisk_size(void) { u64 ramdisk_size = boot_params.hdr.ramdisk_size; + ramdisk_size |= (u64)boot_params.ext_ramdisk_size << 32; + return ramdisk_size; } Index: linux-2.6/arch/x86/boot/compressed/cmdline.c =================================================================== --- linux-2.6.orig/arch/x86/boot/compressed/cmdline.c +++ linux-2.6/arch/x86/boot/compressed/cmdline.c @@ -17,6 +17,8 @@ static unsigned long get_cmd_line_ptr(vo { unsigned long cmd_line_ptr = real_mode->hdr.cmd_line_ptr; + cmd_line_ptr |= (u64)real_mode->ext_cmd_line_ptr << 32; + return cmd_line_ptr; } int cmdline_find_option(const char *option, char *buffer, int bufsize) Index: linux-2.6/arch/x86/kernel/head64.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/head64.c +++ linux-2.6/arch/x86/kernel/head64.c @@ -115,6 +115,8 @@ static unsigned long get_cmd_line_ptr(vo { unsigned long cmd_line_ptr = boot_params.hdr.cmd_line_ptr; + cmd_line_ptr |= (u64)boot_params.ext_cmd_line_ptr << 32; + return cmd_line_ptr; } Index: linux-2.6/arch/x86/boot/compressed/misc.c =================================================================== --- linux-2.6.orig/arch/x86/boot/compressed/misc.c +++ linux-2.6/arch/x86/boot/compressed/misc.c @@ -318,6 +318,23 @@ static void parse_elf(void *output) free(phdrs); } +static void sanitize_real_mode(struct boot_params *real_mode) +{ + if (real_mode->sentinel) { + /*fields in boot_params are not valid, clear them */ + memset(&real_mode->olpc_ofw_header, 0, + (char *)&real_mode->alt_mem_k - + (char *)&real_mode->olpc_ofw_header); + memset(&real_mode->_pad7[0], 0, + (char *)&real_mode->edd_mbr_sig_buffer[0] - + (char *)&real_mode->_pad7[0]); + memset(&real_mode->_pad8[0], 0, + (char *)&real_mode->eddbuf[0] - + (char *)&real_mode->_pad8[0]); + memset(&real_mode->_pad9[0], 0, sizeof(real_mode->_pad9)); + } +} + asmlinkage void decompress_kernel(void *rmode, memptr heap, unsigned char *input_data, unsigned long input_len, @@ -325,6 +342,8 @@ asmlinkage void decompress_kernel(void * { real_mode = rmode; + sanitize_real_mode(real_mode); + if (real_mode->screen_info.orig_video_mode == 7) { vidmem = (char *) 0xb0000; vidport = 0x3b4;