Unify arch/x86/boot/compressed/{vmlinux.scr,misc.c}
Changes from last time:
* Use .rodata.compressed instead of .data.compressed.
* Use the 64 bit strings rather than the 32 bit versions, dropping the odd leading "."
PATCH v2 1/9 x86: Unify whitespace and comments in arch/x86/boot/compressed/vmlinux_??.lds
size reports no change in arch/x86/boot/compressed/vmlinux.
--- arch/x86/boot/compressed/vmlinux_32.lds | 6 +++--- arch/x86/boot/compressed/vmlinux_64.lds | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/x86/boot/compressed/vmlinux_32.lds +3 -3
@@ -3,10 +3,10 @@ OUTPUT_ARCH(i386) ENTRY(startup_32) SECTIONS { - /* Be careful parts of head.S assume startup_32 is at - * address 0. + /* Be careful parts of head_32.S assume startup_32 is at + * address 0. */ - . = 0 ; + . = 0; .text.head : { _head = . ; *(.text.head)
arch/x86/boot/compressed/vmlinux_64.lds +2 -2
@@ -3,8 +3,8 @@ OUTPUT_ARCH(i386:x86-64) ENTRY(startup_64) SECTIONS { - /* Be careful parts of head.S assume startup_32 is at - * address 0. + /* Be careful parts of head_64.S assume startup_64 is at + * address 0. */ . = 0; .text : {
Signature · 1 line
1.5.3.8
PATCH v2 2/9 x86: Unify whitespace in arch/x86/boot/compressed/vmlinux_??.scr
size reports no change in arch/x86/boot/compressed/vmlinux.
--- arch/x86/boot/compressed/vmlinux_32.scr | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/boot/compressed/vmlinux_32.scr +3 -3
@@ -2,9 +2,9 @@ SECTIONS { .data.compressed : { input_len = .; - LONG(input_data_end - input_data) input_data = .; - *(.data) + LONG(input_data_end - input_data) input_data = .; + *(.data) output_len = . - 4; - input_data_end = .; + input_data_end = .; } }
Signature · 1 line
1.5.3.8
PATCH v2 3/9 x86_64: Switch to .rodata.compressed in arch/x86/boot/compressed/vmlinux_??.scr
vmlinux_64 and vmlinux_32.scr are now identical
size shows an expected movement from .text to .rodata and 4 extra bytes of padding.
--- arch/x86/boot/compressed/vmlinux_32.lds | 4 ++-- arch/x86/boot/compressed/vmlinux_32.scr | 2 +- arch/x86/boot/compressed/vmlinux_64.lds | 8 ++++++-- arch/x86/boot/compressed/vmlinux_64.scr | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-)
arch/x86/boot/compressed/vmlinux_32.lds +2 -2
@@ -12,8 +12,8 @@ SECTIONS *(.text.head) _ehead = . ; } - .data.compressed : { - *(.data.compressed) + .rodata.compressed : { + *(.rodata.compressed) } .text : { _text = .; /* Text */
arch/x86/boot/compressed/vmlinux_32.scr +1 -1
@@ -1,6 +1,6 @@ SECTIONS { - .data.compressed : { + .rodata.compressed : { input_len = .; LONG(input_data_end - input_data) input_data = .; *(.data)
arch/x86/boot/compressed/vmlinux_64.lds +6 -2
@@ -7,11 +7,15 @@ SECTIONS * address 0. */ . = 0; - .text : { + .text.head : { _head = . ; *(.text.head) _ehead = . ; - *(.text.compressed) + } + .rodata.compressed : { + *(.rodata.compressed) + } + .text : { _text = .; /* Text */ *(.text) *(.text.*)
arch/x86/boot/compressed/vmlinux_64.scr +1 -1
@@ -1,6 +1,6 @@ SECTIONS { - .text.compressed : { + .rodata.compressed : { input_len = .; LONG(input_data_end - input_data) input_data = .; *(.data)
Signature · 1 line
1.5.3.8
PATCH v2 4/9 x86_64: Unify arch/x86/boot/compressed/vmlinux_??.scr
The files are now identical so merge them.
size reports no change in arch/x86/boot/compressed/vmlinux.
---
arch/x86/boot/compressed/Makefile | 2 +-
.../compressed/{vmlinux_32.scr => vmlinux.scr} | 0
arch/x86/boot/compressed/vmlinux_64.scr | 10 ----------
3 files changed, 1 insertions(+), 11 deletions(-)
rename arch/x86/boot/compressed/{vmlinux_32.scr => vmlinux.scr} (100%)
delete mode 100644 arch/x86/boot/compressed/vmlinux_64.scrarch/x86/boot/compressed/Makefile +1 -1
@@ -59,5 +59,5 @@ LDFLAGS_piggy.o := -r --format binary --oformat elf64-x86-64 -T endif -$(obj)/piggy.o: $(obj)/vmlinux_$(BITS).scr $(obj)/vmlinux.bin.gz FORCE +$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE $(call if_changed,ld)
arch/x86/boot/compressed/vmlinux.scr renamed from arch/x86/boot/compressed/vmlinux_32.scr +0 -0
arch/x86/boot/compressed/vmlinux_64.scr deleted +0 -10
@@ -1,10 +0,0 @@ -SECTIONS -{ - .rodata.compressed : { - input_len = .; - LONG(input_data_end - input_data) input_data = .; - *(.data) - output_len = . - 4; - input_data_end = .; - } -}
Signature · 1 line
1.5.3.8
PATCH v2 5/9 x86: Unify strings in arch/x86/boot/compressed/misc_??.c
There seems to be a preference for the 64 bit version so use that on 32 bit and drop the stray leading "."
--- arch/x86/boot/compressed/misc_32.c | 4 ++-- arch/x86/boot/compressed/misc_64.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/boot/compressed/misc_32.c +2 -2
@@ -377,8 +377,8 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long end,#endif makecrc (); -putstr ("Uncompressing Linux... " ); +putstr ("\nDecompressing Linux... " );gunzip (); -putstr ("Ok, booting the kernel.\n" ); +putstr ("done.\nBooting the kernel.\n" );return ; }
arch/x86/boot/compressed/misc_64.c +1 -1
@@ -372,7 +372,7 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long heap,error ("Destination address too large" );makecrc (); -putstr (".\nDecompressing Linux..." ); +putstr ("\nDecompressing Linux... " );gunzip ();putstr ("done.\nBooting the kernel.\n" );return ;
Signature · 1 line
1.5.3.8
PATCH v2 6/9 x86: Unify whitespace and comments in arch/x86/boot/compressed/misc_??.c
size reports no change in arch/x86/boot/compressed/vmlinux.
--- arch/x86/boot/compressed/misc_32.c | 20 +++++++++++++------- arch/x86/boot/compressed/misc_64.c | 13 +++++++------ 2 files changed, 20 insertions(+), 13 deletions(-)
arch/x86/boot/compressed/misc_32.c +13 -7
@@ -1,7 +1,7 @@/* * misc.c -* -* This is a collection of several routines from gzip-1.0.3 +* +* This is a collection of several routines from gzip-1.0.3 * adapted for Linux. * * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
@@ -9,6 +9,11 @@* High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996 */ +/* +* we have to be careful, because no indirections are allowed here, and +* paravirt_ops is a kind of one. As it will only run in baremetal anyway, +* we just keep it from happening +*/ #undef CONFIG_PARAVIRT#include <linux/linkage.h> #include <linux/vmalloc.h>
@@ -261,7 +266,7 @@ static void putstr(const char *s) y--; } }else { - vidmem [ ( x + cols * y ) *2 ] = c; + vidmem [(x + cols * y) *2 ] = c;if ( ++x >= cols ) { x =0 ;if ( ++y >= lines ) {
@@ -345,7 +350,8 @@ static void error(char *x) } asmlinkage void decompress_kernel(void *rmode, unsigned long end, -uch *input_data,unsigned long input_len,uch *output) +uch *input_data,unsigned long input_len, +uch *output) { real_mode = rmode;
@@ -360,10 +366,10 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long end, lines =RM_SCREEN_INFO .orig_video_lines; cols =RM_SCREEN_INFO .orig_video_cols; - window = output;/* Output buffer (Normally at 1M) */ - free_mem_ptr = end;/* Heap */ + window = output;/* Output buffer (Normally at 1M) */ + free_mem_ptr = end;/* Heap */ free_mem_end_ptr = end +HEAP_SIZE ; - inbuf = input_data;/* Input buffer */ + inbuf = input_data;/* Input buffer */ insize = input_len; inptr =0 ;
arch/x86/boot/compressed/misc_64.c +7 -6
@@ -1,7 +1,7 @@/* * misc.c -* -* This is a collection of several routines from gzip-1.0.3 +* +* This is a collection of several routines from gzip-1.0.3 * adapted for Linux. * * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
@@ -260,7 +260,7 @@ static void putstr(const char *s) y--; } }else { - vidmem [ ( x + cols * y ) *2 ] = c; + vidmem [(x + cols * y) *2 ] = c;if ( ++x >= cols ) { x =0 ;if ( ++y >= lines ) {
@@ -344,7 +344,8 @@ static void error(char *x) } asmlinkage void decompress_kernel(void *rmode, unsigned long heap, -uch *input_data,unsigned long input_len,uch *output) +uch *input_data,unsigned long input_len, +uch *output) { real_mode = rmode;
@@ -359,8 +360,8 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long heap, lines =RM_SCREEN_INFO .orig_video_lines; cols =RM_SCREEN_INFO .orig_video_cols; - window = output;/* Output buffer (Normally at 1M) */ - free_mem_ptr = heap;/* Heap */ + window = output;/* Output buffer (Normally at 1M) */ + free_mem_ptr = heap;/* Heap */ free_mem_end_ptr = heap +HEAP_SIZE ; inbuf = input_data;/* Input buffer */ insize = input_len;
Signature · 1 line
1.5.3.8
PATCH v2 7/9 x86: Unify headers in arch/x86/boot/compressed/misc_??.c
size reports no change in arch/x86/boot/compressed/vmlinux.
--- arch/x86/boot/compressed/misc_32.c | 1 - arch/x86/boot/compressed/misc_64.c | 1 + 2 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/boot/compressed/misc_32.c +0 -1
@@ -16,7 +16,6 @@*/ #undef CONFIG_PARAVIRT#include <linux/linkage.h> -#include <linux/vmalloc.h> #include <linux/screen_info.h> #include <asm/io.h> #include <asm/page.h>
arch/x86/boot/compressed/misc_64.c +1 -0
@@ -22,6 +22,7 @@#include <linux/screen_info.h> #include <asm/io.h> #include <asm/page.h> +#include <asm/boot.h> /* WARNING!! * This code is compiled with -fPIC and it is relocated dynamically
Signature · 1 line
1.5.3.8
PATCH v2 8/9 x86: Unify variable names in arch/x86/boot/compressed/misc_??.c
size reports no change in arch/x86/boot/compressed/vmlinux.
--- arch/x86/boot/compressed/misc_32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/boot/compressed/misc_32.c +4 -4
@@ -348,7 +348,7 @@ static void error(char *x) asm("hlt" ); } -asmlinkage void decompress_kernel(void *rmode, unsigned long end, +asmlinkage void decompress_kernel(void *rmode, unsigned long heap,uch *input_data,unsigned long input_len,uch *output) {
@@ -366,15 +366,15 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long end, cols =RM_SCREEN_INFO .orig_video_cols; window = output;/* Output buffer (Normally at 1M) */ - free_mem_ptr = end;/* Heap */ - free_mem_end_ptr = end +HEAP_SIZE ; + free_mem_ptr = heap;/* Heap */ + free_mem_end_ptr = heap +HEAP_SIZE ; inbuf = input_data;/* Input buffer */ insize = input_len; inptr =0 ;if ((u32 )output & (CONFIG_PHYSICAL_ALIGN -1 ))error ("Destination address not CONFIG_PHYSICAL_ALIGN aligned" ); -if (end > ((-__PAGE_OFFSET-(512 <<20 )-1 ) &0x7fffffff )) +if (heap > ((-__PAGE_OFFSET-(512 <<20 )-1 ) &0x7fffffff ))error ("Destination address too large" );#ifndef CONFIG_RELOCATABLE if ((u32 )output !=LOAD_PHYSICAL_ADDR )
Signature · 1 line
1.5.3.8
PATCH v2 9/9 x86: Unify arch/x86/boot/compressed/misc_??.c
Remainder of unification can occur inplace.
size reports no change in arch/x86/boot/compressed/vmlinux.
---
arch/x86/boot/compressed/Makefile | 4 +-
arch/x86/boot/compressed/{misc_32.c => misc.c} | 32 ++-
arch/x86/boot/compressed/misc_64.c | 381 ------------------------
3 files changed, 30 insertions(+), 387 deletions(-)
rename arch/x86/boot/compressed/{misc_32.c => misc.c} (94%)
delete mode 100644 arch/x86/boot/compressed/misc_64.carch/x86/boot/compressed/Makefile +2 -2
@@ -4,7 +4,7 @@ # create a compressed vmlinux image from the original vmlinux # -targets := vmlinux vmlinux.bin vmlinux.bin.gz head_$(BITS).o misc_$(BITS).o piggy.o +targets := vmlinux vmlinux.bin vmlinux.bin.gz head_$(BITS).o misc.o piggy.o KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2 KBUILD_CFLAGS += -fno-strict-aliasing -fPIC
@@ -18,7 +18,7 @@ KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ LDFLAGS := -m elf_$(UTS_MACHINE) LDFLAGS_vmlinux := -T -$(obj)/vmlinux: $(src)/vmlinux_$(BITS).lds $(obj)/head_$(BITS).o $(obj)/misc_$(BITS).o $(obj)/piggy.o FORCE +$(obj)/vmlinux: $(src)/vmlinux_$(BITS).lds $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/piggy.o FORCE $(call if_changed,ld) @:
arch/x86/boot/compressed/misc.c renamed from arch/x86/boot/compressed/misc_32.c +28 -4
@@ -15,6 +15,11 @@* we just keep it from happening */ #undef CONFIG_PARAVIRT +#ifdef CONFIG_X86_64 +#define _LINUX_STRING_H_ 1 +#define __LINUX_BITMAP_H 1 +#endif +#include <linux/linkage.h> #include <linux/screen_info.h> #include <asm/io.h>
@@ -190,10 +195,20 @@ static void *memcpy(void *dest, const void *src, unsigned n);static void putstr (const char *); -static unsigned long free_mem_ptr; -static unsigned long free_mem_end_ptr; +#ifdef CONFIG_X86_64 +#define memptr long +#else +#define memptr unsigned +#endif + +static memptr free_mem_ptr; +static memptr free_mem_end_ptr; +#ifdef CONFIG_X86_64 +#define HEAP_SIZE 0x7000 +#else #define HEAP_SIZE 0x4000 +#endif static char *vidmem = (char *)0xb8000 ;static int vidport;
@@ -234,7 +249,7 @@ static void gzip_mark(void **ptr)static void gzip_release (void **ptr) { - free_mem_ptr = (unsigned long ) *ptr; + free_mem_ptr = (memptr) *ptr; }static void scroll (void )
@@ -251,8 +266,10 @@ static void putstr(const char *s)int x,y,pos;char c; +#ifdef CONFIG_X86_32 if (RM_SCREEN_INFO .orig_video_mode ==0 && lines ==0 && cols ==0 )return ; +#endif x =RM_SCREEN_INFO .orig_x; y =RM_SCREEN_INFO .orig_y;
@@ -348,7 +365,7 @@ static void error(char *x) asm("hlt" ); } -asmlinkage void decompress_kernel(void *rmode, unsigned long heap, +asmlinkage void decompress_kernel(void *rmode, memptr heap,uch *input_data,unsigned long input_len,uch *output) {
@@ -372,6 +389,12 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long heap, insize = input_len; inptr =0 ; +#ifdef CONFIG_X86_64 +if ((ulg )output & (__KERNEL_ALIGN -1 )) +error ("Destination address not 2M aligned" ); +if ((ulg )output >=0xffffffffffUL ) +error ("Destination address too large" ); +#else if ((u32 )output & (CONFIG_PHYSICAL_ALIGN -1 ))error ("Destination address not CONFIG_PHYSICAL_ALIGN aligned" );if (heap > ((-__PAGE_OFFSET-(512 <<20 )-1 ) &0x7fffffff ))
@@ -380,6 +403,7 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long heap,if ((u32 )output !=LOAD_PHYSICAL_ADDR )error ("Wrong destination address" );#endif +#endif makecrc ();putstr ("\nDecompressing Linux... " );
arch/x86/boot/compressed/misc_64.c deleted +0 -381
381 lines not on this page · raw message
Signature · 1 line
1.5.3.8
Re: [PATCHv2 1/9] x86: Unify whitespace and comments in arch/x86/boot/compressed/vmlinux_??.lds
In reply to Ian Campbellthanks Ian, i've picked up your series into x86.git.
one small nit - when doing cleanups i've been consistently using this formatting for comments:
/*
* Be careful parts of head_32.S assume startup_32 is at
* address 0.
*/
instead of:
/* Be careful parts of head_32.S assume startup_32 is at
* address 0.
*/(this is just personal preference, both forms are CodingStyle conform. I like the former a bit more because it visually separates comments from previous lines of code more. [and comments have rarely any relationship to previous code - they apply to the following code lines.] Anyway, no need to resend the series - just please keep this in mind for future cleanups.)
Ingo