coreboot-gerrit September 2017

coreboot-gerrit@coreboot.org

1 participants
1960 discussions

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

07 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21288 ) Change subject: ifdtool: optimize some code and data types ...................................................................... Patch Set 26: Build Successful https://qa.coreboot.org/job/coreboot-gerrit/60010/ : 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: 26 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: Thu, 07 Sep 2017 13:53:51 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: ifdtool: port the feature to set AltMeDisable/HAP bit here
by build bot (Jenkins) (Code Review) 07 Sep '17

07 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21437 ) Change subject: ifdtool: port the feature to set AltMeDisable/HAP bit here ...................................................................... Patch Set 2: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/15260/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/60013/ : SUCCESS -- To view, visit https://review.coreboot.org/21437 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9a2ecc60cfbb9ee9d96f15be3d53226cb428729a Gerrit-Change-Number: 21437 Gerrit-PatchSet: 2 Gerrit-Owner: 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 07 Sep 2017 13:44:38 +0000 Gerrit-HasComments: No

1 0

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

07 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 17: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/15258/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/60011/ : 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: 17 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 07 Sep 2017 13:42:43 +0000 Gerrit-HasComments: No

1 0

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

07 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 8: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/15259/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/60012/ : 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: 8 Gerrit-Owner: 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: Thu, 07 Sep 2017 13:42:04 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: add util/iotool: a simple tool to do inb/outb calls
by build bot (Jenkins) (Code Review) 07 Sep '17

07 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21438 ) Change subject: add util/iotool: a simple tool to do inb/outb calls ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/15257/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/60009/ : SUCCESS -- To view, visit https://review.coreboot.org/21438 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4bc8501a355b76a47df7619c4cae22f76c8f5927 Gerrit-Change-Number: 21438 Gerrit-PatchSet: 1 Gerrit-Owner: Alexander Couzens <lynxis(a)fe80.eu> Gerrit-Reviewer: Alexander Couzens <lynxis(a)fe80.eu> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 07 Sep 2017 13:34:52 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: add util/iotool: a simple tool to do inb/outb calls
by Alexander Couzens (Code Review) 07 Sep '17

07 Sep '17

Alexander Couzens has posted comments on this change. ( https://review.coreboot.org/21438 ) Change subject: add util/iotool: a simple tool to do inb/outb calls ...................................................................... Patch Set 1: Or should we start a more generic tools to manipulate different things? like msr, gpio, iotool -- To view, visit https://review.coreboot.org/21438 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4bc8501a355b76a47df7619c4cae22f76c8f5927 Gerrit-Change-Number: 21438 Gerrit-PatchSet: 1 Gerrit-Owner: Alexander Couzens <lynxis(a)fe80.eu> Gerrit-Reviewer: Alexander Couzens <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 07 Sep 2017 13:26:39 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: add util/iotool: a simple tool to do inb/outb calls
by Alexander Couzens (Code Review) 07 Sep '17

07 Sep '17

Alexander Couzens has uploaded this change for review. ( https://review.coreboot.org/21438 Change subject: add util/iotool: a simple tool to do inb/outb calls ...................................................................... add util/iotool: a simple tool to do inb/outb calls Change-Id: I4bc8501a355b76a47df7619c4cae22f76c8f5927 Signed-off-by: Alexander Couzens <lynxis(a)fe80.eu> --- A util/iotool/Makefile A util/iotool/iob.c 2 files changed, 94 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/38/21438/1 diff --git a/util/iotool/Makefile b/util/iotool/Makefile new file mode 100644 index 0000000..7dae3f1 --- /dev/null +++ b/util/iotool/Makefile @@ -0,0 +1,5 @@ + +CFLAGS ?= -Wall -Werror -g -static + +iob: iob.c + $(CC) $(CFLAGS) -o iob iob.c diff --git a/util/iotool/iob.c b/util/iotool/iob.c new file mode 100644 index 0000000..2d31070 --- /dev/null +++ b/util/iotool/iob.c @@ -0,0 +1,89 @@ + +#include <stdlib.h> +#include <stdio.h> + +#include <string.h> +#include <sys/io.h> + +void usage() { + fprintf(stderr, "iob r|w address value\n"); +} + +void request_perm() { + int ret; + + ret = iopl(3); + if (ret) { + fprintf(stderr, "iopl failed\n"); + exit(2); + } +} + +int readio(const char *saddr) { + char *endptr; + unsigned short int addr = 0; + unsigned short int value = 0; + + addr = strtol(saddr, &endptr, 0); + if (endptr != NULL && *endptr != '\0') { + fprintf(stderr, "Invalid address '%s'\n", saddr); + return 1; + } + + request_perm(); + value = inb(addr); + printf("read %04x = %02x\n", addr, value); + + return 0; +} + +int writeio(const char *saddr, const char *svalue) { + char *endptr; + unsigned short int addr = 0; + unsigned short int value = 0; + + addr = strtol(saddr, &endptr, 0) & 0xffff; + if (endptr != NULL && *endptr != '\0') { + fprintf(stderr, "Invalid address '%s'\n", saddr); + return 1; + } + + value = strtol(svalue, &endptr, 0) & 0xffff; + if (endptr != NULL && *endptr != '\0') { + fprintf(stderr, "Invalid value '%s'\n", svalue); + return 1; + } + + request_perm(); + outb(value, addr); + fprintf(stderr, "written %02x = %02x\n", addr, value); + + return 0; +} + +int main(int argc, const char *argv[]) { + if (argc <= 2 || argc > 4) { + usage(); + exit(1); + } + + if (argv[1][0] == 'r' && argv[1][1] == '\0') { + /* read */ + if (argc != 3) { + usage(); + exit(1); + } + return readio(argv[2]); + } else if (argv[1][0] == 'w' && argv[1][1] == '\0') { + /* write */ + if (argc != 4) { + usage(); + exit(1); + } + return writeio(argv[2], argv[3]); + } else { + usage(); + exit(1); + } + return 0; +} -- To view, visit https://review.coreboot.org/21438 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4bc8501a355b76a47df7619c4cae22f76c8f5927 Gerrit-Change-Number: 21438 Gerrit-PatchSet: 1 Gerrit-Owner: Alexander Couzens <lynxis(a)fe80.eu>

1 0

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

07 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 7: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/15256/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/60008/ : 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: 7 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> Gerrit-Comment-Date: Thu, 07 Sep 2017 11:09:03 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: ifdtool: port the feature to set AltMeDisable/HAP bit here
by build bot (Jenkins) (Code Review) 07 Sep '17

07 Sep '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21437 ) Change subject: ifdtool: port the feature to set AltMeDisable/HAP bit here ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-checkpatch/15255/ : SUCCESS https://qa.coreboot.org/job/coreboot-gerrit/60007/ : SUCCESS -- To view, visit https://review.coreboot.org/21437 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9a2ecc60cfbb9ee9d96f15be3d53226cb428729a Gerrit-Change-Number: 21437 Gerrit-PatchSet: 1 Gerrit-Owner: Bill XIE <persmule(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 07 Sep 2017 11:08:26 +0000 Gerrit-HasComments: No

1 0

Change in coreboot[master]: ifdtool: port the feature to set AltMeDisable/HAP bit here
by Bill XIE (Code Review) 07 Sep '17

07 Sep '17

Bill XIE has uploaded this change for review. ( https://review.coreboot.org/21437 Change subject: ifdtool: port the feature to set AltMeDisable/HAP bit here ...................................................................... ifdtool: port the feature to set AltMeDisable/HAP bit here Port the newest feature of me_cleaner to ifdtool (https://github.com/corna/me_cleaner/ , Discussed in https://github.com/corna/me_cleaner/issues/53 ) to set AltMeDisable (or HAP for skylake/ME11) bit to the IFD to disable ME. In this commit I use (ifd_version >= IFD_VERSION_2) to judge whether HAP instead AltMeDisable should be set, since this condition is only fulfilled on skylake or newer platforms. Change-Id: I9a2ecc60cfbb9ee9d96f15be3d53226cb428729a Signed-off-by: Bill XIE <persmule(a)gmail.com> --- M util/ifdtool/ifdtool.c 1 file changed, 54 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/21437/1 diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index 66848c0..8ff41a4 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -95,6 +95,14 @@ return (frba_t *) (image + (((fdb->flmap0 >> 16) & 0xff) << 4)); } +static fpsba_t *find_fpsba(char *image, int size) +{ + fdbar_t *fdb = find_fd(image, size); + if (!fdb) + return NULL; + return (fpsba_t *) (image + (((fdb->flmap1 >> 16) & 0xff) << 4)); +} + /* * There is no version field in the descriptor so to determine * if this is a new descriptor format we check the hardcoded SPI @@ -595,8 +603,7 @@ dump_oem((const uint8_t *)image + 0xf00); dump_frba(find_frba(image, size)); dump_fcba(find_fcba(image, size)); - dump_fpsba((const fpsba_t *) - (image + (((fdb->flmap1 >> 16) & 0xff) << 4))); + dump_fpsba(find_fpsba(image, size)); dump_fmba(find_fmba(image, size)); dump_fmsba((const fmsba_t *) (image + (((fdb->flmap2) & 0xff) << 4))); } @@ -845,6 +852,29 @@ fmba->flmstr3 = 0x08080000 | (fmba->flmstr3 & 0xffff); } + } +} + +/* Toggle the AltMeDisable (or HAP for >= IFD_VERSION_2) */ +void fpsba_toggle_altmedisable(fpsba_t *fpsba, + enum toggle_mode altmedisable) +{ + if (ifd_version >= IFD_VERSION_2) { + printf("%sting the HAP bit to %s Intel ME...\n", + altmedisable?"Set":"Unset", + altmedisable?"disable":"enable"); + if (altmedisable == TM_set) + fpsba->pchstrp[0] |= (1 << 16); + else + fpsba->pchstrp[0] &= ~(1 << 16); + } else { + printf("%sting the AltMeDisable to %s Intel ME...\n", + altmedisable?"Set":"Unset", + altmedisable?"disable":"enable"); + if (altmedisable == TM_set) + fpsba->pchstrp[10] |= (1 << 7); + else + fpsba->pchstrp[10] &= ~(1 << 7); } } @@ -1166,6 +1196,8 @@ " -j | --jail Unlock firmware descriptor and ME region,\n" " and remove the ME/TXE's Read/Write permissions\n" " to the other regions\n" + " -A | --altmedisable <0|1> Toggle the AltMeDisable (or HAP for skylake or\n" + " newer platform) bit to disable ME\n" " -p | --platform Add platform-specific quirks\n" " aplk - Apollo Lake\n" " -v | --version: print the version\n" @@ -1180,6 +1212,7 @@ int mode_dump = 0, mode_extract = 0, mode_inject = 0, mode_spifreq = 0; int mode_em100 = 0, mode_locked = 0, mode_unlocked = 0, mode_jail = 0; int mode_layout = 0, mode_newlayout = 0, mode_density = 0; + int mode_altmedisable = 0, altmedisable = 0; char *region_type_string = NULL, *region_fname = NULL; const char *layout_fname = NULL; int region_type = -1, inputfreq = 0; @@ -1195,6 +1228,7 @@ {"spifreq", 1, NULL, 's'}, {"density", 1, NULL, 'D'}, {"chip", 1, NULL, 'C'}, + {"altmedisable", 1, NULL, 'A'}, {"em100", 0, NULL, 'e'}, {"lock", 0, NULL, 'l'}, {"unlock", 0, NULL, 'u'}, @@ -1205,7 +1239,7 @@ {0, 0, 0, 0} }; - while ((opt = getopt_long(argc, argv, "df:D:C:xi:n:s:p:elujvh?", + while ((opt = getopt_long(argc, argv, "df:D:C:A:xi:n:s:p:elujvh?", long_options, &option_index)) != EOF) { switch (opt) { case 'd': @@ -1309,6 +1343,15 @@ exit(EXIT_FAILURE); } break; + case 'A': + mode_altmedisable = 1; + altmedisable = strtol(optarg, NULL, 0); + if (selected_chip > 1) { + fprintf(stderr, "error: Illegal value\n"); + print_usage(argv[0]); + exit(EXIT_FAILURE); + } + break; case 's': // Parse the requested SPI frequency inputfreq = strtol(optarg, NULL, 0); @@ -1387,7 +1430,7 @@ if ((mode_dump + mode_layout + mode_extract + mode_inject + mode_newlayout + (mode_spifreq | mode_em100 | mode_unlocked | - mode_locked)) > 1) { + mode_locked) + mode_altmedisable) > 1) { fprintf(stderr, "You may not specify more than one mode.\n\n"); print_usage(argv[0]); exit(EXIT_FAILURE); @@ -1395,7 +1438,7 @@ if ((mode_dump + mode_layout + mode_extract + mode_inject + mode_newlayout + mode_spifreq + mode_em100 + mode_locked + - mode_unlocked + mode_density) == 0) { + mode_unlocked + mode_density + mode_altmedisable) == 0) { fprintf(stderr, "You need to specify a mode.\n\n"); print_usage(argv[0]); exit(EXIT_FAILURE); @@ -1468,6 +1511,12 @@ write_image(filename, image, size); } + if (mode_altmedisable) { + fpsba_t* fpsba = find_fpsba(image, size); + fpsba_toggle_altmedisable(fpsba, altmedisable); + write_image(filename, image, size); + } + free(image); return 0; -- To view, visit https://review.coreboot.org/21437 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9a2ecc60cfbb9ee9d96f15be3d53226cb428729a Gerrit-Change-Number: 21437 Gerrit-PatchSet: 1 Gerrit-Owner: Bill XIE <persmule(a)gmail.com>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit September 2017