January 2023 - flashrom-gerrit

[S] Change in flashrom[master]: MAINTAINERS: Add Miklos Marton for STLINK-V3
by Miklós Márton (Code Review) 21 Jan '23

21 Jan '23

Attention is currently required from: Felix Singer, Miklós Márton, Angel Pons. Hello Felix Singer, build bot (Jenkins), Angel Pons, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/72180 to look at the new patch set (#3). Change subject: MAINTAINERS: Add Miklos Marton for STLINK-V3 ...................................................................... MAINTAINERS: Add Miklos Marton for STLINK-V3 Change-Id: I2e5c90af2b7313f933780ea570a23d1d9101ef98 Signed-off-by: Miklós Márton <martonmiklosqdev(a)gmail.com> --- M MAINTAINERS 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/80/72180/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/72180 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2e5c90af2b7313f933780ea570a23d1d9101ef98 Gerrit-Change-Number: 72180 Gerrit-PatchSet: 3 Gerrit-Owner: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: MAINTAINERS: Add Miklos Marton for ni854x_spi
by Miklós Márton (Code Review) 21 Jan '23

21 Jan '23

Attention is currently required from: Felix Singer, Miklós Márton, Angel Pons. Hello Felix Singer, build bot (Jenkins), Angel Pons, Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/72181 to look at the new patch set (#2). Change subject: MAINTAINERS: Add Miklos Marton for ni854x_spi ...................................................................... MAINTAINERS: Add Miklos Marton for ni854x_spi Change-Id: Ia548d23d15f0efa92d83577d3106e6231ed7688f Signed-off-by: Miklós Márton <martonmiklosqdev(a)gmail.com> --- M MAINTAINERS 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/81/72181/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/72181 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia548d23d15f0efa92d83577d3106e6231ed7688f Gerrit-Change-Number: 72181 Gerrit-PatchSet: 2 Gerrit-Owner: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[1.3.x]: tests: Fix warnings for 32-bit Linux
by Anastasia Klimchuk (Code Review) 21 Jan '23

21 Jan '23

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/71285 ) Change subject: tests: Fix warnings for 32-bit Linux ...................................................................... tests: Fix warnings for 32-bit Linux Unit tests had int-to-pointer-cast warnings for 32-bit Linux environment, and since warnings are treated as errors this failed build with unit tests. Ticket: https://ticket.coreboot.org/issues/407 Original-Tested-By: Branden Waldner <scruffy99(a)gmail.com> Original-Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Original-Reviewed-on: https://review.coreboot.org/c/flashrom/+/72038 Original-Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Original-Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Original-Reviewed-by: Alexander Goncharov <chat(a)joursoir.net> (cherry picked from commit 87531ef11c00963100f20fac71c2428f54162916) Change-Id: I9ec5d37cc038171afc67a69ea9a6885deb8fa4a8 Signed-off-by: Evan Benn <evanbenn(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/71285 Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Tested-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/linux_spi.c 1 file changed, 29 insertions(+), 2 deletions(-) Approvals: Anastasia Klimchuk: Verified; Looks good to me, approved diff --git a/tests/linux_spi.c b/tests/linux_spi.c index 2e3dc95..d71e5b4 100644 --- a/tests/linux_spi.c +++ b/tests/linux_spi.c @@ -23,14 +23,14 @@ /* First message has write array and write count */ unsigned int writecnt = msg[0].len; - unsigned char *writearr = (unsigned char *)msg[0].tx_buf; + unsigned char *writearr = (unsigned char *)(uintptr_t)msg[0].tx_buf; /* Second message has read array and read count */ unsigned int readcnt = msg[1].len; /* Detect probing */ if (writecnt == 1 && writearr[0] == JEDEC_RDID && readcnt == 3) { /* We need to populate read array. */ - unsigned char *readarr = (unsigned char *)msg[1].rx_buf; + unsigned char *readarr = (unsigned char *)(uintptr_t)msg[1].rx_buf; readarr[0] = 0xEF; /* WINBOND_NEX_ID */ readarr[1] = 0x40; /* WINBOND_NEX_W25Q128_V left byte */ readarr[2] = 0x18; /* WINBOND_NEX_W25Q128_V right byte */ -- To view, visit https://review.coreboot.org/c/flashrom/+/71285 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.3.x Gerrit-Change-Id: I9ec5d37cc038171afc67a69ea9a6885deb8fa4a8 Gerrit-Change-Number: 71285 Gerrit-PatchSet: 4 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Branden Waldner <scruffy99(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: MAINTAINERS: Add Miklos Marton for STLINK-V3
by Anastasia Klimchuk (Code Review) 21 Jan '23

21 Jan '23

Attention is currently required from: Felix Singer, Miklós Márton, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/72180 ) Change subject: MAINTAINERS: Add Miklos Marton for STLINK-V3 ...................................................................... Patch Set 2: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/72180/comment/c06285d3_36f2491f PS2, Line 10: Same as another patch: you need to add sign-off tag. Thank you! -- To view, visit https://review.coreboot.org/c/flashrom/+/72180 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2e5c90af2b7313f933780ea570a23d1d9101ef98 Gerrit-Change-Number: 72180 Gerrit-PatchSet: 2 Gerrit-Owner: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Sat, 21 Jan 2023 07:28:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: MAINTAINERS: Add Miklos Marton for ni854x_spi
by Anastasia Klimchuk (Code Review) 21 Jan '23

21 Jan '23

Attention is currently required from: Felix Singer, Miklós Márton, Angel Pons. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/72181 ) Change subject: MAINTAINERS: Add Miklos Marton for ni854x_spi ...................................................................... Patch Set 1: (1 comment) Commit Message: https://review.coreboot.org/c/flashrom/+/72181/comment/242662a4_93cf67f0 PS1, Line 10: You need to add Signed-off-by tag with you name and email (it's a requirement for flashrom, see guidelines https://www.flashrom.org/Development_Guidelines#Sign-off_Procedure ) And this is why build failed: if you look at console output of jenkins, it tells that sign-off tag is missing. Other than that, all great, thank you so much!! -- To view, visit https://review.coreboot.org/c/flashrom/+/72181 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia548d23d15f0efa92d83577d3106e6231ed7688f Gerrit-Change-Number: 72181 Gerrit-PatchSet: 1 Gerrit-Owner: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Sat, 21 Jan 2023 07:27:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: MAINTAINERS: Add Miklos Marton for ni854x_spi
by Miklós Márton (Code Review) 20 Jan '23

20 Jan '23

Miklós Márton has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72181 ) Change subject: MAINTAINERS: Add Miklos Marton for ni854x_spi ...................................................................... MAINTAINERS: Add Miklos Marton for ni854x_spi Change-Id: Ia548d23d15f0efa92d83577d3106e6231ed7688f --- M MAINTAINERS 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/81/72181/1 diff --git a/MAINTAINERS b/MAINTAINERS index 6e4c40e..c38c071 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -134,6 +134,11 @@ S: Supported F: linux_mtd.c +National Instruments USB-845x +M: Miklos Marton <martonmiklosqdev(a)gmail.com> +S: Maintained +F: ni845x_spi.c + ################################################################################ # TESTS ################################################################################ -- To view, visit https://review.coreboot.org/c/flashrom/+/72181 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia548d23d15f0efa92d83577d3106e6231ed7688f Gerrit-Change-Number: 72181 Gerrit-PatchSet: 1 Gerrit-Owner: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: MAINTAINERS: Add Miklos Marton for STLINK-V3
by Miklós Márton (Code Review) 20 Jan '23

20 Jan '23

Attention is currently required from: Felix Singer, Miklós Márton, Anastasia Klimchuk. Hello Felix Singer, build bot (Jenkins), Anastasia Klimchuk, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/72180 to look at the new patch set (#2). Change subject: MAINTAINERS: Add Miklos Marton for STLINK-V3 ...................................................................... MAINTAINERS: Add Miklos Marton for STLINK-V3 Change-Id: I2e5c90af2b7313f933780ea570a23d1d9101ef98 --- M MAINTAINERS 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/80/72180/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/72180 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2e5c90af2b7313f933780ea570a23d1d9101ef98 Gerrit-Change-Number: 72180 Gerrit-PatchSet: 2 Gerrit-Owner: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in flashrom[master]: MAINTAINERS: Add Miklos Marton for STLINK-V3
by Miklós Márton (Code Review) 20 Jan '23

20 Jan '23

Attention is currently required from: Felix Singer, Anastasia Klimchuk. Miklós Márton has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72180 ) Change subject: MAINTAINERS: Add Miklos Marton for STLINK-V3 ...................................................................... MAINTAINERS: Add Miklos Marton for STLINK-V3 Change-Id: I2e5c90af2b7313f933780ea570a23d1d9101ef98 --- M MAINTAINERS M util/git-hooks/wrapper.sh 2 files changed, 85 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/80/72180/1 diff --git a/MAINTAINERS b/MAINTAINERS index 6e4c40e..bfcdf4b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -134,6 +134,11 @@ S: Supported F: linux_mtd.c +STLINK-V3 +M: Miklos Marton <martonmiklosqdev(a)gmail.com> +S: Maintained +F: stlinkv3_spi.c + ################################################################################ # TESTS ################################################################################ diff --git a/util/git-hooks/wrapper.sh b/util/git-hooks/wrapper.sh index 3fc3e05..b5f4620 100755 --- a/util/git-hooks/wrapper.sh +++ b/util/git-hooks/wrapper.sh @@ -1,10 +1,75 @@ #!/bin/sh -if [ -x $0.local ]; then - $0.local "$@" || exit $? +# A hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# <local ref> <local sha1> <remote ref> <remote sha1> + +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 fi -hook=$(git rev-parse --show-toplevel)"/util/git-hooks/"$(basename $0) -if [ -x $hook ]; then - $hook "$@" || exit $? -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/c/flashrom/+/72180 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I2e5c90af2b7313f933780ea570a23d1d9101ef98 Gerrit-Change-Number: 72180 Gerrit-PatchSet: 1 Gerrit-Owner: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: flashrom.c: Supplement `chip->unlock()` calls with wp unlocking
by Sergii Dmytruk (Code Review) 20 Jan '23

20 Jan '23

Attention is currently required from: Edward O'Callaghan, Nikolai Artemiev. Sergii Dmytruk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/69517 ) Change subject: flashrom.c: Supplement `chip->unlock()` calls with wp unlocking ...................................................................... Patch Set 12: (1 comment) File flashrom.c: https://review.coreboot.org/c/flashrom/+/69517/comment/227eea1e_52cd5729 PS12, Line 1930: return register_chip_restore(restore_flash_wp, flash, initial_wp_cfg); I think error code from `register_chip_restore()` needs to be handled by calling `flashrom_wp_cfg_release(initial_wp_cfg);`. -- To view, visit https://review.coreboot.org/c/flashrom/+/69517 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I74b3f5d3a17749ea60485b916b2d87467a5d8b2f Gerrit-Change-Number: 69517 Gerrit-PatchSet: 12 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Sergii Dmytruk <sergii.dmytruk(a)3mdeb.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Fri, 20 Jan 2023 16:51:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: ni845_spi: refactor singleton states into reentrant pattern
by Alexander Goncharov (Code Review) 20 Jan '23

20 Jan '23

Alexander Goncharov has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72160 ) Change subject: ni845_spi: refactor singleton states into reentrant pattern ...................................................................... ni845_spi: refactor singleton states into reentrant pattern Move global singleton states into a struct and store within the spi_master data field for the life-time of the driver. TOPIC=register_master_api Change-Id: I45fcb8e20582cb0c532c4a9f0c78543a25f8d484 Signed-off-by: Alexander Goncharov <chat(a)joursoir.net> --- M ni845x_spi.c 1 file changed, 71 insertions(+), 31 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/60/72160/1 diff --git a/ni845x_spi.c b/ni845x_spi.c index de907af..7d96eb0 100644 --- a/ni845x_spi.c +++ b/ni845x_spi.c @@ -40,13 +40,14 @@ USE_HIGHER }; -static unsigned char CS_number; // use chip select 0 as default -static enum USB845x_type device_pid = Unknown_NI845X_Device; - -static uInt32 device_handle; -static NiHandle configuration_handle; -static uint16_t io_voltage_in_mV; -static bool ignore_io_voltage_limits; +struct ni845x_spi_data { + unsigned char CS_number; // use chip select 0 as default + enum USB845x_type device_pid; + Int32 device_handle; + NiHandle configuration_handle; + uint16_t io_voltage_in_mV; + bool ignore_io_voltage_limits; +}; // USB-8452 supported voltages, keep this array in ascending order! static const uint8_t usb8452_io_voltages_in_100mV[5] = { @@ -223,7 +224,8 @@ static int usb8452_spi_set_io_voltage(uint16_t requested_io_voltage_mV, uint16_t *set_io_voltage_mV, enum voltage_coerce_mode coerce_mode, - enum USB845x_type device_pid) + enum USB845x_type device_pid, + uInt32 device_handle) { int i = 0; uint8_t selected_voltage_100mV = 0; @@ -388,16 +390,17 @@ static void ni845x_spi_cleanup(NiHandle configuration_handle, uInt32 device_handle) { + struct ni845x_spi_data *data = data; int32 ret = 0; - if (configuration_handle != 0) { - ret = ni845xSpiConfigurationClose(configuration_handle); + if (data->configuration_handle != 0) { + ret = ni845xSpiConfigurationClose(data->configuration_handle); if (ret) ni845x_report_error("ni845xSpiConfigurationClose", ret); } - if (device_handle != 0) { - ret = ni845xClose(device_handle); + if (data->device_handle != 0) { + ret = ni845xClose(data->device_handle); if (ret) ni845x_report_error("ni845xClose", ret); } @@ -412,76 +415,79 @@ static void ni845x_warn_over_max_voltage(const struct flashctx *flash) { - if (device_pid == USB8451) { + const struct ni845x_spi_data *data = flash->mst->spi.data; + + if (data->device_pid == USB8451) { msg_pwarn("The %s chip maximum voltage is %.1fV, while the USB-8451 " "IO voltage levels are 3.3V.\n" "Ignoring this because ignore_io_voltage_limits parameter is set.\n", flash->chip->name, flash->chip->voltage.max / 1000.0f); - } else if (device_pid == USB8452) { + } else if (data->device_pid == USB8452) { msg_pwarn("The %s chip maximum voltage is %.1fV, while the USB-8452 " "IO voltage is set to %.1fV.\n" "Ignoring this because ignore_io_voltage_limits parameter is set.\n", flash->chip->name, flash->chip->voltage.max / 1000.0f, - io_voltage_in_mV / 1000.0f); + data->io_voltage_in_mV / 1000.0f); } } static int ni845x_spi_io_voltage_check(const struct flashctx *flash) { + const struct ni845x_spi_data *data = flash->mst->spi.data; static bool first_transmit = true; if (first_transmit && flash->chip) { first_transmit = false; - if (io_voltage_in_mV > flash->chip->voltage.max) { - if (ignore_io_voltage_limits) { + if (data->io_voltage_in_mV > flash->chip->voltage.max) { + if (data->ignore_io_voltage_limits) { ni845x_warn_over_max_voltage(flash); return 0; } - if (device_pid == USB8451) { + if (data->device_pid == USB8451) { msg_perr("The %s chip maximum voltage is %.1fV, while the USB-8451 " "IO voltage levels are 3.3V.\nAborting operations\n", flash->chip->name, flash->chip->voltage.max / 1000.0f); return -1; - } else if (device_pid == USB8452) { + } else if (data->device_pid == USB8452) { msg_perr("Lowering IO voltage because the %s chip maximum voltage is %.1fV, " "(%.1fV was set)\n", flash->chip->name, flash->chip->voltage.max / 1000.0f, - io_voltage_in_mV / 1000.0f); + data->io_voltage_in_mV / 1000.0f); if (usb8452_spi_set_io_voltage(flash->chip->voltage.max, - &io_voltage_in_mV, + &data->io_voltage_in_mV, USE_LOWER)) { msg_perr("Unable to lower the IO voltage below " "the chip's maximum voltage\n"); return -1; } } - } else if (io_voltage_in_mV < flash->chip->voltage.min) { - if (device_pid == USB8451) { + } else if (data->io_voltage_in_mV < flash->chip->voltage.min) { + if (data->device_pid == USB8451) { msg_pwarn("Flash operations might be unreliable, because the %s chip's " "minimum voltage is %.1fV, while the USB-8451's " "IO voltage levels are 3.3V.\n", flash->chip->name, flash->chip->voltage.min / 1000.0f); - return ignore_io_voltage_limits ? 0 : -1; - } else if (device_pid == USB8452) { + return data->ignore_io_voltage_limits ? 0 : -1; + } else if (data->device_pid == USB8452) { msg_pwarn("Raising the IO voltage because the %s chip's " "minimum voltage is %.1fV, " "(%.1fV was set)\n", flash->chip->name, flash->chip->voltage.min / 1000.0f, - io_voltage_in_mV / 1000.0f); + data->io_voltage_in_mV / 1000.0f); if (usb8452_spi_set_io_voltage(flash->chip->voltage.min, - &io_voltage_in_mV, + &data->io_voltage_in_mV, USE_HIGHER)) { msg_pwarn("Unable to raise the IO voltage above the chip's " "minimum voltage\n" "Flash operations might be unreliable.\n"); - return ignore_io_voltage_limits ? 0 : -1; + return data->ignore_io_voltage_limits ? 0 : -1; } } } @@ -495,6 +501,7 @@ const unsigned char *write_arr, unsigned char *read_arr) { + const struct ni845x_spi_data *data = flash->mst->spi.data; uInt32 read_size = 0; uInt8 *transfer_buffer = NULL; int32 ret = 0; @@ -510,8 +517,8 @@ memcpy(transfer_buffer, write_arr, write_cnt); - ret = ni845xSpiWriteRead(device_handle, - configuration_handle, + ret = ni845xSpiWriteRead(data->device_handle, + data->configuration_handle, (write_cnt + read_cnt), transfer_buffer, &read_size, transfer_buffer); if (ret < 0) { // Negative specifies an error, meaning the function did not perform the expected behavior. @@ -558,6 +565,12 @@ int spi_speed_KHz = 1000; // selecting 1 MHz SCK is a good bet char *serial_number = NULL; // by default open the first connected device char *ignore_io_voltage_limits_str = NULL; + bool ignore_io_voltage_limits; + uint16_t io_voltage_in_mV; + unsigned char CS_number; + enum USB845x_type device_pid = Unknown_NI845X_Device; + NiHandle configuration_handle; + uInt32 device_handle; int32 tmp = 0; // read the cs parameter (which Chip select should we use) @@ -623,7 +636,7 @@ goto err; } - if (usb8452_spi_set_io_voltage(requested_io_voltage_mV, &io_voltage_in_mV, USE_LOWER) < 0) { + if (usb8452_spi_set_io_voltage(requested_io_voltage_mV, &io_voltage_in_mV, USE_LOWER, device_pid) < 0) { // no alert here usb8452_spi_set_io_voltage already printed that goto err; } @@ -633,6 +646,18 @@ goto err; } + struct ni845x_spi_data *data = calloc(1, sizeof(*data)); + if (!data) { + msg_perr("Unable to allocate space for SPI master data\n"); + return 1; + } + data->CS_number = CS_number; + data->device_pid = device_pid; + data->device_handle = device_handle; + data->configuration_handle = configuration_handle; + data->io_voltage_in_mV = io_voltage_in_mV; + data->ignore_io_voltage_limits = ignore_io_voltage_limits;; + return register_spi_master(&spi_programmer_ni845x, NULL); err: -- To view, visit https://review.coreboot.org/c/flashrom/+/72160 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I45fcb8e20582cb0c532c4a9f0c78543a25f8d484 Gerrit-Change-Number: 72160 Gerrit-PatchSet: 1 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit January 2023