coreboot-gerrit November 2015

coreboot-gerrit@coreboot.org

1 participants
1544 discussions

Patch merged into coreboot/master: console: Add help for serial IO port selection
by gerrit＠coreboot.org 21 Nov '15

21 Nov '15

the following patch was just integrated into master: commit ac76ed9998f95cb54d3862ce491402038340e9aa Author: Martin Roth <martinroth(a)google.com> Date: Thu Nov 19 11:40:43 2015 -0700 console: Add help for serial IO port selection Add help and a comment about the serial IO port selection to give the user better feedback when a port index is selected. Change-Id: I4c1614be51aee0286308fbc5c24554e218120bf7 Signed-off-by: Martin Roth <martinroth(a)google.com> Reviewed-on: http://review.coreboot.org/12487 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> See http://review.coreboot.org/12487 for details. -gerrit

1 0

Patch merged into coreboot/master: hexdump: Fix output if length is not a multiple of 16
by gerrit＠coreboot.org 21 Nov '15

21 Nov '15

the following patch was just integrated into master: commit b50d8fbb6e769df782d5bc3c156cb82d3f646e86 Author: Ben Gardner <gardner.ben(a)gmail.com> Date: Thu Nov 19 11:43:05 2015 -0600 hexdump: Fix output if length is not a multiple of 16 hexdump currently rounds up length to a multiple of 16. So, hexdump(ptr, 12) prints 16 hex digits, including 4 garbage bytes. That isn't desirable and is easy to fix. Change-Id: I86415fa9bc6cdc84b111e5e1968e39f570f294d9 Signed-off-by: Ben Gardner <gardner.ben(a)gmail.com> Reviewed-on: http://review.coreboot.org/12486 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth(a)google.com> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See http://review.coreboot.org/12486 for details. -gerrit

1 0

Patch merged into coreboot/master: baytrail: add C0 and D0 stepping decode
by gerrit＠coreboot.org 21 Nov '15

21 Nov '15

the following patch was just integrated into master: commit 2d3d1b7eee52bca47ab08730be99336c021d0f7c Author: Ben Gardner <gardner.ben(a)gmail.com> Date: Thu Nov 19 16:12:21 2015 -0600 baytrail: add C0 and D0 stepping decode The E3800 with ordering code FH8065301487717 is stepping D0, value 0x11. Add that so the debug log shows 'D0' instead of '??'. Also, add the C0 stepping decode to fsp_baytrail. Change-Id: Ibec764fcf5d3f448e38831786a071f5ab6066d67 Signed-off-by: Ben Gardner <gardner.ben(a)gmail.com> Reviewed-on: http://review.coreboot.org/12488 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth(a)google.com> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See http://review.coreboot.org/12488 for details. -gerrit

1 0

Patch merged into coreboot/master: cpu/amd/car/post_cache_as_ram: Avoid trailing spaces
by gerrit＠coreboot.org 21 Nov '15

21 Nov '15

the following patch was just integrated into master: commit 42b6265035a58bae254b701ec2a8fcc7d1ebb4a2 Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Sat Nov 7 09:15:06 2015 +0100 cpu/amd/car/post_cache_as_ram: Avoid trailing spaces Looking at the coreboot console logs there are sometimes trailing whitespaces in the output, for example, if writing `Done` was not possible. Adapt the code, that spaces are only added when needed. Change-Id: Ia0af493ab62b6fab24e8a2629cf5fd67329e0af7 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-on: http://review.coreboot.org/12357 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth(a)google.com> See http://review.coreboot.org/12357 for details. -gerrit

1 0

Patch merged into coreboot/master: chromeos: Fix Kconfig TPM warnings on systems with no LPC TPM
by gerrit＠coreboot.org 21 Nov '15

21 Nov '15

the following patch was just integrated into master: commit 4aac08afecd51eb7f3e776d3422767dba0d49030 Author: Martin Roth <martinroth(a)google.com> Date: Thu Nov 19 18:24:30 2015 -0700 chromeos: Fix Kconfig TPM warnings on systems with no LPC TPM Put dependecies on CHROMEOS's selection of the Kconfig symbols TPM_INIT_FAILURE_IS_FATAL and SKIP_TPM_STARTUP_ON_NORMAL_BOOT to match the dependencies on those symbols where they are defined in src/drivers/pc80/tpm/Kconfig The file that uses these only gets built in if CONFIG_LPC_TPM is selected selected. The warnings were: warning: (CHROMEOS) selects TPM_INIT_FAILURE_IS_FATAL which has unmet direct dependencies (PC80_SYSTEM && LPC_TPM) warning: (CHROMEOS) selects SKIP_TPM_STARTUP_ON_NORMAL_BOOT which has unmet direct dependencies (PC80_SYSTEM && LPC_TPM) Change-Id: I7af00c79050bf511758bf29e3d57f6ff34d2a296 Signed-off-by: Martin Roth <martinroth(a)google.com> Reviewed-on: http://review.coreboot.org/12497 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> See http://review.coreboot.org/12497 for details. -gerrit

1 0

Patch set updated for coreboot: drivers/intel/fsp1_1: Don't include files from blobs / fsp directory
by Stefan Reinauer 21 Nov '15

21 Nov '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12464 -gerrit commit c183b1a0c10c8522c2998763233670e65408d55b Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Wed Nov 18 15:26:07 2015 -0800 drivers/intel/fsp1_1: Don't include files from blobs / fsp directory coreboot's binary policy forbids to store include files required to build the host binaries in the blobs directory. Hence remove the infrastructure to do so. Change-Id: I66d57f84cbc392bbfc1f951d13424742d2cff978 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- src/drivers/intel/fsp1_1/Kconfig | 5 ----- src/drivers/intel/fsp1_1/Makefile.inc | 2 -- src/drivers/intel/fsp1_1/include/fsp/soc_binding.h | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/drivers/intel/fsp1_1/Kconfig b/src/drivers/intel/fsp1_1/Kconfig index 4ae3727..51fa314 100644 --- a/src/drivers/intel/fsp1_1/Kconfig +++ b/src/drivers/intel/fsp1_1/Kconfig @@ -66,11 +66,6 @@ config FSP_IMAGE_ID_STRING 8 ASCII character byte signature string that will help match the FSP binary to a supported hardware configuration. -config FSP_INCLUDE_PATH - string "Path for FSP specific include files" - help - The path and filename of the Intel FSP binary for this platform. - config FSP_LOC hex "Intel FSP Binary location in CBFS" help diff --git a/src/drivers/intel/fsp1_1/Makefile.inc b/src/drivers/intel/fsp1_1/Makefile.inc index a296b53..f101cc4 100644 --- a/src/drivers/intel/fsp1_1/Makefile.inc +++ b/src/drivers/intel/fsp1_1/Makefile.inc @@ -36,8 +36,6 @@ ramstage-y += stage_cache.c ramstage-$(CONFIG_GOP_SUPPORT) += vbt.c CPPFLAGS_common += -Isrc/drivers/intel/fsp1_1/include -# Where FspUpdVpd.h can be picked up from. -CPPFLAGS_common += -I$(CONFIG_FSP_INCLUDE_PATH) cpu_incs-$(CONFIG_USE_GENERIC_FSP_CAR_INC) += $(src)/drivers/intel/fsp1_1/cache_as_ram.inc diff --git a/src/drivers/intel/fsp1_1/include/fsp/soc_binding.h b/src/drivers/intel/fsp1_1/include/fsp/soc_binding.h index 04b01e9..affb43f 100644 --- a/src/drivers/intel/fsp1_1/include/fsp/soc_binding.h +++ b/src/drivers/intel/fsp1_1/include/fsp/soc_binding.h @@ -27,7 +27,7 @@ #pragma pack(push) /* - * This file is found by way of the Kconfig FSP_INCLUDE_PATH option. It is + * This file is found in the soc / chipset directory. It is * a per implementation specific header. i.e. different FSP implementations * for different chipsets. */

1 0

Patch set updated for coreboot: drivers/intel/fsp1_1: Include rules.h in util.h
by Stefan Reinauer 21 Nov '15

21 Nov '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12495 -gerrit commit 69c2130891be534ae58b5c80719457cc795711d6 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Thu Nov 19 17:12:30 2015 -0800 drivers/intel/fsp1_1: Include rules.h in util.h util.h uses ENV_* and hence needs to have rules.h This is required for successful compilation of strago. Change-Id: I0df35e90e2010aac43ef0a4d900f20c842d3bcb5 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- src/drivers/intel/fsp1_1/include/fsp/util.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/drivers/intel/fsp1_1/include/fsp/util.h b/src/drivers/intel/fsp1_1/include/fsp/util.h index 49a7798..5595e73 100644 --- a/src/drivers/intel/fsp1_1/include/fsp/util.h +++ b/src/drivers/intel/fsp1_1/include/fsp/util.h @@ -17,6 +17,7 @@ #ifndef FSP1_1_UTIL_H #define FSP1_1_UTIL_H +#include <rules.h> #include <fsp/api.h> /* Current users expect to get the SoC's FSP definitions by including util.h. */ #include <fsp/soc_binding.h>

1 0

New patch to review for coreboot: cbfstool: remove trampoline_start and trampoline_size
by Stefan Reinauer 21 Nov '15

21 Nov '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12508 -gerrit commit e58eda275c6241759ad8e0782cad99c9dcfd8ba5 Author: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Date: Sat Nov 21 01:59:50 2015 +0100 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 8304b6f..679962a 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..8797240 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 char trampoline[]; +extern 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 21 Nov '15

21 Nov '15

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12505 -gerrit commit 2562bb51c2182dd93f40ada67bc2ea767bb79185 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 64db0b3..8304b6f 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,4 +18,16 @@ clean: $(RM) $(objutil)/cbfstool/fmaptool $(fmapobj) $(RM) $(objutil)/cbfstool/rmodtool $(rmodobj) +linux_trampoline.c: linux_trampoline.S + rm -f linux_trampoline.c + $(CC) -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 + 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: northbridge/amd/amdfam10: Fix poor performance on Family 15h CPUs
by Timothy Pearson 20 Nov '15

20 Nov '15

Timothy Pearson (tpearson(a)raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12031 -gerrit commit 90a6365c9676cc9a5fcce033b5deb471a4383bf1 Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Fri Aug 7 19:06:09 2015 -0500 northbridge/amd/amdfam10: Fix poor performance on Family 15h CPUs Change-Id: I193749bc767b7c1139de7cd67622a7b03298009b Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> --- src/northbridge/amd/amdfam10/nb_control.c | 4 ++-- src/northbridge/amd/amdfam10/northbridge.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/northbridge/amd/amdfam10/nb_control.c b/src/northbridge/amd/amdfam10/nb_control.c index f95b6f8..8e8dd57 100644 --- a/src/northbridge/amd/amdfam10/nb_control.c +++ b/src/northbridge/amd/amdfam10/nb_control.c @@ -60,10 +60,10 @@ static void nb_control_init(struct device *dev) pci_write_config32(dev, 0xe0, dword); /* Configure northbridge P-states */ - dword = pci_read_config32(dev, 0xe0); + dword = pci_read_config32(dev, 0x170); dword &= ~(0x7 << 9); /* NbPstateThreshold = compute_unit_count */ dword |= (compute_unit_count & 0x7) << 9; - pci_write_config32(dev, 0xe0, dword); + pci_write_config32(dev, 0x170, dword); printk(BIOS_DEBUG, "done.\n"); } diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c index 2684d89..4826a36 100644 --- a/src/northbridge/amd/amdfam10/northbridge.c +++ b/src/northbridge/amd/amdfam10/northbridge.c @@ -1755,6 +1755,8 @@ static void detect_and_enable_probe_filter(device_t dev) disable_cache(); wbinvd(); + + /* Enable probe filter */ for (i = 0; i < sysconf.nodes; i++) { device_t f3x_dev = dev_find_slot(0, PCI_DEVFN(0x18 + i, 3)); @@ -1771,6 +1773,25 @@ static void detect_and_enable_probe_filter(device_t dev) do { } while (!(pci_read_config32(f3x_dev, 0x1d4) & (0x1 << 19))); } + + if (is_fam15h()) { + printk(BIOS_DEBUG, "Enabling ATM mode\n"); + + /* Enable ATM mode */ + for (i = 0; i < sysconf.nodes; i++) { + device_t f0x_dev = dev_find_slot(0, PCI_DEVFN(0x18 + i, 0)); + device_t f3x_dev = dev_find_slot(0, PCI_DEVFN(0x18 + i, 3)); + + dword = pci_read_config32(f0x_dev, 0x68); + dword |= (0x1 << 12); /* ATMModeEn = 1 */ + pci_write_config32(f0x_dev, 0x68, dword); + + dword = pci_read_config32(f3x_dev, 0x1b8); + dword |= (0x1 << 27); /* L3ATMModeEn = 1 */ + pci_write_config32(f3x_dev, 0x1b8, dword); + } + } + enable_cache(); /* Reenable L3 and DRAM scrubbers */

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2015