coreboot-gerrit September 2017

coreboot-gerrit@coreboot.org

1 participants
1960 discussions

Change in coreboot[master]: util/me_cleaner: Merge upstream, add HAP/AltMeDisable menu option
by build bot (Jenkins) (Code Review) 01 Sep '17

01 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21312 ) Change subject: util/me_cleaner: Merge upstream, add HAP/AltMeDisable menu option ...................................................................... Patch Set 2: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/14957/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/59683/ : SUCCESS -- To view, visit https://review.coreboot.org/21312 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0ebc5def2b9c01b2cc75f5b1541911a05f95c1ba Gerrit-Change-Number: 21312 Gerrit-PatchSet: 2 Gerrit-Owner: Jean Lucas <jean(a)4ray.co> Gerrit-Reviewer: Jean Lucas <jean(a)4ray.co> Gerrit-Reviewer: Nicola Corna <nicola(a)corna.info> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 01 Sep 2017 11:01:18 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: ifdtool: refactor region_name(s) and new_layout
by build bot (Jenkins) (Code Review) 01 Sep '17

01 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21315 ) Change subject: ifdtool: refactor region_name(s) and new_layout ...................................................................... Patch Set 3: Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/14956/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/59682/ : SUCCESS -- To view, visit https://review.coreboot.org/21315 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia2b92c3f835f9849a243a48c37588c2dbe7449bf Gerrit-Change-Number: 21315 Gerrit-PatchSet: 3 Gerrit-Owner: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: Nicola Corna <nicola(a)corna.info> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 01 Sep 2017 10:28:46 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: ifdtool: optimize some code and data type
by build bot (Jenkins) (Code Review) 01 Sep '17

01 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21288 ) Change subject: ifdtool: optimize some code and data type ...................................................................... Patch Set 12: Build Successful https://qa.coreboot.org/job/coreboot-gerrit/59681/ : SUCCESS -- To view, visit https://review.coreboot.org/21288 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6d05418c8b32fa31dcd038a3e56f9aefe13fa9c4 Gerrit-Change-Number: 21288 Gerrit-PatchSet: 12 Gerrit-Owner: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philippe Mathieu-Daudé <f4bug(a)amsat.org> Gerrit-Reviewer: Ronald G. Minnich <rminnich(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 01 Sep 2017 10:25:25 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: ifdtool: refactor region_name(s) and new_layout
by Bill XIE (Code Review) 01 Sep '17

01 Sep '17

Hello Nicola Corna, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/21315 to look at the new patch set (#3). Change subject: ifdtool: refactor region_name(s) and new_layout ...................................................................... ifdtool: refactor region_name(s) and new_layout The feature "--newlayout" is designed to use scheme "right-align" to copy every regions since its birstday (change I0e0925a725c40fa44d8c4b6e86552028779d0523), but such scheme may be only valid for the bios region. For example, it will cut off the starting chunk of the me region when attempting to shrink it, according to https://github.com/corna/me_cleaner/issues/58 . In this commit, I add a member "dir" to "struct region_info" (former "struct region_name" to record the alignment direction of the region, and for now, only bios region uses "right-align". (ME region should use "left-align", according to me_cleaner's practice) Change-Id: Ia2b92c3f835f9849a243a48c37588c2dbe7449bf Signed-off-by: Bill XIE <persmule(a)gmail.com> --- M util/ifdtool/ifdtool.c M util/ifdtool/ifdtool.h 2 files changed, 102 insertions(+), 42 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/21315/3 -- To view, visit https://review.coreboot.org/21315 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia2b92c3f835f9849a243a48c37588c2dbe7449bf Gerrit-Change-Number: 21315 Gerrit-PatchSet: 3 Gerrit-Owner: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: Nicola Corna <nicola(a)corna.info> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in coreboot[master]: ifdtool: refactor region_name(s) and new_layout
by build bot (Jenkins) (Code Review) 01 Sep '17

01 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21315 ) Change subject: ifdtool: refactor region_name(s) and new_layout ...................................................................... Patch Set 2: Build Successful https://qa.coreboot.org/job/coreboot-gerrit/59677/ : SUCCESS -- To view, visit https://review.coreboot.org/21315 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia2b92c3f835f9849a243a48c37588c2dbe7449bf Gerrit-Change-Number: 21315 Gerrit-PatchSet: 2 Gerrit-Owner: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: Nicola Corna <nicola(a)corna.info> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 01 Sep 2017 10:05:06 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: ifdtool: refactor region_name(s) and new_layout
by Bill XIE (Code Review) 01 Sep '17

01 Sep '17

Bill XIE has posted comments on this change. ( https://review.coreboot.org/21315 ) Change subject: ifdtool: refactor region_name(s) and new_layout ...................................................................... Patch Set 2: (1 comment) https://review.coreboot.org/#/c/21315/2/util/ifdtool/ifdtool.c File util/ifdtool/ifdtool.c: https://review.coreboot.org/#/c/21315/2/util/ifdtool/ifdtool.c@980 PS2, Line 980: void new_layout(const char *filename, char *image, int size, I believe this function needs further dismantlement. -- To view, visit https://review.coreboot.org/21315 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia2b92c3f835f9849a243a48c37588c2dbe7449bf Gerrit-Change-Number: 21315 Gerrit-PatchSet: 2 Gerrit-Owner: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: Nicola Corna <nicola(a)corna.info> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 01 Sep 2017 10:00:38 +0000 Gerrit-HasComments: Yes

1 0

Change in coreboot[master]: ifdtool: refactor region_name(s) and new_layout
by Bill XIE (Code Review) 01 Sep '17

01 Sep '17

Hello Nicola Corna, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/21315 to look at the new patch set (#2). Change subject: ifdtool: refactor region_name(s) and new_layout ...................................................................... ifdtool: refactor region_name(s) and new_layout The feature "--newlayout" is designed to use scheme "right-align" to copy every regions since its birstday (change I0e0925a725c40fa44d8c4b6e86552028779d0523), but such scheme may be only valid for the bios region. For example, it will cut off the starting chunk of the me region when attempting to shrink it, according to https://github.com/corna/me_cleaner/issues/58 . In this commit, I add a member "dir" to "struct region_info" (former "struct region_name" to record the alignment direction of the region, and for now, only bios region uses "right-align". (ME region should use "left-align", according to me_cleaner's practice) Change-Id: Ia2b92c3f835f9849a243a48c37588c2dbe7449bf Signed-off-by: Bill XIE <persmule(a)gmail.com> --- M util/ifdtool/ifdtool.c M util/ifdtool/ifdtool.h 2 files changed, 102 insertions(+), 42 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/21315/2 -- To view, visit https://review.coreboot.org/21315 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia2b92c3f835f9849a243a48c37588c2dbe7449bf Gerrit-Change-Number: 21315 Gerrit-PatchSet: 2 Gerrit-Owner: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: Nicola Corna <nicola(a)corna.info> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in coreboot[master]: ifdtool: refactor region_name(s) and new_layout
by build bot (Jenkins) (Code Review) 01 Sep '17

01 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21315 ) Change subject: ifdtool: refactor region_name(s) and new_layout ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/14950/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/59674/ : SUCCESS -- To view, visit https://review.coreboot.org/21315 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia2b92c3f835f9849a243a48c37588c2dbe7449bf Gerrit-Change-Number: 21315 Gerrit-PatchSet: 1 Gerrit-Owner: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 01 Sep 2017 09:48:23 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: ifdtool: refactor region_name(s) and new_layout
by Bill XIE (Code Review) 01 Sep '17

01 Sep '17

Bill XIE has uploaded this change for review. ( https://review.coreboot.org/21315 Change subject: ifdtool: refactor region_name(s) and new_layout ...................................................................... ifdtool: refactor region_name(s) and new_layout The feature "--newlayout" is designed to use scheme "right-align" to copy every regions since its birstday (commit 4eabe1e), but such scheme may be only valid for the bios region. For example, it will cut off the starting chunk of the me region when attempting to shrink it, according to https://github.com/corna/me_cleaner/issues/58 . In this commit, I add a member "dir" to "struct region_info" (former "struct region_name" to record the alignment direction of the region, and for now, only bios region uses "right-align". (ME region should use "left-align", according to me_cleaner's practice) Change-Id: Ia2b92c3f835f9849a243a48c37588c2dbe7449bf Signed-off-by: Bill XIE <persmule(a)gmail.com> --- M util/ifdtool/ifdtool.c M util/ifdtool/ifdtool.h 2 files changed, 102 insertions(+), 42 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/21315/1 diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index d2e530d..a12611e 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -32,16 +32,16 @@ static int selected_chip = 0; static int platform = -1; -static const struct region_name region_names[MAX_REGIONS] = { - { "Flash Descriptor", "fd" }, - { "BIOS", "bios" }, - { "Intel ME", "me" }, - { "GbE", "gbe" }, - { "Platform Data", "pd" }, - { "Reserved", "res1" }, - { "Reserved", "res2" }, - { "Reserved", "res3" }, - { "EC", "ec" }, +static const struct region_info region_infos[MAX_REGIONS] = { + { "Flash Descriptor", "fd", ALD_left }, + { "BIOS", "bios", ALD_right }, + { "Intel ME", "me", ALD_left }, + { "GbE", "gbe", ALD_left }, + { "Platform Data", "pd", ALD_left }, + { "Reserved", "res1", ALD_left }, + { "Reserved", "res2", ALD_left }, + { "Reserved", "res3", ALD_left }, + { "EC", "ec", ALD_left }, }; static fdbar_t *find_fd(char *image, int size) @@ -150,7 +150,7 @@ exit (EXIT_FAILURE); } - return region_names[region_type].pretty; + return region_infos[region_type].pretty; } static const char *region_name_short(int region_type) @@ -160,7 +160,17 @@ exit (EXIT_FAILURE); } - return region_names[region_type].terse; + return region_infos[region_type].terse; +} + +static int region_align_dir(int region_type) +{ + if (region_type < 0 || region_type >= max_regions) { + fprintf(stderr, "Invalid region type.\n"); + exit (EXIT_FAILURE); + } + + return region_infos[region_type].dir; } static int region_num(const char *name) @@ -168,9 +178,9 @@ int i; for (i = 0; i < max_regions; i++) { - if (strcasecmp(name, region_names[i].pretty) == 0) + if (strcasecmp(name, region_infos[i].pretty) == 0) return i; - if (strcasecmp(name, region_names[i].terse) == 0) + if (strcasecmp(name, region_infos[i].terse) == 0) return i; } @@ -911,6 +921,62 @@ return 0; } +/** + * Copy a region into new image's memory. + * + * @param image, size current image with size. + * @param new_image, new_size new image with size. + * @param current_regions, new_regions pointer to array of region_t. + * @param region_type type of a region, also act as index. + */ +static void copy_region(const char *image, int size, + char *new_image, int new_size, + const region_t (*current_regions)[MAX_REGIONS], + const region_t (*new_regions)[MAX_REGIONS], + int region_type) +{ + int dir = region_align_dir(region_type); + const region_t *current = &(*current_regions)[region_type]; + const region_t *new = &(*new_regions)[region_type]; + int copy_size = new->size; + int offset_current = 0, offset_new = 0; + if (dir == ALD_right) { + if (new->size > current->size) { + /* copy from the end of the current region */ + copy_size = current->size; + offset_new = new->size - current->size; + } + + if (new->size < current->size) { + /* copy to the end of the new region */ + offset_current = current->size - new->size; + } + } else { + if (new->size > current->size) { + /* copy from the start of the current region */ + copy_size = current->size; + } + } + + printf("Copy Descriptor %d (%s) (%d bytes)\n", region_type, + region_name(region_type), copy_size); + printf(" from %08x+%08x:%08x (%10d)\n", current->base, + offset_current, current->limit, current->size); + printf(" to %08x+%08x:%08x (%10d)\n", new->base, + offset_new, new->limit, new->size); + + if (((new->base + offset_new) > new_size) && + (current->base + offset_current > size)) { + fprintf(stderr, "Region %d (%s) exceeds the end of the image.\n", + region_type, region_name(region_type)); + exit(EXIT_FAILURE); + } + + memcpy(new_image + new->base + offset_new, + image + current->base + offset_current, + copy_size); +} + void new_layout(const char *filename, char *image, int size, const char *layout_fname) { @@ -1010,35 +1076,11 @@ new_image = malloc(new_extent); memset(new_image, 0xff, new_extent); for (i = 0; i < max_regions; i++) { - int copy_size = new_regions[i].size; - int offset_current = 0, offset_new = 0; - region_t current = current_regions[i]; - region_t new = new_regions[i]; - - if (new.size == 0) + if (new_regions[i].size == 0) continue; - if (new.size > current.size) { - /* copy from the end of the current region */ - copy_size = current.size; - offset_new = new.size - current.size; - } - - if (new.size < current.size) { - /* copy to the end of the new region */ - offset_current = current.size - new.size; - } - - printf("Copy Descriptor %d (%s) (%d bytes)\n", i, - region_name(i), copy_size); - printf(" from %08x+%08x:%08x (%10d)\n", current.base, - offset_current, current.limit, current.size); - printf(" to %08x+%08x:%08x (%10d)\n", new.base, - offset_new, new.limit, new.size); - - memcpy(new_image + new.base + offset_new, - image + current.base + offset_current, - copy_size); + copy_region(image, size, new_image, new_extent, + &current_regions, &new_regions, i); } /* update new descriptor regions */ diff --git a/util/ifdtool/ifdtool.h b/util/ifdtool/ifdtool.h index b4a6cd4..a7a8398 100644 --- a/util/ifdtool/ifdtool.h +++ b/util/ifdtool/ifdtool.h @@ -64,6 +64,23 @@ #define MAX_REGIONS 9 #define MAX_REGIONS_OLD 5 +enum region_types { + RT_fd, + RT_bios, + RT_me, + RT_gbe, + RT_pd, + RT_res1, + RT_res2, + RT_res3, + RT_ec +}; + +enum alignment_direction { + ALD_left, + ALD_right +}; + typedef struct { uint32_t flreg[MAX_REGIONS]; } __attribute__((packed)) frba_t; @@ -118,7 +135,8 @@ int base, limit, size; } region_t; -struct region_name { +struct region_info { const char *pretty; const char *terse; + enum alignment_direction dir; }; -- To view, visit https://review.coreboot.org/21315 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2b92c3f835f9849a243a48c37588c2dbe7449bf Gerrit-Change-Number: 21315 Gerrit-PatchSet: 1 Gerrit-Owner: Bill XIE <persmule(a)gmail.com>

1 0

Change in coreboot[master]: intelmetool: Add support for Sunrise Point-H
by Philipp Deppenwiese (Code Review) 01 Sep '17

01 Sep '17

Philipp Deppenwiese has posted comments on this change. ( https://review.coreboot.org/21301 ) Change subject: intelmetool: Add support for Sunrise Point-H ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/21301 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62f78fe5ca03bf70497939a12f0036bf247b2aa7 Gerrit-Change-Number: 21301 Gerrit-PatchSet: 1 Gerrit-Owner: Shawn C <citypw(a)gmail.com> Gerrit-Reviewer: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: Damien Zammit <damien(a)zamaudio.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 01 Sep 2017 08:40:40 +0000 Gerrit-HasComments: No

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit September 2017