coreboot-gerrit August 2013

coreboot-gerrit@coreboot.org

1 participants
247 discussions

Patch merged into coreboot/master: 16ae95c Add Kconfig options for Linux as payload
by gerrit＠coreboot.org 31 Aug '13

31 Aug '13

the following patch was just integrated into master: commit 16ae95c4bce956c115deaa7b5d42b3472a72e9e9 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Sat Aug 31 08:26:52 2013 +0200 Add Kconfig options for Linux as payload These allow to define a kernel image, initrd and command line. Change-Id: I40155b812728a176b6d15871e1e6c96e4ad693c8 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/3893 Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Tested-by: build bot (Jenkins) See http://review.coreboot.org/3893 for details. -gerrit

1 0

Patch merged into coreboot/master: 2f39eae Remove NRV2B compression support
by gerrit＠coreboot.org 31 Aug '13

31 Aug '13

the following patch was just integrated into master: commit 2f39eae41d750817143f9372f67de6b1ee96b4a6 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Sat Aug 31 08:16:27 2013 +0200 Remove NRV2B compression support It wasn't even hooked up to the build system anymore. Change-Id: I4b962ffd945b39451e19da3ec2f7b8e0eecf2e53 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/3892 Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Tested-by: build bot (Jenkins) See http://review.coreboot.org/3892 for details. -gerrit

1 0

Patch merged into coreboot/master: de36d33 Add a (b)zImage parser to cbfstool
by gerrit＠coreboot.org 31 Aug '13

31 Aug '13

the following patch was just integrated into master: commit de36d333c27c258bc05ecc0b6649fbdafcae619f Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 27 20:22:21 2013 +0200 Add a (b)zImage parser to cbfstool In the great tradition of LinuxBIOS this allows adding a kernel as payload. add-payload is extended to also allow adding an initial ramdisk (-I filename) and a command line (-C console=ttyS0). Change-Id: Iaca499a98b0adf0134e78d6bf020b6531a626aaa Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/3302 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> See http://review.coreboot.org/3302 for details. -gerrit

1 0

Patch merged into filo/master: a954218 Add .gitignore
by gerrit＠coreboot.org 31 Aug '13

31 Aug '13

the following patch was just integrated into master: commit a9542183e04ce352f0b2264736cd0ede55d7948e Author: Stefan Tauner <stefan.tauner(a)gmx.at> Date: Fri Aug 30 15:32:52 2013 +0200 Add .gitignore Change-Id: I8fadb09aed552d23a232bbcbc719fd25070aa501 Signed-off-by: Stefan Tauner <stefan.tauner(a)gmx.at> Reviewed-on: http://review.coreboot.org/3890 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick(a)georgi-clan.de> See http://review.coreboot.org/3890 for details. -gerrit

1 0

New patch to review for coreboot: 42c5e4e Add Kconfig options for Linux as payload
by Patrick Georgi 31 Aug '13

31 Aug '13

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3893 -gerrit commit 42c5e4ed5f20f2ce8ee74b135e875551d2a58677 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Sat Aug 31 08:26:52 2013 +0200 Add Kconfig options for Linux as payload These allow to define a kernel image, initrd and command line. Change-Id: I40155b812728a176b6d15871e1e6c96e4ad693c8 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- src/Kconfig | 31 +++++++++++++++++++++++++++++++ src/arch/x86/Makefile.inc | 14 ++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/src/Kconfig b/src/Kconfig index f714cb2..be2cb24 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -539,6 +539,16 @@ config PAYLOAD_ELF You will be able to specify the location and file name of the payload image later. +config PAYLOAD_LINUX + bool "A Linux payload" + help + Select this option if you have a Linux bzImage which coreboot + should run as soon as the basic hardware initialization + is completed. + + You will be able to specify the location and file name of the + payload image later. + config PAYLOAD_SEABIOS bool "SeaBIOS" depends on ARCH_X86 @@ -617,6 +627,13 @@ config PAYLOAD_FILE The path and filename of the ELF executable file to use as payload. config PAYLOAD_FILE + string "Linux path and filename" + depends on PAYLOAD_LINUX + default "bzImage" + help + The path and filename of the bzImage kernel to use as payload. + +config PAYLOAD_FILE depends on PAYLOAD_SEABIOS default "$(obj)/seabios/out/bios.bin.elf" @@ -640,6 +657,20 @@ config COMPRESSED_PAYLOAD_LZMA In order to reduce the size payloads take up in the ROM chip coreboot can compress them using the LZMA algorithm. +config LINUX_COMMAND_LINE + string "Linux command line" + depends on PAYLOAD_LINUX + default "" + help + A command line to add to the Linux kernel. + +config LINUX_INITRD + string "Linux initrd" + depends on PAYLOAD_LINUX + default "" + help + An initrd image to add to the Linux kernel. + endmenu menu "Debugging" diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 5c28676..b3b82b9 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -74,6 +74,16 @@ $(obj)/coreboot.pre1: $(CBFSTOOL) mv $(obj)/coreboot.rom $@ endif +ifeq ($(CONFIG_PAYLOAD_LINUX),y) +LINUX_ADDITIONAL_CONFIG:= +ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUX_COMMAND_LINE))),) + LINUX_ADDITIONAL_CONFIG+=-C $(CONFIG_LINUX_COMMAND_LINE) +endif +ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD))),) + LINUX_ADDITIONAL_CONFIG+=-I $(CONFIG_LINUX_INITRD) +endif +endif + $(obj)/coreboot.rom: $(obj)/coreboot.pre $(objcbfs)/coreboot_ram.elf $(CBFSTOOL) $(call strip_quotes,$(COREBOOT_ROM_DEPENDENCIES)) $$(INTERMEDIATE) $$(VBOOT_STUB_ELF) @printf " CBFS $(subst $(obj)/,,$(@))\n" cp $(obj)/coreboot.pre $@.tmp @@ -85,6 +95,10 @@ ifeq ($(CONFIG_PAYLOAD_ELF),y) @printf " PAYLOAD $(CONFIG_PAYLOAD_FILE) (compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n" $(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG) endif +ifeq ($(CONFIG_PAYLOAD_LINUX),y) + @printf " PAYLOAD $(CONFIG_PAYLOAD_FILE) (compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n" + $(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG) $(LINUX_ADDITIONAL_CONFIG) +endif ifeq ($(CONFIG_PAYLOAD_SEABIOS),y) @printf " PAYLOAD SeaBIOS (internal, compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n" $(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG)

1 0

New patch to review for coreboot: 72b1ad3 Remove NRV2B compression support
by Patrick Georgi 31 Aug '13

31 Aug '13

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3892 -gerrit commit 72b1ad30d8cb23e3e078b117c946843cf9437926 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Sat Aug 31 08:16:27 2013 +0200 Remove NRV2B compression support It wasn't even hooked up to the build system anymore. Change-Id: I4b962ffd945b39451e19da3ec2f7b8e0eecf2e53 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- .gitignore | 1 - documentation/cbfs.txt | 10 +- src/Kconfig | 4 - src/lib/nrv2b.c | 84 --- src/lib/selfboot.c | 9 - util/nrv2b/Makefile | 7 - util/nrv2b/nrv2b.c | 1473 ------------------------------------------------ 7 files changed, 5 insertions(+), 1583 deletions(-) diff --git a/.gitignore b/.gitignore index 0061152..1cdabfc 100644 --- a/.gitignore +++ b/.gitignore @@ -71,7 +71,6 @@ util/mptable/mptable util/msrtool/Makefile util/msrtool/Makefile.deps util/msrtool/msrtool -util/nrv2b/nrv2b util/nvramtool/.dependencies util/nvramtool/nvramtool util/optionlist/Options.wiki diff --git a/documentation/cbfs.txt b/documentation/cbfs.txt index 4b266f2..7ecc901 100644 --- a/documentation/cbfs.txt +++ b/documentation/cbfs.txt @@ -308,8 +308,8 @@ struct cbfs_stage { 'compression' is an integer defining how the data is compressed. There are three compression types defined by this version of the standard: -none (0x0), lzma (0x1), and nrv2b (0x02), though additional types may be -added assuming that coreboot understands how to handle the scheme. +none (0x0), lzma (0x1), and nrv2b (0x02, deprecated), though additional +types may be added assuming that coreboot understands how to handle the scheme. 'entry' is a 64 bit value indicating the location where the program counter should jump following the loading of the stage. This should be @@ -388,9 +388,9 @@ PAYLOAD_SEGMENT_ENTRY 0x52544E45 The segment contains the entry point 'compression' is the compression scheme for the segment. Each segment can be independently compressed. There are three compression types defined by -this version of the standard: none (0x0), lzma (0x1), and nrv2b (0x02), -though additional types may be added assuming that coreboot understands -how to handle the scheme. +this version of the standard: none (0x0), lzma (0x1), and nrv2b +(0x02, deprecated), though additional types may be added assuming that +coreboot understands how to handle the scheme. 'offset' is the address of the data within the component, starting from the component header. diff --git a/src/Kconfig b/src/Kconfig index 515c618..f714cb2 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -640,10 +640,6 @@ config COMPRESSED_PAYLOAD_LZMA In order to reduce the size payloads take up in the ROM chip coreboot can compress them using the LZMA algorithm. -config COMPRESSED_PAYLOAD_NRV2B - bool - default n - endmenu menu "Debugging" diff --git a/src/lib/nrv2b.c b/src/lib/nrv2b.c deleted file mode 100644 index d84e99e..0000000 --- a/src/lib/nrv2b.c +++ /dev/null @@ -1,84 +0,0 @@ -// This GETBIT is supposed to work on little endian -// 32bit systems. The algorithm will definitely need -// some fixing on other systems, but it might not be -// a problem since the nrv2b binary behaves the same.. - -#ifndef ENDIAN -#define ENDIAN 0 -#endif -#ifndef BITSIZE -#define BITSIZE 32 -#endif - -#define GETBIT_8(bb, src, ilen) \ - (((bb = bb & 0x7f ? bb*2 : ((unsigned)src[ilen++]*2+1)) >> 8) & 1) - -#define GETBIT_LE16(bb, src, ilen) \ - (bb*=2,bb&0xffff ? (bb>>16)&1 : (ilen+=2,((bb=(src[ilen-2]+src[ilen-1]*256u)*2+1)>>16)&1)) -#define GETBIT_LE32(bb, src, ilen) \ - (bc > 0 ? ((bb>>--bc)&1) : (bc=31,\ - bb=*(const uint32_t *)((src)+ilen),ilen+=4,(bb>>31)&1)) - -#if ENDIAN == 0 && BITSIZE == 8 -#define GETBIT(bb, src, ilen) GETBIT_8(bb, src, ilen) -#endif -#if ENDIAN == 0 && BITSIZE == 16 -#define GETBIT(bb, src, ilen) GETBIT_LE16(bb, src, ilen) -#endif -#if ENDIAN == 0 && BITSIZE == 32 -#define GETBIT(bb, src, ilen) GETBIT_LE32(bb, src, ilen) -#endif -static unsigned long unrv2b(uint8_t * src, uint8_t * dst, unsigned long *ilen_p) -{ - unsigned long ilen = 0, olen = 0, last_m_off = 1; - uint32_t bb = 0; - unsigned bc = 0; - const uint8_t *m_pos; - - // skip length - src += 4; - /* FIXME: check olen with the length stored in first 4 bytes */ - - for (;;) { - unsigned int m_off, m_len; - while (GETBIT(bb, src, ilen)) { - dst[olen++] = src[ilen++]; - } - - m_off = 1; - do { - m_off = m_off * 2 + GETBIT(bb, src, ilen); - } while (!GETBIT(bb, src, ilen)); - if (m_off == 2) { - m_off = last_m_off; - } else { - m_off = (m_off - 3) * 256 + src[ilen++]; - if (m_off == 0xffffffffU) - break; - last_m_off = ++m_off; - } - - m_len = GETBIT(bb, src, ilen); - m_len = m_len * 2 + GETBIT(bb, src, ilen); - if (m_len == 0) { - m_len++; - do { - m_len = m_len * 2 + GETBIT(bb, src, ilen); - } while (!GETBIT(bb, src, ilen)); - m_len += 2; - } - m_len += (m_off > 0xd00); - - m_pos = dst + olen - m_off; - dst[olen++] = *m_pos++; - do { - dst[olen++] = *m_pos++; - } while (--m_len > 0); - } - - *ilen_p = ilen; - - return olen; - -} - diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index d8c7392..f69ad14 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -454,15 +454,6 @@ static int load_self_segments( return 0; break; } -#if CONFIG_COMPRESSED_PAYLOAD_NRV2B - case CBFS_COMPRESS_NRV2B: { - printk(BIOS_DEBUG, "using NRV2B\n"); - unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p); - unsigned long tmp; - len = unrv2b(src, dest, &tmp); - break; - } -#endif case CBFS_COMPRESS_NONE: { printk(BIOS_DEBUG, "it's not compressed!\n"); memcpy(dest, src, len); diff --git a/util/nrv2b/Makefile b/util/nrv2b/Makefile deleted file mode 100644 index e4d6e7b..0000000 --- a/util/nrv2b/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -GCC=gcc - -nrv2b: nrv2b.c - $(GCC) -O2 -DENCODE -DDECODE -DMAIN -DVERBOSE -DNDEBUG -DBITSIZE=32 -DENDIAN=0 -o $@ $< - -clean: - rm -f nrv2b diff --git a/util/nrv2b/nrv2b.c b/util/nrv2b/nrv2b.c deleted file mode 100644 index e9b72a6..0000000 --- a/util/nrv2b/nrv2b.c +++ /dev/null @@ -1,1473 +0,0 @@ -/************************************************************** - Form adapted from lzhuf.c - written by Haruyasu Yoshizaki 11/20/1988 - some minor changes 4/6/1989 - comments translated by Haruhiko Okumura 4/7/1989 - - minor beautifications and adjustments for compiling under Linux - by Markus Gutschke <gutschk(a)math.uni-muenster.de> - 1997-01-27 - - Modifications to allow use as a filter by Ken Yap - <ken_yap(a)users.sourceforge.net>. - - 1997-07-01 - - Small mod to cope with running on big-endian machines - by Jim Hague <jim.hague(a)acm.org) - 1998-02-06 - - Make compression statistics report shorter - by Ken Yap <ken_yap(a)users.sourceforge.net>. - 2001-04-25 - - Replaced algorithm with nrv2b from ucl the compression - library from upx. That code is: - Copyright (C) 1996-2002 Markus Franz Xaver Johannes Oberhumer - And is distributed under the terms of the GPL. - The conversion was performed - by Eric Biederman <ebiederman(a)lnxi.com>. - 20 August 2002 - -**************************************************************/ -#define UCLPACK_COMPAT 0 -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <ctype.h> -#include <errno.h> -#include <stdint.h> -#include <limits.h> -#include <assert.h> -#if UCLPACK_COMPAT -#include <netinet/in.h> -#endif - - -#ifndef VERBOSE -#define Fprintf(x) -#define wterr 0 -#else -#define Fprintf(x) fprintf x -#endif - -#ifndef MAIN -extern -#endif -FILE *infile, *outfile; - -#if defined(ENCODE) || defined(DECODE) - -#ifndef ENDIAN -#define ENDIAN 0 -#endif -#ifndef BITSIZE -#define BITSIZE 32 -#endif - -static __inline__ __attribute__((noreturn)) void Error(char *message) -{ - Fprintf((stderr, "\n%s\n", message)); - exit(EXIT_FAILURE); -} - -/* These will be a complete waste of time on a lo-endian */ -/* system, but it only gets done once so WTF. */ -static unsigned long i86ul_to_host(unsigned long ul) -{ - unsigned long res = 0; - int i; - union - { - unsigned char c[4]; - unsigned long ul; - } u; - - u.ul = ul; - for (i = 3; i >= 0; i--) - res = (res << 8) + u.c[i]; - return res; -} - -static unsigned long host_to_i86ul(unsigned long ul) -{ - int i; - union - { - unsigned char c[4]; - unsigned long ul; - } u; - - for (i = 0; i < 4; i++) - { - u.c[i] = ul & 0xff; - ul >>= 8; - } - return u.ul; -} -#endif - - - -#if UCLPACK_COMPAT -/* magic file header for compressed files */ -static const unsigned char magic[8] = -{ 0x00, 0xe9, 0x55, 0x43, 0x4c, 0xff, 0x01, 0x1a }; - -#endif - -#ifdef ENCODE -/********** NRV2B_99 compression **********/ - -#define N (1024*1024ul) /* size of ring buffer */ -#define THRESHOLD 1 /* lower limit for match length */ -#define F 2048 /* upper limit for match length */ -#define M2_MAX_OFFSET 0xd00 - -/* note: to use default values pass -1, i.e. initialize - * this struct by a memset(x,0xff,sizeof(x)) */ -struct ucl_compress_config -{ - int bb_endian; - int bb_size; - unsigned int max_offset; - unsigned int max_match; - int s_level; - int h_level; - int p_level; - int c_flags; - unsigned int m_size; -}; - -struct ucl_compress -{ - int init; - - unsigned int look; /* bytes in lookahead buffer */ - - unsigned int m_len; - unsigned int m_off; - - unsigned int last_m_len; - unsigned int last_m_off; - - const unsigned char *bp; - const unsigned char *ip; - const unsigned char *in; - const unsigned char *in_end; - unsigned char *out; - - uint32_t bb_b; - unsigned bb_k; - unsigned bb_c_endian; - unsigned bb_c_s; - unsigned bb_c_s8; - unsigned char *bb_p; - unsigned char *bb_op; - - struct ucl_compress_config conf; - unsigned int *result; - - unsigned int textsize; /* text size counter */ - unsigned int codesize; /* code size counter */ - unsigned int printcount; /* counter for reporting progress every 1K - bytes */ - - - /* some stats */ - unsigned long lit_bytes; - unsigned long match_bytes; - unsigned long rep_bytes; - unsigned long lazy; -}; - - - -#define getbyte(c) ((c).ip < (c).in_end ? *((c).ip)++ : (-1)) - -#define UCL_E_OK 0 -#define UCL_E_INVALID_ARGUMENT 1 -#define UCL_E_OUT_OF_MEMORY 2 -#define UCL_E_ERROR 3 - -/*********************************************************************** -// -************************************************************************/ - -#define SWD_HSIZE 16384 -#define SWD_MAX_CHAIN 2048 - -#define HEAD3(b,p) \ - (((0x9f5f*(((((uint32_t)b[p]<<5)^b[p+1])<<5)^b[p+2]))>>5) & (SWD_HSIZE-1)) - -#define HEAD2(b,p) (b[p] ^ ((unsigned)b[p+1]<<8)) -#define NIL2 UINT_MAX - -struct ucl_swd -{ -/* public - "built-in" */ - unsigned int n; - unsigned int f; - unsigned int threshold; - -/* public - configuration */ - unsigned int max_chain; - unsigned int nice_length; - int use_best_off; - unsigned int lazy_insert; - -/* public - output */ - unsigned int m_len; - unsigned int m_off; - unsigned int look; - int b_char; -#if defined(SWD_BEST_OFF) - unsigned int best_off[ SWD_BEST_OFF ]; -#endif - -/* semi public */ - struct ucl_compress *c; - unsigned int m_pos; -#if defined(SWD_BEST_OFF) - unsigned int best_pos[ SWD_BEST_OFF ]; -#endif - -/* private */ - const uint8_t *dict; - const uint8_t *dict_end; - unsigned int dict_len; - -/* private */ - unsigned int ip; /* input pointer (lookahead) */ - unsigned int bp; /* buffer pointer */ - unsigned int rp; /* remove pointer */ - unsigned int b_size; - - unsigned char *b_wrap; - - unsigned int node_count; - unsigned int first_rp; - - unsigned char b [ N + F + F ]; - unsigned int head3 [ SWD_HSIZE ]; - unsigned int succ3 [ N + F ]; - unsigned int best3 [ N + F ]; - unsigned int llen3 [ SWD_HSIZE ]; - unsigned int head2 [ 65536U ]; -}; - -#define s_head3(s,key) s->head3[key] - - -#if !defined( NDEBUG) -static void assert_match(const struct ucl_swd * swd, unsigned int m_len, - unsigned int m_off ) - -{ - const struct ucl_compress *c = swd->c; - unsigned int d_off; - - assert(m_len >= 2); - if (m_off <= (unsigned int) (c->bp - c->in)) - { - assert(c->bp - m_off + m_len < c->ip); - assert(memcmp(c->bp, c->bp - m_off, m_len) == 0); - } - else - { - assert(swd->dict != NULL); - d_off = m_off - (unsigned int) (c->bp - c->in); - assert(d_off <= swd->dict_len); - if (m_len > d_off) - { - assert(memcmp(c->bp, swd->dict_end - d_off, d_off) == - 0); - - assert(c->in + m_len - d_off < c->ip); - assert(memcmp(c->bp + d_off, c->in, m_len - d_off) == - 0); - - } - else - { - assert(memcmp(c->bp, swd->dict_end - d_off, m_len) == - 0); - - } - } -} -#else -# define assert_match(a,b,c) ((void)0) -#endif - -/*********************************************************************** -// -************************************************************************/ - - -static -void swd_initdict(struct ucl_swd *s, const uint8_t *dict, unsigned int dict_len) - -{ - s->dict = s->dict_end = NULL; - s->dict_len = 0; - - if (!dict || dict_len <= 0) - return; - if (dict_len > s->n) - { - dict += dict_len - s->n; - dict_len = s->n; - } - - s->dict = dict; - s->dict_len = dict_len; - s->dict_end = dict + dict_len; - memcpy(s->b,dict,dict_len); - s->ip = dict_len; -} - - -static -void swd_insertdict(struct ucl_swd *s, unsigned int node, unsigned int len) -{ - unsigned int key; - - s->node_count = s->n - len; - s->first_rp = node; - - while (len-- > 0) - { - key = HEAD3(s->b,node); - s->succ3[node] = s_head3(s,key); - s->head3[key] = (unsigned int)(node); - s->best3[node] = (unsigned int)(s->f + 1); - s->llen3[key]++; - assert(s->llen3[key] <= s->n); - - key = HEAD2(s->b,node); - s->head2[key] = (unsigned int)(node); - - node++; - } -} - -/*********************************************************************** -// -************************************************************************/ - - -static -int swd_init(struct ucl_swd *s, const uint8_t *dict, unsigned int dict_len) -{ - unsigned int i = 0; - int c = 0; - - if (s->n == 0) - s->n = N; - if (s->f == 0) - s->f = F; - s->threshold = THRESHOLD; - if (s->n > N || s->f > F) - return UCL_E_INVALID_ARGUMENT; - - /* defaults */ - s->max_chain = SWD_MAX_CHAIN; - s->nice_length = s->f; - s->use_best_off = 0; - s->lazy_insert = 0; - - s->b_size = s->n + s->f; - if (s->b_size + s->f >= UINT_MAX) - return UCL_E_ERROR; - s->b_wrap = s->b + s->b_size; - s->node_count = s->n; - - memset(s->llen3, 0, sizeof(s->llen3[0]) * SWD_HSIZE); - for (i = 0; i < 65536U; i++) - s->head2[i] = NIL2; - - s->ip = 0; - swd_initdict(s,dict,dict_len); - s->bp = s->ip; - s->first_rp = s->ip; - - assert(s->ip + s->f <= s->b_size); - - s->look = (unsigned int) (s->c->in_end - s->c->ip); - if (s->look > 0) - { - if (s->look > s->f) - s->look = s->f; - memcpy(&s->b[s->ip],s->c->ip,s->look); - s->c->ip += s->look; - s->ip += s->look; - } - if (s->ip == s->b_size) - s->ip = 0; - - if (s->look >= 2 && s->dict_len > 0) - swd_insertdict(s,0,s->dict_len); - - s->rp = s->first_rp; - if (s->rp >= s->node_count) - s->rp -= s->node_count; - else - s->rp += s->b_size - s->node_count; - - /* unused i */ - /* unused c */ - return UCL_E_OK; -} - - -static -void swd_exit(struct ucl_swd *s) -{ - /* unused s */ - -} - -#define swd_pos2off(s,pos) \ - (s->bp > (pos) ? s->bp - (pos) : s->b_size - ((pos) - s->bp)) - -/*********************************************************************** -// -************************************************************************/ - -static __inline__ -void swd_getbyte(struct ucl_swd *s) -{ - int c; - - if ((c = getbyte(*(s->c))) < 0) - { - if (s->look > 0) - --s->look; - } - else - { - s->b[s->ip] = (uint8_t)(c); - if (s->ip < s->f) - s->b_wrap[s->ip] = (uint8_t)(c); - } - if (++s->ip == s->b_size) - s->ip = 0; - if (++s->bp == s->b_size) - s->bp = 0; - if (++s->rp == s->b_size) - s->rp = 0; -} -/*********************************************************************** -// remove node from lists -************************************************************************/ - -static __inline__ -void swd_remove_node(struct ucl_swd *s, unsigned int node) -{ - if (s->node_count == 0) - { - unsigned int key; - -#ifdef UCL_DEBUG - if (s->first_rp != UINT_MAX) - { - if (node != s->first_rp) - printf("Remove %5d: %5d %5d %5d %5d %6d %6d\n", - - node, s->rp, s->ip, s->bp, s->first_rp, - s->ip - node, s->ip - s->bp); - assert(node == s->first_rp); - s->first_rp = UINT_MAX; - } -#endif - - key = HEAD3(s->b,node); - assert(s->llen3[key] > 0); - --s->llen3[key]; - - key = HEAD2(s->b,node); - assert(s->head2[key] != NIL2); - if ((unsigned int) s->head2[key] == node) - s->head2[key] = NIL2; - } - else - --s->node_count; -} - - -/*********************************************************************** -// -************************************************************************/ - - -static -void swd_accept(struct ucl_swd *s, unsigned int n) -{ - assert(n <= s->look); - - if (n > 0) do - { - unsigned int key; - - swd_remove_node(s,s->rp); - - /* add bp into HEAD3 */ - key = HEAD3(s->b,s->bp); - s->succ3[s->bp] = s_head3(s,key); - s->head3[key] = (unsigned int)(s->bp); - s->best3[s->bp] = (unsigned int)(s->f + 1); - s->llen3[key]++; - assert(s->llen3[key] <= s->n); - - /* add bp into HEAD2 */ - key = HEAD2(s->b,s->bp); - s->head2[key] = (unsigned int)(s->bp); - - swd_getbyte(s); - } while (--n > 0); -} - -/*********************************************************************** -// -************************************************************************/ - -static -void swd_search(struct ucl_swd *s, unsigned int node, unsigned int cnt) -{ - const unsigned char *p1; - const unsigned char *p2; - const unsigned char *px; - - unsigned int m_len = s->m_len; - const unsigned char * b = s->b; - const unsigned char * bp = s->b + s->bp; - const unsigned char * bx = s->b + s->bp + s->look; - unsigned char scan_end1; - - assert(s->m_len > 0); - - scan_end1 = bp[m_len - 1]; - for ( ; cnt-- > 0; node = s->succ3[node]) - { - p1 = bp; - p2 = b + node; - px = bx; - - assert(m_len < s->look); - - if ( - p2[m_len - 1] == scan_end1 && - p2[m_len] == p1[m_len] && - p2[0] == p1[0] && - p2[1] == p1[1]) - { - unsigned int i; - assert(memcmp(bp,&b[node],3) == 0); - - p1 += 2; p2 += 2; - do {} while (++p1 < px && *p1 == *++p2); - i = p1 - bp; - -#ifdef UCL_DEBUG - if (memcmp(bp,&b[node],i) != 0) - printf("%5ld %5ld %02x%02x %02x%02x\n", - (long)s->bp, (long) node, - bp[0], bp[1], b[node], b[node+1]); -#endif - assert(memcmp(bp,&b[node],i) == 0); - -#if defined(SWD_BEST_OFF) - if (i < SWD_BEST_OFF) - { - if (s->best_pos[i] == 0) - s->best_pos[i] = node + 1; - } -#endif - if (i > m_len) - { - s->m_len = m_len = i; - s->m_pos = node; - if (m_len == s->look) - return; - if (m_len >= s->nice_length) - return; - if (m_len > (unsigned int) s->best3[node]) - return; - scan_end1 = bp[m_len - 1]; - } - } - } -} - -static int swd_search2(struct ucl_swd *s) -{ - unsigned int key; - - assert(s->look >= 2); - assert(s->m_len > 0); - - key = s->head2[ HEAD2(s->b,s->bp) ]; - if (key == NIL2) - return 0; -#ifdef UCL_DEBUG - if (memcmp(&s->b[s->bp],&s->b[key],2) != 0) - printf("%5ld %5ld %02x%02x %02x%02x\n", (long)s->bp, (long)key, - s->b[s->bp], s->b[s->bp+1], s->b[key], s->b[key+1]); -#endif - assert(memcmp(&s->b[s->bp],&s->b[key],2) == 0); -#if defined(SWD_BEST_OFF) - if (s->best_pos[2] == 0) - s->best_pos[2] = key + 1; -#endif - - if (s->m_len < 2) - { - s->m_len = 2; - s->m_pos = key; - } - return 1; -} - -/*********************************************************************** -// -************************************************************************/ - -static -void swd_findbest(struct ucl_swd *s) -{ - unsigned int key; - unsigned int cnt, node; - unsigned int len; - - assert(s->m_len > 0); - - /* get current head, add bp into HEAD3 */ - key = HEAD3(s->b,s->bp); - node = s->succ3[s->bp] = s_head3(s,key); - cnt = s->llen3[key]++; - assert(s->llen3[key] <= s->n + s->f); - if (cnt > s->max_chain && s->max_chain > 0) - cnt = s->max_chain; - s->head3[key] = (unsigned int)(s->bp); - - s->b_char = s->b[s->bp]; - len = s->m_len; - if (s->m_len >= s->look) - { - if (s->look == 0) - s->b_char = -1; - s->m_off = 0; - s->best3[s->bp] = (unsigned int)(s->f + 1); - } - else - { - if (swd_search2(s)) - if (s->look >= 3) - swd_search(s,node,cnt); - if (s->m_len > len) - s->m_off = swd_pos2off(s,s->m_pos); - s->best3[s->bp] = (unsigned int)(s->m_len); - -#if defined(SWD_BEST_OFF) - if (s->use_best_off) - { - int i; - for (i = 2; i < SWD_BEST_OFF; i++) - if (s->best_pos[i] > 0) - s->best_off[i] = - swd_pos2off(s,s->best_pos[i]-1); - - else - s->best_off[i] = 0; - } -#endif - } - - swd_remove_node(s,s->rp); - - /* add bp into HEAD2 */ - key = HEAD2(s->b,s->bp); - s->head2[key] = (unsigned int)(s->bp); -} - - -/*********************************************************************** -// -************************************************************************/ - -static int -init_match ( struct ucl_compress *c, struct ucl_swd *s, - const uint8_t *dict, unsigned int dict_len, - uint32_t flags ) -{ - int r; - - assert(!c->init); - c->init = 1; - - s->c = c; - - c->last_m_len = c->last_m_off = 0; - - c->textsize = c->codesize = c->printcount = 0; - c->lit_bytes = c->match_bytes = c->rep_bytes = 0; - c->lazy = 0; - - r = swd_init(s,dict,dict_len); - if (r != UCL_E_OK) - { - swd_exit(s); - return r; - } - - s->use_best_off = (flags & 1) ? 1 : 0; - return UCL_E_OK; -} - -static int -find_match ( struct ucl_compress *c, struct ucl_swd *s, - unsigned int this_len, unsigned int skip ) -{ - assert(c->init); - - if (skip > 0) - { - assert(this_len >= skip); - swd_accept(s, this_len - skip); - c->textsize += this_len - skip + 1; - } - else - { - assert(this_len <= 1); - c->textsize += this_len - skip; - } - - s->m_len = THRESHOLD; -#ifdef SWD_BEST_OFF - if (s->use_best_off) - memset(s->best_pos,0,sizeof(s->best_pos)); -#endif - swd_findbest(s); - c->m_len = s->m_len; - c->m_off = s->m_off; - - swd_getbyte(s); - - if (s->b_char < 0) - { - c->look = 0; - c->m_len = 0; - swd_exit(s); - } - else - { - c->look = s->look + 1; - } - c->bp = c->ip - c->look; - -#if 0 - /* brute force match search */ - if (c->m_len > THRESHOLD && c->m_len + 1 <= c->look) - { - const uint8_t *ip = c->bp; - const uint8_t *m = c->bp - c->m_off; - const uint8_t *in = c->in; - - if (ip - in > N) - in = ip - N; - for (;;) - { - while (*in != *ip) - in++; - if (in == ip) - break; - if (in != m) - if (memcmp(in,ip,c->m_len+1) == 0) - printf("%p %p %p %5d\n", - in, ip, m, c->m_len); - - in++; - } - } -#endif - - return UCL_E_OK; -} - - -static int bbConfig(struct ucl_compress *c, int endian, int bitsize) -{ - if (endian != -1) - { - if (endian != 0) - return UCL_E_ERROR; - c->bb_c_endian = endian; - } - if (bitsize != -1) - { - if (bitsize != 8 && bitsize != 16 && bitsize != 32) - return UCL_E_ERROR; - c->bb_c_s = bitsize; - c->bb_c_s8 = bitsize / 8; - } - c->bb_b = 0; c->bb_k = 0; - c->bb_p = NULL; - c->bb_op = NULL; - return UCL_E_OK; -} - -static void bbWriteBits(struct ucl_compress *c) -{ - uint8_t *p = c->bb_p; - uint32_t b = c->bb_b; - - p[0] = (uint8_t)(b >> 0); - if (c->bb_c_s >= 16) - { - p[1] = (uint8_t)(b >> 8); - if (c->bb_c_s == 32) - { - p[2] = (uint8_t)(b >> 16); - p[3] = (uint8_t)(b >> 24); - } - } -} - - -static void bbPutBit(struct ucl_compress *c, unsigned bit) -{ - assert(bit == 0 || bit == 1); - assert(c->bb_k <= c->bb_c_s); - - if (c->bb_k < c->bb_c_s) - { - if (c->bb_k == 0) - { - assert(c->bb_p == NULL); - c->bb_p = c->bb_op; - c->bb_op += c->bb_c_s8; - } - assert(c->bb_p != NULL); - assert(c->bb_p + c->bb_c_s8 <= c->bb_op); - - c->bb_b = (c->bb_b << 1) + bit; - c->bb_k++; - } - else - { - assert(c->bb_p != NULL); - assert(c->bb_p + c->bb_c_s8 <= c->bb_op); - - bbWriteBits(c); - c->bb_p = c->bb_op; - c->bb_op += c->bb_c_s8; - c->bb_b = bit; - c->bb_k = 1; - } -} - - -static void bbPutByte(struct ucl_compress *c, unsigned b) -{ - /**printf("putbyte %p %p %x (%d)\n", op, bb_p, x, bb_k);*/ - assert(c->bb_p == NULL || c->bb_p + c->bb_c_s8 <= c->bb_op); - *c->bb_op++ = (uint8_t)(b); -} - -static void bbFlushBits(struct ucl_compress *c, unsigned filler_bit) -{ - if (c->bb_k > 0) - { - assert(c->bb_k <= c->bb_c_s); - while (c->bb_k != c->bb_c_s) - bbPutBit(c, filler_bit); - bbWriteBits(c); - c->bb_k = 0; - } - c->bb_p = NULL; -} - - - -/*********************************************************************** -// -************************************************************************/ - - -static void code_prefix_ss11(struct ucl_compress *c, uint32_t i) -{ - if (i >= 2) - { - uint32_t t = 4; - i += 2; - do { - t <<= 1; - } while (i >= t); - t >>= 1; - do { - t >>= 1; - bbPutBit(c, (i & t) ? 1 : 0); - bbPutBit(c, 0); - } while (t > 2); - } - bbPutBit(c, (unsigned)i & 1); - bbPutBit(c, 1); -} - -static void -code_match(struct ucl_compress *c, unsigned int m_len, const unsigned int m_off) - -{ - while (m_len > c->conf.max_match) - { - code_match(c, c->conf.max_match - 3, m_off); - m_len -= c->conf.max_match - 3; - } - - c->match_bytes += m_len; - if (m_len > c->result[3]) - c->result[3] = m_len; - if (m_off > c->result[1]) - c->result[1] = m_off; - - bbPutBit(c, 0); - - if (m_off == c->last_m_off) - { - bbPutBit(c, 0); - bbPutBit(c, 1); - } - else - { - code_prefix_ss11(c, 1 + ((m_off - 1) >> 8)); - bbPutByte(c, (unsigned)m_off - 1); - } - m_len = m_len - 1 - (m_off > M2_MAX_OFFSET); - if (m_len >= 4) - { - bbPutBit(c,0); - bbPutBit(c,0); - code_prefix_ss11(c, m_len - 4); - } - else - { - bbPutBit(c, m_len > 1); - bbPutBit(c, (unsigned)m_len & 1); - } - - c->last_m_off = m_off; -} - -static void -code_run(struct ucl_compress *c, const uint8_t *ii, unsigned int lit) -{ - if (lit == 0) - return; - c->lit_bytes += lit; - if (lit > c->result[5]) - c->result[5] = lit; - do { - bbPutBit(c, 1); - bbPutByte(c, *ii++); - } while (--lit > 0); -} - -/*********************************************************************** -// -************************************************************************/ - -static int -len_of_coded_match(struct ucl_compress *c, unsigned int m_len, unsigned int - m_off) - -{ - int b; - if (m_len < 2 || (m_len == 2 && (m_off > M2_MAX_OFFSET)) - || m_off > c->conf.max_offset) - return -1; - assert(m_off > 0); - - m_len = m_len - 2 - (m_off > M2_MAX_OFFSET); - - if (m_off == c->last_m_off) - b = 1 + 2; - else - { - b = 1 + 10; - m_off = (m_off - 1) >> 8; - while (m_off > 0) - { - b += 2; - m_off >>= 1; - } - } - - b += 2; - if (m_len < 3) - return b; - m_len -= 3; - - do { - b += 2; - m_len >>= 1; - } while (m_len > 0); - - return b; -} - -int ucl_nrv2b_99_compress( - const uint8_t *in, unsigned long in_len, - uint8_t *out, unsigned long *out_len, - unsigned int *result) -{ - const uint8_t *ii; - unsigned int lit; - unsigned int m_len, m_off; - struct ucl_compress c_buffer; - struct ucl_compress * const c = &c_buffer; - struct ucl_swd *swd; - unsigned int result_buffer[16]; - int r; - -/* max compression */ -#define SC_TRY_LAZY 2 -#define SC_GOOD_LENGTH F -#define SC_MAX_LAZY F -#define SC_NICE_LENGTH F -#define SC_MAX_CHAIN 4096 -#define SC_FLAGS 1 -#define SC_MAX_OFFSET N - - memset(c, 0, sizeof(*c)); - c->ip = c->in = in; - c->in_end = in + in_len; - c->out = out; - c->result = result ? result : result_buffer; - memset(c->result, 0, 16*sizeof(*c->result)); - c->result[0] = c->result[2] = c->result[4] = UINT_MAX; - result = NULL; - memset(&c->conf, 0xff, sizeof(c->conf)); - r = bbConfig(c, ENDIAN, BITSIZE); - if (r == 0) - r = bbConfig(c, c->conf.bb_endian, c->conf.bb_size); - if (r != 0) - return UCL_E_INVALID_ARGUMENT; - c->bb_op = out; - - ii = c->ip; /* point to start of literal run */ - lit = 0; - - - swd = (struct ucl_swd *) malloc(sizeof(*swd)); - if (!swd) - return UCL_E_OUT_OF_MEMORY; - - swd->f = F; - swd->n = N; - if (in_len >= 256 && in_len < swd->n) - swd->n = in_len; - if (swd->f < 8 || swd->n < 256) - return UCL_E_INVALID_ARGUMENT; - - r = init_match(c,swd,NULL,0, SC_FLAGS); - if (r != UCL_E_OK) - { - free(swd); - return r; - } - if (SC_MAX_CHAIN > 0) - swd->max_chain = SC_MAX_CHAIN; - if (SC_NICE_LENGTH > 0) - swd->nice_length = SC_NICE_LENGTH; - if (c->conf.max_match < swd->nice_length) - swd->nice_length = c->conf.max_match; - - c->last_m_off = 1; - r = find_match(c,swd,0,0); - if (r != UCL_E_OK) - return r; - while (c->look > 0) - { - unsigned int ahead; - unsigned int max_ahead; - int l1, l2; - - c->codesize = c->bb_op - out; - - m_len = c->m_len; - m_off = c->m_off; - - assert(c->bp == c->ip - c->look); - assert(c->bp >= in); - if (lit == 0) - ii = c->bp; - assert(ii + lit == c->bp); - assert(swd->b_char == *(c->bp)); - - if (m_len < 2 || (m_len == 2 && (m_off > M2_MAX_OFFSET)) - || m_off > c->conf.max_offset) - { - /* a literal */ - lit++; - swd->max_chain = SC_MAX_CHAIN; - r = find_match(c,swd,1,0); - assert(r == 0); - continue; - } - - /* a match */ - assert_match(swd,m_len,m_off); - - /* shall we try a lazy match ? */ - ahead = 0; - if (SC_TRY_LAZY <= 0 || m_len >= SC_MAX_LAZY || m_off == - c->last_m_off) - - { - /* no */ - l1 = 0; - max_ahead = 0; - } - else - { - /* yes, try a lazy match */ - l1 = len_of_coded_match(c,m_len,m_off); - assert(l1 > 0); - max_ahead = SC_TRY_LAZY; - if ((m_len - 1) < max_ahead) { - max_ahead = m_len -1; - } - } - - while (ahead < max_ahead && c->look > m_len) - { - if (m_len >= SC_GOOD_LENGTH) - swd->max_chain = SC_MAX_CHAIN >> 2; - else - swd->max_chain = SC_MAX_CHAIN; - r = find_match(c,swd,1,0); - ahead++; - - assert(r == 0); - assert(c->look > 0); - assert(ii + lit + ahead == c->bp); - - if (c->m_len < 2) - continue; - l2 = len_of_coded_match(c,c->m_len,c->m_off); - if (l2 < 0) - continue; - if (l1 + (int)(ahead + c->m_len - m_len) * 5 > l2 + - (int)(ahead) * 9) - { - c->lazy++; - assert_match(swd,c->m_len,c->m_off); - lit += ahead; - assert(ii + lit == c->bp); - goto lazy_match_done; - } - } - - assert(ii + lit + ahead == c->bp); - - /* 1 - code run */ - code_run(c,ii,lit); - lit = 0; - - /* 2 - code match */ - code_match(c,m_len,m_off); - swd->max_chain = SC_MAX_CHAIN; - r = find_match(c,swd,m_len,1+ahead); - assert(r == 0); - - lazy_match_done: ; - } - - /* store final run */ - code_run(c,ii,lit); - - /* EOF */ - bbPutBit(c, 0); - code_prefix_ss11(c, 0x1000000U); - bbPutByte(c, 0xff); - - bbFlushBits(c, 0); - - assert(c->textsize == in_len); - c->codesize = c->bb_op - out; - *out_len = c->bb_op - out; - -#if 0 - printf("%7ld %7ld -> %7ld %7ld %7ld %ld (max: %d %d %d)\n", - (long) c->textsize, (long) in_len, (long) c->codesize, - c->match_bytes, c->lit_bytes, c->lazy, - c->result[1], c->result[3], c->result[5]); -#endif - assert(c->lit_bytes + c->match_bytes == in_len); - - swd_exit(swd); - free(swd); - - return UCL_E_OK; -} - - -void Encode(void) /* compression */ -{ - uint8_t *in, *out; - unsigned long in_len, out_len; - uint32_t tw; - int r; - fseek(infile, 0, SEEK_END); - in_len = ftell(infile); -#ifdef VERBOSE - if ((signed long)in_len < 0) - Fprintf((stderr, "Errno: %d", errno)); -#endif -#if UCLPACK_COMPAT - { - uint8_t byte; - if (fwrite(magic, sizeof(magic), 1, outfile) != 1) - Error("Can't write."); - tw = htonl(0); /* flags */ - if (fwrite(&tw, sizeof(tw), 1, outfile) != 1) - Error("Can't write."); - byte = 0x2b; /* method */ - if (fwrite(&byte, sizeof(byte), 1, outfile) != 1) - Error("Can't write."); - byte = 10; /* level */ - if (fwrite(&byte, sizeof(byte), 1, outfile) != 1) - Error("Can't write."); - tw = htonl(256*1024); /* block_size */ - if (fwrite(&tw, sizeof(tw), 1, outfile) != 1) - Error("Can't write."); - tw = htonl(in_len); - if (fwrite(&tw, sizeof(tw), 1, outfile) != 1) - Error("Can't write."); /* output size of text */ - } -#else - tw = host_to_i86ul(in_len); - if (fwrite(&tw, sizeof(tw), 1, outfile) != 1) - Error("Can't write."); /* output size of text */ -#endif - if (in_len == 0) - return; - rewind(infile); - - in = malloc(in_len); - out_len = in_len + (in_len/8) + 256; - out = malloc(out_len); - if (!in || !out) { - Error("Can't malloc"); - } - if (fread(in, in_len, 1, infile) != 1) { - Error("Can't read"); - } - r = ucl_nrv2b_99_compress(in, in_len, out, &out_len, 0 ); - if (r != UCL_E_OK) { - Error("Error during compression."); - } -#if UCLPACK_COMPAT - tw = htonl(out_len); - if (fwrite(&tw, sizeof(tw), 1, outfile) != 1) - Error("Can't write."); /* file size of text */ - -#endif - if (fwrite(out, out_len, 1, outfile) != 1) { - Error("Write error\n"); - } -#if UCLPACK_COMPAT - tw = htonl(0); /* EOF marker */ - if (fwrite(&tw, sizeof(tw), 1, outfile) != 1) - Error("Can't write."); - -#endif - -#ifdef LONG_REPORT - Fprintf((stderr, "input size %ld bytes\n", in_len)); - Fprintf((stderr, "output size %ld bytes\n", out_len)); - Fprintf((stderr, "input/output %.3f\n", (double)in_len / out_len)); -#else - Fprintf((stderr, "input/output = %ld/%ld = %.3f\n", in_len, out_len, - (double)in_len / out_len)); -#endif - -} - -#endif - -#ifdef DECODE - -#define GETBIT_8(bb, src, ilen) \ - (((bb = bb & 0x7f ? bb*2 : ((unsigned)src[ilen++]*2+1)) >> 8) & 1) - -#define GETBIT_LE16(bb, src, ilen) \ - (bb*=2,bb&0xffff ? (bb>>16)&1 : (ilen+=2,((bb=(src[ilen-2]+src[ilen-1]*256u)*2+1)>>16)&1)) - -#define GETBIT_LE32(bb, src, ilen) \ - (bc > 0 ? ((bb>>--bc)&1) : (bc=31,\ - bb=*(const uint32_t *)((src)+ilen),ilen+=4,(bb>>31)&1)) - -#if ENDIAN == 0 && BITSIZE == 8 -#define GETBIT(bb, src, ilen) GETBIT_8(bb, src, ilen) -#endif -#if ENDIAN == 0 && BITSIZE == 16 -#define GETBIT(bb, src, ilen) GETBIT_LE16(bb, src, ilen) -#endif -#if ENDIAN == 0 && BITSIZE == 32 -#define GETBIT(bb, src, ilen) GETBIT_LE32(bb, src, ilen) -#endif - -#ifndef GETBIT -#error "Bad Combination of ENDIAN and BITSIZE values specified" -#endif - -#undef SAFE - -#ifdef SAFE -#define FAIL(x,r) if (x) { Error(r); } -#else -#define FAIL(x,r) -#endif - -void Decode(void) /* recover */ -{ - uint32_t tw; - uint8_t *src, *dst; - unsigned long max_src_len, src_len, dst_len; - unsigned long ilen = 0, olen = 0, last_m_off = 1; - uint32_t bb = 0; - unsigned bc = 0; -#if UCLPACK_COMPAT - if (fseek(infile, sizeof(magic) + sizeof(tw) + 1 + 1 + sizeof(tw), - SEEK_SET) != 0) - - Error("Seek Error"); - if (fread(&tw, sizeof(tw), 1, infile) < 1) - Error("Can't read"); /* read size of text */ - dst_len = ntohl(tw); - if (fread(&tw, sizeof(tw), 1, infile) < 1) - Error("Can't read"); /* read size of file */ - max_src_len = ntohl(tw); -#else - if (fread(&tw, sizeof(tw), 1, infile) < 1) - Error("Can't read"); /* read size of text */ - dst_len = i86ul_to_host(tw); - max_src_len = dst_len + (dst_len/8) + 256; -#endif - if (dst_len == 0) - return; - dst = malloc(dst_len); - if (!dst) - Error("Can't malloc"); - src = malloc(max_src_len); - if (!src) - Error("Can't malloc"); - src_len = fread(src, 1, max_src_len, infile); - if (src_len <= 0) - Error("Can't read"); - - for(;;) { - unsigned int m_off, m_len; - while(GETBIT(bb, src, ilen)) { - FAIL(ilen >= src_len, "input overrun"); - FAIL(olen >= dst_len, "output overrun"); - dst[olen++] = src[ilen++]; - } - m_off = 1; - do { - m_off = m_off*2 + GETBIT(bb, src, ilen); - FAIL(ilen >= src_len, "input overrun"); - FAIL(m_off > 0xffffffU +3, "lookbehind overrun"); - } while (!GETBIT(bb, src, ilen)); - if (m_off == 2) - { - m_off = last_m_off; - } - else - { - FAIL(ilen >= src_len, "input overrun"); - m_off = (m_off - 3)*256 + src[ilen++]; - if(m_off == 0xffffffffU) - break; - last_m_off = ++m_off; - } - m_len = GETBIT(bb, src, ilen); - m_len = m_len*2 + GETBIT(bb, src, ilen); - if (m_len == 0) - { - m_len++; - do { - m_len = m_len*2 + GETBIT(bb, src, ilen); - FAIL(ilen >= src_len, "input overrun"); - FAIL(m_len >= dst_len, "output overrun"); - } while(!GETBIT(bb, src, ilen)); - m_len += 2; - } - m_len += (m_off > 0xd00); - FAIL(olen + m_len > dst_len, "output overrun"); - FAIL(m_off > olen, "lookbeind overrun"); - { - const uint8_t *m_pos; - m_pos = dst + olen - m_off; - dst[olen++] = *m_pos++; - do { - dst[olen++] = *m_pos++; - } while(--m_len > 0); - } - } - FAIL(ilen < src_len, "input not consumed"); - FAIL(ilen > src_len, "input overrun"); - assert(ilen == src_len); - Fprintf((stderr, "%12ld\n", olen)); - if (dst_len != olen) { - fprintf(stderr, "length != expected length\n"); - } - if (fwrite(dst, olen, 1, outfile) != 1) - Error("Write error\n"); - free(src); - free(dst); -} -#endif - -#ifdef MAIN -int main(int argc, char *argv[]) -{ - char *s; - FILE *f; - int c; - - if (argc == 2) { - outfile = stdout; - if ((f = tmpfile()) == NULL) { - perror("tmpfile"); - return EXIT_FAILURE; - } - while ((c = getchar()) != EOF) - fputc(c, f); - rewind(infile = f); - } - else if (argc != 4) { - Fprintf((stderr, "'nrv2b e file1 file2' encodes file1 into file2.\n" - "'nrv2b d file2 file1' decodes file2 into file1.\n")); - - return EXIT_FAILURE; - } - if (argc == 4) { - if ((s = argv[1], s[1] || strpbrk(s, "DEde") == NULL) - || (s = argv[2], (infile = fopen(s, "rb")) == NULL) - || (s = argv[3], (outfile = fopen(s, "wb")) == NULL)) { - Fprintf((stderr, "??? %s\n", s)); - return EXIT_FAILURE; - } - } - if (toupper(*argv[1]) == 'E') - Encode(); - else - Decode(); - fclose(infile); - fclose(outfile); - return EXIT_SUCCESS; -} -#endif

1 0

Patch set updated for coreboot: 22d025c Add a (b)zImage parser to cbfstool
by Patrick Georgi 30 Aug '13

30 Aug '13

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3302 -gerrit commit 22d025caca2322bc9d05a9c3d70e701fe2563f1a Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 27 20:22:21 2013 +0200 Add a (b)zImage parser to cbfstool In the great tradition of LinuxBIOS this allows adding a kernel as payload. add-payload is extended to also allow adding an initial ramdisk (-I filename) and a command line (-C console=ttyS0). Change-Id: Iaca499a98b0adf0134e78d6bf020b6531a626aaa Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/cbfstool/Makefile | 2 + util/cbfstool/Makefile.inc | 3 + util/cbfstool/cbfs-mkpayload.c | 1 + util/cbfstool/cbfs-payload-linux.c | 238 +++++++++++++++++++++++++++++++++++++ util/cbfstool/cbfstool.c | 19 ++- util/cbfstool/common.h | 3 + util/cbfstool/linux.h | 191 +++++++++++++++++++++++++++++ util/cbfstool/linux_trampoline.c | 141 ++++++++++++++++++++++ 8 files changed, 597 insertions(+), 1 deletion(-) diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index a0de08d..3aa5edc 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -12,6 +12,8 @@ COMMON+=cbfs-mkstage.o cbfs-mkpayload.o COMMON+=lzma/lzma.o COMMON+=lzma/C/LzFind.o lzma/C/LzmaDec.o lzma/C/LzmaEnc.o +COMMON+=linux_trampoline.o cbfs-payload-linux.o + COMMON:=$(addprefix $(obj)/,$(COMMON)) all: dep $(BINARY) diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc index 970620d..fc120f3 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.inc @@ -11,6 +11,9 @@ cbfsobj += lzma.o cbfsobj += LzFind.o cbfsobj += LzmaDec.o cbfsobj += LzmaEnc.o +# linux as payload +cbfsobj += linux_trampoline.o +cbfsobj += cbfs-payload-linux.o CBFSTOOLFLAGS=-D_7ZIP_ST -g diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c index 9f3dabf..78988a0 100644 --- a/util/cbfstool/cbfs-mkpayload.c +++ b/util/cbfstool/cbfs-mkpayload.c @@ -377,3 +377,4 @@ int parse_fv_to_payload(const struct buffer *input, return 0; } + diff --git a/util/cbfstool/cbfs-payload-linux.c b/util/cbfstool/cbfs-payload-linux.c new file mode 100644 index 0000000..149265c --- /dev/null +++ b/util/cbfstool/cbfs-payload-linux.c @@ -0,0 +1,238 @@ +/* + * cbfs-payload-linux + * + * Copyright (C) 2013 Patrick Georgi <patrick(a)georgi-clan.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "common.h" +#include "cbfs.h" +#include "linux.h" + +/* TODO: + * handle special arguments + * mem= argument - only affects loading decisions (kernel + initrd), not e820 -> build time + * vga= argument (FILO ignores this) + * add support for more parameters to trampoline: + * alt_mem_k, ext_mem_k (not strictly necessary since e820 takes precedence) + * framebuffer/console values + * + * larger work: + * is compress() safe to use in a size constrained buffer? ie. do(es) the + * compression algorithm(s) stop once the compression result reaches input + * size (ie. incompressible data)? + */ +int parse_bzImage_to_payload(const struct buffer *input, + struct buffer *output, const char *initrd_name, + char *cmdline, comp_algo algo) +{ + int cur_len = 0; + int num_segments = 3; /* parameter block, real kernel, and trampoline */ + + comp_func_ptr compress = compression_function(algo); + if (!compress) + return -1; + + unsigned int initrd_base = 64*1024*1024; + unsigned int initrd_size = 0; + void *initrd_data = NULL; + if (initrd_name != NULL) { + /* TODO: load initrd, set initrd_size */ + num_segments++; + FILE *initrd_file = fopen(initrd_name, "rb"); + if (!initrd_file) { + ERROR("could not open initrd.\n"); + return -1; + } + fseek(initrd_file, 0, SEEK_END); + initrd_size = ftell(initrd_file); + fseek(initrd_file, 0, SEEK_SET); + initrd_data = malloc(initrd_size); + if (!initrd_data) { + ERROR("could not allocate memory for initrd.\n"); + return -1; + } + if (fread(initrd_data, initrd_size, 1, initrd_file) != 1) { + ERROR("could not load initrd.\n"); + return -1; + } + fclose(initrd_file); + } + + unsigned int cmdline_size = 0; + if (cmdline != NULL) { + num_segments++; + cmdline_size = strlen(cmdline) + 1; + } + + struct linux_header *hdr = (struct linux_header *)input->data; + unsigned int setup_size = 4 * 512; + if (hdr->setup_sects != 0) { + setup_size = (hdr->setup_sects + 1) * 512; + } + + /* Setup parameter block. Imitate FILO. */ + struct linux_params params; + params.mount_root_rdonly = hdr->root_flags; + params.orig_root_dev = hdr->root_dev; + /* Sensible video defaults. Might be overridden on runtime by coreboot tables. */ + params.orig_video_mode = 3; + params.orig_video_cols = 80; + params.orig_video_lines = 25; + params.orig_video_isVGA = 1; + params.orig_video_points = 16; + + params.loader_type = 0xff; /* Unregistered Linux loader */ + + if (cmdline != NULL) { + if (hdr->protocol_version < 0x202) { + params.cl_magic = CL_MAGIC_VALUE; + params.cl_offset = COMMAND_LINE_LOC - LINUX_PARAM_LOC; + } else { + params.cmd_line_ptr = COMMAND_LINE_LOC; + } + } + + unsigned long kernel_base = 0x100000; + if ((hdr->protocol_version >= 0x200) && (!hdr->loadflags & 1)) { + kernel_base = 0x1000; /* zImage kernel */ + } + /* kernel prefers an address, so listen */ + if ((hdr->protocol_version >= 0x20a) && (!(hdr->pref_address >> 32))) { + kernel_base = hdr->pref_address; + } + if (hdr->protocol_version >= 0x205) { + params.relocatable_kernel = hdr->relocatable_kernel; + params.kernel_alignment = hdr->kernel_alignment; + if (hdr->relocatable_kernel != 0) { + /* 16 MB should be way outside coreboot's playground, + * so if possible (relocatable kernel) use that to + * avoid a trampoline copy. */ + kernel_base = ALIGN(16*1024*1024, params.kernel_alignment); + } + } + + /* We have a trampoline and use that, but it can simply use + * this information for its jump to real Linux. */ + params.kernel_start = kernel_base; + + void *kernel_data = input->data + setup_size; + unsigned int kernel_size = input->size - setup_size; + + if (initrd_data != NULL) { + /* TODO: this is a bit of a hack. Linux recommends to store + * initrd near to end-of-mem, but that's hard to do on build + * time. It definitely fails to read the image if it's too + * close to the kernel, so give it some room. + */ + initrd_base = ALIGN(kernel_base + kernel_size, 16*1024*1024); + + params.initrd_start = initrd_base; + params.initrd_size = initrd_size; + } + + struct cbfs_payload_segment *segs; + unsigned long doffset = (num_segments + 1) * sizeof(*segs); + + /* Allocate a block of memory to store the data in */ + int isize = sizeof(params) + kernel_size + cmdline_size + initrd_size; + if (buffer_create(output, doffset + isize, input->name) != 0) + return -1; + memset(output->data, 0, output->size); + + segs = (struct cbfs_payload_segment *)output->data; + + /* parameter block */ + segs[0].type = PAYLOAD_SEGMENT_DATA; + segs[0].load_addr = htonll(LINUX_PARAM_LOC); + segs[0].mem_len = htonl(sizeof(params)); + segs[0].offset = htonl(doffset); + + compress((void*)&params, sizeof(params), output->data + doffset, &cur_len); + segs[0].compression = htonl(algo); + segs[0].len = htonl(cur_len); + + doffset += cur_len; + + /* code block */ + segs[1].type = PAYLOAD_SEGMENT_CODE; + segs[1].load_addr = htonll(kernel_base); + segs[1].mem_len = htonl(kernel_size); + segs[1].offset = htonl(doffset); + + compress(kernel_data, kernel_size, output->data + doffset, &cur_len); + segs[1].compression = htonl(algo); + segs[1].len = htonl(cur_len); + + doffset += cur_len; + + /* trampoline */ + extern void *trampoline_start; + extern long trampoline_size; + + unsigned int entrypoint = 0x40000; /* TODO: any better place? */ + + segs[2].type = PAYLOAD_SEGMENT_CODE; + segs[2].load_addr = htonll(entrypoint); + segs[2].mem_len = htonl(trampoline_size); + segs[2].offset = htonl(doffset); + + compress(trampoline_start, trampoline_size, output->data + doffset, &cur_len); + segs[2].compression = htonl(algo); + segs[2].len = htonl(cur_len); + + doffset += cur_len; + + if (cmdline_size > 0) { + /* command line block */ + segs[3].type = PAYLOAD_SEGMENT_DATA; + segs[3].load_addr = htonll(COMMAND_LINE_LOC); + segs[3].mem_len = htonl(cmdline_size); + segs[3].offset = htonl(doffset); + + compress(cmdline, cmdline_size, output->data + doffset, &cur_len); + segs[3].compression = htonl(algo); + segs[3].len = htonl(cur_len); + + doffset += cur_len; + } + + if (initrd_size > 0) { + /* setup block */ + segs[num_segments-1].type = PAYLOAD_SEGMENT_DATA; + segs[num_segments-1].load_addr = htonll(initrd_base); + segs[num_segments-1].mem_len = htonl(initrd_size); + segs[num_segments-1].offset = htonl(doffset); + + compress(initrd_data, initrd_size, output->data + doffset, &cur_len); + segs[num_segments-1].compression = htonl(algo); + segs[num_segments-1].len = htonl(cur_len); + + doffset += cur_len; + } + + /* prepare entry point segment */ + segs[num_segments].type = PAYLOAD_SEGMENT_ENTRY; + segs[num_segments].load_addr = htonll(entrypoint); + output->size = doffset; + + return 0; +} + + diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index fc49ed2..34002a9 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -57,6 +57,9 @@ static struct param { uint32_t top_aligned; int fit_empty_entries; comp_algo algo; + /* for linux payloads */ + char *initrd; + char *cmdline; } param = { /* All variables not listed are initialized as zero. */ .algo = CBFS_COMPRESS_NONE, @@ -194,6 +197,11 @@ static int cbfstool_convert_mkpayload(struct buffer *buffer, uint32_t *offset) { if (ret != 0) ret = parse_fv_to_payload(buffer, &output, param.algo); + /* If it's neither ELF nor UEFI Fv, try bzImage */ + if (ret != 0) + ret = parse_bzImage_to_payload(buffer, &output, + param.initrd, param.cmdline, param.algo); + /* Not a supported payload type */ if (ret != 0) { ERROR("Not a supported payload type (ELF / FV).\n"); @@ -502,7 +510,7 @@ static int cbfs_update_fit(void) static const struct command commands[] = { {"add", "f:n:t:b:vh?", cbfs_add}, - {"add-payload", "f:n:t:c:b:vh?", cbfs_add_payload}, + {"add-payload", "f:n:t:c:b:vh?C:I:", cbfs_add_payload}, {"add-stage", "f:n:t:c:b:vh?", cbfs_add_stage}, {"add-flat-binary", "f:n:l:e:c:b:vh?", cbfs_add_flat_binary}, {"add-int", "i:n:b:vh?", cbfs_add_integer}, @@ -531,6 +539,8 @@ static struct option long_options[] = { {"int", required_argument, 0, 'i' }, {"machine", required_argument, 0, 'm' }, {"empty-fits", required_argument, 0, 'x' }, + {"initrd", required_argument, 0, 'I' }, + {"cmdline", required_argument, 0, 'C' }, {"verbose", no_argument, 0, 'v' }, {"help", no_argument, 0, 'h' }, {NULL, 0, 0, 0 } @@ -550,6 +560,7 @@ static void usage(char *name) "Add a component\n" " add-payload -f FILE -n NAME [-c compression] [-b base] " "Add a payload to the ROM\n" + " (linux specific: [-C cmdline] [-I initrd])\n" " add-stage -f FILE -n NAME [-c compression] [-b base] " "Add a stage to the ROM\n" " add-flat-binary -f FILE -n NAME -l load-address \\\n" @@ -691,6 +702,12 @@ int main(int argc, char **argv) case 'm': arch = string_to_arch(optarg); break; + case 'I': + param.initrd = optarg; + break; + case 'C': + param.cmdline = optarg; + break; case 'h': case '?': usage(argv[0]); diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index e197143..6e12fcb 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -102,6 +102,9 @@ int parse_elf_to_payload(const struct buffer *input, struct buffer *output, comp_algo algo); int parse_fv_to_payload(const struct buffer *input, struct buffer *output, comp_algo algo); +int parse_bzImage_to_payload(const struct buffer *input, + struct buffer *output, const char *initrd, + char *cmdline, comp_algo algo); int parse_flat_binary_to_payload(const struct buffer *input, struct buffer *output, uint32_t loadaddress, diff --git a/util/cbfstool/linux.h b/util/cbfstool/linux.h new file mode 100644 index 0000000..20837e3 --- /dev/null +++ b/util/cbfstool/linux.h @@ -0,0 +1,191 @@ +/* + * This file is part of coreboot.. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* + * Linux/i386 loader + * Supports bzImage, zImage and Image format. + * + * Based on work by Steve Gehlbach. + * Portions are taken from mkelfImage. + * + * 2003-09 by SONE Takeshi + */ + +#include <stdint.h> + +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint32_t u32; +typedef uint64_t u64; + +#define LINUX_PARAM_LOC 0x90000 +#define COMMAND_LINE_LOC 0x91000 +#define GDT_LOC 0x92000 +#define STACK_LOC 0x93000 + +#define E820MAX 32 /* number of entries in E820MAP */ +struct e820entry { + unsigned long long addr; /* start of memory segment */ + unsigned long long size; /* size of memory segment */ + unsigned long type; /* type of memory segment */ +#define E820_RAM 1 +#define E820_RESERVED 2 +#define E820_ACPI 3 /* usable as RAM once ACPI tables have been read */ +#define E820_NVS 4 +}; + +/* The header of Linux/i386 kernel */ +struct linux_header { + u8 reserved1[0x1f1]; /* 0x000 */ + u8 setup_sects; /* 0x1f1 */ + u16 root_flags; /* 0x1f2 */ + u32 syssize; /* 0x1f4 (2.04+) */ + u8 reserved2[2]; /* 0x1f8 */ + u16 vid_mode; /* 0x1fa */ + u16 root_dev; /* 0x1fc */ + u16 boot_sector_magic; /* 0x1fe */ + /* 2.00+ */ + u8 reserved3[2]; /* 0x200 */ + u8 header_magic[4]; /* 0x202 */ + u16 protocol_version; /* 0x206 */ + u32 realmode_swtch; /* 0x208 */ + u16 start_sys; /* 0x20c */ + u16 kver_addr; /* 0x20e */ + u8 type_of_loader; /* 0x210 */ + u8 loadflags; /* 0x211 */ + u16 setup_move_size; /* 0x212 */ + u32 code32_start; /* 0x214 */ + u32 ramdisk_image; /* 0x218 */ + u32 ramdisk_size; /* 0x21c */ + u8 reserved4[4]; /* 0x220 */ + /* 2.01+ */ + u16 heap_end_ptr; /* 0x224 */ + u8 reserved5[2]; /* 0x226 */ + /* 2.02+ */ + u32 cmd_line_ptr; /* 0x228 */ + /* 2.03+ */ + u32 initrd_addr_max; /* 0x22c */ + /* 2.05+ */ + u32 kernel_alignment; /* 0x230 */ + u8 relocatable_kernel; /* 0x234 */ + u8 min_alignment; /* 0x235 (2.10+) */ + u8 reserved6[2]; /* 0x236 */ + /* 2.06+ */ + u32 cmdline_size; /* 0x238 */ + /* 2.07+ */ + u32 hardware_subarch; /* 0x23c */ + u64 hardware_subarch_data;/* 0x240 */ + /* 2.08+ */ + u32 payload_offset; /* 0x248 */ + u32 payload_length; /* 0x24c */ + /* 2.09+ */ + u64 setup_data; /* 0x250 */ + /* 2.10+ */ + u64 pref_address; /* 0x258 */ + u32 init_size; /* 0x260 */ +} __attribute__ ((packed)); + +/* Paramters passed to 32-bit part of Linux + * This is another view of the structure above.. */ +struct linux_params { + u8 orig_x; /* 0x00 */ + u8 orig_y; /* 0x01 */ + u16 ext_mem_k; /* 0x02 -- EXT_MEM_K sits here */ + u16 orig_video_page; /* 0x04 */ + u8 orig_video_mode; /* 0x06 */ + u8 orig_video_cols; /* 0x07 */ + u16 unused2; /* 0x08 */ + u16 orig_video_ega_bx; /* 0x0a */ + u16 unused3; /* 0x0c */ + u8 orig_video_lines; /* 0x0e */ + u8 orig_video_isVGA; /* 0x0f */ + u16 orig_video_points; /* 0x10 */ + + /* VESA graphic mode -- linear frame buffer */ + u16 lfb_width; /* 0x12 */ + u16 lfb_height; /* 0x14 */ + u16 lfb_depth; /* 0x16 */ + u32 lfb_base; /* 0x18 */ + u32 lfb_size; /* 0x1c */ + u16 cl_magic; /* 0x20 */ +#define CL_MAGIC_VALUE 0xA33F + u16 cl_offset; /* 0x22 */ + u16 lfb_linelength; /* 0x24 */ + u8 red_size; /* 0x26 */ + u8 red_pos; /* 0x27 */ + u8 green_size; /* 0x28 */ + u8 green_pos; /* 0x29 */ + u8 blue_size; /* 0x2a */ + u8 blue_pos; /* 0x2b */ + u8 rsvd_size; /* 0x2c */ + u8 rsvd_pos; /* 0x2d */ + u16 vesapm_seg; /* 0x2e */ + u16 vesapm_off; /* 0x30 */ + u16 pages; /* 0x32 */ + u8 reserved4[12]; /* 0x34 -- 0x3f reserved for future expansion */ + + //struct apm_bios_info apm_bios_info; /* 0x40 */ + u8 apm_bios_info[0x40]; + //struct drive_info_struct drive_info; /* 0x80 */ + u8 drive_info[0x20]; + //struct sys_desc_table sys_desc_table; /* 0xa0 */ + u8 sys_desc_table[0x140]; + u32 alt_mem_k; /* 0x1e0 */ + u8 reserved5[4]; /* 0x1e4 */ + u8 e820_map_nr; /* 0x1e8 */ + u8 reserved6[9]; /* 0x1e9 */ + u16 mount_root_rdonly; /* 0x1f2 */ + u8 reserved7[4]; /* 0x1f4 */ + u16 ramdisk_flags; /* 0x1f8 */ +#define RAMDISK_IMAGE_START_MASK 0x07FF +#define RAMDISK_PROMPT_FLAG 0x8000 +#define RAMDISK_LOAD_FLAG 0x4000 + u8 reserved8[2]; /* 0x1fa */ + u16 orig_root_dev; /* 0x1fc */ + u8 reserved9[1]; /* 0x1fe */ + u8 aux_device_info; /* 0x1ff */ + u8 reserved10[2]; /* 0x200 */ + u8 param_block_signature[4]; /* 0x202 */ + u16 param_block_version; /* 0x206 */ + u8 reserved11[8]; /* 0x208 */ + u8 loader_type; /* 0x210 */ +#define LOADER_TYPE_LOADLIN 1 +#define LOADER_TYPE_BOOTSECT_LOADER 2 +#define LOADER_TYPE_SYSLINUX 3 +#define LOADER_TYPE_ETHERBOOT 4 +#define LOADER_TYPE_KERNEL 5 + u8 loader_flags; /* 0x211 */ + u8 reserved12[2]; /* 0x212 */ + u32 kernel_start; /* 0x214 */ + u32 initrd_start; /* 0x218 */ + u32 initrd_size; /* 0x21c */ + u8 reserved12_5[8]; /* 0x220 */ + u32 cmd_line_ptr; /* 0x228 */ + u32 initrd_addr_max; /* 0x22c */ + u32 kernel_alignment; /* 0x230 */ + u8 relocatable_kernel; /* 0x234 */ + u8 reserved13[155]; /* 0x22c */ + struct e820entry e820_map[E820MAX]; /* 0x2d0 */ + u8 reserved16[688]; /* 0x550 */ +#define COMMAND_LINE_SIZE 256 + /* Command line is copied here by 32-bit i386/kernel/head.S. + * So I will follow the boot protocol, rather than putting it + * directly here. --ts1 */ + u8 command_line[COMMAND_LINE_SIZE]; /* 0x800 */ + u8 reserved17[1792]; /* 0x900 - 0x1000 */ +}; + diff --git a/util/cbfstool/linux_trampoline.c b/util/cbfstool/linux_trampoline.c new file mode 100644 index 0000000..79d1576 --- /dev/null +++ b/util/cbfstool/linux_trampoline.c @@ -0,0 +1,141 @@ +/* + * linux_trampoline + * + * Copyright (C) 2013 Patrick Georgi <patrick(a)georgi-clan.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#if 0 +/* NOTE: THIS CODE MUST REMAIN POSITION INDEPENDENT + * IT SHOULDN'T USE THE STACK + * AND IN GENERAL EXPECT NOTHING BUT RAM TO WORK + */ +.code32 +.data +#define HEADER_SIG 0x4f49424c // LBIO little endian +#define CB_TAG_FORWARD 0x11 +#define CB_TAG_MEMORY 0x1 +#define CB_TAG_FRAMEBUFFER 0x12 + +#define LINUX_PARAM_LOC 0x90000 +#define E820_NR_OFFSET 0x1e8 +#define LINUX_ENTRY_OFFSET 0x214 +#define E820_OFFSET 0x2d0 + +.trampoline_start: + +cld +xor %edx, %edx +mov $0, %ecx + +.headerSearch: +mov $0x10000, %ebx +add %ecx, %ebx +mov (%ecx), %eax +cmp $HEADER_SIG, %eax +je .headerSearchDone // found the header +add $16, %ecx +cmp %ecx, %ebx +jne .headerSearch + +.headerSearchDone: +cmp %ecx, %ebx // reached the end == not found anything? +je 2f // give up + +// we assume the checksum is okay, no test +mov 4(%ecx), %ebx +add %ecx, %ebx // ebx = cb_header + header_bytes +mov 20(%ecx), %ecx // ecx = table_entries + +.tableScan: +cmp $CB_TAG_FORWARD, (%ebx) +jne .testMemory + +/* forward tag: assume 32bit pointer */ +mov 8(%ebx), %ecx +jmp .headerSearch + +.testMemory: +cmp $CB_TAG_MEMORY, (%ebx) +jne .testFramebuffer + +/* memory tag: copy e820 map and entry count. also determine alt_mem_k */ +mov 4(%ebx), %eax +sub $8, %eax +shr $2, %eax /* eax = number of dwords of e820 data */ +cmp $(32 * 5), %eax /* linux wants at most 32 entries of 5 dwords */ +jng 1f +mov $(32 * 5), %eax /* only copy 32 entries */ +1: +mov %eax, %esi +mov $5, %edi +div %edi +mov %eax, (LINUX_PARAM_LOC + E820_NR_OFFSET) +mov %esi, %eax +xchg %eax, %ecx +lea 8(%ebx), %esi /* e820 data source */ +mov $(LINUX_PARAM_LOC + E820_OFFSET), %edi +rep movsl +xchg %eax, %ecx +jmp .endScan + +.testFramebuffer: +cmp $CB_TAG_FRAMEBUFFER, (%ebx) +jne .endScan +/* TODO: handle framebuffer tag */ + +.endScan: +add 4(%ebx), %ebx +dec %ecx +jnz .tableScan + +/* finally: jump to kernel */ +mov $LINUX_PARAM_LOC, %esi +jmp *(LINUX_PARAM_LOC + LINUX_ENTRY_OFFSET) + + +2: +hlt +jmp 2b + +.trampoline_end: + +.global trampoline_start, trampoline_size +trampoline_start: +.long .trampoline_start +trampoline_size: +.long .trampoline_end - .trampoline_start +#endif + +/* The code above is hand-crafted to fit various contraints. + * To simplify porting, the below matches the above. + * When changing any code in here, compile the above as a .S + * file, objcopy it to binary and paste the result below (minus + * the last 8 bytes which are trampoline_start and trampoline_size). + */ +const unsigned char trampoline[] = { +0xfc, 0x31, 0xd2, 0xb9, 0x00, 0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x01, 0x00, 0x01, 0xcb, 0x8b, +0x01, 0x3d, 0x4c, 0x42, 0x49, 0x4f, 0x74, 0x07, 0x83, 0xc1, 0x10, 0x39, 0xcb, 0x75, 0xe9, 0x39, +0xcb, 0x74, 0x60, 0x8b, 0x59, 0x04, 0x01, 0xcb, 0x8b, 0x49, 0x14, 0x83, 0x3b, 0x11, 0x75, 0x05, +0x8b, 0x4b, 0x08, 0xeb, 0xd3, 0x83, 0x3b, 0x01, 0x75, 0x33, 0x8b, 0x43, 0x04, 0x83, 0xe8, 0x08, +0xc1, 0xe8, 0x02, 0x3d, 0xa0, 0x00, 0x00, 0x00, 0x7e, 0x05, 0xb8, 0xa0, 0x00, 0x00, 0x00, 0x89, +0xc6, 0xbf, 0x05, 0x00, 0x00, 0x00, 0xf7, 0xf7, 0xa3, 0xe8, 0x01, 0x09, 0x00, 0x89, 0xf0, 0x91, +0x8d, 0x73, 0x08, 0xbf, 0xd0, 0x02, 0x09, 0x00, 0xf3, 0xa5, 0x91, 0xeb, 0x05, 0x83, 0x3b, 0x12, +0x75, 0x00, 0x03, 0x5b, 0x04, 0x49, 0x75, 0xb3, 0xbe, 0x00, 0x00, 0x09, 0x00, 0xff, 0x25, 0x14, +0x02, 0x09, 0x00, 0xf4, 0xeb, 0xfd +}; + +void * const trampoline_start = &trampoline; +const unsigned long trampoline_size = sizeof trampoline;

1 0

New patch to review for coreboot: d3ddc8b libpayload: Add a simple timeout API
by Patrick Georgi 30 Aug '13

30 Aug '13

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3891 -gerrit commit d3ddc8bd65837a203831171caf48b9e6e7750737 Author: Nico Huber <nico.huber(a)secunet.com> Date: Wed Jun 26 12:28:32 2013 +0200 libpayload: Add a simple timeout API Most timeouts in libpayload are currently implemented with loops that delay program execution by a specific time in each iteration. Like: int timeout = 100; while (check_what_we_are_waiting_for() && timeout) { explicit_mdelay(1); --timeout; } This pattern relies on the assumption that any per-iteration call to a (most likely lower-level) function doesn't delay the execution by itself. That's never true but works well as long as the explicit delays are long enough... Stop! We don't want them to be long! as this would cause higher latencies. The obvious solution is to wait until a point in time instead. So, add a simple API for that now and port misbehaving timeout loops when they start to bother. The example above would become: deadline_t timeout = new_timeout_ms(100); while (check_what_we_are_waiting_for() && !timeout_mdelay(timeout, 1)) ; Change-Id: I19dcab5be7d81b5cf26167512a7089b275196d7a Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/include/libpayload.h | 1 + payloads/libpayload/include/timeout.h | 149 +++++++++++++++++++++++++++++++ payloads/libpayload/libc/time.c | 17 ++++ 3 files changed, 167 insertions(+) diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index f23fb87..12f5957 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -63,6 +63,7 @@ #define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b)) #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) #define LITTLE_ENDIAN 1234 #define BIG_ENDIAN 4321 diff --git a/payloads/libpayload/include/timeout.h b/payloads/libpayload/include/timeout.h new file mode 100644 index 0000000..278f5e4 --- /dev/null +++ b/payloads/libpayload/include/timeout.h @@ -0,0 +1,149 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2013 secunet Security Networks AG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _LIBPAYLOAD_TIMEOUT_H +#define _LIBPAYLOAD_TIMEOUT_H + +#include <libpayload.h> +#include <stdint.h> + +#define NSECS_PER_SEC 1000000000L +#define USECS_PER_SEC 1000000L +#define MSECS_PER_SEC 1000 + +typedef const uint64_t deadline_t; + +/* For a TSC, 0 won't be reached within years. How about non-x86 platforms? */ +#define NEVER_TIMEOUT ((deadline_t)0) + +/** + * Starts a new timeout from now + * + * @param ns nanoseconds to timeout after + */ +static inline deadline_t new_timeout_ns(const unsigned long ns) +{ + return timer_raw_value() + + DIV_ROUND_UP((uint64_t)ns * timer_hz(), NSECS_PER_SEC); +} + +/** + * Starts a new timeout from now + * + * @param us microseconds to timeout after + */ +static inline deadline_t new_timeout_us(const unsigned long us) +{ + return timer_raw_value() + + DIV_ROUND_UP((uint64_t)us * timer_hz(), USECS_PER_SEC); +} + +/** + * Starts a new timeout from now + * + * @param ms milliseconds to timeout after + */ +static inline deadline_t new_timeout_ms(const unsigned long ms) +{ + return timer_raw_value() + + DIV_ROUND_UP((uint64_t)ms * timer_hz(), MSECS_PER_SEC); +} + +/** + * Starts a new timeout from now + * + * @param s seconds to timeout after + */ +static inline deadline_t new_timeout_s(const unsigned long s) +{ + return timer_raw_value() + ((uint64_t)s * timer_hz()); +} + +/** + * Checks if a deadline has expired + * + * @param dl the deadline to check + * @return 1 if dl has expired, 0 if not + */ +static inline int timed_out(deadline_t dl) +{ + return timer_raw_value() >= dl; +} + +int delay_until(deadline_t delay_end, deadline_t); + +/** + * Delay for a specified time but break at a deadline + * + * @param dl deadline to satisfy + * @param ns number of nanoseconds to delay for + * @return -1 if dl has already expired, 0 if not + */ +static inline int timeout_ndelay(deadline_t dl, unsigned long ns) +{ + return delay_until(new_timeout_ns(ns), dl); +} + +/** + * Delay for a specified time but break at a deadline + * + * @param dl deadline to satisfy + * @param us number of microseconds to delay for + * @return -1 if dl has already expired, 0 if not + */ +static inline int timeout_udelay(deadline_t dl, unsigned long us) +{ + return delay_until(new_timeout_us(us), dl); +} + +/** + * Delay for a specified time but break at a deadline + * + * @param dl deadline to satisfy + * @param ms number of milliseconds to delay for + * @return -1 if dl has already expired, 0 if not + */ +static inline int timeout_mdelay(deadline_t dl, const unsigned long ms) +{ + return delay_until(new_timeout_ms(ms), dl); +} + +/** + * Delay for a specified time but break at a deadline + * + * @param dl deadline to satisfy + * @param s number of seconds to delay for + * @return -1 if dl has already expired, 0 if not + */ +static inline int timeout_delay(deadline_t dl, const unsigned long s) +{ + return delay_until(new_timeout_s(s), dl); +} + +#endif diff --git a/payloads/libpayload/libc/time.c b/payloads/libpayload/libc/time.c index 7b6bf47..421ef24 100644 --- a/payloads/libpayload/libc/time.c +++ b/payloads/libpayload/libc/time.c @@ -37,6 +37,7 @@ #ifdef CONFIG_ARCH_X86 #include <arch/rdtsc.h> #endif +#include <timeout.h> extern u32 cpu_khz; @@ -189,3 +190,19 @@ void delay(unsigned int s) { _delay((uint64_t)s * timer_hz()); } + +/** + * Delay until a specified point in time but break at a deadline + * + * @param delay_end point in time to delay until + * @param dl deadline to satisfy + * @return -1 if dl has already expired, 0 if not + */ +int delay_until(deadline_t delay_end, deadline_t dl) +{ + if (timed_out(dl)) + return -1; + deadline_t de = MIN(delay_end, dl); + while (timer_raw_value() < de) ; + return 0; +}

1 0

New patch to review for filo: 9c9cbb5 Add .gitignore
by Stefan Tauner 30 Aug '13

30 Aug '13

Stefan Tauner (stefan.tauner(a)gmx.at) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3890 -gerrit commit 9c9cbb57d4bc866c9baac040e237d5ef21c41071 Author: Stefan Tauner <stefan.tauner(a)gmx.at> Date: Fri Aug 30 15:32:52 2013 +0200 Add .gitignore Change-Id: I8fadb09aed552d23a232bbcbc719fd25070aa501 Signed-off-by: Stefan Tauner <stefan.tauner(a)gmx.at> --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f89904f --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.config +.config.old +.xcompile +build/

1 0

New patch to review for coreboot: 0c071cb libpayload: Set heap's header size to 64-bit
by Patrick Georgi 30 Aug '13

30 Aug '13

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3889 -gerrit commit 0c071cb7d0b10d4510f9ec3200e1e4e9d9bdc376 Author: Nico Huber <nico.huber(a)secunet.com> Date: Fri Jun 14 15:34:59 2013 +0200 libpayload: Set heap's header size to 64-bit Change-Id: Ic82d6477c53da62a1325400f2e596d7d557d5d1e Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- payloads/libpayload/libc/malloc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/payloads/libpayload/libc/malloc.c b/payloads/libpayload/libc/malloc.c index c03cc73..851ef57 100644 --- a/payloads/libpayload/libc/malloc.c +++ b/payloads/libpayload/libc/malloc.c @@ -37,9 +37,6 @@ * We're also susceptible to the usual buffer overrun poisoning, though the * risk is within acceptable ranges for this implementation (don't overrun * your buffers, kids!). - * - * The header format (hdrtype_t) supports heaps of up to 32MiB (given that int - * is 32 bits long). */ #define IN_MALLOC_C @@ -50,7 +47,7 @@ extern char _heap, _eheap; /* Defined in the ldscript. */ static void *hstart = (void *)&_heap; static void *hend = (void *)&_eheap; -typedef unsigned int hdrtype_t; +typedef u64 hdrtype_t; #define HDRSIZE (sizeof(hdrtype_t)) #define SIZE_BITS ((HDRSIZE << 3) - 7)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit August 2013