Use structs instead of hardcoded offsets in x86 boot decompressor.
PATCH v4 1/2 Use structs instead of hardcoded offsets in x86 boot decompressor.
Signed-off-by Kristian Høgsberg <[email protected]>
---
Updated to not use the RM_SCREEN_INFO macro but just access real_mode->screen_info directly. Slightly bigger patch but cleaner result.
arch/x86/boot/compressed/misc.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-)
arch/x86/boot/compressed/misc.c +11 -15
@@ -30,6 +30,7 @@#include <asm/io.h> #include <asm/page.h> #include <asm/boot.h> +#include <asm/bootparam.h> /* WARNING!! * This code is compiled with -fPIC and it is relocated dynamically
@@ -187,13 +188,7 @@ static void gzip_release(void **);/* * This is set up by the setup-routine at boot-time */ -static unsigned char *real_mode;/* Pointer to real-mode data */ - -#define RM_EXT_MEM_K (*(unsigned short *)(real_mode + 0x2)) -#ifndef STANDARD_MEMORY_BIOS_CALL -#define RM_ALT_MEM_K (*(unsigned long *)(real_mode + 0x1e0)) -#endif -#define RM_SCREEN_INFO (*(struct screen_info *)(real_mode+0)) +static struct boot_params *real_mode;/* Pointer to real-mode data */ extern unsigned char input_data[];extern int input_len;
@@ -276,12 +271,13 @@ static void putstr(const char *s)char c;#ifdef CONFIG_X86_32 -if (RM_SCREEN_INFO .orig_video_mode ==0 && lines ==0 && cols ==0 ) +if (real_mode->screen_info.orig_video_mode ==0 && + lines ==0 && cols ==0 )return ;#endif - x =RM_SCREEN_INFO .orig_x; - y =RM_SCREEN_INFO .orig_y; + x = real_mode->screen_info.orig_x; + y = real_mode->screen_info.orig_y;while ((c = *s++) !='\0' ) {if (c =='\n' ) {
@@ -302,8 +298,8 @@ static void putstr(const char *s) } } -RM_SCREEN_INFO .orig_x = x; -RM_SCREEN_INFO .orig_y = y; + real_mode->screen_info.orig_x = x; + real_mode->screen_info.orig_y = y; pos = (x + cols * y) *2 ;/* Update cursor position */ outb (14 , vidport);
@@ -430,7 +426,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, { real_mode = rmode; -if (RM_SCREEN_INFO .orig_video_mode ==7 ) { +if (real_mode->screen_info.orig_video_mode ==7 ) { vidmem = (char *)0xb0000 ; vidport =0x3b4 ; }else {
@@ -438,8 +434,8 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, vidport =0x3d4 ; } - lines =RM_SCREEN_INFO .orig_video_lines; - cols =RM_SCREEN_INFO .orig_video_cols; + lines = real_mode->screen_info.orig_video_lines; + cols = real_mode->screen_info.orig_video_cols; window = output;/* Output buffer (Normally at 1M) */ free_mem_ptr = heap;/* Heap */
Signature · 1 line
1.5.4.5
PATCH v4 2/2 Honor 'quiet' command line option in real mode boot decompressor.
This patch lets the early real mode code look for the 'quiet' option on the kernel command line and pass a loadflag to the decompressor. When this flag is set, we suppress the "Decompressing Linux... Parsing ELF... done." messages.
Signed-off-by Kristian Høgsberg <[email protected]>
---
Changed to use the bootflags approach suggested by hpa. Less code and yet it does a better job of parsing the command line (doesn't get confused by eg fooquiet etc).
arch/x86/boot/compressed/misc.c | 13 ++++++++++--- arch/x86/boot/main.c | 4 ++++ include/asm-x86/bootparam.h | 1 + 3 files changed, 15 insertions(+), 3 deletions(-)
arch/x86/boot/compressed/misc.c +10 -3
@@ -189,6 +189,7 @@ static void gzip_release(void **);* This is set up by the setup-routine at boot-time */ static struct boot_params *real_mode;/* Pointer to real-mode data */ +static int quiet;extern unsigned char input_data[];extern int input_len;
@@ -391,7 +392,8 @@ static void parse_elf(void *output)return ; } -putstr ("Parsing ELF... " ); +if (!quiet) +putstr ("Parsing ELF... " ); phdrs =malloc (sizeof (*phdrs) * ehdr.e_phnum);if (!phdrs)
@@ -426,6 +428,9 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, { real_mode = rmode; +if (real_mode->hdr.loadflags &QUIET_FLAG ) + quiet =1 ; +if (real_mode->screen_info.orig_video_mode ==7 ) { vidmem = (char *)0xb0000 ; vidport =0x3b4 ;
@@ -461,9 +466,11 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,#endif makecrc (); -putstr ("\nDecompressing Linux... " ); +if (!quiet) +putstr ("\nDecompressing Linux... " );gunzip ();parse_elf (output); -putstr ("done.\nBooting the kernel.\n" ); +if (!quiet) +putstr ("done.\nBooting the kernel.\n" );return ; }
arch/x86/boot/main.c +4 -0
@@ -165,6 +165,10 @@ void main(void)/* Set the video mode */ set_video (); +/* Parse command line for 'quiet' and pass it to decompressor. */ +if (cmdline_find_option_bool ("quiet" )) + boot_params.hdr.loadflags |=QUIET_FLAG ; +/* Do the last things and invoke protected mode */ go_to_protected_mode (); }
include/asm-x86/bootparam.h +1 -0
@@ -40,6 +40,7 @@ struct setup_header {__u8 type_of_loader;__u8 loadflags;#define LOADED_HIGH (1<<0) +#define QUIET_FLAG (1<<5)#define KEEP_SEGMENTS (1<<6)#define CAN_USE_HEAP (1<<7)__u16 setup_move_size;
Signature · 1 line
1.5.4.5