February 2018 - flashrom-gerrit

Change in flashrom[master]: Add "gingerly" flashing mode for the unreliable ISP environments
by Mike Banon (Code Review) Feb. 21, 2018

Feb. 21, 2018

Mike Banon has uploaded this change for review. ( https://review.coreboot.org/23840 Change subject: Add "gingerly" flashing mode for the unreliable ISP environments ...................................................................... Add "gingerly" flashing mode for the unreliable ISP environments Some in-system-programming environments are very unreliable, e.g. when you connect a SOIC8 test clip to the flash chip of WR841ND v9 wireless router: because the low power SOC of this router becomes powered and is constantly trying to boot, the router's flash chip is correctly detected only 30% of times, and when it is detected just 30% of the operations are successful - the rest result in zeroes or garbage data being read from / written to a flash chip While in this new mode called "-g" / "--gingerly", flashrom will be constantly probing for a flash chip until it is correctly detected - and then, depending on the operation selected by a user, at the moments of chip availability it will be reading or writing by the small chunks of 256 bytes maximum size, verifying each small chunk and retrying the operation until the verification becomes successful. Constant probing between the small chunk operations is also being done - to avoid a possible situation where we have got two identical blocks of zeroes while reading a chunk and erroneously accepted it Currently this mode is active only for those SPI25 chips which are ".write = spi_chip_write_256" and ".read = spi_chip_read", but later could be expanded to more functions to become useful for more chips Change-Id: Ie3f18276d9fb7233d082720cb29d154f31c77100 Signed-off-by: Mike Banon <mikebdp2(a)gmail.com> --- M cli_classic.c M flash.h M libflashrom.c M libflashrom.h M spi25.c 5 files changed, 120 insertions(+), 16 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/40/23840/1 diff --git a/cli_classic.c b/cli_classic.c index 31f7394..d9f0c65 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -42,7 +42,7 @@ "-z|" #endif "-p <programmername>[:<parameters>] [-c <chipname>]\n" - "[-E|(-r|-w|-v) <file>] [(-l <layoutfile>|--ifd) [-i <imagename>]...] [-n] [-N] [-f]]\n" + "[-E|(-r|-w|-v) <file>] [(-l <layoutfile>|--ifd) [-i <imagename>]...] [-n] [-N] [-g] [-f]]\n" "[-V[V[V]]] [-o <logfile>]\n\n", name); printf(" -h | --help print this help text\n" @@ -54,6 +54,7 @@ " -V | --verbose more verbose output\n" " -c | --chip <chipname> probe only for specified flash chip\n" " -f | --force force specific operations (see man page)\n" + " -g | --gingerly verify each small chunk and probe constantly\n" " -n | --noverify don't auto-verify\n" " -N | --noverify-all verify included regions only (cf. -i)\n" " -l | --layout <layoutfile> read ROM layout from <layoutfile>\n" @@ -105,7 +106,7 @@ #if CONFIG_PRINT_WIKI == 1 int list_supported_wiki = 0; #endif - int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0; + int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0, gingerly = 0; int dont_verify_it = 0, dont_verify_all = 0, list_supported = 0, operation_specified = 0; struct flashrom_layout *layout = NULL; enum programmer prog = PROGRAMMER_INVALID; @@ -115,7 +116,7 @@ }; int ret = 0; - static const char optstring[] = "r:Rw:v:nNVEfc:l:i:p:Lzho:"; + static const char optstring[] = "r:Rw:v:nNVEfgc:l:i:p:Lzho:"; static const struct option long_options[] = { {"read", 1, NULL, 'r'}, {"write", 1, NULL, 'w'}, @@ -126,6 +127,7 @@ {"chip", 1, NULL, 'c'}, {"verbose", 0, NULL, 'V'}, {"force", 0, NULL, 'f'}, + {"gingerly", 0, NULL, 'g'}, {"layout", 1, NULL, 'l'}, {"ifd", 0, NULL, OPTION_IFD}, {"image", 1, NULL, 'i'}, @@ -224,6 +226,9 @@ case 'f': force = 1; break; + case 'g': + gingerly = 1; + break; case 'l': if (layoutfile) { fprintf(stderr, "Error: --layout specified " @@ -454,16 +459,21 @@ msg_pdbg("The following protocols are supported: %s.\n", tempstr); free(tempstr); - for (j = 0; j < registered_master_count; j++) { - startchip = 0; - while (chipcount < ARRAY_SIZE(flashes)) { - startchip = probe_flash(&registered_masters[j], startchip, &flashes[chipcount], 0); - if (startchip == -1) - break; - chipcount++; - startchip++; + do { + chipcount = 0; + for (j = 0; j < registered_master_count; j++) { + startchip = 0; + while (chipcount < ARRAY_SIZE(flashes)) { + startchip = probe_flash(&registered_masters[j], startchip, &flashes[chipcount], 0); + if (startchip == -1) + break; + chipcount++; + startchip++; + } } - } + } while (gingerly && ( !chipcount || // wait for the correct chip detection + ((flashes[0].chip->manufacture_id == GENERIC_MANUF_ID) || + (flashes[0].chip->model_id == GENERIC_DEVICE_ID)) ) ); if (chipcount > 1) { msg_cinfo("Multiple flash chip definitions match the detected chip(s): \"%s\"", @@ -566,6 +576,7 @@ flashrom_layout_set(fill_flash, layout); flashrom_flag_set(fill_flash, FLASHROM_FLAG_FORCE, !!force); + flashrom_flag_set(fill_flash, FLASHROM_FLAG_GINGERLY, !!gingerly); #if CONFIG_INTERNAL == 1 flashrom_flag_set(fill_flash, FLASHROM_FLAG_FORCE_BOARDMISMATCH, !!force_boardmismatch); #endif diff --git a/flash.h b/flash.h index a80a9c2..9e8a8ee 100644 --- a/flash.h +++ b/flash.h @@ -254,6 +254,7 @@ struct { bool force; bool force_boardmismatch; + bool gingerly; bool verify_after_write; bool verify_whole_chip; } flags; diff --git a/libflashrom.c b/libflashrom.c index 6e0f42c..c0e4fcf 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -253,6 +253,7 @@ switch (flag) { case FLASHROM_FLAG_FORCE: flashctx->flags.force = value; break; case FLASHROM_FLAG_FORCE_BOARDMISMATCH: flashctx->flags.force_boardmismatch = value; break; + case FLASHROM_FLAG_GINGERLY: flashctx->flags.gingerly = value; break; case FLASHROM_FLAG_VERIFY_AFTER_WRITE: flashctx->flags.verify_after_write = value; break; case FLASHROM_FLAG_VERIFY_WHOLE_CHIP: flashctx->flags.verify_whole_chip = value; break; } @@ -270,6 +271,7 @@ switch (flag) { case FLASHROM_FLAG_FORCE: return flashctx->flags.force; case FLASHROM_FLAG_FORCE_BOARDMISMATCH: return flashctx->flags.force_boardmismatch; + case FLASHROM_FLAG_GINGERLY: return flashctx->flags.gingerly; case FLASHROM_FLAG_VERIFY_AFTER_WRITE: return flashctx->flags.verify_after_write; case FLASHROM_FLAG_VERIFY_WHOLE_CHIP: return flashctx->flags.verify_whole_chip; default: return false; diff --git a/libflashrom.h b/libflashrom.h index 786147b..712df4f 100644 --- a/libflashrom.h +++ b/libflashrom.h @@ -53,6 +53,7 @@ enum flashrom_flag { FLASHROM_FLAG_FORCE, FLASHROM_FLAG_FORCE_BOARDMISMATCH, + FLASHROM_FLAG_GINGERLY, FLASHROM_FLAG_VERIFY_AFTER_WRITE, FLASHROM_FLAG_VERIFY_WHOLE_CHIP, }; @@ -69,4 +70,4 @@ void flashrom_layout_release(struct flashrom_layout *); void flashrom_layout_set(struct flashrom_flashctx *, const struct flashrom_layout *); -#endif /* !__LIBFLASHROM_H__ */ \ No newline at end of file +#endif /* !__LIBFLASHROM_H__ */ diff --git a/spi25.c b/spi25.c index 00e0992..adcaff5 100644 --- a/spi25.c +++ b/spi25.c @@ -25,6 +25,7 @@ #include <stddef.h> #include <string.h> #include <stdbool.h> +#include <stdlib.h> #include "flash.h" #include "flashchips.h" #include "chipdrivers.h" @@ -652,6 +653,46 @@ return spi_send_command(flash, 1 + addr_len, len, cmd, bytes); } +static int spi_rw_gingerly(struct flashctx *flash, uint8_t *buf1, uint8_t *buf2, + unsigned int startrw_here, unsigned int torw_len, bool rw_flag) { + + int rc = 0; + + while (1) { + + // FIRST PROBE + if (flash->chip->probe(flash) != 1) + continue; + + // FIRST OPERATION + if (rw_flag == 0) + rc = spi_nbyte_read(flash, startrw_here, buf1, torw_len); + else + rc = spi_nbyte_program(flash, startrw_here, buf1, torw_len); + + if (rc != 0) + break; + + // SECOND PROBE + if (flash->chip->probe(flash) != 1) + continue; + + // SECOND OPERATION + rc = spi_nbyte_read(flash, startrw_here, buf2, torw_len); + + if (rc != 0) + break; + + // COMPARE TWO BUFFERS + if (memcmp(buf1, buf2, torw_len)) + continue; + + break; + } + + return rc; +} + /* * Read a part of the flash chip. * FIXME: Use the chunk code from Michael Karcher instead. @@ -665,6 +706,20 @@ /* Limit for multi-die 4-byte-addressing chips. */ unsigned int area_size = min(flash->chip->total_size * 1024, 16 * 1024 * 1024); + unsigned int gingerly = flashrom_flag_get(flash, FLASHROM_FLAG_GINGERLY); + uint8_t *const buf1 = gingerly ? malloc(chunksize) : NULL; + uint8_t *const buf2 = gingerly ? malloc(chunksize) : NULL; + + if (gingerly && (!buf1 || !buf2)) { + msg_gerr("Out of memory!\n"); + goto _free_ret; + } + + if (gingerly) { + msg_cdbg("spi_read_chunked: chunksize %i ---> %i\n", chunksize, min(chunksize, 256)); + chunksize = min(chunksize, 256); + } + /* Warning: This loop has a very unusual condition and body. * The loop needs to go through each area with at least one affected * byte. The lowest area number is (start / area_size) since that @@ -674,6 +729,7 @@ * (start + len - 1) / area_size. Since we want to include that last * area as well, the loop condition uses <=. */ + for (i = start / area_size; i <= (start + len - 1) / area_size; i++) { /* Byte position of the first byte in the range in this area. */ /* starthere is an offset to the base address of the chip. */ @@ -682,7 +738,14 @@ lenhere = min(start + len, (i + 1) * area_size) - starthere; for (j = 0; j < lenhere; j += chunksize) { toread = min(chunksize, lenhere - j); - rc = spi_nbyte_read(flash, starthere + j, buf + starthere - start + j, toread); + + if (gingerly) { + rc = spi_rw_gingerly(flash, buf1, buf2, starthere + j, toread, 0 /* read */); + memcpy(buf + starthere - start + j, buf1, toread); + } + else + rc = spi_nbyte_read(flash, starthere + j, buf + starthere - start + j, toread); + if (rc) break; } @@ -690,6 +753,9 @@ break; } +_free_ret: + free(buf1); + free(buf2); return rc; } @@ -709,6 +775,20 @@ */ unsigned int page_size = flash->chip->page_size; + unsigned int gingerly = flashrom_flag_get(flash, FLASHROM_FLAG_GINGERLY); + uint8_t *const buf1 = gingerly ? malloc(chunksize) : NULL; + uint8_t *const buf2 = gingerly ? malloc(chunksize) : NULL; + + if (gingerly && (!buf1 || !buf2)) { + msg_gerr("Out of memory!\n"); + goto _free_ret; + } + + if (gingerly) { + msg_cdbg("spi_read_chunked: chunksize %i ---> %i\n", chunksize, min(chunksize, 256)); + chunksize = min(chunksize, 256); + } + /* Warning: This loop has a very unusual condition and body. * The loop needs to go through each page with at least one affected * byte. The lowest page number is (start / page_size) since that @@ -718,6 +798,7 @@ * (start + len - 1) / page_size. Since we want to include that last * page as well, the loop condition uses <=. */ + for (i = start / page_size; i <= (start + len - 1) / page_size; i++) { /* Byte position of the first byte in the range in this page. */ /* starthere is an offset to the base address of the chip. */ @@ -726,14 +807,22 @@ lenhere = min(start + len, (i + 1) * page_size) - starthere; for (j = 0; j < lenhere; j += chunksize) { int rc; - towrite = min(chunksize, lenhere - j); - rc = spi_nbyte_program(flash, starthere + j, buf + starthere - start + j, towrite); + + if (gingerly) { + memcpy(buf1, buf + starthere - start + j, towrite); + rc = spi_rw_gingerly(flash, buf1, buf2, starthere + j, towrite, 1 /* write */); + } + else + rc = spi_nbyte_program(flash, starthere + j, buf + starthere - start + j, towrite); if (rc) return rc; } } +_free_ret: + free(buf1); + free(buf2); return 0; } -- To view, visit https://review.coreboot.org/23840 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3f18276d9fb7233d082720cb29d154f31c77100 Gerrit-Change-Number: 23840 Gerrit-PatchSet: 1 Gerrit-Owner: Mike Banon <mikebdp2(a)gmail.com>

1 0

Change in flashrom[master]: dummyflasher: make it possible to choose MX25L6436 for emulation
by Mike Banon (Code Review) Feb. 21, 2018

Feb. 21, 2018

Mike Banon has posted comments on this change. ( https://review.coreboot.org/23837 ) Change subject: dummyflasher: make it possible to choose MX25L6436 for emulation ...................................................................... Patch Set 1: > I'm having trouble to understand this change. What's the benefit > in having to specify "MX25L6405" to emulate an MX25L6436? Or is > anything broken atm? After retesting the master I discovered that " ./flashrom -p dummy:emulate=MX25L6436 -c "MX25L6436E/MX25L6445E/MX25L6465E/MX25L6473E/MX25L6473F" " works OK. Sorry, I probably got confused by that flashchips.c doesn't have "MX25L6436" chip - has "MX25L6436E" instead, and when I initially tried " ./flashrom -p dummy:emulate=MX25L6436E " it didn't work --- so while trying to make things work I renamed "6436" to " 6405"... This change could be abandoned now, but maybe in the future we could rename MX25L6436 to MX25L6436E in those few places for clarity -- To view, visit https://review.coreboot.org/23837 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I687f4fd23fa2234d74b992749b0eab44efcebc1c Gerrit-Change-Number: 23837 Gerrit-PatchSet: 1 Gerrit-Owner: Mike Banon <mikebdp2(a)gmail.com> Gerrit-Reviewer: Mike Banon <mikebdp2(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, 21 Feb 2018 21:55:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No

1 0

Change in flashrom[master]: flashchips: Add ZD25D20
by Nico Huber (Code Review) Feb. 21, 2018

Feb. 21, 2018

Nico Huber has posted comments on this change. ( https://review.coreboot.org/23702 ) Change subject: flashchips: Add ZD25D20 ...................................................................... Patch Set 3: needs a manual rebase -- To view, visit https://review.coreboot.org/23702 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idf805252647be44e28296a161d2e6160710bcc71 Gerrit-Change-Number: 23702 Gerrit-PatchSet: 3 Gerrit-Owner: 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: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 21 Feb 2018 21:34:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No

1 0

Change in flashrom[master]: git-hooks: Fix install script for various git versions
by build bot (Jenkins) (Code Review) Feb. 21, 2018

Feb. 21, 2018

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/22971 ) Change subject: git-hooks: Fix install script for various git versions ...................................................................... Patch Set 3: Build Successful https://qa.coreboot.org/job/flashrom-customrules/1161/ : SUCCESS -- To view, visit https://review.coreboot.org/22971 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7ee8d4d54db48f7207fe8abf895c7fbba7685ad2 Gerrit-Change-Number: 22971 Gerrit-PatchSet: 3 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: 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: Wed, 21 Feb 2018 21:21:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No

1 0

Change in flashrom[master]: git-hooks: Fix install script for various git versions
by Nico Huber (Code Review) Feb. 21, 2018

Feb. 21, 2018

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/22971 ) Change subject: git-hooks: Fix install script for various git versions ...................................................................... git-hooks: Fix install script for various git versions There are older versions of git-rev-parse that don't understand the `--git-path` switch. Also, when the install script was written, git- rev-parse had a bug when it wasn't run from the root directory. They fixed the behaviour by now. To simplify things and not have to account for that too, we just bail out when the script is run from a sub- directory. Change-Id: I7ee8d4d54db48f7207fe8abf895c7fbba7685ad2 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/22971 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> --- M util/git-hooks/install.sh 1 file changed, 15 insertions(+), 5 deletions(-) Approvals: build bot (Jenkins): Verified David Hendricks: Looks good to me, approved diff --git a/util/git-hooks/install.sh b/util/git-hooks/install.sh index d557c2f..fda0098 100755 --- a/util/git-hooks/install.sh +++ b/util/git-hooks/install.sh @@ -3,18 +3,28 @@ root=$(git rev-parse --show-cdup 2>/dev/null) || \ { echo "Not under git control. Cannot install git hooks." >&2 ; exit 0 ; } -dst="${root}"$(git rev-parse --git-path hooks/) +[ -z "${root}" ] || \ + { echo "Not in root directory. Can only run from git root." >&2 ; exit 1 ; } + src=util/git-hooks/ # relative to root -hooks=$(cd "${root}${src}" && git ls-files -c | grep -Ev 'install.sh|wrapper.sh') +hooks=$(cd "${src}" && git ls-files -c | grep -Ev 'install.sh|wrapper.sh') + +if [ "$(git rev-parse --git-path 2>/dev/null)" = "--git-path" ]; then + # very old git, we have to guess + dst=".git/hooks/" + rel="../../" +else + dst=$(git rev-parse --git-path hooks/) + rel=$(git rev-parse --prefix "${dst}" --show-cdup) +fi for h in $hooks; do # Test if hook is not already installed, i.e. doesn't point at the wrapper - if [ ! "${dst}$h" -ef "${root}${src}wrapper.sh" ]; then + if [ ! "${dst}$h" -ef "${src}wrapper.sh" ]; then # preserve custom hooks if any if [ -e "${dst}$h" ]; then mv "${dst}$h" "${dst}$h.local" fi - ln -s "$(git rev-parse --prefix $(git rev-parse --git-path hooks/) --show-cdup)${src}wrapper.sh" \ - "${dst}$h" + ln -s "${rel}${src}wrapper.sh" "${dst}$h" fi done -- To view, visit https://review.coreboot.org/22971 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7ee8d4d54db48f7207fe8abf895c7fbba7685ad2 Gerrit-Change-Number: 22971 Gerrit-PatchSet: 3 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: 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[master]: dummyflasher: make it possible to choose MX25L6436 for emulation
by Nico Huber (Code Review) Feb. 21, 2018

Feb. 21, 2018

Nico Huber has posted comments on this change. ( https://review.coreboot.org/23837 ) Change subject: dummyflasher: make it possible to choose MX25L6436 for emulation ...................................................................... Patch Set 1: I'm having trouble to understand this change. What's the benefit in having to specify "MX25L6405" to emulate an MX25L6436? Or is anything broken atm? -- To view, visit https://review.coreboot.org/23837 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I687f4fd23fa2234d74b992749b0eab44efcebc1c Gerrit-Change-Number: 23837 Gerrit-PatchSet: 1 Gerrit-Owner: Mike Banon <mikebdp2(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, 21 Feb 2018 21:14:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No

1 0

Change in flashrom[master]: dummyflasher: make it possible to choose MX25L6436 for emulation
by build bot (Jenkins) (Code Review) Feb. 21, 2018

Feb. 21, 2018

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/23837 ) Change subject: dummyflasher: make it possible to choose MX25L6436 for emulation ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom-customrules/1160/ : SUCCESS https://qa.coreboot.org/job/flashrom_gerrit/974/ : SUCCESS -- To view, visit https://review.coreboot.org/23837 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I687f4fd23fa2234d74b992749b0eab44efcebc1c Gerrit-Change-Number: 23837 Gerrit-PatchSet: 1 Gerrit-Owner: Mike Banon <mikebdp2(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 21 Feb 2018 20:34:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in flashrom[master]: dummyflasher: make it possible to choose MX25L6436 for emulation
by Mike Banon (Code Review) Feb. 21, 2018

Feb. 21, 2018

Mike Banon has uploaded this change for review. ( https://review.coreboot.org/23837 Change subject: dummyflasher: make it possible to choose MX25L6436 for emulation ...................................................................... dummyflasher: make it possible to choose MX25L6436 for emulation flashchips.h does not have "#define MACRONIX_MX25L6436" - instead MX25L6436 chip currently belongs to "#define MACRONIX_MX25L6405". This commit makes it possible to emulate MX25L6436 by choosing MX25L6405 Change-Id: I687f4fd23fa2234d74b992749b0eab44efcebc1c Signed-off-by: Mike Banon <mikebdp2(a)gmail.com> --- M dummyflasher.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/37/23837/1 diff --git a/dummyflasher.c b/dummyflasher.c index 1c0c85b..e104617 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -322,7 +322,7 @@ msg_pdbg("Emulating SST SST25VF032B SPI flash chip (RDID, AAI " "write)\n"); } - if (!strcmp(tmp, "MX25L6436")) { + if (!strcmp(tmp, "MX25L6405")) { emu_chip = EMULATE_MACRONIX_MX25L6436; emu_chip_size = 8 * 1024 * 1024; emu_max_byteprogram_size = 256; -- To view, visit https://review.coreboot.org/23837 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I687f4fd23fa2234d74b992749b0eab44efcebc1c Gerrit-Change-Number: 23837 Gerrit-PatchSet: 1 Gerrit-Owner: Mike Banon <mikebdp2(a)gmail.com>

1 0

Change in flashrom[master]: flashchips: Add Zettadevice ZD25D40
by build bot (Jenkins) (Code Review) Feb. 21, 2018

Feb. 21, 2018

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/23701 ) Change subject: flashchips: Add Zettadevice ZD25D40 ...................................................................... Patch Set 5: Build Successful https://qa.coreboot.org/job/flashrom-customrules/1159/ : SUCCESS -- To view, visit https://review.coreboot.org/23701 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0400b059ddacdf166d1b77f619becec3a250cece Gerrit-Change-Number: 23701 Gerrit-PatchSet: 5 Gerrit-Owner: David Hendricks <david.hendricks(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-Comment-Date: Wed, 21 Feb 2018 17:40:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No

1 0

Change in flashrom[master]: flashchips: Add Zettadevice ZD25D40
by David Hendricks (Code Review) Feb. 21, 2018

Feb. 21, 2018

David Hendricks has submitted this change and it was merged. ( https://review.coreboot.org/23701 ) Change subject: flashchips: Add Zettadevice ZD25D40 ...................................................................... flashchips: Add Zettadevice ZD25D40 This introduces the Zettadevice manufacturer ID and adds support for the ZD25D40 chip. Based on PR20 from Github. Change-Id: I0400b059ddacdf166d1b77f619becec3a250cece Signed-off-by: David Hendricks <david.hendricks(a)gmail.com> Reviewed-on: https://review.coreboot.org/23701 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M flashchips.c M flashchips.h 2 files changed, 42 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/flashchips.c b/flashchips.c index 0d85142..1d45810 100644 --- a/flashchips.c +++ b/flashchips.c @@ -16329,7 +16329,45 @@ .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program */ }, - + + { + .vendor = "Zetta Device", + .name = "ZD25D40", + .bustype = BUS_SPI, + .manufacture_id = ZETTADEVICE_ID, + .model_id = ZETTADEVICE_ZD25D40, + .total_size = 512, + .page_size = 256, + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 128} }, + .block_erase = spi_block_erase_20, + }, { + .eraseblocks = { {32 * 1024, 16} }, + .block_erase = spi_block_erase_52, + }, { + .eraseblocks = { {64 * 1024, 8} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = spi_block_erase_60, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ + .unlock = spi_disable_blockprotect, + .write = spi_chip_write_256, + .read = spi_chip_read, + .voltage = {2700, 3600}, + }, + { .vendor = "Unknown", .name = "SFDP-capable chip", diff --git a/flashchips.h b/flashchips.h index f487248..8c07628 100644 --- a/flashchips.h +++ b/flashchips.h @@ -957,4 +957,7 @@ #define WINBOND_W49V002A 0xB0 #define WINBOND_W49V002FA 0x32 +#define ZETTADEVICE_ID 0xBA /* Zetta Device */ +#define ZETTADEVICE_ZD25D40 0x2013 + #endif /* !FLASHCHIPS_H */ -- To view, visit https://review.coreboot.org/23701 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0400b059ddacdf166d1b77f619becec3a250cece Gerrit-Change-Number: 23701 Gerrit-PatchSet: 5 Gerrit-Owner: David Hendricks <david.hendricks(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>

1 0