March 2019 - flashrom-gerrit - mail.coreboot.org

Change in ...flashrom[master]: dediprog: Disable 4BA completely
by David Hendricks (Code Review) March 23, 2019

March 23, 2019

David Hendricks has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/30386 ) Change subject: dediprog: Disable 4BA completely ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/30386 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I08efcbb09ab3499ef6902a698e9ce3d6232237c4 Gerrit-Change-Number: 30386 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Stefan T <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Comment-Date: Sat, 23 Mar 2019 05:09:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in ...flashrom[master]: Add support for National Instruments USB-845x devices
by Miklós Márton (Code Review) March 20, 2019

March 20, 2019

Miklós Márton has uploaded a new patch set (#17) to the change originally created by David Hendricks. ( https://review.coreboot.org/c/flashrom/+/25683 ) Change subject: Add support for National Instruments USB-845x devices ...................................................................... Add support for National Instruments USB-845x devices Change-Id: I9477b6f0193bfdf20bbe63421a7fb97b597ec549 Signed-off-by: Miklós Márton <martonmiklosqdev(a)gmail.com> --- M Makefile M flashrom.8.tmpl M flashrom.c A ni845x_spi.c M programmer.h 5 files changed, 630 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/83/25683/17 -- To view, visit https://review.coreboot.org/c/flashrom/+/25683 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9477b6f0193bfdf20bbe63421a7fb97b597ec549 Gerrit-Change-Number: 25683 Gerrit-PatchSet: 17 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-CC: Márton Miklós <martonmiklosqdev(a)gmail.com> Gerrit-CC: Stefan T <stefan.tauner(a)gmx.at> Gerrit-MessageType: newpatchset

1 0

Change in ...flashrom[master]: Add support for National Instruments USB-845x devices
by Miklós Márton (Code Review) March 20, 2019

March 20, 2019

Miklós Márton has uploaded a new patch set (#16) to the change originally created by David Hendricks. ( https://review.coreboot.org/c/flashrom/+/25683 ) Change subject: Add support for National Instruments USB-845x devices ...................................................................... Add support for National Instruments USB-845x devices Change-Id: I9477b6f0193bfdf20bbe63421a7fb97b597ec549 Signed-off-by: Miklós Márton <martonmiklosqdev(a)gmail.com> --- M Makefile M flashrom.8.tmpl M flashrom.c A ni845x_spi.c M programmer.h 5 files changed, 629 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/83/25683/16 -- To view, visit https://review.coreboot.org/c/flashrom/+/25683 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9477b6f0193bfdf20bbe63421a7fb97b597ec549 Gerrit-Change-Number: 25683 Gerrit-PatchSet: 16 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-CC: Márton Miklós <martonmiklosqdev(a)gmail.com> Gerrit-CC: Stefan T <stefan.tauner(a)gmx.at> Gerrit-MessageType: newpatchset

1 0

Change in ...flashrom[master]: Add support for National Instruments USB-845x devices
by Miklós Márton (Code Review) March 20, 2019

March 20, 2019

Miklós Márton has uploaded a new patch set (#15) to the change originally created by David Hendricks. ( https://review.coreboot.org/c/flashrom/+/25683 ) Change subject: Add support for National Instruments USB-845x devices ...................................................................... Add support for National Instruments USB-845x devices Change-Id: I9477b6f0193bfdf20bbe63421a7fb97b597ec549 Signed-off-by: Miklós Márton <martonmiklosqdev(a)gmail.com> --- M Makefile M flashrom.8.tmpl M flashrom.c A ni845x_spi.c M programmer.h 5 files changed, 632 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/83/25683/15 -- To view, visit https://review.coreboot.org/c/flashrom/+/25683 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9477b6f0193bfdf20bbe63421a7fb97b597ec549 Gerrit-Change-Number: 25683 Gerrit-PatchSet: 15 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Miklós Márton <martonmiklosqdev(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-CC: Márton Miklós <martonmiklosqdev(a)gmail.com> Gerrit-CC: Stefan T <stefan.tauner(a)gmx.at> Gerrit-MessageType: newpatchset

1 0

Change in ...flashrom[master]: Add "gingerly" flashing mode for the unreliable ISP environments
by mikeb mikeb (Code Review) March 9, 2019

March 9, 2019

mikeb mikeb has abandoned this change. ( https://review.coreboot.org/c/flashrom/+/23840 ) Change subject: Add "gingerly" flashing mode for the unreliable ISP environments ...................................................................... Abandoned Superseeded by CB:31830. I have implemented some of your ideas to improve this change: 1) "gingerly" --> "dangerous-bruteforce" 2) timeout , and will remember the rest (although don't know when I will do them) -- To view, visit https://review.coreboot.org/c/flashrom/+/23840 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie3f18276d9fb7233d082720cb29d154f31c77100 Gerrit-Change-Number: 23840 Gerrit-PatchSet: 3 Gerrit-Owner: mikeb mikeb <mikebdp2(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Reviewer: mikeb mikeb <mikebdp2(a)gmail.com> Gerrit-MessageType: abandon

1 0

Change in ...flashrom[master]: Remove trailing whitespace
by HAOUAS Elyes (Code Review) March 4, 2019

March 4, 2019

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/31227 Change subject: Remove trailing whitespace ...................................................................... Remove trailing whitespace Change-Id: I1ff9418bcf150558ce7c97fafa3a68e5fa59f11e Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M at45db.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/27/31227/1 diff --git a/at45db.c b/at45db.c index 619d41c..38c0685 100644 --- a/at45db.c +++ b/at45db.c @@ -341,7 +341,7 @@ { const unsigned int page_size = flash->chip->page_size; const unsigned int total_size = flash->chip->total_size * 1024; - + if ((addr % page_size) != 0 || (blocklen % page_size) != 0) { msg_cerr("%s: cannot erase partial pages: addr=%u, blocklen=%u\n", __func__, addr, blocklen); return 1; @@ -361,7 +361,7 @@ { const unsigned int page_size = flash->chip->page_size; const unsigned int total_size = flash->chip->total_size * 1024; - + if ((addr % page_size) != 0 || (blocklen % page_size) != 0) { // FIXME: should check blocks not pages msg_cerr("%s: cannot erase partial pages: addr=%u, blocklen=%u\n", __func__, addr, blocklen); return 1; @@ -381,7 +381,7 @@ { const unsigned int page_size = flash->chip->page_size; const unsigned int total_size = flash->chip->total_size * 1024; - + if ((addr % page_size) != 0 || (blocklen % page_size) != 0) { // FIXME: should check sectors not pages msg_cerr("%s: cannot erase partial pages: addr=%u, blocklen=%u\n", __func__, addr, blocklen); return 1; @@ -400,7 +400,7 @@ int spi_erase_at45db_chip(struct flashctx *flash, unsigned int addr, unsigned int blocklen) { const unsigned int total_size = flash->chip->total_size * 1024; - + if ((addr + blocklen) > total_size) { msg_cerr("%s: tried to erase beyond flash boundary: addr=%u, blocklen=%u, size=%u\n", __func__, addr, blocklen, total_size); @@ -532,7 +532,7 @@ { const unsigned int page_size = flash->chip->page_size; const unsigned int total_size = flash->chip->total_size; - + if ((start % page_size) != 0 || (len % page_size) != 0) { msg_cerr("%s: cannot write partial pages: start=%u, len=%u\n", __func__, start, len); return 1; -- To view, visit https://review.coreboot.org/c/flashrom/+/31227 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1ff9418bcf150558ce7c97fafa3a68e5fa59f11e Gerrit-Change-Number: 31227 Gerrit-PatchSet: 1 Gerrit-Owner: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-MessageType: newchange

4 4

Change in ...flashrom[master]: layout.c: Remove unused variable
by Arthur Heymans (Code Review) March 4, 2019

March 4, 2019

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/31243 Change subject: layout.c: Remove unused variable ...................................................................... layout.c: Remove unused variable Change-Id: I0c0c085999a12987376d75825fcf43e788a55a4b Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M layout.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/43/31243/1 diff --git a/layout.c b/layout.c index fa66238..e10bb73 100644 --- a/layout.c +++ b/layout.c @@ -161,7 +161,6 @@ int process_include_args(struct flashrom_layout *const l) { int i; - unsigned int found = 0; if (num_include_args == 0) return 0; @@ -180,7 +179,6 @@ include_args[i]); return 1; } - found++; } msg_ginfo("Using region%s: \"%s\"", num_include_args > 1 ? "s" : "", -- To view, visit https://review.coreboot.org/c/flashrom/+/31243 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I0c0c085999a12987376d75825fcf43e788a55a4b Gerrit-Change-Number: 31243 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-MessageType: newchange

4 3

Change in ...flashrom[master]: layout: Add missing stdbool.h include
by Nico Huber (Code Review) March 4, 2019

March 4, 2019

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/31013 Change subject: layout: Add missing stdbool.h include ...................................................................... layout: Add missing stdbool.h include Change-Id: I9a413d491038b29c832011a738f3b49e029dcf6f Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M layout.h 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/13/31013/1 diff --git a/layout.h b/layout.h index 61311bc..a10cbb4 100644 --- a/layout.h +++ b/layout.h @@ -23,6 +23,7 @@ #include <stddef.h> #include <stdint.h> +#include <stdbool.h> /* Types and macros regarding the maximum flash space size supported by generic code. */ typedef uint32_t chipoff_t; /* Able to store any addressable offset within a supported flash memory. */ -- To view, visit https://review.coreboot.org/c/flashrom/+/31013 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9a413d491038b29c832011a738f3b49e029dcf6f Gerrit-Change-Number: 31013 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

4 5

Change in ...flashrom[1.0.x]: Fix erasing of unaligned regions
by Nico Huber (Code Review) March 4, 2019

March 4, 2019

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/31069 Change subject: Fix erasing of unaligned regions ...................................................................... Fix erasing of unaligned regions The erase (-E) feature is somehow a brute force method, but still, if we are given a region to erase, we should make sure to restore surrounding data if the erase block expands beyond the region. Change-Id: I5fc35310f0b090f218cd1d660e27fb39dd05c3c5 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M flashrom.c 1 file changed, 66 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/69/31069/1 diff --git a/flashrom.c b/flashrom.c index 1a7dfb1..cc0a631 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1690,17 +1690,80 @@ const struct walk_info *const info, const erasefn_t erasefn) { const unsigned int erase_len = info->erase_end + 1 - info->erase_start; + const bool region_unaligned = info->region_start > info->erase_start || + info->erase_end > info->region_end; + uint8_t *backup_contents = NULL, *erased_contents = NULL; + int ret = 2; + /* + * If the region is not erase-block aligned, merge current flash con- + * tents into a new buffer `backup_contents`. + */ + if (region_unaligned) { + backup_contents = malloc(erase_len); + erased_contents = malloc(erase_len); + if (!backup_contents || !erased_contents) { + msg_cerr("Out of memory!\n"); + ret = 1; + goto _free_ret; + } + memset(backup_contents, ERASED_VALUE(flashctx), erase_len); + memset(erased_contents, ERASED_VALUE(flashctx), erase_len); + + msg_cdbg("R"); + /* Merge data preceding the current region. */ + if (info->region_start > info->erase_start) { + const chipoff_t start = info->erase_start; + const chipsize_t len = info->region_start - info->erase_start; + if (flashctx->chip->read(flashctx, backup_contents, start, len)) { + msg_cerr("Can't read! Aborting.\n"); + goto _free_ret; + } + } + /* Merge data following the current region. */ + if (info->erase_end > info->region_end) { + const chipoff_t start = info->region_end + 1; + const chipoff_t rel_start = start - info->erase_start; /* within this erase block */ + const chipsize_t len = info->erase_end - info->region_end; + if (flashctx->chip->read(flashctx, backup_contents + rel_start, start, len)) { + msg_cerr("Can't read! Aborting.\n"); + goto _free_ret; + } + } + } + + ret = 1; all_skipped = false; msg_cdbg("E"); if (erasefn(flashctx, info->erase_start, erase_len)) - return 1; + goto _free_ret; if (check_erased_range(flashctx, info->erase_start, erase_len)) { msg_cerr("ERASE FAILED!\n"); - return 1; + goto _free_ret; } - return 0; + + if (region_unaligned) { + unsigned int starthere = 0, lenhere = 0, writecount = 0; + /* get_next_write() sets starthere to a new value after the call. */ + while ((lenhere = get_next_write(erased_contents + starthere, backup_contents + starthere, + erase_len - starthere, &starthere, flashctx->chip->gran))) { + if (!writecount++) + msg_cdbg("W"); + /* Needs the partial write function signature. */ + if (flashctx->chip->write(flashctx, backup_contents + starthere, + info->erase_start + starthere, lenhere)) + goto _free_ret; + starthere += lenhere; + } + } + + ret = 0; + +_free_ret: + free(erased_contents); + free(backup_contents); + return ret; } /** -- To view, visit https://review.coreboot.org/c/flashrom/+/31069 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.0.x Gerrit-Change-Id: I5fc35310f0b090f218cd1d660e27fb39dd05c3c5 Gerrit-Change-Number: 31069 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

1 7

Change in ...flashrom[master]: Fix erasing of unaligned regions
by Nico Huber (Code Review) March 4, 2019

March 4, 2019

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/31068 Change subject: Fix erasing of unaligned regions ...................................................................... Fix erasing of unaligned regions The erase (-E) feature is somehow a brute force method, but still, if we are given a region to erase, we should make sure to restore surrounding data if the erase block expands beyond the region. Change-Id: I5fc35310f0b090f218cd1d660e27fb39dd05c3c5 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M flashrom.c 1 file changed, 66 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/68/31068/1 diff --git a/flashrom.c b/flashrom.c index 7129a51..e141f2c 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1732,17 +1732,80 @@ const struct walk_info *const info, const erasefn_t erasefn) { const unsigned int erase_len = info->erase_end + 1 - info->erase_start; + const bool region_unaligned = info->region_start > info->erase_start || + info->erase_end > info->region_end; + uint8_t *backup_contents = NULL, *erased_contents = NULL; + int ret = 2; + /* + * If the region is not erase-block aligned, merge current flash con- + * tents into a new buffer `backup_contents`. + */ + if (region_unaligned) { + backup_contents = malloc(erase_len); + erased_contents = malloc(erase_len); + if (!backup_contents || !erased_contents) { + msg_cerr("Out of memory!\n"); + ret = 1; + goto _free_ret; + } + memset(backup_contents, ERASED_VALUE(flashctx), erase_len); + memset(erased_contents, ERASED_VALUE(flashctx), erase_len); + + msg_cdbg("R"); + /* Merge data preceding the current region. */ + if (info->region_start > info->erase_start) { + const chipoff_t start = info->erase_start; + const chipsize_t len = info->region_start - info->erase_start; + if (flashctx->chip->read(flashctx, backup_contents, start, len)) { + msg_cerr("Can't read! Aborting.\n"); + goto _free_ret; + } + } + /* Merge data following the current region. */ + if (info->erase_end > info->region_end) { + const chipoff_t start = info->region_end + 1; + const chipoff_t rel_start = start - info->erase_start; /* within this erase block */ + const chipsize_t len = info->erase_end - info->region_end; + if (flashctx->chip->read(flashctx, backup_contents + rel_start, start, len)) { + msg_cerr("Can't read! Aborting.\n"); + goto _free_ret; + } + } + } + + ret = 1; all_skipped = false; msg_cdbg("E"); if (erasefn(flashctx, info->erase_start, erase_len)) - return 1; + goto _free_ret; if (check_erased_range(flashctx, info->erase_start, erase_len)) { msg_cerr("ERASE FAILED!\n"); - return 1; + goto _free_ret; } - return 0; + + if (region_unaligned) { + unsigned int starthere = 0, lenhere = 0, writecount = 0; + /* get_next_write() sets starthere to a new value after the call. */ + while ((lenhere = get_next_write(erased_contents + starthere, backup_contents + starthere, + erase_len - starthere, &starthere, flashctx->chip->gran))) { + if (!writecount++) + msg_cdbg("W"); + /* Needs the partial write function signature. */ + if (flashctx->chip->write(flashctx, backup_contents + starthere, + info->erase_start + starthere, lenhere)) + goto _free_ret; + starthere += lenhere; + } + } + + ret = 0; + +_free_ret: + free(erased_contents); + free(backup_contents); + return ret; } /** -- To view, visit https://review.coreboot.org/c/flashrom/+/31068 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5fc35310f0b090f218cd1d660e27fb39dd05c3c5 Gerrit-Change-Number: 31068 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

4 12