- flashrom-gerrit - mail.coreboot.org

Change in flashrom[1.0.x]: fixup! nicintel_eeprom: Support for I210 emulated EEprom
by Nico Huber (Code Review) 04 Nov '17

04 Nov '17

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/22331 Change subject: fixup! nicintel_eeprom: Support for I210 emulated EEprom ...................................................................... fixup! nicintel_eeprom: Support for I210 emulated EEprom Fix is_i210(), add a comment and break an overlong line. Change-Id: I5d3f71e4e0f77cc8793e7f395baf69e1fad930a3 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/21934 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> (cherry picked from commit 4343e7d44006dcda2ea76b0e7625837832141539) --- M nicintel_eeprom.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/31/22331/1 diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index e4a91ef..c787580 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -80,6 +80,10 @@ #define UNPROG_DEVICE 0x1509 +/* + * Warning: is_i210() below makes assumptions on these PCI ids. + * It may have to be updated when this list is extended. + */ const struct dev_entry nics_intel_ee[] = { {PCI_VENDOR_ID_INTEL, 0x150e, OK, "Intel", "82580 Quad Gigabit Ethernet Controller (Copper)"}, {PCI_VENDOR_ID_INTEL, 0x150f, NT , "Intel", "82580 Quad Gigabit Ethernet Controller (Fiber)"}, @@ -99,7 +103,7 @@ static inline bool is_i210(uint16_t device_id) { - return (device_id & 0xff00) == 0x1500; + return (device_id & 0xfff0) == 0x1530; } static int nicintel_ee_probe_i210(struct flashctx *flash) @@ -218,7 +222,8 @@ return -1; } -static int nicintel_ee_write_i210(struct flashctx *flash, const uint8_t *buf, unsigned int addr, unsigned int len) +static int nicintel_ee_write_i210(struct flashctx *flash, const uint8_t *buf, + unsigned int addr, unsigned int len) { done_i20_write = true; -- To view, visit https://review.coreboot.org/22331 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.0.x Gerrit-MessageType: newchange Gerrit-Change-Id: I5d3f71e4e0f77cc8793e7f395baf69e1fad930a3 Gerrit-Change-Number: 22331 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[staging]: Prepare for a single branch on gerrit
by build bot (Jenkins) (Code Review) 04 Nov '17

04 Nov '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/22330 ) Change subject: Prepare for a single branch on gerrit ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom_gerrit/713/ : SUCCESS https://qa.coreboot.org/job/flashrom-customrules/809/ : SUCCESS -- To view, visit https://review.coreboot.org/22330 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I13aa478edd200ce85da86962e4f94f7ac446b05f Gerrit-Change-Number: 22330 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 04 Nov 2017 13:02:16 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Prepare for a single branch on gerrit
by Nico Huber (Code Review) 04 Nov '17

04 Nov '17

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/22330 Change subject: Prepare for a single branch on gerrit ...................................................................... Prepare for a single branch on gerrit Discourage all direct pushes to the upstream repositories, no matter the branch. Also, skip adding Change-Ids to fixup! and squash! commits. Change-Id: I13aa478edd200ce85da86962e4f94f7ac446b05f Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M util/git-hooks/commit-msg M util/git-hooks/pre-push 2 files changed, 7 insertions(+), 54 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/30/22330/1 diff --git a/util/git-hooks/commit-msg b/util/git-hooks/commit-msg index b9217e0..811cced 100755 --- a/util/git-hooks/commit-msg +++ b/util/git-hooks/commit-msg @@ -44,11 +44,10 @@ return fi - # *Do* add Change-Id to temp commits (original code bails out here) - # if echo "$clean_message" | head -1 | grep -q '^$fixup\|squash$!' - # then - # return - # fi + if echo "$clean_message" | head -1 | grep -q '^$fixup\|squash$!' + then + return + fi if test "false" = "`git config --bool --get gerrit.createChangeId`" then diff --git a/util/git-hooks/pre-push b/util/git-hooks/pre-push index b5f4620..dcce264 100755 --- a/util/git-hooks/pre-push +++ b/util/git-hooks/pre-push @@ -19,57 +19,11 @@ remote="$1" url="$2" -zero=0000000000000000000000000000000000000000 - upstream_pattern="github\.com.flashrom/flashrom(\.git)?|flashrom\.org.git/flashrom(\.git)?" -# Only care about the upstream repositories -if echo "$url" | grep -q -v -E "$upstream_pattern" ; then - exit 0 +# We use gerrit only and don't want direct pushes +if echo "$url" | grep -q -E "$upstream_pattern" ; then + exit 1 fi - -while read local_ref local_sha remote_ref remote_sha ; do - - # Only allow the stable and staging branches as well as versioned stable branches (e.g., 0.0.x). - # The matching expression's RE is always anchored to the first character (^ is undefined). - # The outer parentheses are needed to print out the whole matched string. - version=$(expr ${remote_ref#*refs/heads/} : '$\([0-9]\+\.$\{2,\}x\)$') - if [ "$remote_ref" != "refs/heads/staging" ] && \ - [ "$remote_ref" != "refs/heads/stable" ] && \ - [ -z "$version" ]; then - echo "Feature branches not allowed ($remote_ref)." >&2 - exit 1 - fi - - if [ "$local_sha" = $zero ]; then - echo "Deletion of branches is prohibited." >&2 - exit 1 - fi - - # Check for Signed-off-by and Acked-by - commit=$(git rev-list -n 1 --all-match --invert-grep -E \ - --grep '^Signed-off-by: .+ <.+@.+\..+>$' \ - --grep '^Acked-by: .+ <.+@.+\..+>$' \ - "$remote_sha..$local_sha") - if [ -n "$commit" ]; then - echo "Commit $local_sha in $local_ref is missing either \"Signed-off-by\"" \ - " or \"Acked-by\" lines, not pushing." >&2 - exit 1 - fi - - # Make _really_ sure we do not rewrite history of any head/branch - if [ "${remote_ref#*refs/heads/}" != "$remote_ref" ]; then - nonreachable=$(git rev-list $remote_sha ^$local_sha | head -1) - if [ -n "$nonreachable" ]; then - echo "Only fast-forward pushes are allowed on branches." >&2 - echo "At least $nonreachable is not included in $remote_sha while pushing to " \ - "$remote_ref" >&2 - exit 1 - fi - fi - - # FIXME: check commit log format (subject without full stop at the end etc). - # FIXME: do buildbot checks if authorized? -done exit 0 -- To view, visit https://review.coreboot.org/22330 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: newchange Gerrit-Change-Id: I13aa478edd200ce85da86962e4f94f7ac446b05f Gerrit-Change-Number: 22330 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[staging]: ichspi: Fix software sequencing for Skylake
by build bot (Jenkins) (Code Review) 03 Nov '17

03 Nov '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/22273 ) Change subject: ichspi: Fix software sequencing for Skylake ...................................................................... Patch Set 2: Build Successful https://qa.coreboot.org/job/flashrom-customrules/808/ : SUCCESS -- To view, visit https://review.coreboot.org/22273 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I16eebcf37ab8ba39b02f33135535552e380b0b92 Gerrit-Change-Number: 22273 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 03 Nov 2017 16:53:47 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: ichspi: Fix software sequencing for Skylake
by Nico Huber (Code Review) 03 Nov '17

03 Nov '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/22273 ) Change subject: ichspi: Fix software sequencing for Skylake ...................................................................... ichspi: Fix software sequencing for Skylake Two occurences of ICH9_REG_OPMENU were overlooked and not replaced, rendering the software sequencing unusable on Skylake. Change-Id: I16eebcf37ab8ba39b02f33135535552e380b0b92 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-on: https://review.coreboot.org/22273 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Patrick Rudolph <siro(a)das-labor.org> --- M ichspi.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Patrick Rudolph: Looks good to me, approved diff --git a/ichspi.c b/ichspi.c index 9d6b62b..ec81628 100644 --- a/ichspi.c +++ b/ichspi.c @@ -983,8 +983,8 @@ } /* Select opcode */ - opmenu = REGREAD32(ICH9_REG_OPMENU); - opmenu |= ((uint64_t)REGREAD32(ICH9_REG_OPMENU + 4)) << 32; + opmenu = REGREAD32(swseq_data.reg_opmenu); + opmenu |= ((uint64_t)REGREAD32(swseq_data.reg_opmenu + 4)) << 32; for (opcode_index = 0; opcode_index < 8; opcode_index++) { if ((opmenu & 0xff) == op.opcode) { -- To view, visit https://review.coreboot.org/22273 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: merged Gerrit-Change-Id: I16eebcf37ab8ba39b02f33135535552e380b0b92 Gerrit-Change-Number: 22273 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: Fix standalone ich_descriptor_tool compilation with MinGW and DJGPP
by build bot (Jenkins) (Code Review) 03 Nov '17

03 Nov '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/21838 ) Change subject: Fix standalone ich_descriptor_tool compilation with MinGW and DJGPP ...................................................................... Patch Set 3: Build Successful https://qa.coreboot.org/job/flashrom-customrules/807/ : SUCCESS -- To view, visit https://review.coreboot.org/21838 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: Id146f5ba06a0e510397c6f32a2bd7c819a405a25 Gerrit-Change-Number: 21838 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 03 Nov 2017 16:50:31 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Fix standalone ich_descriptor_tool compilation with MinGW and DJGPP
by Nico Huber (Code Review) 03 Nov '17

03 Nov '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/21838 ) Change subject: Fix standalone ich_descriptor_tool compilation with MinGW and DJGPP ...................................................................... Fix standalone ich_descriptor_tool compilation with MinGW and DJGPP TARGET_OS as well as EXEC_SUFFIX were only set when called via the main makefile and even then __USE_MINGW_ANSI_STDIO was not set for MinGW. While at it, also replace the hardcoded gnu_printf printf format attribute with __MINGW_PRINTF_FORMAT which is set according to __USE_MINGW_ANSI_STDIO respectively. Change-Id: Id146f5ba06a0e510397c6f32a2bd7c819a405a25 Signed-off-by: Stefan Tauner <stefan.tauner(a)gmx.at> Reviewed-on: https://review.coreboot.org/21838 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M flash.h M util/ich_descriptors_tool/Makefile 2 files changed, 14 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/flash.h b/flash.h index dfda9d2..62f2e34 100644 --- a/flash.h +++ b/flash.h @@ -333,7 +333,7 @@ /* Let gcc and clang check for correct printf-style format strings. */ int print(enum flashrom_log_level level, const char *fmt, ...) #ifdef __MINGW32__ -__attribute__((format(gnu_printf, 2, 3))); +__attribute__((format(__MINGW_PRINTF_FORMAT, 2, 3))); #else __attribute__((format(printf, 2, 3))); #endif diff --git a/util/ich_descriptors_tool/Makefile b/util/ich_descriptors_tool/Makefile index e312996..d1b5eae 100644 --- a/util/ich_descriptors_tool/Makefile +++ b/util/ich_descriptors_tool/Makefile @@ -21,10 +21,23 @@ # If the user has specified custom CFLAGS, all CFLAGS settings below will be # completely ignored by gnumake. CFLAGS ?= -Os -Wall -Wshadow + +override TARGET_OS := $(shell $(CC) $(CPPFLAGS) -E $(SHAREDSRCDIR)/os.h | grep -v '^\#' | grep '"' | \ + cut -f 2 -d'"') + ifeq ($(TARGET_OS), DOS) +EXEC_SUFFIX := .exe # DJGPP has odd uint*_t definitions which cause lots of format string warnings. CFLAGS += -Wno-format endif + +ifeq ($(TARGET_OS), MinGW) +EXEC_SUFFIX := .exe +# Some functions provided by Microsoft do not work as described in C99 specifications. This macro fixes that +# for MinGW. See http://sourceforge.net/p/mingw-w64/wiki2/printf%20and%20scanf%20family/ */ +FLASHROM_CFLAGS += -D__USE_MINGW_ANSI_STDIO=1 +endif + ifeq ($(WARNERROR), yes) CFLAGS += -Werror endif -- To view, visit https://review.coreboot.org/21838 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: merged Gerrit-Change-Id: Id146f5ba06a0e510397c6f32a2bd7c819a405a25 Gerrit-Change-Number: 21838 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: ichspi: Fix software sequencing for Skylake
by Patrick Rudolph (Code Review) 01 Nov '17

01 Nov '17

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/22273 ) Change subject: ichspi: Fix software sequencing for Skylake ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/22273 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I16eebcf37ab8ba39b02f33135535552e380b0b92 Gerrit-Change-Number: 22273 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 01 Nov 2017 15:07:34 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: ichspi: Disable software sequencing by default for Skylake
by Nico Huber (Code Review) 01 Nov '17

01 Nov '17

Nico Huber has posted comments on this change. ( https://review.coreboot.org/22274 ) Change subject: ichspi: Disable software sequencing by default for Skylake ...................................................................... Patch Set 1: Scratch that, you likely don't have a Lewisburg system with unlocked / non-zero opmenu, do you? -- To view, visit https://review.coreboot.org/22274 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I8a13fb9c3ca679b3f7d39ad1dc56d5efdc80045b Gerrit-Change-Number: 22274 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 01 Nov 2017 13:52:23 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: ichspi: Disable software sequencing by default for Skylake
by Nico Huber (Code Review) 01 Nov '17

01 Nov '17

Nico Huber has posted comments on this change. ( https://review.coreboot.org/22274 ) Change subject: ichspi: Disable software sequencing by default for Skylake ...................................................................... Patch Set 1: David, I'd guess that it's the same for Lewisburg. Can you confirm that? You'd see that every transaction attempt just times out. -- To view, visit https://review.coreboot.org/22274 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I8a13fb9c3ca679b3f7d39ad1dc56d5efdc80045b Gerrit-Change-Number: 22274 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 01 Nov 2017 13:27:26 +0000 Gerrit-HasComments: No

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit