coreboot-gerrit March 2016

coreboot-gerrit@coreboot.org

1 participants
1119 discussions

Patch merged into coreboot/master: arch/x86/smbios: fix length calculation for SMBIOS type 17
by gerrit＠coreboot.org 11 Mar '16

11 Mar '16

the following patch was just integrated into master: commit 3677520fd9162d7447308ff5580313cca9e64a19 Author: Iru Cai <mytbk920423(a)gmail.com> Date: Wed Mar 9 23:22:58 2016 +0800 arch/x86/smbios: fix length calculation for SMBIOS type 17 Different DIMM modules give different SMBIOS type 17 lengths, so we can't use `meminfo->dimm_cnt*len' for entry struct size, otherwise it'll give a wrong SMBIOS size when two or more different DIMMs are installed on the machine. Change-Id: I0e33853f6aa4b30da547eb433839a397d451a8cf Signed-off-by: Iru Cai <mytbk920423(a)gmail.com> Reviewed-on: https://review.coreboot.org/14008 Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> Tested-by: build bot (Jenkins) See https://review.coreboot.org/14008 for details. -gerrit

1 0

Patch merged into coreboot/master: Kconfig: remove COMPRESS_PRERAM_STAGES option from x86
by gerrit＠coreboot.org 11 Mar '16

11 Mar '16

the following patch was just integrated into master: commit f2e0461d8970d4690297dc9e40ee4f6d91e5a0c6 Author: Martin Roth <martinroth(a)google.com> Date: Wed Mar 9 15:50:23 2016 -0700 Kconfig: remove COMPRESS_PRERAM_STAGES option from x86 Instead of just defaulting to disabled, remove the option for x86 since it doesn't work there. Change-Id: I2b84b9f866f9231943e573b873c970f420c7c9a5 Signed-off-by: Martin Roth <martinroth(a)google.com> Reviewed-on: https://review.coreboot.org/14017 Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Tested-by: build bot (Jenkins) See https://review.coreboot.org/14017 for details. -gerrit

1 0

Patch set updated for coreboot: util/ifdtool: add option to change chip density
by Jan Tatje 11 Mar '16

11 Mar '16

Jan Tatje just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14032 -gerrit commit 683bd27adb57d6e409b1f883756ab64eab6a75bb Author: Jan Tatje <jan(a)jnt.io> Date: Fri Mar 11 00:52:07 2016 +0100 util/ifdtool: add option to change chip density Adds -D / --density option to change the chip density. This is only implemented for IFD version 1 as I do not have an IFD version 2 to test this. Density of both chips is changed, but second value is ignored, if there is no second chip present. Change-Id: Iba7affbf6cbefa3147b7b0e019298d905e694716 Signed-off-by: Jan Tatje <jan(a)jnt.io> --- util/ifdtool/ifdtool.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index 8a12725..7fabe61 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -748,6 +748,66 @@ static void set_em100_mode(char *filename, char *image, int size) set_spi_frequency(filename, image, size, freq); } +static void set_chipdensity(char *filename, char *image, int size, int new_density) +{ + fdbar_t *fdb = find_fd(image, size); + fcba_t *fcba = (fcba_t *) (image + (((fdb->flmap0) & 0xff) << 4)); + uint32_t density = 0; + + switch (ifd_version) { + case IFD_VERSION_1: + break; + case IFD_VERSION_2: + /* I do not have a version 2 IFD nor do i have the docs. */ + printf("error: Changing the chip density for IFD version 2 has not been" + " implemented yet.\n"); + exit(EXIT_FAILURE); + default: + printf("error: Unknown IFD version\n"); + exit(EXIT_FAILURE); + break; + } + + printf("setting chip density to "); + switch (new_density) { + case 512: + density = COMPONENT_DENSITY_512KB; + printf("512KB\n"); + break; + case 1: + density = COMPONENT_DENSITY_1MB; + printf("1MB\n"); + break; + case 2: + density = COMPONENT_DENSITY_2MB; + printf("2MB\n"); + break; + case 4: + density = COMPONENT_DENSITY_4MB; + printf("4MB\n"); + break; + case 8: + density = COMPONENT_DENSITY_8MB; + printf("8MB\n"); + break; + case 16: + density = COMPONENT_DENSITY_16MB; + printf("16MB\n"); + break; + default: + printf("unknown density: error\n"); + exit(EXIT_FAILURE); + } + + /* clear lower 6 bit which are chip density */ + fcba->flcomp &= ~(0x3F); + /* set the new density */ + fcba->flcomp |= (density); /* first chip */ + fcba->flcomp |= (density << 3); /* second chip */ + + write_image(filename, image, size); +} + static void lock_descriptor(char *filename, char *image, int size) { int wr_shift, rd_shift; @@ -1075,6 +1135,7 @@ static void print_usage(const char *name) " -i | --inject <region>:<module> inject file <module> into region <region>\n" " -n | --newlayout <filename> update regions using a flashrom layout file\n" " -s | --spifreq <17|20|30|33|48|50> set the SPI frequency\n" + " -D | --density <512|1|2|4|8|16> set chip density (512 in KByte, others in MByte)\n" " -e | --em100 set SPI frequency to 20MHz and disable\n" " Dual Output Fast Read Support\n" " -l | --lock Lock firmware descriptor and ME region\n" @@ -1090,9 +1151,10 @@ int main(int argc, char *argv[]) int opt, option_index = 0; int mode_dump = 0, mode_extract = 0, mode_inject = 0, mode_spifreq = 0; int mode_em100 = 0, mode_locked = 0, mode_unlocked = 0; - int mode_layout = 0, mode_newlayout = 0; + int mode_layout = 0, mode_newlayout = 0, mode_density = 0; char *region_type_string = NULL, *region_fname = NULL, *layout_fname = NULL; int region_type = -1, inputfreq = 0; + int new_density= 0; enum spi_frequency spifreq = SPI_FREQUENCY_20MHZ; static struct option long_options[] = { @@ -1102,6 +1164,7 @@ int main(int argc, char *argv[]) {"inject", 1, NULL, 'i'}, {"newlayout", 1, NULL, 'n'}, {"spifreq", 1, NULL, 's'}, + {"density", 1, NULL, 'D'}, {"em100", 0, NULL, 'e'}, {"lock", 0, NULL, 'l'}, {"unlock", 0, NULL, 'u'}, @@ -1110,7 +1173,7 @@ int main(int argc, char *argv[]) {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "df:xi:n:s:eluvh?", + while ((opt = getopt_long(argc, argv, "df:D:xi:n:s:eluvh?", long_options, &option_index)) != EOF) { switch (opt) { case 'd': @@ -1169,6 +1232,15 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } break; + case 'D': + mode_density = 1; + new_density = strtol(optarg, NULL, 0); + if (!new_density) { + fprintf(stderr, "No chip density specified\n"); + print_usage(argv[0]); + exit(EXIT_FAILURE); + } + break; case 's': // Parse the requested SPI frequency inputfreq = strtol(optarg, NULL, 0); @@ -1239,7 +1311,7 @@ int main(int argc, char *argv[]) if ((mode_dump + mode_layout + mode_extract + mode_inject + mode_newlayout + mode_spifreq + mode_em100 + mode_locked + - mode_unlocked) == 0) { + mode_unlocked + mode_density) == 0) { fprintf(stderr, "You need to specify a mode.\n\n"); print_usage(argv[0]); exit(EXIT_FAILURE); @@ -1300,6 +1372,9 @@ int main(int argc, char *argv[]) if (mode_spifreq) set_spi_frequency(filename, image, size, spifreq); + if (mode_density) + set_chipdensity(filename, image, size, new_density); + if (mode_em100) set_em100_mode(filename, image, size);

1 0

New patch to review for coreboot: top/Makefile.inc: Give BUILD_TIMELESS a default value
by Zheng Bao 11 Mar '16

11 Mar '16

Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14036 -gerrit commit 2a20f0962fb2993a149abf2b63c95907c6ebf5e8 Author: zbao <fishbaozi(a)gmail.com> Date: Fri Mar 11 18:00:21 2016 +0800 top/Makefile.inc: Give BUILD_TIMELESS a default value The genbuild_h.sh can not get the definition in Makefile and the BUILD_TIMELESS in script is empty, unless it is pre-defined. GEN build.h util/genbuild_h/genbuild_h.sh: 27: [: Illegal number: Change-Id: I2009bf26e9d3d5bb74ba4cb5883aa7f975e71832 Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com> --- Makefile.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.inc b/Makefile.inc index a07f92a..7979193 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -30,6 +30,7 @@ export KERNELVERSION := $(strip $(if $(GIT),\ $(if $(wildcard $(top)/.coreboot-version),\ $(shell cat $(top)/.coreboot-version),\ coreboot-unknown$(KERNELREVISION)))) +BUILD_TIMELESS=0 endif ####################################################################### @@ -360,7 +361,7 @@ additional-dirs := $(objutil)/cbfstool $(objutil)/romcc $(objutil)/ifdtool \ $(obj)/build.h: .xcompile @printf " GEN build.h\n" rm -f $(obj)/build.h - util/genbuild_h/genbuild_h.sh > $(obj)/build.ht + BUILD_TIMELESS=$(BUILD_TIMELESS) util/genbuild_h/genbuild_h.sh > $(obj)/build.ht mv $(obj)/build.ht $(obj)/build.h build-dirs:

1 0

Patch merged into coreboot/master: cbmem: Fix cbmem_add_bootmem()
by gerrit＠coreboot.org 11 Mar '16

11 Mar '16

the following patch was just integrated into master: commit 447d9489a21aad3dda400aa519eaeaafed25573f Author: Andrey Petrov <andrey.petrov(a)intel.com> Date: Thu Mar 10 22:14:41 2016 -0800 cbmem: Fix cbmem_add_bootmem() Change 13363 (555d6c2) introduced a bug where cbmem_add_bootmem() was converted to use a new function. Unfortunately instead of passing a pointer, NULL was passed due to type confusion. This change fixes that problem by passing address of stack variable instead of NULL. Change-Id: Ib8e1add3547cda01f71bf1dea14d3e58bdd99730 Signed-off-by: Andrey Petrov <andrey.petrov(a)intel.com> Reviewed-on: https://review.coreboot.org/14033 Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> 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> See https://review.coreboot.org/14033 for details. -gerrit

1 0

New patch to review for coreboot: coreinfo: Use numbers instead of letters to switch between pages
by Jonathan Neuschäfer 11 Mar '16

11 Mar '16

Jonathan Neuschäfer just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14034 -gerrit commit 2b5d2a09987dfb78f8c702fa796dc4865bab038b Author: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Date: Fri Mar 11 08:50:07 2016 +0100 coreinfo: Use numbers instead of letters to switch between pages In my opinion, the number keys (1234) are easier to use than the keys ABCD, because they're next to each other. Change-Id: I55bcc84d82b796311039963986216198ce37d5ee Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> --- payloads/coreinfo/coreinfo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/payloads/coreinfo/coreinfo.c b/payloads/coreinfo/coreinfo.c index 41b5f12..37c840b 100644 --- a/payloads/coreinfo/coreinfo.c +++ b/payloads/coreinfo/coreinfo.c @@ -108,7 +108,7 @@ static void print_submenu(struct coreinfo_cat *cat) return; for (i = 0; i < cat->count; i++) - ptr += sprintf(ptr, "[%c: %s] ", 'A' + i, + ptr += sprintf(ptr, "[%c: %s] ", '1' + i, cat->modules[i]->name); mvwprintw(menuwin, 0, 0, menu); @@ -198,8 +198,8 @@ static void redraw_module(struct coreinfo_cat *cat) static void handle_category_key(struct coreinfo_cat *cat, int key) { - if (key >= 'a' && key <= 'z') { - int index = key - 'a'; + if (key >= '1' && key <= '9') { + int index = key - '1'; if (index < cat->count) { cat->cur = index; redraw_module(cat);

1 0

Patch set updated for coreboot: cbmem: Fix cbmem_add_bootmem()
by Andrey Petrov 11 Mar '16

11 Mar '16

Andrey Petrov (andrey.petrov(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14033 -gerrit commit 71ea970f8dfe4e437318d9c478e5f1b2785bed49 Author: Andrey Petrov <andrey.petrov(a)intel.com> Date: Thu Mar 10 22:14:41 2016 -0800 cbmem: Fix cbmem_add_bootmem() Change 13363 (555d6c2) introduced a bug where cbmem_add_bootmem() was converted to use a new function. Unfortunately instead of passing a pointer, NULL was passed due to type confusion. This change fixes that problem by passing address of stack variable instead of NULL. Change-Id: Ib8e1add3547cda01f71bf1dea14d3e58bdd99730 Signed-off-by: Andrey Petrov <andrey.petrov(a)intel.com> --- src/lib/imd_cbmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index e75c538..a078071 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -272,11 +272,11 @@ void cbmem_region_used(uintptr_t *base, size_t *size) void cbmem_add_bootmem(void) { - void *base = NULL; + uintptr_t base = 0; size_t size = 0; - cbmem_region_used(base, &size); - bootmem_add_range((uintptr_t)base, size, LB_MEM_TABLE); + cbmem_region_used(&base, &size); + bootmem_add_range(base, size, LB_MEM_TABLE); } #if ENV_RAMSTAGE

1 0

Patch set updated for coreboot: cbmem: Fix cbmem_add_bootmem()
by Andrey Petrov 11 Mar '16

11 Mar '16

Andrey Petrov (andrey.petrov(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14033 -gerrit commit 27514b6d761d209a6fac8a0a538888727c83ff35 Author: Andrey Petrov <andrey.petrov(a)intel.com> Date: Thu Mar 10 22:14:41 2016 -0800 cbmem: Fix cbmem_add_bootmem() Change 13363 (555d6c2) introduced a bug where cbmem_add_bootmem() was converted to use a new function. Unfortunately instead of passing a pointer NULL was passed due to type confusion. This change fixes that problem by passing address of stack variable rather than NULL. Change-Id: Ib8e1add3547cda01f71bf1dea14d3e58bdd99730 Signed-off-by: Andrey Petrov <andrey.petrov(a)intel.com> --- src/lib/imd_cbmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index e75c538..a078071 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -272,11 +272,11 @@ void cbmem_region_used(uintptr_t *base, size_t *size) void cbmem_add_bootmem(void) { - void *base = NULL; + uintptr_t base = 0; size_t size = 0; - cbmem_region_used(base, &size); - bootmem_add_range((uintptr_t)base, size, LB_MEM_TABLE); + cbmem_region_used(&base, &size); + bootmem_add_range(base, size, LB_MEM_TABLE); } #if ENV_RAMSTAGE

1 0

New patch to review for coreboot: cbmem: Fix for 555d6c2
by Andrey Petrov 11 Mar '16

11 Mar '16

Andrey Petrov (andrey.petrov(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14033 -gerrit commit 87ad98fedaae068d371b575aa3e2a9fc8524489e Author: Andrey Petrov <andrey.petrov(a)intel.com> Date: Thu Mar 10 22:14:41 2016 -0800 cbmem: Fix for 555d6c2 Change-Id: Ib8e1add3547cda01f71bf1dea14d3e58bdd99730 Signed-off-by: Andrey Petrov <andrey.petrov(a)intel.com> --- src/lib/imd_cbmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index e75c538..a078071 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -272,11 +272,11 @@ void cbmem_region_used(uintptr_t *base, size_t *size) void cbmem_add_bootmem(void) { - void *base = NULL; + uintptr_t base = 0; size_t size = 0; - cbmem_region_used(base, &size); - bootmem_add_range((uintptr_t)base, size, LB_MEM_TABLE); + cbmem_region_used(&base, &size); + bootmem_add_range(base, size, LB_MEM_TABLE); } #if ENV_RAMSTAGE

1 0

Patch set updated for coreboot: nortbridge/sandybridge/mrccache: parse the return code of flash->write
by Alexander Couzens 11 Mar '16

11 Mar '16

Alexander Couzens (lynxis(a)fe80.eu) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13999 -gerrit commit 3e2b2366c8587e4ac1613d4e4656d3091874e385 Author: Alexander Couzens <lynxis(a)fe80.eu> Date: Wed Mar 9 04:02:42 2016 +0100 nortbridge/sandybridge/mrccache: parse the return code of flash->write Change-Id: I2738da99e4651598faeaa228fba447d0872e9ded Signed-off-by: Alexander Couzens <lynxis(a)fe80.eu> --- src/northbridge/intel/sandybridge/mrccache.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/northbridge/intel/sandybridge/mrccache.c b/src/northbridge/intel/sandybridge/mrccache.c index a5dd456..37bca85 100644 --- a/src/northbridge/intel/sandybridge/mrccache.c +++ b/src/northbridge/intel/sandybridge/mrccache.c @@ -160,6 +160,7 @@ static void update_mrc_cache(void *unused) struct mrc_data_container *current = cbmem_find(CBMEM_ID_MRCDATA); struct mrc_data_container *cache, *cache_base; u32 cache_size; + int ret; if (!current) { printk(BIOS_ERR, "No MRC cache in cbmem. Can't update flash.\n"); @@ -220,8 +221,14 @@ static void update_mrc_cache(void *unused) // 4. write mrc data with flash->write() printk(BIOS_DEBUG, "Finally: write MRC cache update to flash at %p\n", cache); - flash->write(flash, to_flash_offset(flash, cache), + ret = flash->write(flash, to_flash_offset(flash, cache), current->mrc_data_size + sizeof(*current), current); + + if (ret) + printk(BIOS_WARNING, "Writing the MRC cache failed with ret %d\n", + ret); + else + printk(BIOS_DEBUG, "Successfully wrote MRC cache\n"); } BOOT_STATE_INIT_ENTRY(BS_WRITE_TABLES, BS_ON_ENTRY, update_mrc_cache, NULL);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit March 2016