Commit df8ce259 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Tidy up gzip-based zImage decompression. 



This brings the zImage handling in to the current century, in preparation
for handling the other compression types.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent f686d8c1

arch/sh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ config SUPERH 
	select HAVE_ARCH_TRACEHOOK

	select HAVE_DMA_API_DEBUG

	select HAVE_PERF_COUNTERS

	select HAVE_KERNEL_GZIP

	select RTC_LIB

	select GENERIC_ATOMIC64

	help

arch/sh/boot/compressed/misc_32.c

+11 −95
Original line number Diff line number Diff line
@@ -14,73 +14,23 @@ 
#include <asm/uaccess.h>

#include <asm/addrspace.h>

#include <asm/page.h>

#ifdef CONFIG_SH_STANDARD_BIOS

#include <asm/sh_bios.h>

#endif



/*

 * gzip declarations

 */



#define OF(args)  args

#define STATIC static



#undef memset

#undef memcpy

#define memzero(s, n)     memset ((s), 0, (n))



typedef unsigned char  uch;

typedef unsigned short ush;

typedef unsigned long  ulg;



#define WSIZE 0x8000		/* Window size must be at least 32k, */

				/* and a power of two */



static uch *inbuf;	     /* input buffer */

static uch window[WSIZE];    /* Sliding window buffer */



static unsigned insize = 0;  /* valid bytes in inbuf */

static unsigned inptr = 0;   /* index of next byte to be processed in inbuf */

static unsigned outcnt = 0;  /* bytes in output buffer */



/* gzip flag byte */

#define ASCII_FLAG   0x01 /* bit 0 set: file probably ASCII text */

#define CONTINUATION 0x02 /* bit 1 set: continuation of multi-part gzip file */

#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */

#define ORIG_NAME    0x08 /* bit 3 set: original file name present */

#define COMMENT      0x10 /* bit 4 set: file comment present */

#define ENCRYPTED    0x20 /* bit 5 set: file is encrypted */

#define RESERVED     0xC0 /* bit 6,7:   reserved */



#define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf())



/* Diagnostic functions */

#ifdef DEBUG

#  define Assert(cond,msg) {if(!(cond)) error(msg);}

#  define Trace(x) fprintf x

#  define Tracev(x) {if (verbose) fprintf x ;}

#  define Tracevv(x) {if (verbose>1) fprintf x ;}

#  define Tracec(c,x) {if (verbose && (c)) fprintf x ;}

#  define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;}

#else

#  define Assert(cond,msg)

#  define Trace(x)

#  define Tracev(x)

#  define Tracevv(x)

#  define Tracec(c,x)

#  define Tracecv(c,x)

#endif



static int  fill_inbuf(void);

static void flush_window(void);

static void error(char *m);



extern char input_data[];

extern int input_len;



static long bytes_out = 0;

static uch *output_data;

static unsigned long output_ptr = 0;

static unsigned char *output;



static void error(char *m);
@@ -93,7 +43,9 @@ static unsigned long free_mem_end_ptr; 


#define HEAP_SIZE             0x10000



#include "../../../../lib/inflate.c"

#ifdef CONFIG_KERNEL_GZIP

#include "../../../../lib/decompress_inflate.c"

#endif



#ifdef CONFIG_SH_STANDARD_BIOS

size_t strlen(const char *s)
@@ -138,44 +90,6 @@ void* memcpy(void* __dest, __const void* __src, 
	return __dest;

}



/* ===========================================================================

 * Fill the input buffer. This is called only when the buffer is empty

 * and at least one byte is really needed.

 */

static int fill_inbuf(void)

{

	if (insize != 0) {

		error("ran out of input data");

	}



	inbuf = input_data;

	insize = input_len;

	inptr = 1;

	return inbuf[0];

}



/* ===========================================================================

 * Write the output window window[0..outcnt-1] and update crc and bytes_out.

 * (Used for the decompressed data only.)

 */

static void flush_window(void)

{

    ulg c = crc;         /* temporary variable */

    unsigned n;

    uch *in, *out, ch;



    in = window;

    out = &output_data[output_ptr];

    for (n = 0; n < outcnt; n++) {

	    ch = *out++ = *in++;

	    c = crc_32_tab[((int)c ^ ch) & 0xff] ^ (c >> 8);

    }

    crc = c;

    bytes_out += (ulg)outcnt;

    output_ptr += (ulg)outcnt;

    outcnt = 0;

}



static void error(char *x)

{

	puts("\n\n");
@@ -191,16 +105,18 @@ long* stack_start = &user_stack[STACK_SIZE]; 


void decompress_kernel(void)

{

	output_data = NULL;

	output_ptr = PHYSADDR((unsigned long)&_text+PAGE_SIZE);

	unsigned long output_addr;



	output_addr = PHYSADDR((unsigned long)&_text+PAGE_SIZE);

#ifdef CONFIG_29BIT

	output_ptr |= P2SEG;

	output_addr |= P2SEG;

#endif



	output = (unsigned char *)output_addr;

	free_mem_ptr = (unsigned long)&_end;

	free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;



	makecrc();

	puts("Uncompressing Linux... ");

	gunzip();

	decompress(input_data, input_len, NULL, NULL, output, NULL, error);

	puts("Ok, booting the kernel.\n");

}

arch/sh/boot/compressed/misc_64.c

+7 −120
Original line number Diff line number Diff line
@@ -20,67 +20,18 @@ int cache_control(unsigned int command); 
 * gzip declarations

 */



#define OF(args)  args

#define STATIC static



#undef memset

#undef memcpy

#define memzero(s, n)     memset ((s), 0, (n))



typedef unsigned char uch;

typedef unsigned short ush;

typedef unsigned long ulg;



#define WSIZE 0x8000		/* Window size must be at least 32k, */

				/* and a power of two */



static uch *inbuf;		/* input buffer */

static uch window[WSIZE];	/* Sliding window buffer */



static unsigned insize = 0;	/* valid bytes in inbuf */

static unsigned inptr = 0;	/* index of next byte to be processed in inbuf */

static unsigned outcnt = 0;	/* bytes in output buffer */



/* gzip flag byte */

#define ASCII_FLAG   0x01	/* bit 0 set: file probably ASCII text */

#define CONTINUATION 0x02	/* bit 1 set: continuation of multi-part gzip file */

#define EXTRA_FIELD  0x04	/* bit 2 set: extra field present */

#define ORIG_NAME    0x08	/* bit 3 set: original file name present */

#define COMMENT      0x10	/* bit 4 set: file comment present */

#define ENCRYPTED    0x20	/* bit 5 set: file is encrypted */

#define RESERVED     0xC0	/* bit 6,7:   reserved */



#define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf())



/* Diagnostic functions */

#ifdef DEBUG

#  define Assert(cond,msg) {if(!(cond)) error(msg);}

#  define Trace(x) fprintf x

#  define Tracev(x) {if (verbose) fprintf x ;}

#  define Tracevv(x) {if (verbose>1) fprintf x ;}

#  define Tracec(c,x) {if (verbose && (c)) fprintf x ;}

#  define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;}

#else

#  define Assert(cond,msg)

#  define Trace(x)

#  define Tracev(x)

#  define Tracevv(x)

#  define Tracec(c,x)

#  define Tracecv(c,x)

#endif



static int fill_inbuf(void);

static void flush_window(void);

static void error(char *m);



extern char input_data[];

extern int input_len;



static long bytes_out = 0;

static uch *output_data;

static unsigned long output_ptr = 0;



static void error(char *m);

static unsigned char *output_data;



static void puts(const char *);
@@ -91,7 +42,9 @@ static unsigned long free_mem_end_ptr; 


#define HEAP_SIZE             0x10000



#include "../../../../lib/inflate.c"

#ifdef CONFIG_KERNEL_GZIP

#include "../../../../lib/decompress_inflate.c"

#endif



void puts(const char *s)

{
@@ -117,45 +70,6 @@ void *memcpy(void *__dest, __const void *__src, size_t __n) 
	return __dest;

}



/* ===========================================================================

 * Fill the input buffer. This is called only when the buffer is empty

 * and at least one byte is really needed.

 */

static int fill_inbuf(void)

{

	if (insize != 0) {

		error("ran out of input data\n");

	}



	inbuf = input_data;

	insize = input_len;

	inptr = 1;

	return inbuf[0];

}



/* ===========================================================================

 * Write the output window window[0..outcnt-1] and update crc and bytes_out.

 * (Used for the decompressed data only.)

 */

static void flush_window(void)

{

	ulg c = crc;		/* temporary variable */

	unsigned n;

	uch *in, *out, ch;



	in = window;

	out = &output_data[output_ptr];

	for (n = 0; n < outcnt; n++) {

		ch = *out++ = *in++;

		c = crc_32_tab[((int) c ^ ch) & 0xff] ^ (c >> 8);

	}

	crc = c;

	bytes_out += (ulg) outcnt;

	output_ptr += (ulg) outcnt;

	outcnt = 0;

	puts(".");

}



static void error(char *x)

{

	puts("\n\n");
@@ -171,40 +85,13 @@ long *stack_start = &user_stack[STACK_SIZE]; 


void decompress_kernel(void)

{

	output_data = (uch *) (CONFIG_MEMORY_START + 0x2000);

	output_data = (unsigned char *) (CONFIG_MEMORY_START + 0x2000);

	free_mem_ptr = (unsigned long) &_end;

	free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;



	makecrc();

	puts("Uncompressing Linux... ");

	cache_control(CACHE_ENABLE);

	gunzip();

	puts("\n");



#if 0

	/* When booting from ROM may want to do something like this if the

	 * boot loader doesn't.

	 */



	/* Set up the parameters and command line */

	{

		volatile unsigned int *parambase =

		    (int *) (CONFIG_MEMORY_START + 0x1000);



		parambase[0] = 0x1;	/* MOUNT_ROOT_RDONLY */

		parambase[1] = 0x0;	/* RAMDISK_FLAGS */

		parambase[2] = 0x0200;	/* ORIG_ROOT_DEV */

		parambase[3] = 0x0;	/* LOADER_TYPE */

		parambase[4] = 0x0;	/* INITRD_START */

		parambase[5] = 0x0;	/* INITRD_SIZE */

		parambase[6] = 0;



		strcpy((char *) ((int) parambase + 0x100),

		       "console=ttySC0,38400");

	}

#endif



	puts("Ok, booting the kernel.\n");



	decompress(input_data, input_len, NULL, NULL, output_data, NULL, error);

	cache_control(CACHE_DISABLE);

	puts("Ok, booting the kernel.\n");

}