coreboot-gerrit September 2017

coreboot-gerrit@coreboot.org

1 participants
1960 discussions

Change in coreboot[master]: ifdtool: merge region_filenames with region_name(s)
by build bot (Jenkins) (Code Review) 12 Sep '17

12 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21509 ) Change subject: ifdtool: merge region_filenames with region_name(s) ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/15526/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/60303/ : SUCCESS -- To view, visit https://review.coreboot.org/21509 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I38489c6d3b3c161e9b0281188e6cdd0b62e38335 Gerrit-Change-Number: 21509 Gerrit-PatchSet: 1 Gerrit-Owner: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 12 Sep 2017 08:47:08 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: mb/google/poppy: Add lens_focus property for OV13858 camera module
by V Sowmya (Code Review) 12 Sep '17

12 Sep '17

V Sowmya has uploaded this change for review. ( https://review.coreboot.org/21512 Change subject: mb/google/poppy: Add lens_focus property for OV13858 camera module ...................................................................... mb/google/poppy: Add lens_focus property for OV13858 camera module Add lens_focus property with reference to VCM device for OV13858 camera module to register the corresponding v4l2 sub-device asynchronously. Change-Id: Ib22403f668dd07d6b9226fe2c22b533223b69473 Signed-off-by: V Sowmya <v.sowmya(a)intel.com> --- M src/mainboard/google/poppy/acpi/mipi_camera.asl 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/21512/1 diff --git a/src/mainboard/google/poppy/acpi/mipi_camera.asl b/src/mainboard/google/poppy/acpi/mipi_camera.asl index 0732abb..595868d 100644 --- a/src/mainboard/google/poppy/acpi/mipi_camera.asl +++ b/src/mainboard/google/poppy/acpi/mipi_camera.asl @@ -649,8 +649,10 @@ ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), Package () { Package () { "clock-frequency", 19200000 }, + Package () { "lens-focus", + Package () { \_SB.PCI0.I2C2.VCM0, 0, 0 } + } } - }) Name (PRT0, Package() { -- To view, visit https://review.coreboot.org/21512 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib22403f668dd07d6b9226fe2c22b533223b69473 Gerrit-Change-Number: 21512 Gerrit-PatchSet: 1 Gerrit-Owner: V Sowmya <v.sowmya(a)intel.com>

1 0

Change in coreboot[master]: buildgcc: Update IASL to 20170831
by build bot (Jenkins) (Code Review) 12 Sep '17

12 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21156 ) Change subject: buildgcc: Update IASL to 20170831 ...................................................................... Patch Set 4: Verified-1 Build Unstable https://qa.coreboot.org/job/coreboot-toolchain/366/ : UNSTABLE https://qa.coreboot.org/job/coreboot-checkpatch/15522/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/60299/ : SUCCESS -- To view, visit https://review.coreboot.org/21156 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6c14f3aad59749896816bb8789788fc513e7176f Gerrit-Change-Number: 21156 Gerrit-PatchSet: 4 Gerrit-Owner: Iru Cai <mytbk920423(a)gmail.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 12 Sep 2017 08:45:41 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: ifdtool: refactor region-permission-related feature
by build bot (Jenkins) (Code Review) 12 Sep '17

12 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21416 ) Change subject: ifdtool: refactor region-permission-related feature ...................................................................... Patch Set 18: Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/15525/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/60301/ : SUCCESS -- To view, visit https://review.coreboot.org/21416 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4d34606545db4d970ce3ec202da4bf4c5cbad18c Gerrit-Change-Number: 21416 Gerrit-PatchSet: 18 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: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philippe Mathieu-Daudé <f4bug(a)amsat.org> Gerrit-Reviewer: Shawn Chang <citypw(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 12 Sep 2017 08:42:34 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: ifdtool: Const-correct and redesign some functions
by build bot (Jenkins) (Code Review) 12 Sep '17

12 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21288 ) Change subject: ifdtool: Const-correct and redesign some functions ...................................................................... Patch Set 35: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/15523/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/60302/ : 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: 35 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: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Nicola Corna <nicola(a)corna.info> 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: Tue, 12 Sep 2017 08:38:30 +0000 Gerrit-HasComments: No

1 0

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

12 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 27: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/15524/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/60300/ : 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: 27 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: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philippe Mathieu-Daudé <f4bug(a)amsat.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 12 Sep 2017 08:29:17 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: ifdtool: refacter some code
by Bill XIE (Code Review) 12 Sep '17

12 Sep '17

Bill XIE has uploaded this change for review. ( https://review.coreboot.org/21511 Change subject: ifdtool: refacter some code ...................................................................... ifdtool: refacter some code add find_fcba(), find_frba(), find_fmba(), find_fpsba() and find_fmsba() to replace those copy-pasted addressings. This commit is one separated from the original I6d05418c. Change-Id: I98965711e4cb9792e5cc86cc4c1035559e0274f5 Signed-off-by: Bill XIE <persmule(a)gmail.com> --- M util/ifdtool/ifdtool.c 1 file changed, 112 insertions(+), 54 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/21511/1 diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index f6524c9..a0245c7 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -28,6 +28,17 @@ #define O_BINARY 0 #endif +/** + * PTR_IN_RANGE - examine whether a pointer falls in [base, base + limit) + * @param ptr: the non-void* pointer to a single arbitrary-sized object. + * @param base: base address represented with char* type. + * @param limit: upper limit of the legal address. + * + */ +#define PTR_IN_RANGE(ptr, base, limit) \ + ((const char *)(ptr) >= (base) && \ + (const char *)&(ptr)[1] <= (base) + (limit)) + static int ifd_version; static unsigned int max_regions = 0; static int selected_chip = 0; @@ -62,7 +73,56 @@ return NULL; } - return (fdbar_t *) (image + i); + fdbar_t *fdb = (fdbar_t *) (image + i); + return PTR_IN_RANGE(fdb, image, size) ? fdb : NULL; +} + +static fcba_t *find_fcba(char *image, int size) +{ + fdbar_t *fdb = find_fd(image, size); + if (!fdb) + return NULL; + fcba_t *fcba = (fcba_t *) (image + ((fdb->flmap0 & 0xff) << 4)); + return PTR_IN_RANGE(fcba, image, size) ? fcba : NULL; + +} + +static fmba_t *find_fmba(char *image, int size) +{ + fdbar_t *fdb = find_fd(image, size); + if (!fdb) + return NULL; + fmba_t *fmba = (fmba_t *) (image + ((fdb->flmap1 & 0xff) << 4)); + return PTR_IN_RANGE(fmba, image, size) ? fmba : NULL; +} + +static frba_t *find_frba(char *image, int size) +{ + fdbar_t *fdb = find_fd(image, size); + if (!fdb) + return NULL; + frba_t *frba = + (frba_t *) (image + (((fdb->flmap0 >> 16) & 0xff) << 4)); + return PTR_IN_RANGE(frba, image, size) ? frba : NULL; +} + +static fpsba_t *find_fpsba(char *image, int size) +{ + fdbar_t *fdb = find_fd(image, size); + if (!fdb) + return NULL; + fpsba_t *fpsba = + (fpsba_t *) (image + (((fdb->flmap1 >> 16) & 0xff) << 4)); + return PTR_IN_RANGE(fpsba, image, size) ? fpsba : NULL; +} + +static fmsba_t *find_fmsba(char *image, int size) +{ + fdbar_t *fdb = find_fd(image, size); + if (!fdb) + return NULL; + fmsba_t *fmsba = (fmsba_t *) (image + ((fdb->flmap2 & 0xff) << 4)); + return PTR_IN_RANGE(fmsba, image, size) ? fmsba : NULL; } /* @@ -72,14 +132,9 @@ */ static void check_ifd_version(char *image, int size) { - fdbar_t *fdb = find_fd(image, size); - fcba_t *fcba; int read_freq; - if (!fdb) - exit(EXIT_FAILURE); - - fcba = (fcba_t *) (image + (((fdb->flmap0) & 0xff) << 4)); + const fcba_t *fcba = find_fcba(image, size); if (!fcba) exit(EXIT_FAILURE); @@ -430,11 +485,10 @@ static void dump_fmsba(const fmsba_t *fmsba) { + unsigned int i; printf("Found Processor Strap Section\n"); - printf("????: 0x%08x\n", fmsba->data[0]); - printf("????: 0x%08x\n", fmsba->data[1]); - printf("????: 0x%08x\n", fmsba->data[2]); - printf("????: 0x%08x\n", fmsba->data[3]); + for (i = 0; i < ARRAY_SIZE(fmsba->data); i++) + printf("????: 0x%08x\n", fmsba->data[i]); } static void dump_jid(uint32_t jid) @@ -528,7 +582,7 @@ static void dump_fd(char *image, int size) { - fdbar_t *fdb = find_fd(image, size); + const fdbar_t *fdb = find_fd(image, size); if (!fdb) exit(EXIT_FAILURE); @@ -557,36 +611,40 @@ (image + ((fdb->flumap1 & 0xff) << 4)), (fdb->flumap1 >> 8) & 0xff); dump_oem((const uint8_t *)image + 0xf00); - dump_frba((const frba_t *) - (image + (((fdb->flmap0 >> 16) & 0xff) << 4))); - dump_fcba((const fcba_t *) (image + ((fdb->flmap0 & 0xff) << 4))); - dump_fpsba((const fpsba_t *) - (image + (((fdb->flmap1 >> 16) & 0xff) << 4))); - dump_fmba((const fmba_t *) (image + ((fdb->flmap1 & 0xff) << 4))); - dump_fmsba((const fmsba_t *) (image + ((fdb->flmap2 & 0xff) << 4))); + + const frba_t *frba = find_frba(image, size); + const fcba_t *fcba = find_fcba(image, size); + const fpsba_t *fpsba = find_fpsba(image, size); + const fmba_t *fmba = find_fmba(image, size); + const fmsba_t *fmsba = find_fmsba(image, size); + + if (frba && fcba && fpsba && fmba && fmsba) { + dump_frba(frba); + dump_fcba(fcba); + dump_fpsba(fpsba); + dump_fmba(fmba); + dump_fmsba(fmsba); + } else { + printf("FD is corrupted!\n"); + } } static void dump_layout(char *image, int size, const char *layout_fname) { - fdbar_t *fdb = find_fd(image, size); - if (!fdb) + const frba_t *frba = find_frba(image, size); + if (!frba) exit(EXIT_FAILURE); - dump_frba_layout((frba_t *) - (image + (((fdb->flmap0 >> 16) & 0xff) << 4)), - layout_fname); + dump_frba_layout(frba, layout_fname); } static void write_regions(char *image, int size) { unsigned int i; + const frba_t *frba = find_frba(image, size); - fdbar_t *fdb = find_fd(image, size); - if (!fdb) + if (!frba) exit(EXIT_FAILURE); - - frba_t *frba = - (frba_t *) (image + (((fdb->flmap0 >> 16) & 0xff) << 4)); for (i = 0; i < max_regions; i++) { region_t region = get_region(frba, i); @@ -634,8 +692,9 @@ static void set_spi_frequency(const char *filename, char *image, int size, enum spi_frequency freq) { - fdbar_t *fdb = find_fd(image, size); - fcba_t *fcba = (fcba_t *) (image + (((fdb->flmap0) & 0xff) << 4)); + fcba_t *fcba = find_fcba(image, size); + if (!fcba) + exit(EXIT_FAILURE); /* clear bits 21-29 */ fcba->flcomp &= ~0x3fe00000; @@ -651,8 +710,10 @@ static void set_em100_mode(const char *filename, char *image, int size) { - fdbar_t *fdb = find_fd(image, size); - fcba_t *fcba = (fcba_t *) (image + (((fdb->flmap0) & 0xff) << 4)); + fcba_t *fcba = find_fcba(image, size); + if (!fcba) + exit(EXIT_FAILURE); + int freq; switch (ifd_version) { @@ -674,8 +735,9 @@ static void set_chipdensity(const char *filename, char *image, int size, unsigned int density) { - fdbar_t *fdb = find_fd(image, size); - fcba_t *fcba = (fcba_t *) (image + (((fdb->flmap0) & 0xff) << 4)); + fcba_t *fcba = find_fcba(image, size); + if (!fcba) + exit(EXIT_FAILURE); printf("Setting chip density to "); decode_component_density(density); @@ -727,8 +789,9 @@ static void lock_descriptor(const char *filename, char *image, int size) { int wr_shift, rd_shift; - fdbar_t *fdb = find_fd(image, size); - fmba_t *fmba = (fmba_t *) (image + (((fdb->flmap1) & 0xff) << 4)); + fmba_t *fmba = find_fmba(image, size); + if (!fmba) + exit(EXIT_FAILURE); /* TODO: Dynamically take Platform Data Region and GbE Region * into regard. */ @@ -783,8 +846,9 @@ static void unlock_descriptor(const char *filename, char *image, int size) { - fdbar_t *fdb = find_fd(image, size); - fmba_t *fmba = (fmba_t *) (image + (((fdb->flmap1) & 0xff) << 4)); + fmba_t *fmba = find_fmba(image, size); + if (!fmba) + exit(EXIT_FAILURE); if (ifd_version >= IFD_VERSION_2) { /* Access bits for each region are read: 19:8 write: 31:20 */ @@ -804,11 +868,9 @@ void inject_region(const char *filename, char *image, int size, unsigned int region_type, const char *region_fname) { - fdbar_t *fdb = find_fd(image, size); - if (!fdb) + frba_t *frba = find_frba(image, size); + if (!frba) exit(EXIT_FAILURE); - frba_t *frba = - (frba_t *) (image + (((fdb->flmap0 >> 16) & 0xff) << 4)); region_t region = get_region(frba, region_type); if (region.size <= 0xfff) { @@ -913,12 +975,9 @@ char *new_image; /* load current descriptor map and regions */ - fdbar_t *fdb = find_fd(image, size); - if (!fdb) + frba_t *frba = find_frba(image, size); + if (!frba) exit(EXIT_FAILURE); - - frba_t *frba = - (frba_t *) (image + (((fdb->flmap0 >> 16) & 0xff) << 4)); for (i = 0; i < max_regions; i++) { current_regions[i] = get_region(frba, i); @@ -1030,14 +1089,12 @@ } /* update new descriptor regions */ - fdb = find_fd(new_image, new_extent); - if (!fdb) + frba = find_frba(new_image, new_extent); + if (!frba) exit(EXIT_FAILURE); - frba = (frba_t *) (new_image + (((fdb->flmap0 >> 16) & 0xff) << 4)); - for (i = 1; i < max_regions; i++) { + for (i = 1; i < max_regions; i++) set_region(frba, i, &new_regions[i]); - } write_image(filename, new_image, new_extent); free(new_image); @@ -1089,7 +1146,8 @@ 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, mode_density = 0; - char *region_type_string = NULL, *region_fname = NULL, *layout_fname = NULL; + char *region_type_string = NULL, *region_fname = NULL; + const char *layout_fname = NULL; int region_type = -1, inputfreq = 0; unsigned int new_density = 0; enum spi_frequency spifreq = SPI_FREQUENCY_20MHZ; -- To view, visit https://review.coreboot.org/21511 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I98965711e4cb9792e5cc86cc4c1035559e0274f5 Gerrit-Change-Number: 21511 Gerrit-PatchSet: 1 Gerrit-Owner: Bill XIE <persmule(a)gmail.com>

1 0

Change in coreboot[master]: ifdtool: redesign some structures
by Bill XIE (Code Review) 12 Sep '17

12 Sep '17

Bill XIE has uploaded this change for review. ( https://review.coreboot.org/21510 Change subject: ifdtool: redesign some structures ...................................................................... ifdtool: redesign some structures Redesign some array-like structures as true arrays, and rewrite functions to dump them as loops. This commit is one separated from the original I6d05418c. Change-Id: I161c9a2ae83d26e658d67d0804e943fff95fe076 Signed-off-by: Bill XIE <persmule(a)gmail.com> --- M util/ifdtool/Makefile M util/ifdtool/ifdtool.c M util/ifdtool/ifdtool.h 3 files changed, 21 insertions(+), 120 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/21510/1 diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile index 77547ef..936aa50 100644 --- a/util/ifdtool/Makefile +++ b/util/ifdtool/Makefile @@ -18,7 +18,7 @@ CC = gcc INSTALL = /usr/bin/install PREFIX = /usr/local -CFLAGS = -O2 -g -Wall -W -Werror +CFLAGS = -O2 -g -Wall -W -Werror -I../../src/commonlib/include LDFLAGS = OBJS = ifdtool.o diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index 03b28f4..f6524c9 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -21,6 +21,7 @@ #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> +#include <commonlib/helpers.h> #include "ifdtool.h" #ifndef O_BINARY @@ -106,7 +107,6 @@ int base_mask; int limit_mask; uint32_t flreg; - const void *v; region_t region; if (ifd_version >= IFD_VERSION_2) @@ -116,40 +116,12 @@ limit_mask = base_mask << 16; - switch (region_type) { - case 0: - v = &frba->flreg0; - break; - case 1: - v = &frba->flreg1; - break; - case 2: - v = &frba->flreg2; - break; - case 3: - v = &frba->flreg3; - break; - case 4: - v = &frba->flreg4; - break; - case 5: - v = &frba->flreg5; - break; - case 6: - v = &frba->flreg6; - break; - case 7: - v = &frba->flreg7; - break; - case 8: - v = &frba->flreg8; - break; - default: + if (region_type >= MAX_REGIONS) { fprintf(stderr, "Invalid region type %d.\n", region_type); exit (EXIT_FAILURE); } - memmove(&flreg, v, sizeof(flreg)); + flreg = frba->flreg[region_type]; region.base = (flreg & base_mask) << 12; region.limit = ((flreg & limit_mask) >> 4) | 0xfff; region.size = region.limit - region.base + 1; @@ -163,31 +135,14 @@ static void set_region(frba_t *frba, unsigned int region_type, const region_t *region) { - switch (region_type) { - case 0: - frba->flreg0 = (((region->limit >> 12) & 0x7fff) << 16) - | ((region->base >> 12) & 0x7fff); - break; - case 1: - frba->flreg1 = (((region->limit >> 12) & 0x7fff) << 16) - | ((region->base >> 12) & 0x7fff); - break; - case 2: - frba->flreg2 = (((region->limit >> 12) & 0x7fff) << 16) - | ((region->base >> 12) & 0x7fff); - break; - case 3: - frba->flreg3 = (((region->limit >> 12) & 0x7fff) << 16) - | ((region->base >> 12) & 0x7fff); - break; - case 4: - frba->flreg4 = (((region->limit >> 12) & 0x7fff) << 16) - | ((region->base >> 12) & 0x7fff); - break; - default: - fprintf(stderr, "Invalid region type.\n"); + if (region_type >= MAX_REGIONS_OLD) { + fprintf(stderr, "Invalid region type %d.\n", region_type); exit (EXIT_FAILURE); } + + frba->flreg[region_type] = + (((region->limit >> 12) & 0x7fff) << 16) | + ((region->base >> 12) & 0x7fff); } static const char *region_name(unsigned int region_type) @@ -252,27 +207,11 @@ static void dump_frba(const frba_t *frba) { + unsigned int i; printf("Found Region Section\n"); - printf("FLREG0: 0x%08x\n", frba->flreg0); - dump_region(0, frba); - printf("FLREG1: 0x%08x\n", frba->flreg1); - dump_region(1, frba); - printf("FLREG2: 0x%08x\n", frba->flreg2); - dump_region(2, frba); - printf("FLREG3: 0x%08x\n", frba->flreg3); - dump_region(3, frba); - printf("FLREG4: 0x%08x\n", frba->flreg4); - dump_region(4, frba); - - if (ifd_version >= IFD_VERSION_2) { - printf("FLREG5: 0x%08x\n", frba->flreg5); - dump_region(5, frba); - printf("FLREG6: 0x%08x\n", frba->flreg6); - dump_region(6, frba); - printf("FLREG7: 0x%08x\n", frba->flreg7); - dump_region(7, frba); - printf("FLREG8: 0x%08x\n", frba->flreg8); - dump_region(8, frba); + for (i = 0; i < max_regions; i++) { + printf("FLREG%u: 0x%08x\n", i, frba->flreg[i]); + dump_region(i, frba); } } @@ -419,25 +358,11 @@ static void dump_fpsba(const fpsba_t *fpsba) { + unsigned int i; printf("Found PCH Strap Section\n"); - printf("PCHSTRP0: 0x%08x\n", fpsba->pchstrp0); - printf("PCHSTRP1: 0x%08x\n", fpsba->pchstrp1); - printf("PCHSTRP2: 0x%08x\n", fpsba->pchstrp2); - printf("PCHSTRP3: 0x%08x\n", fpsba->pchstrp3); - printf("PCHSTRP4: 0x%08x\n", fpsba->pchstrp4); - printf("PCHSTRP5: 0x%08x\n", fpsba->pchstrp5); - printf("PCHSTRP6: 0x%08x\n", fpsba->pchstrp6); - printf("PCHSTRP7: 0x%08x\n", fpsba->pchstrp7); - printf("PCHSTRP8: 0x%08x\n", fpsba->pchstrp8); - printf("PCHSTRP9: 0x%08x\n", fpsba->pchstrp9); - printf("PCHSTRP10: 0x%08x\n", fpsba->pchstrp10); - printf("PCHSTRP11: 0x%08x\n", fpsba->pchstrp11); - printf("PCHSTRP12: 0x%08x\n", fpsba->pchstrp12); - printf("PCHSTRP13: 0x%08x\n", fpsba->pchstrp13); - printf("PCHSTRP14: 0x%08x\n", fpsba->pchstrp14); - printf("PCHSTRP15: 0x%08x\n", fpsba->pchstrp15); - printf("PCHSTRP16: 0x%08x\n", fpsba->pchstrp16); - printf("PCHSTRP17: 0x%08x\n\n", fpsba->pchstrp17); + for (i = 0; i < ARRAY_SIZE(fpsba->pchstrp); i++) + printf("PCHSTRP%u: 0x%08x\n", i, fpsba->pchstrp[i]); + printf("\n"); } static void decode_flmstr(uint32_t flmstr) diff --git a/util/ifdtool/ifdtool.h b/util/ifdtool/ifdtool.h index f50f6be..0cce8e4 100644 --- a/util/ifdtool/ifdtool.h +++ b/util/ifdtool/ifdtool.h @@ -60,16 +60,9 @@ // regions #define MAX_REGIONS 9 #define MAX_REGIONS_OLD 5 + typedef struct { - uint32_t flreg0; - uint32_t flreg1; - uint32_t flreg2; - uint32_t flreg3; - uint32_t flreg4; - uint32_t flreg5; - uint32_t flreg6; - uint32_t flreg7; - uint32_t flreg8; + uint32_t flreg[MAX_REGIONS]; } __attribute__((packed)) frba_t; // component section @@ -81,24 +74,7 @@ // pch strap typedef struct { - uint32_t pchstrp0; - uint32_t pchstrp1; - uint32_t pchstrp2; - uint32_t pchstrp3; - uint32_t pchstrp4; - uint32_t pchstrp5; - uint32_t pchstrp6; - uint32_t pchstrp7; - uint32_t pchstrp8; - uint32_t pchstrp9; - uint32_t pchstrp10; - uint32_t pchstrp11; - uint32_t pchstrp12; - uint32_t pchstrp13; - uint32_t pchstrp14; - uint32_t pchstrp15; - uint32_t pchstrp16; - uint32_t pchstrp17; + uint32_t pchstrp[18]; } __attribute__((packed)) fpsba_t; /* -- To view, visit https://review.coreboot.org/21510 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I161c9a2ae83d26e658d67d0804e943fff95fe076 Gerrit-Change-Number: 21510 Gerrit-PatchSet: 1 Gerrit-Owner: Bill XIE <persmule(a)gmail.com>

1 0

Change in coreboot[master]: ifdtool: merge region_filenames with region_name(s)
by Bill XIE (Code Review) 12 Sep '17

12 Sep '17

Bill XIE has uploaded this change for review. ( https://review.coreboot.org/21509 Change subject: ifdtool: merge region_filenames with region_name(s) ...................................................................... ifdtool: merge region_filenames with region_name(s) There is no reason to keep a separate region_filenames array, so I merge it into region_name(s). This commit is one separated from the original I6d05418c. Change-Id: I38489c6d3b3c161e9b0281188e6cdd0b62e38335 Signed-off-by: Bill XIE <persmule(a)gmail.com> --- M util/ifdtool/ifdtool.c M util/ifdtool/ifdtool.h 2 files changed, 11 insertions(+), 22 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/09/21509/1 diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index e330494..03b28f4 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -33,15 +33,15 @@ 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" }, + { "Flash Descriptor", "fd", "flashregion_0_flashdescriptor.bin" }, + { "BIOS", "bios", "flashregion_1_bios.bin" }, + { "Intel ME", "me", "flashregion_2_intel_me.bin" }, + { "GbE", "gbe", "flashregion_3_gbe.bin" }, + { "Platform Data", "pd", "flashregion_4_platform_data.bin" }, + { "Reserved", "res1", "flashregion_5_reserved.bin" }, + { "Reserved", "res2", "flashregion_6_reserved.bin" }, + { "Reserved", "res3", "flashregion_7_reserved.bin" }, + { "EC", "ec", "flashregion_8_ec.bin" } }; static fdbar_t *find_fd(char *image, int size) @@ -226,24 +226,12 @@ static const char *region_filename(unsigned int region_type) { - static const char * const region_filenames[MAX_REGIONS] = { - "flashregion_0_flashdescriptor.bin", - "flashregion_1_bios.bin", - "flashregion_2_intel_me.bin", - "flashregion_3_gbe.bin", - "flashregion_4_platform_data.bin", - "flashregion_5_reserved.bin", - "flashregion_6_reserved.bin", - "flashregion_7_reserved.bin", - "flashregion_8_ec.bin", - }; - if (region_type >= max_regions) { fprintf(stderr, "Invalid region type %d.\n", region_type); exit (EXIT_FAILURE); } - return region_filenames[region_type]; + return region_names[region_type].filename; } static void dump_region(unsigned int num, const frba_t *frba) diff --git a/util/ifdtool/ifdtool.h b/util/ifdtool/ifdtool.h index 1ebe629..f50f6be 100644 --- a/util/ifdtool/ifdtool.h +++ b/util/ifdtool/ifdtool.h @@ -142,4 +142,5 @@ struct region_name { const char *pretty; const char *terse; + const char *filename; }; -- To view, visit https://review.coreboot.org/21509 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I38489c6d3b3c161e9b0281188e6cdd0b62e38335 Gerrit-Change-Number: 21509 Gerrit-PatchSet: 1 Gerrit-Owner: Bill XIE <persmule(a)gmail.com>

1 0

Change in coreboot[master]: mb/google/poppy: Modify the HID and add DSD for VCM device
by build bot (Jenkins) (Code Review) 12 Sep '17

12 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21508 ) Change subject: mb/google/poppy: Modify the HID and add DSD for VCM device ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/15521/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/60298/ : SUCCESS -- To view, visit https://review.coreboot.org/21508 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4a59dd2027267fbd3837fcd7dbc00551a69f7d6 Gerrit-Change-Number: 21508 Gerrit-PatchSet: 1 Gerrit-Owner: V Sowmya <v.sowmya(a)intel.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 12 Sep 2017 06:14:16 +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