August 2020 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: git-hooks: Use check-style in pre-commit hook
by David Hendricks (Code Review) Aug. 4, 2020

Aug. 4, 2020

David Hendricks has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/44095 ) Change subject: git-hooks: Use check-style in pre-commit hook ...................................................................... git-hooks: Use check-style in pre-commit hook This adds the check-style script to the pre-commit hook and makes some minor changes to warnings printed by the script. Errors are be non-fatal for now. Change-Id: I58b9e64f825de0ca222277a7d16c3904368edfe6 Signed-off-by: David Hendricks <david.hendricks(a)gmail.com> --- M util/git-hooks/pre-commit M util/lint/check-style 2 files changed, 22 insertions(+), 13 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/95/44095/1 diff --git a/util/git-hooks/pre-commit b/util/git-hooks/pre-commit index dbccb9e..db6b256 100755 --- a/util/git-hooks/pre-commit +++ b/util/git-hooks/pre-commit @@ -1,9 +1,22 @@ #!/bin/sh + # -# A hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. +# This file is part of the flashrom project. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# + +set -e # -o errexit +set -u # -o nounset # Check for whitespace errors -git diff-index --check --cached HEAD -- || exit 1 +git diff-index --check --cached HEAD -- + +util/lint/check-style diff --git a/util/lint/check-style b/util/lint/check-style index 91ed197..06ced0b 100755 --- a/util/lint/check-style +++ b/util/lint/check-style @@ -89,6 +89,7 @@ printf "Warning: clang-format executable not found.\n" printf "Set the correct path in $(canonicalize_filename "$0").\n" printf "Skipping clang-format style check test.\n" + printf "Changes that violate style guidelines will not be accepted upstream.\n" # exit 1 exit 0 fi @@ -133,12 +134,7 @@ printf "and the clang-format rules:\n\n" cat "$patch" -printf "\nYou can apply these changes with:\n git apply $patch\n" -printf "(may need to be called from the root directory of your repository)\n" - -# FIXME: clang-format is currently unusable, so don't abort the commit. -# printf "Aborting commit. Apply changes and commit again or skip checking with" -# printf " --no-verify (not recommended).\n" -# exit 1 - +printf "\nApply these changes using:\n" +printf " git apply $patch\n" +printf "Changes that violate style guidelines will not be accepted upstream.\n" exit 0 -- To view, visit https://review.coreboot.org/c/flashrom/+/44095 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I58b9e64f825de0ca222277a7d16c3904368edfe6 Gerrit-Change-Number: 44095 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-MessageType: newchange

4 5

Change in flashrom[master]: git-hooks: Add check-style for pre-commit hook
by David Hendricks (Code Review) Aug. 4, 2020

Aug. 4, 2020

David Hendricks has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/43602 ) Change subject: git-hooks: Add check-style for pre-commit hook ...................................................................... git-hooks: Add check-style for pre-commit hook This imports check-style and some related lint tools from coreboot for the pre-commit hook: - Add check-style rule to Makefile - Replace the current pre-commit hook with the one from coreboot, omitting lint-stable for the time being. - Import checkpatch.pl, along with certain dependencies (spelling.txt and const_structs.checkpatch) and .checkpatch.conf. - Add .clang-format from CB:38673. Change-Id: Ieb77aa1aa2911e081c69c93929a2f1c4430cd2b9 Signed-off-by: David Hendricks <david.hendricks(a)gmail.com> --- A .checkpatch.conf A .clang-format M Makefile M util/git-hooks/pre-commit A util/lint/check-style A util/lint/checkpatch.pl A util/lint/const_structs.checkpatch A util/lint/lint-007-checkpatch A util/lint/spelling.txt 9 files changed, 16,655 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/02/43602/1 -- To view, visit https://review.coreboot.org/c/flashrom/+/43602 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ieb77aa1aa2911e081c69c93929a2f1c4430cd2b9 Gerrit-Change-Number: 43602 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-MessageType: newchange

3 7

Change in flashrom[master]: meson: Do not compile with -DSTANDALONE
by Richard Hughes (Code Review) Aug. 4, 2020

Aug. 4, 2020

Richard Hughes has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/42230 ) Change subject: meson: Do not compile with -DSTANDALONE ...................................................................... meson: Do not compile with -DSTANDALONE This enables the -o option which is used to collect logs for debugging. Change-Id: If6c12c682ba72cd519e30f1f8c96552322ff75e3 Signed-off-by: Richard Hughes <richard(a)hughsie.com> --- M meson.build 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/30/42230/1 diff --git a/meson.build b/meson.build index 5d8e630..4b00339 100644 --- a/meson.build +++ b/meson.build @@ -415,7 +415,6 @@ ], c_args : [ cargs, - '-DSTANDALONE', '-DCONFIG_DEFAULT_PROGRAMMER=PROGRAMMER_INVALID', '-DCONFIG_DEFAULT_PROGRAMMER_ARGS=""', ], -- To view, visit https://review.coreboot.org/c/flashrom/+/42230 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If6c12c682ba72cd519e30f1f8c96552322ff75e3 Gerrit-Change-Number: 42230 Gerrit-PatchSet: 1 Gerrit-Owner: Richard Hughes <richard(a)hughsie.com> Gerrit-MessageType: newchange

3 5

Change in flashrom[master]: ft2232_spi.c: align with Chrome OS flashrom
by Nikolai Artemiev (Code Review) Aug. 4, 2020

Aug. 4, 2020

Nikolai Artemiev has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/42796 ) Change subject: ft2232_spi.c: align with Chrome OS flashrom ...................................................................... ft2232_spi.c: align with Chrome OS flashrom Brings over various changes: - Limit servo channel selection to valid range - Use DIS_DIV_5 constant - Update some comments - Wrap long lines Signed-off-by: Nikolai Artemiev <nartemiev(a)google.com> Change-Id: I24c20e9b5d7e661d0180699bbd0d1447f6bf816f --- M ft2232_spi.c 1 file changed, 20 insertions(+), 10 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/96/42796/1 diff --git a/ft2232_spi.c b/ft2232_spi.c index 87e6057..083e58f 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -110,7 +110,8 @@ { int i; for (i = 0; devs_ft2232spi[i].vendor_name != NULL; i++) { - if ((devs_ft2232spi[i].device_id == ft2232_type) && (devs_ft2232spi[i].vendor_id == ft2232_vid)) + if ((devs_ft2232spi[i].device_id == ft2232_type) + && (devs_ft2232spi[i].vendor_id == ft2232_vid)) return devs_ft2232spi[i].device_name; } return "unknown device"; @@ -120,7 +121,8 @@ { int i; for (i = 0; devs_ft2232spi[i].vendor_name != NULL; i++) { - if ((devs_ft2232spi[i].device_id == ft2232_type) && (devs_ft2232spi[i].vendor_id == ft2232_vid)) + if ((devs_ft2232spi[i].device_id == ft2232_type) + && (devs_ft2232spi[i].vendor_id == ft2232_vid)) return devs_ft2232spi[i].vendor_name; } return "unknown vendor"; @@ -132,7 +134,8 @@ int r; r = ftdi_write_data(ftdic, (unsigned char *) buf, size); if (r < 0) { - msg_perr("ftdi_write_data: %d, %s\n", r, ftdi_get_error_string(ftdic)); + msg_perr("ftdi_write_data: %d, %s\n", r, + ftdi_get_error_string(ftdic)); return 1; } return 0; @@ -146,7 +149,8 @@ while (size > 0) { r = ftdi_read_data(ftdic, (unsigned char *) buf, size); if (r < 0) { - msg_perr("ftdi_read_data: %d, %s\n", r, ftdi_get_error_string(ftdic)); + msg_perr("ftdi_read_data: %d, %s\n", r, + ftdi_get_error_string(ftdic)); return 1; } buf += r; @@ -183,8 +187,8 @@ enum ftdi_interface ft2232_interface = INTERFACE_A; /* * The 'H' chips can run with an internal clock of either 12 MHz or 60 MHz, - * but the non-H chips can only run at 12 MHz. We enable the divide-by-5 - * prescaler on the former to run on the same speed. + * but the non-H chips can only run at 12 MHz. We disable the divide-by-5 + * prescaler on 'H' chips so they run at 60MHz. */ uint8_t clock_5x = 1; /* In addition to the prescaler mentioned above there is also another @@ -193,7 +197,8 @@ * div = (1 + x) * 2 <-> x = div / 2 - 1 * Hence the expressible divisors are all even numbers between 2 and * 2^17 (=131072) resulting in SCK frequencies of 6 MHz down to about - * 92 Hz for 12 MHz inputs. + * 92 Hz for 12 MHz inputs and 30 MHz down to about 458 Hz for 60 MHz + * inputs. */ uint32_t divisor = DEFAULT_DIVISOR; int f; @@ -268,14 +273,17 @@ } else if (!strcasecmp(arg, "google-servo")) { ft2232_vid = GOOGLE_VID; ft2232_type = GOOGLE_SERVO_PID; + channel_count = 2; } else if (!strcasecmp(arg, "google-servo-v2")) { ft2232_vid = GOOGLE_VID; ft2232_type = GOOGLE_SERVO_V2_PID1; + channel_count = 2; /* Default divisor is too fast, and chip ID fails */ divisor = 6; } else if (!strcasecmp(arg, "google-servo-v2-legacy")) { ft2232_vid = GOOGLE_VID; ft2232_type = GOOGLE_SERVO_V2_PID0; + channel_count = 2; } else if (!strcasecmp(arg, "flyswatter")) { ft2232_type = FTDI_FT2232H_PID; channel_count = 2; @@ -381,7 +389,8 @@ free(arg); if (f < 0 && f != -5) { - msg_perr("Unable to open FTDI device: %d (%s).\n", f, ftdi_get_error_string(ftdic)); + msg_perr("Unable to open FTDI device: %d (%s)\n", f, + ftdi_get_error_string(ftdic)); return -4; } @@ -408,7 +417,7 @@ if (clock_5x) { msg_pdbg("Disable divide-by-5 front stage\n"); - buf[0] = 0x8a; /* Disable divide-by-5. DIS_DIV_5 in newer libftdi */ + buf[0] = DIS_DIV_5; if (send_buf(ftdic, buf, 1)) { ret = -5; goto ftdi_err; @@ -453,7 +462,8 @@ ftdi_err: if ((f = ftdi_usb_close(ftdic)) < 0) { - msg_perr("Unable to close FTDI device: %d (%s)\n", f, ftdi_get_error_string(ftdic)); + msg_perr("Unable to close FTDI device: %d (%s)\n", f, + ftdi_get_error_string(ftdic)); } return ret; } -- To view, visit https://review.coreboot.org/c/flashrom/+/42796 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I24c20e9b5d7e661d0180699bbd0d1447f6bf816f Gerrit-Change-Number: 42796 Gerrit-PatchSet: 1 Gerrit-Owner: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-MessageType: newchange

3 12

Change in flashrom[master]: [stlinkv3_spi]Added missing line ends, and added a note about the fir...
by Miklós Márton (Code Review) Aug. 4, 2020

Aug. 4, 2020

Miklós Márton has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/43900 ) Change subject: [stlinkv3_spi]Added missing line ends, and added a note about the first version of the updater which contains the necessary V3 bridge feature. ...................................................................... [stlinkv3_spi]Added missing line ends, and added a note about the first version of the updater which contains the necessary V3 bridge feature. Change-Id: Ib45efa37b192489bdfe26f1f0fd1d81035a08c70 Signed-off-by: Miklós Márton <martonmiklosqdev(a)gmail.com> --- M stlinkv3_spi.c 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/00/43900/1 diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c index ae865be..c75f7db 100644 --- a/stlinkv3_spi.c +++ b/stlinkv3_spi.c @@ -253,21 +253,22 @@ enum fw_version_check_result fw_check_result; if (stlinkv3_check_version(&fw_check_result)) { - msg_perr("Failed to query FW version"); + msg_perr("Failed to query FW version\n"); return -1; } if (fw_check_result != FW_VERSION_OK) { msg_pinfo("Your STLink V3 has too old version of the bridge interface\n" - "Please update the firmware with the STSW-LINK007 which can be downloaded from here:\n" - "https://www.st.com/en/development-tools/stsw-link007.html"); + "Please update the firmware with version 2.33.25 or newer of the STSW-LINK007\n" + "which can be downloaded from here:\n" + "https://www.st.com/en/development-tools/stsw-link007.html\n"); return -1; } if (stlinkv3_spi_calc_prescaler(reqested_freq_in_kHz, &prescaler, &SCK_freq_in_kHz)) { - msg_perr("Failed to calculate SPI clock prescaler"); + msg_perr("Failed to calculate SPI clock prescaler\n"); return -1; } msg_pinfo("SCK frequency set to %d kHz\n", SCK_freq_in_kHz); -- To view, visit https://review.coreboot.org/c/flashrom/+/43900 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ib45efa37b192489bdfe26f1f0fd1d81035a08c70 Gerrit-Change-Number: 43900 Gerrit-PatchSet: 1 Gerrit-Owner: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-MessageType: newchange

2 9

Change in flashrom[master]: Makefile: Fix a bug with debug_shell lacking escaping single quotes.
by Pyry Kontio (Code Review) Aug. 4, 2020

Aug. 4, 2020

Pyry Kontio has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/44104 ) Change subject: Makefile: Fix a bug with debug_shell lacking escaping single quotes. ...................................................................... Makefile: Fix a bug with debug_shell lacking escaping single quotes. Signed-off-by: Pyry Kontio <pyry.kontio> Change-Id: I851f2d104c4f4a8171e0b2f74be519d3760fd4ae --- M Makefile 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/04/44104/1 diff --git a/Makefile b/Makefile index 4ce854f..afe6334 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,8 @@ # Provide an easy way to execute a command, print its output to stdout and capture any error message on stderr # in the build details file together with the original stdout output. -debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(1) ; }' >&2; { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE)) +debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(subst ','\'',$(1)) ; }' >&2; \ + { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE)) ############################################################################### # General OS-specific settings. -- To view, visit https://review.coreboot.org/c/flashrom/+/44104 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I851f2d104c4f4a8171e0b2f74be519d3760fd4ae Gerrit-Change-Number: 44104 Gerrit-PatchSet: 1 Gerrit-Owner: Pyry Kontio <pyry.kontio(a)drasa.eu> Gerrit-MessageType: newchange

1 2

Change in flashrom[master]: ati: add ellesmere/polaris10
by Name of user not set (Code Review) Aug. 1, 2020

Aug. 1, 2020

Name of user not set #1003051 has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/29219 ) Change subject: ati: add ellesmere/polaris10 ...................................................................... Patch Set 3: Code-Review+1 I tested Polaris10 and Polaris20 a while back, works as advertised. I want to get in touch with another dev, though, as I can help with the newer GPUs somewhat. -- To view, visit https://review.coreboot.org/c/flashrom/+/29219 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iad0ba28ac7d08ea3cc519737633bcf635612cbfa Gerrit-Change-Number: 29219 Gerrit-PatchSet: 3 Gerrit-Owner: Luc Verhaegen <libv(a)skynet.be> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Name of user not set #1003051 Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 01 Aug 2020 01:26:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: ati: add polaris22
by Name of user not set (Code Review) Aug. 1, 2020

Aug. 1, 2020

Name of user not set #1003051 has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/29222 ) Change subject: ati: add polaris22 ...................................................................... Patch Set 3: Code-Review+1 I tested Polaris10 and Polaris20 a while back, works as advertised. I want to get in touch with another dev, though, as I can help with the newer GPUs somewhat. -- To view, visit https://review.coreboot.org/c/flashrom/+/29222 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia4950bb098a2bb8dba7b10bb9b2b6012c79365ea Gerrit-Change-Number: 29222 Gerrit-PatchSet: 3 Gerrit-Owner: Luc Verhaegen <libv(a)skynet.be> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Name of user not set #1003051 Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 01 Aug 2020 01:05:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0