coreboot-gerrit December 2015

coreboot-gerrit@coreboot.org

1 participants
752 discussions

Patch merged into coreboot/master: kconfig_lint: Separate errors from warnings
by gerrit＠coreboot.org 02 Dec '15

02 Dec '15

the following patch was just integrated into master: commit d808017760a9f9ecd1e6820dd5a92d14f14c6146 Author: Martin Roth <martinroth(a)google.com> Date: Thu Nov 26 19:12:44 2015 -0700 kconfig_lint: Separate errors from warnings - Create subroutines for printing warnings and errors - Change all the existing warning and error routines to use subroutines - Add new command line options to suppress errors and to print notes Change-Id: I04893faffca21c5bb7b51be920cca4620dc283c3 Signed-off-by: Martin Roth <martinroth(a)google.com> Reviewed-on: https://review.coreboot.org/12555 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> See https://review.coreboot.org/12555 for details. -gerrit

1 0

Patch merged into coreboot/master: coreinfo: use coreboot crosscompiler
by gerrit＠coreboot.org 02 Dec '15

02 Dec '15

the following patch was just integrated into master: commit cacbcf481513b69fe379058803800731b85d2660 Author: Martin Roth <martinroth(a)google.com> Date: Mon Nov 16 22:33:48 2015 -0700 coreinfo: use coreboot crosscompiler Set up coreinfo makefile to use .xcompile and the coreboot 32-bit cross compiler toolchain. Restrict to x86_32 gcc compiler. Tested in QEMU Change-Id: I1cc180a5eeaf6cb9a36fdcef70a9819d0f459168 Signed-off-by: Martin Roth <martinroth(a)google.com> Reviewed-on: https://review.coreboot.org/12454 Tested-by: build bot (Jenkins) Tested-by: BSI firmware lab <coreboot-labor(a)bsi.bund.de> Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> See https://review.coreboot.org/12454 for details. -gerrit

1 0

Patch merged into coreboot/master: build system: replace files on UPDATE_IMAGE
by gerrit＠coreboot.org 02 Dec '15

02 Dec '15

the following patch was just integrated into master: commit 89b4abdf80ae64374f378058bc3f2f5484a7f977 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue Dec 1 18:34:42 2015 +0100 build system: replace files on UPDATE_IMAGE So far the build system only added files starting with CBFS_PREFIX/ in the UPDATE_IMAGE configuration, but there are a number of files that exist in the global namespace (eg. config, revision, but also cmos_layout.bin). Now, existing files are removed if necessary. Change-Id: I977ff85fe18115c84268103be72e91ca854e62a4 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Reviewed-on: https://review.coreboot.org/12581 Reviewed-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Tested-by: Raptor Engineering Automated Test Stand <noreply(a)raptorengineeringinc.com> Tested-by: BSI firmware lab <coreboot-labor(a)bsi.bund.de> See https://review.coreboot.org/12581 for details. -gerrit

1 0

New patch to review for coreboot: mainboard/intel/d510mo: Licence fixes and azalia verb table
by Damien Zammit 02 Dec '15

02 Dec '15

Damien Zammit (damien(a)zamaudio.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12621 -gerrit commit 0e9b16390e1f8d0c6d38b779e0fdd3909aad9887 Author: Damien Zammit <damien(a)zamaudio.com> Date: Wed Dec 2 14:03:02 2015 +1100 mainboard/intel/d510mo: Licence fixes and azalia verb table Azalia verb table replicated from vendor bios. Licence headers added where appropriate. Change-Id: I29e4fe433dee6c5f30fe36055fc9a8bf2062fef5 Signed-off-by: Damien Zammit <damien(a)zamaudio.com> --- src/mainboard/intel/d510mo/cstates.c | 15 +++++++++++++++ src/mainboard/intel/d510mo/hda_verb.c | 36 +++++++++++++++++++++++++++++++++-- src/mainboard/intel/d510mo/romstage.c | 4 ++-- 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/src/mainboard/intel/d510mo/cstates.c b/src/mainboard/intel/d510mo/cstates.c index 2d543ff..b7eb6df 100644 --- a/src/mainboard/intel/d510mo/cstates.c +++ b/src/mainboard/intel/d510mo/cstates.c @@ -1,3 +1,18 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2015 Damien Zammit <damien(a)zamaudio.com> + * + * 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. + */ + #include <device/device.h> #include <arch/x86/include/arch/acpigen.h> diff --git a/src/mainboard/intel/d510mo/hda_verb.c b/src/mainboard/intel/d510mo/hda_verb.c index 072a306..a0dba38 100644 --- a/src/mainboard/intel/d510mo/hda_verb.c +++ b/src/mainboard/intel/d510mo/hda_verb.c @@ -1,7 +1,39 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2015 Damien Zammit <damien(a)zamaudio.com> + * + * 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. + */ + #include <device/azalia_device.h> -const u32 cim_verb_data[0] = {}; +const u32 cim_verb_data[] = { + /* coreboot specific header */ + 0x10ec0662, + 0x8086d618, // Subsystem ID + 0x0000000a, // Number of entries -const u32 pc_beep_verbs[0] = {}; + /* Pin Widget Verb Table */ + AZALIA_PIN_CFG(0, 0x14, 0x01014410), + AZALIA_PIN_CFG(0, 0x15, 0x411111f0), + AZALIA_PIN_CFG(0, 0x16, 0x411111f0), + AZALIA_PIN_CFG(0, 0x18, 0x01a19840), + AZALIA_PIN_CFG(0, 0x19, 0x02a19841), + AZALIA_PIN_CFG(0, 0x1a, 0x0181304f), + AZALIA_PIN_CFG(0, 0x1b, 0x02214420), + AZALIA_PIN_CFG(0, 0x1c, 0x411111f0), + AZALIA_PIN_CFG(0, 0x1d, 0x4015c603), + AZALIA_PIN_CFG(0, 0x1e, 0x99430130), +}; +const u32 pc_beep_verbs[] = { +}; AZALIA_ARRAY_SIZES; diff --git a/src/mainboard/intel/d510mo/romstage.c b/src/mainboard/intel/d510mo/romstage.c index b0bd0c0..f6e957e 100644 --- a/src/mainboard/intel/d510mo/romstage.c +++ b/src/mainboard/intel/d510mo/romstage.c @@ -125,9 +125,9 @@ void main(unsigned long bist) post_code(0x30); - printk(BIOS_DEBUG, "Start native raminit\n"); + printk(BIOS_DEBUG, "Initializing memory\n"); sdram_initialize(0, spd_addrmap); - printk(BIOS_DEBUG, "Native raminit done\n"); + printk(BIOS_DEBUG, "Memory initialized\n"); post_code(0x31); ram_check(0x200000,0x300000);

1 0

New patch to review for coreboot: cbfstool: Fix checkpatch error
by Stefan Reinauer 02 Dec '15

02 Dec '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12620 -gerrit commit 8d5398536ffd4049d6ca2756f80f5241f492ca7c Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Tue Dec 1 17:58:58 2015 -0800 cbfstool: Fix checkpatch error ERROR: code indent should use tabs where possible +^I trampoline_len);$ Change-Id: If46f977e2e07d73e6cfd3038912a172236a7e571 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- util/cbfstool/cbfs-payload-linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/cbfstool/cbfs-payload-linux.c b/util/cbfstool/cbfs-payload-linux.c index 84e348d..34b21e9 100644 --- a/util/cbfstool/cbfs-payload-linux.c +++ b/util/cbfstool/cbfs-payload-linux.c @@ -98,7 +98,7 @@ static void bzp_add_segment(struct bzpayload *bzp, struct buffer *b, void *data, static int bzp_add_trampoline(struct bzpayload *bzp) { bzp_add_segment(bzp, &bzp->trampoline, trampoline, - trampoline_len); + trampoline_len); return 0; }

1 0

Patch set updated for coreboot: cbfstool: autocreate trampoline
by Stefan Reinauer 02 Dec '15

02 Dec '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12505 -gerrit commit 2fc8cb4b106f9c2a909e19fb869a2b80754b1ad3 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Fri Nov 20 17:58:59 2015 +0100 cbfstool: autocreate trampoline Add the code necessary to create the linux trampoline blob. Don't enforce this for the in-coreboot build or use objcopy to produce linux_trampoline.o as it is a bit trickier to get all the details right than I had hoped: - you have to know the elf architecture of the host machine - you might have to have more tools (xxd, perl, etc) installed Change-Id: I9b7877c58d90f9fb21d16e0061a31e19fffa2470 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- util/cbfstool/Makefile | 13 +++ util/cbfstool/linux_trampoline.S | 133 ++++++++++++++++++++++++++++++ util/cbfstool/linux_trampoline.c | 173 +++------------------------------------ 3 files changed, 159 insertions(+), 160 deletions(-) diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index 085a19a..b595297 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -4,6 +4,7 @@ objutil ?= $(top)/util CONFIG_FMD_GENPARSER := y HOSTCC ?= $(CC) +OBJCOPY ?= objcopy .PHONY: all all: $(objutil)/cbfstool/cbfstool \ @@ -17,6 +18,18 @@ clean: $(RM) $(objutil)/cbfstool/fmaptool $(fmapobj) $(RM) $(objutil)/cbfstool/rmodtool $(rmodobj) +linux_trampoline.c: linux_trampoline.S + rm -f linux_trampoline.c + $(CC) -m32 -o linux_trampoline linux_trampoline.S -ffreestanding -nostdlib -nostdinc -Wl,--defsym=_start=0 + $(OBJCOPY) -Obinary -j .data linux_trampoline trampoline + echo "/* This file is automatically generated. Do not manually change */" > trampoline.c + xxd -c 16 -i trampoline >> trampoline.c + perl -pi -e 's,unsigned int.*$$,,g;s,unsigned char,const unsigned char,g' trampoline.c + echo "const void * const trampoline_start = &trampoline;" >> trampoline.c + echo "const unsigned long trampoline_size = sizeof trampoline;" >> trampoline.c + mv trampoline.c linux_trampoline.c + rm linux_trampoline trampoline + .SILENT: include Makefile.inc diff --git a/util/cbfstool/linux_trampoline.S b/util/cbfstool/linux_trampoline.S new file mode 100644 index 0000000..65819e9 --- /dev/null +++ b/util/cbfstool/linux_trampoline.S @@ -0,0 +1,133 @@ +/* + * 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. + */ + +/* NOTE: THIS CODE MUST REMAIN POSITION INDEPENDENT + * IT SHOULDN'T USE THE STACK + * AND IN GENERAL EXPECT NOTHING BUT RAM TO WORK + */ +.code32 +.data + +#include "linux_trampoline.h" +#define HEADER_SIG 0x4f49424c // LBIO little endian +#define CB_TAG_FORWARD 0x11 +#define CB_TAG_MEMORY 0x1 +#define CB_TAG_FRAMEBUFFER 0x12 + +#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 + +/* Setup basic code and data segment selectors for Linux +** +** Flat code segment descriptor: +** selector: 0x10 +** base : 0x00000000 +** limit : 0xFFFFFFFF +** type : code, execute, read +** +** Flat data segment descriptor: +** selector: 0x18 +** base : 0x00000000 +** limit : 0xFFFFFFFF +** type : data, read/write +** +** Use TRAMPOLINE_ENTRY_LOC as a scratchpad. +*/ +mov $TRAMPOLINE_ENTRY_LOC, %eax +sgdt (%eax) +mov 2(%eax), %ebx +movl $0x0000ffff, 16(%ebx) +movl $0x00cf9b00, 20(%ebx) +movl $0x0000ffff, 24(%ebx) +movl $0x00cf9300, 28(%ebx) + +/* finally: jump to kernel */ +mov $LINUX_PARAM_LOC, %esi +jmp *(LINUX_PARAM_LOC + LINUX_ENTRY_OFFSET) + + +2: +hlt +jmp 2b + +.trampoline_end: diff --git a/util/cbfstool/linux_trampoline.c b/util/cbfstool/linux_trampoline.c index aacf411..c5956d6 100644 --- a/util/cbfstool/linux_trampoline.c +++ b/util/cbfstool/linux_trampoline.c @@ -1,164 +1,17 @@ -/* - * 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. - */ - -#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 - -#include "linux_trampoline.h" -#define HEADER_SIG 0x4f49424c // LBIO little endian -#define CB_TAG_FORWARD 0x11 -#define CB_TAG_MEMORY 0x1 -#define CB_TAG_FRAMEBUFFER 0x12 - -#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 - -/* Setup basic code and data segment selectors for Linux -** -** Flat code segment descriptor: -** selector: 0x10 -** base : 0x00000000 -** limit : 0xFFFFFFFF -** type : code, execute, read -** -** Flat data segment descriptor: -** selector: 0x18 -** base : 0x00000000 -** limit : 0xFFFFFFFF -** type : data, read/write -** -** Use TRAMPOLINE_ENTRY_LOC as a scratchpad. -*/ -mov $TRAMPOLINE_ENTRY_LOC, %eax -sgdt (%eax) -mov 2(%eax), %ebx -movl $0x0000ffff, 16(%ebx) -movl $0x00cf9b00, 20(%ebx) -movl $0x0000ffff, 24(%ebx) -movl $0x00cf9300, 28(%ebx) - -/* 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). - */ +/* This file is automatically generated. Do not manually change */ 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, 0x0f, 0x84, 0x85, 0x00, 0x00, 0x00, 0x8b, 0x59, 0x04, 0x01, 0xcb, 0x8b, 0x49, 0x14, 0x83, -0x3b, 0x11, 0x75, 0x05, 0x8b, 0x4b, 0x08, 0xeb, 0xcf, 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, 0xb8, 0x00, 0x00, 0x04, -0x00, 0x0f, 0x01, 0x00, 0x8b, 0x58, 0x02, 0xc7, 0x43, 0x10, 0xff, 0xff, 0x00, 0x00, 0xc7, 0x43, -0x14, 0x00, 0x9b, 0xcf, 0x00, 0xc7, 0x43, 0x18, 0xff, 0xff, 0x00, 0x00, 0xc7, 0x43, 0x1c, 0x00, -0x93, 0xcf, 0x00, 0xbe, 0x00, 0x00, 0x09, 0x00, 0xff, 0x25, 0x14, 0x02, 0x09, 0x00, 0xf4, 0xeb, -0xfd + 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, 0x0f, 0x84, 0x87, 0x00, 0x00, 0x00, 0x8b, 0x59, 0x04, 0x01, 0xcb, 0x8b, 0x49, 0x14, 0x83, + 0x3b, 0x11, 0x75, 0x05, 0x8b, 0x4b, 0x08, 0xeb, 0xcf, 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, 0xb8, 0x00, 0x00, 0x04, + 0x00, 0x0f, 0x01, 0x00, 0x8b, 0x58, 0x02, 0xc7, 0x43, 0x10, 0xff, 0xff, 0x00, 0x00, 0xc7, 0x43, + 0x14, 0x00, 0x9b, 0xcf, 0x00, 0xc7, 0x43, 0x18, 0xff, 0xff, 0x00, 0x00, 0xc7, 0x43, 0x1c, 0x00, + 0x93, 0xcf, 0x00, 0xbe, 0x00, 0x00, 0x09, 0x00, 0xff, 0x25, 0x14, 0x02, 0x09, 0x00, 0xf4, 0xeb, + 0xfd }; const void * const trampoline_start = &trampoline;

1 0

Patch set updated for coreboot: cbfstool: remove trampoline_start and trampoline_size
by Stefan Reinauer 02 Dec '15

02 Dec '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12508 -gerrit commit fcbdcc0783092098e050d262fcd609ac5dd8d46d Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Tue Dec 1 17:58:08 2015 -0800 cbfstool: remove trampoline_start and trampoline_size It's not needed, so we can remove some extra file mangling, too. Change-Id: I80d707708e70c07a29653258b4cb6e9cd88d3de3 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- util/cbfstool/Makefile | 3 --- util/cbfstool/cbfs-payload-linux.c | 8 ++++---- util/cbfstool/linux_trampoline.c | 6 ++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index b595297..61a1a63 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -24,9 +24,6 @@ linux_trampoline.c: linux_trampoline.S $(OBJCOPY) -Obinary -j .data linux_trampoline trampoline echo "/* This file is automatically generated. Do not manually change */" > trampoline.c xxd -c 16 -i trampoline >> trampoline.c - perl -pi -e 's,unsigned int.*$$,,g;s,unsigned char,const unsigned char,g' trampoline.c - echo "const void * const trampoline_start = &trampoline;" >> trampoline.c - echo "const unsigned long trampoline_size = sizeof trampoline;" >> trampoline.c mv trampoline.c linux_trampoline.c rm linux_trampoline trampoline diff --git a/util/cbfstool/cbfs-payload-linux.c b/util/cbfstool/cbfs-payload-linux.c index 2492766..84e348d 100644 --- a/util/cbfstool/cbfs-payload-linux.c +++ b/util/cbfstool/cbfs-payload-linux.c @@ -22,8 +22,8 @@ #include "linux.h" /* trampoline */ -extern void *trampoline_start; -extern long trampoline_size; +extern unsigned char trampoline[]; +extern unsigned int trampoline_len; /* * Current max number of segments include: @@ -97,8 +97,8 @@ static void bzp_add_segment(struct bzpayload *bzp, struct buffer *b, void *data, static int bzp_add_trampoline(struct bzpayload *bzp) { - bzp_add_segment(bzp, &bzp->trampoline, trampoline_start, - trampoline_size); + bzp_add_segment(bzp, &bzp->trampoline, trampoline, + trampoline_len); return 0; } diff --git a/util/cbfstool/linux_trampoline.c b/util/cbfstool/linux_trampoline.c index c5956d6..c3df214 100644 --- a/util/cbfstool/linux_trampoline.c +++ b/util/cbfstool/linux_trampoline.c @@ -1,5 +1,5 @@ /* This file is automatically generated. Do not manually change */ -const unsigned char trampoline[] = { +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, 0x0f, 0x84, 0x87, 0x00, 0x00, 0x00, 0x8b, 0x59, 0x04, 0x01, 0xcb, 0x8b, 0x49, 0x14, 0x83, @@ -13,6 +13,4 @@ const unsigned char trampoline[] = { 0x93, 0xcf, 0x00, 0xbe, 0x00, 0x00, 0x09, 0x00, 0xff, 0x25, 0x14, 0x02, 0x09, 0x00, 0xf4, 0xeb, 0xfd }; - -const void * const trampoline_start = &trampoline; -const unsigned long trampoline_size = sizeof trampoline; +unsigned int trampoline_len = 177;

1 0

Patch set updated for coreboot: cbfstool: autocreate trampoline
by Stefan Reinauer 02 Dec '15

02 Dec '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12505 -gerrit commit e06e6629953d18b8bcc51aa17bc9edd586f805d5 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Fri Nov 20 17:58:59 2015 +0100 cbfstool: autocreate trampoline Add the code necessary to create the linux trampoline blob. Don't enforce this for the in-coreboot build or use objcopy to produce linux_trampoline.o as it is a bit trickier to get all the details right than I had hoped: - you have to know the elf architecture of the host machine - you might have to have more tools (xxd, perl, etc) installed Change-Id: I9b7877c58d90f9fb21d16e0061a31e19fffa2470 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- util/cbfstool/Makefile | 13 ++++ util/cbfstool/linux_trampoline.S | 133 ++++++++++++++++++++++++++++++++++ util/cbfstool/linux_trampoline.c | 151 +-------------------------------------- 3 files changed, 148 insertions(+), 149 deletions(-) diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index 085a19a..16aa2cf 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -4,6 +4,7 @@ objutil ?= $(top)/util CONFIG_FMD_GENPARSER := y HOSTCC ?= $(CC) +OBJCOPY ?= objcopy .PHONY: all all: $(objutil)/cbfstool/cbfstool \ @@ -17,6 +18,18 @@ clean: $(RM) $(objutil)/cbfstool/fmaptool $(fmapobj) $(RM) $(objutil)/cbfstool/rmodtool $(rmodobj) +linux_trampoline.c: linux_trampoline.S + rm -f linux_trampoline.c + $(CC) -m32 -o linux_trampoline linux_trampoline.S -ffreestanding -nostdlib -nostdinc -Wl,--defsym=_start=0 + $(OBJCOPY) -Obinary -j .data linux_trampoline trampoline + echo "/* This file is automatically generated. Do not manually change */" > trampoline.c + xxd -c 16 -i trampoline >> trampoline.c + perl -pi -e 's,unsigned int.*$$,,g;s,unsigned char,const unsigned char,g;s,^ ,,g' trampoline.c + echo "const void * const trampoline_start = &trampoline;" >> trampoline.c + echo "const unsigned long trampoline_size = sizeof trampoline;" >> trampoline.c + mv trampoline.c linux_trampoline.c + rm linux_trampoline trampoline + .SILENT: include Makefile.inc diff --git a/util/cbfstool/linux_trampoline.S b/util/cbfstool/linux_trampoline.S new file mode 100644 index 0000000..65819e9 --- /dev/null +++ b/util/cbfstool/linux_trampoline.S @@ -0,0 +1,133 @@ +/* + * 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. + */ + +/* NOTE: THIS CODE MUST REMAIN POSITION INDEPENDENT + * IT SHOULDN'T USE THE STACK + * AND IN GENERAL EXPECT NOTHING BUT RAM TO WORK + */ +.code32 +.data + +#include "linux_trampoline.h" +#define HEADER_SIG 0x4f49424c // LBIO little endian +#define CB_TAG_FORWARD 0x11 +#define CB_TAG_MEMORY 0x1 +#define CB_TAG_FRAMEBUFFER 0x12 + +#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 + +/* Setup basic code and data segment selectors for Linux +** +** Flat code segment descriptor: +** selector: 0x10 +** base : 0x00000000 +** limit : 0xFFFFFFFF +** type : code, execute, read +** +** Flat data segment descriptor: +** selector: 0x18 +** base : 0x00000000 +** limit : 0xFFFFFFFF +** type : data, read/write +** +** Use TRAMPOLINE_ENTRY_LOC as a scratchpad. +*/ +mov $TRAMPOLINE_ENTRY_LOC, %eax +sgdt (%eax) +mov 2(%eax), %ebx +movl $0x0000ffff, 16(%ebx) +movl $0x00cf9b00, 20(%ebx) +movl $0x0000ffff, 24(%ebx) +movl $0x00cf9300, 28(%ebx) + +/* finally: jump to kernel */ +mov $LINUX_PARAM_LOC, %esi +jmp *(LINUX_PARAM_LOC + LINUX_ENTRY_OFFSET) + + +2: +hlt +jmp 2b + +.trampoline_end: diff --git a/util/cbfstool/linux_trampoline.c b/util/cbfstool/linux_trampoline.c index aacf411..be7b467 100644 --- a/util/cbfstool/linux_trampoline.c +++ b/util/cbfstool/linux_trampoline.c @@ -1,155 +1,8 @@ -/* - * 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. - */ - -#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 - -#include "linux_trampoline.h" -#define HEADER_SIG 0x4f49424c // LBIO little endian -#define CB_TAG_FORWARD 0x11 -#define CB_TAG_MEMORY 0x1 -#define CB_TAG_FRAMEBUFFER 0x12 - -#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 - -/* Setup basic code and data segment selectors for Linux -** -** Flat code segment descriptor: -** selector: 0x10 -** base : 0x00000000 -** limit : 0xFFFFFFFF -** type : code, execute, read -** -** Flat data segment descriptor: -** selector: 0x18 -** base : 0x00000000 -** limit : 0xFFFFFFFF -** type : data, read/write -** -** Use TRAMPOLINE_ENTRY_LOC as a scratchpad. -*/ -mov $TRAMPOLINE_ENTRY_LOC, %eax -sgdt (%eax) -mov 2(%eax), %ebx -movl $0x0000ffff, 16(%ebx) -movl $0x00cf9b00, 20(%ebx) -movl $0x0000ffff, 24(%ebx) -movl $0x00cf9300, 28(%ebx) - -/* 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). - */ +/* This file is automatically generated. Do not manually change */ 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, 0x0f, 0x84, 0x85, 0x00, 0x00, 0x00, 0x8b, 0x59, 0x04, 0x01, 0xcb, 0x8b, 0x49, 0x14, 0x83, +0xcb, 0x0f, 0x84, 0x87, 0x00, 0x00, 0x00, 0x8b, 0x59, 0x04, 0x01, 0xcb, 0x8b, 0x49, 0x14, 0x83, 0x3b, 0x11, 0x75, 0x05, 0x8b, 0x4b, 0x08, 0xeb, 0xcf, 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,

1 0

Patch merged into coreboot/master: toolchain.inc: Add IASL test as part of coreboot toolchain
by gerrit＠coreboot.org 02 Dec '15

02 Dec '15

the following patch was just integrated into master: commit d9c193d8b3bcc73dff4f6085c5b6164c0f6a4108 Author: Martin Roth <martinroth(a)google.com> Date: Thu Nov 26 22:34:42 2015 -0700 toolchain.inc: Add IASL test as part of coreboot toolchain Even though coreboot has IASL as part of its toolchain, it was not being picked up when testing to make sure coreboot is being compiled with the coreboot toolchain. This patch adds an iasl test when testing coreboot toolchain. Change-Id: I5b989869417c3f60057a91842b911855d9528f1b Signed-off-by: Martin Roth <martinroth(a)google.com> Reviewed-on: https://review.coreboot.org/12543 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi(a)google.com> See https://review.coreboot.org/12543 for details. -gerrit

1 0

Patch merged into coreboot/master: toolchain.inc: Improve help messages for coreboot toolchain
by gerrit＠coreboot.org 02 Dec '15

02 Dec '15

the following patch was just integrated into master: commit 335a9b61b3856486645727dfdef8ed32b036c860 Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 25 12:44:15 2015 -0700 toolchain.inc: Improve help messages for coreboot toolchain Show better help text on how to compile the coreboot toolchain or use an unsupported toolchain. Change-Id: I64a2159d324d673784669b2464c1a2769b048678 Signed-off-by: Martin Roth <martinroth(a)google.com> Reviewed-on: https://review.coreboot.org/12557 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi(a)google.com> See https://review.coreboot.org/12557 for details. -gerrit

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
76
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit December 2015