[PATCH] ppc64 boot: remove zlib

Switch ppc64 to the in-kernel zlib, it has less bugs than the current one.
The code in arch/ppc64/boot is compiled as 32bit, so it can not use the
includes from include/asm.

Copy all zlib related header files and convert them with sed.

Reduce the scratch size to 47k, check possible changes at runtime.

Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 12 insertions, 70 deletions

diff --git a/arch/ppc64/boot/main.c b/arch/ppc64/boot/main.c
index f7ec19a2d0b0..0b95ccfb143c 100644
--- a/arch/ppc64/boot/main.c
+++ b/arch/ppc64/boot/main.c
@@ -26,12 +26,6 @@ extern void flush_cache(void *, unsigned long);
 #define RAM_END         (512<<20) // Fixme: use OF */
 #define ONE_MB          0x100000
 
-static char *avail_ram;
-static char *begin_avail, *end_avail;
-static char *avail_high;
-static unsigned int heap_use;
-static unsigned int heap_max;
-
 extern char _start[];
 extern char _end[];
 extern char _vmlinux_start[];
@@ -50,7 +44,8 @@ static struct addr_range vmlinux = {0, 0, 0};
 static struct addr_range vmlinuz = {0, 0, 0};
 static struct addr_range initrd  = {0, 0, 0};
 
-static char scratch[128<<10];   /* 128kB of scratch space for gunzip */
+static char scratch[46912];     /* scratch space for gunzip, from zlib_inflate_workspacesize() */
+
 
 typedef void (*kernel_entry_t)( unsigned long,
                                 unsigned long,
@@ -161,17 +156,12 @@ void start(unsigned long a1, unsigned long a2, void *promptr)
         /* Eventually gunzip the kernel */
         if (*(unsigned short *)vmlinuz.addr == 0x1f8b) {
                 int len;
-                avail_ram = scratch;
-                begin_avail = avail_high = avail_ram;
-                end_avail = scratch + sizeof(scratch);
                 printf("gunzipping (0x%lx <- 0x%lx:0x%0lx)...",
                        vmlinux.addr, vmlinuz.addr, vmlinuz.addr+vmlinuz.size);
                 len = vmlinuz.size;
                 gunzip((void *)vmlinux.addr, vmlinux.size,
                         (unsigned char *)vmlinuz.addr, &len);
                 printf("done 0x%lx bytes\n\r", len);
-                printf("0x%x bytes of heap consumed, max in use 0x%x\n\r",
-                       (unsigned)(avail_high - begin_avail), heap_max);
         } else {
                 memmove((void *)vmlinux.addr,(void *)vmlinuz.addr,vmlinuz.size);
         }
@@ -225,64 +215,12 @@ void start(unsigned long a1, unsigned long a2, void *promptr)
         exit();
 }
 
-struct memchunk {
-        unsigned int size;
-        unsigned int pad;
-        struct memchunk *next;
-};
-
-static struct memchunk *freechunks;
-
-void *zalloc(void *x, unsigned items, unsigned size)
-{
-        void *p;
-        struct memchunk **mpp, *mp;
-
-        size *= items;
-        size = _ALIGN(size, sizeof(struct memchunk));
-        heap_use += size;
-        if (heap_use > heap_max)
-                heap_max = heap_use;
-        for (mpp = &freechunks; (mp = *mpp) != 0; mpp = &mp->next) {
-                if (mp->size == size) {
-                        *mpp = mp->next;
-                        return mp;
-                }
-        }
-        p = avail_ram;
-        avail_ram += size;
-        if (avail_ram > avail_high)
-                avail_high = avail_ram;
-        if (avail_ram > end_avail) {
-                printf("oops... out of memory\n\r");
-                pause();
-        }
-        return p;
-}
-
-void zfree(void *x, void *addr, unsigned nb)
-{
-        struct memchunk *mp = addr;
-
-        nb = _ALIGN(nb, sizeof(struct memchunk));
-        heap_use -= nb;
-        if (avail_ram == addr + nb) {
-                avail_ram = addr;
-                return;
-        }
-        mp->size = nb;
-        mp->next = freechunks;
-        freechunks = mp;
-}
-
 #define HEAD_CRC        2
 #define EXTRA_FIELD     4
 #define ORIG_NAME       8
 #define COMMENT         0x10
 #define RESERVED        0xe0
 
-#define DEFLATED        8
-
 static void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
 {
         z_stream s;
@@ -291,7 +229,7 @@ static void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
         /* skip header */
         i = 10;
         flags = src[3];
-        if (src[2] != DEFLATED || (flags & RESERVED) != 0) {
+        if (src[2] != Z_DEFLATED || (flags & RESERVED) != 0) {
                 printf("bad gzipped data\n\r");
                 exit();
         }
@@ -310,9 +248,13 @@ static void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
                 exit();
         }
 
-        s.zalloc = zalloc;
-        s.zfree = zfree;
-        r = inflateInit2(&s, -MAX_WBITS);
+        if (zlib_inflate_workspacesize() > sizeof(scratch)) {
+                printf("gunzip needs more mem\n");
+                exit();
+        }
+        memset(&s, 0, sizeof(s));
+        s.workspace = scratch;
+        r = zlib_inflateInit2(&s, -MAX_WBITS);
         if (r != Z_OK) {
                 printf("inflateInit2 returned %d\n\r", r);
                 exit();
@@ -321,12 +263,12 @@ static void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
         s.avail_in = *lenp - i;
         s.next_out = dst;
         s.avail_out = dstlen;
-        r = inflate(&s, Z_FINISH);
+        r = zlib_inflate(&s, Z_FINISH);
         if (r != Z_OK && r != Z_STREAM_END) {
                 printf("inflate returned %d msg: %s\n\r", r, s.msg);
                 exit();
         }
         *lenp = s.next_out - (unsigned char *) dst;
-        inflateEnd(&s);
+        zlib_inflateEnd(&s);
 }