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

Change in flashrom[master]: flashchips: Mark GigaDevice GD25Q512 as tested
by Stefan Tauner (Code Review) 18 Aug '18

18 Aug '18

Stefan Tauner has posted comments on this change. ( https://review.coreboot.org/28209 ) Change subject: flashchips: Mark GigaDevice GD25Q512 as tested ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/28209 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: Id3928e3790ddac34645959535e646d552ce5328e Gerrit-Change-Number: 28209 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sat, 18 Aug 2018 10:49:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in flashrom[master]: flashchips: Mark GigaDevice GD25Q512 as tested
by Nico Huber (Code Review) 18 Aug '18

18 Aug '18

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/28209 Change subject: flashchips: Mark GigaDevice GD25Q512 as tested ...................................................................... flashchips: Mark GigaDevice GD25Q512 as tested As reported by `nvflash` on IRC. Change-Id: Id3928e3790ddac34645959535e646d552ce5328e Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M flashchips.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/09/28209/1 diff --git a/flashchips.c b/flashchips.c index 17cb1b4..9b45c33 100644 --- a/flashchips.c +++ b/flashchips.c @@ -6054,7 +6054,7 @@ .total_size = 64, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PREW, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = { -- To view, visit https://review.coreboot.org/28209 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: Id3928e3790ddac34645959535e646d552ce5328e Gerrit-Change-Number: 28209 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[master]: Fix typos
by Elyes HAOUAS (Code Review) 18 Aug '18

18 Aug '18

Hello Paul Menzel, build bot (Jenkins), Nico Huber, I'd like you to reexamine a change. Please visit https://review.coreboot.org/28206 to look at the new patch set (#3). Change subject: Fix typos ...................................................................... Fix typos Change-Id: I20745d5f30f9577622e27abf2f45220f026f65ac Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M atapromise.c M buspirate_spi.c M ch341a_spi.c M flashchips.c M mstarddc_spi.c M physmap.c M platform.h M serial.c 8 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/06/28206/3 -- To view, visit https://review.coreboot.org/28206 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I20745d5f30f9577622e27abf2f45220f026f65ac Gerrit-Change-Number: 28206 Gerrit-PatchSet: 3 Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr> 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

Change in flashrom[master]: Remove empty line at EOF
by Elyes HAOUAS (Code Review) 18 Aug '18

18 Aug '18

Elyes HAOUAS has uploaded this change for review. ( https://review.coreboot.org/28207 Change subject: Remove empty line at EOF ...................................................................... Remove empty line at EOF Change-Id: Id6063cb5d406d7139abf7fcdf2ae265363640f9f Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M cli_common.c M jedec.c M print_wiki.c M sst_fwhub.c 4 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/07/28207/1 diff --git a/cli_common.c b/cli_common.c index 2ccfe07..9375859 100644 --- a/cli_common.c +++ b/cli_common.c @@ -76,4 +76,3 @@ "Thanks for your help!\n"); } } - diff --git a/jedec.c b/jedec.c index 3343e99..54b7da7 100644 --- a/jedec.c +++ b/jedec.c @@ -751,4 +751,3 @@ (const struct unlockblock *)flash->chip->block_erasers[1].eraseblocks; return regspace2_walk_unlockblocks(flash, unlockblocks, &unlock_regspace2_block_generic); } - diff --git a/print_wiki.c b/print_wiki.c index 95158f7..ea8c4d7 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -450,4 +450,3 @@ #endif print_supported_devs_wiki(); } - diff --git a/sst_fwhub.c b/sst_fwhub.c index 306415c..398b01b 100644 --- a/sst_fwhub.c +++ b/sst_fwhub.c @@ -88,4 +88,3 @@ } return ret; } - -- To view, visit https://review.coreboot.org/28207 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: Id6063cb5d406d7139abf7fcdf2ae265363640f9f Gerrit-Change-Number: 28207 Gerrit-PatchSet: 1 Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr>

1 0

Change in flashrom[master]: Fix typo
by Paul Menzel (Code Review) 18 Aug '18

18 Aug '18

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/28206 ) Change subject: Fix typo ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://review.coreboot.org/#/c/28206/2//COMMIT_MSG Commit Message: https://review.coreboot.org/#/c/28206/2//COMMIT_MSG@7 PS2, Line 7: Fix typo Fix typos -- To view, visit https://review.coreboot.org/28206 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: I20745d5f30f9577622e27abf2f45220f026f65ac Gerrit-Change-Number: 28206 Gerrit-PatchSet: 2 Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr> 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: Sat, 18 Aug 2018 07:19:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes

1 0

Change in flashrom[master]: Fix typo
by Elyes HAOUAS (Code Review) 18 Aug '18

18 Aug '18

Hello build bot (Jenkins), Nico Huber, I'd like you to reexamine a change. Please visit https://review.coreboot.org/28206 to look at the new patch set (#2). Change subject: Fix typo ...................................................................... Fix typo Change-Id: I20745d5f30f9577622e27abf2f45220f026f65ac Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M atapromise.c M buspirate_spi.c M ch341a_spi.c M flashchips.c M mstarddc_spi.c M physmap.c M platform.h M serial.c 8 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/06/28206/2 -- To view, visit https://review.coreboot.org/28206 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I20745d5f30f9577622e27abf2f45220f026f65ac Gerrit-Change-Number: 28206 Gerrit-PatchSet: 2 Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[master]: Fix typo
by Elyes HAOUAS (Code Review) 18 Aug '18

18 Aug '18

Elyes HAOUAS has uploaded this change for review. ( https://review.coreboot.org/28206 Change subject: Fix typo ...................................................................... Fix typo Change-Id: I20745d5f30f9577622e27abf2f45220f026f65ac Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M atapromise.c M buspirate_spi.c M ch341a_spi.c M flashchips.c M mstarddc_spi.c M physmap.c M platform.h M serial.c 8 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/06/28206/1 diff --git a/atapromise.c b/atapromise.c index ca63df7..ab34a1e 100644 --- a/atapromise.c +++ b/atapromise.c @@ -144,7 +144,7 @@ msg_pwarn("Do not use this device as a generic programmer. It will leave anything outside\n" "the first %zu kB of the flash chip in an undefined state. It works fine for the\n" - "purpose of updating the firmware of this device (padding may neccessary).\n", + "purpose of updating the firmware of this device (padding may necessary).\n", rom_size / 1024); return 0; diff --git a/buspirate_spi.c b/buspirate_spi.c index fad309f..d6030aa 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -252,7 +252,7 @@ } free(tmp); - /* Extract serialspeed paramater */ + /* Extract serialspeed parameter */ tmp = extract_programmer_param("serialspeed"); if (tmp) { for (i = 0; serialspeeds[i].name; i++) { @@ -661,4 +661,4 @@ memcpy(readarr, bp_commbuf + 1, readcnt); return ret; -} \ No newline at end of file +} diff --git a/ch341a_spi.c b/ch341a_spi.c index f88b624..9ebda0d 100644 --- a/ch341a_spi.c +++ b/ch341a_spi.c @@ -315,7 +315,7 @@ /* De-assert and assert CS in one operation. */ static void pluck_cs(uint8_t *ptr) { - /* This was measured to give a minumum deassertion time of 2.25 us, + /* This was measured to give a minimum deassertion time of 2.25 us, * >20x more than needed for most SPI chips (100ns). */ int delay_cnt = 2; if (stored_delay_us) { diff --git a/flashchips.c b/flashchips.c index 464e9b5..59b0427 100644 --- a/flashchips.c +++ b/flashchips.c @@ -5533,7 +5533,7 @@ .model_id = EXCEL_ES25P40, .total_size = 512, .page_size = 256, - /* 256-byte paramter page separate from memory array: + /* 256-byte parameter page separate from memory array: * supports read (0x53), fast read (0x5B), erase (0xD5) and program (0x52) instructions. */ .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, @@ -5564,7 +5564,7 @@ .model_id = EXCEL_ES25P80, .total_size = 1024, .page_size = 256, - /* 256-byte paramter page separate from memory array: + /* 256-byte parameter page separate from memory array: * supports read (0x53), fast read (0x5B), erase (0xD5) and program (0x52) instructions. */ .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, @@ -5595,7 +5595,7 @@ .model_id = EXCEL_ES25P16, .total_size = 2 * 1024, .page_size = 256, - /* 256-byte paramter page separate from memory array: + /* 256-byte parameter page separate from memory array: * supports read (0x53), fast read (0x5B), erase (0xD5) and program (0x52) instructions. */ .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, diff --git a/mstarddc_spi.c b/mstarddc_spi.c index f6e573a..afe4e12 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -57,7 +57,7 @@ } else { msg_pinfo("Info: Reset command was not sent. " "Either the noreset=1 option was used, " - "or an error occured.\n"); + "or an error occurred.\n"); } if (close(mstarddc_fd) < 0) { diff --git a/physmap.c b/physmap.c index 8dd50a5..8e80925 100644 --- a/physmap.c +++ b/physmap.c @@ -364,7 +364,7 @@ } /* MSR abstraction implementations for Linux, OpenBSD, FreeBSD/Dragonfly, OSX, libpayload - * and a non-working default implemenation on the bottom. See also hwaccess.h for some (re)declarations. */ + * and a non-working default implementation on the bottom. See also hwaccess.h for some (re)declarations. */ #if defined(__i386__) || defined(__x86_64__) #ifdef __linux__ diff --git a/platform.h b/platform.h index 4af1c48..d290afc 100644 --- a/platform.h +++ b/platform.h @@ -80,7 +80,7 @@ #error Unknown architecture #endif -/* The next big hunk tries to guess endianess from various preprocessor macros */ +/* The next big hunk tries to guess endianness from various preprocessor macros */ /* First some error checking in case some weird header has defined both. * NB: OpenBSD always defines _BIG_ENDIAN and _LITTLE_ENDIAN. */ #if defined (__LITTLE_ENDIAN__) && defined (__BIG_ENDIAN__) diff --git a/serial.c b/serial.c index f08542d..e61df74 100644 --- a/serial.c +++ b/serial.c @@ -194,7 +194,7 @@ return 1; } /* We want whatever the termios looks like now, so the rest of the - setup doesnt mess up the custom rate. */ + setup doesn't mess up the custom rate. */ if (tcgetattr(fd, &wanted) != 0) { /* This should pretty much never happen (see above), but.. */ msg_perr_strerror("Could not fetch serial port configuration: "); -- To view, visit https://review.coreboot.org/28206 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: I20745d5f30f9577622e27abf2f45220f026f65ac Gerrit-Change-Number: 28206 Gerrit-PatchSet: 1 Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr>

1 0

Change in flashrom[master]: Add support for MX25R6435F
by Nico Huber (Code Review) 17 Aug '18

17 Aug '18

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/28004 ) Change subject: Add support for MX25R6435F ...................................................................... Add support for MX25R6435F Change-Id: I664ffce6f9aa7544e17b516a1b4179d561208b2f Signed-off-by: Nathan Rennie-Waldock <nathan.renniewaldock(a)gmail.com> Reviewed-on: https://review.coreboot.org/28004 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M flashchips.c M flashchips.h 2 files changed, 41 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve diff --git a/flashchips.c b/flashchips.c index 2bbf60f..464e9b5 100644 --- a/flashchips.c +++ b/flashchips.c @@ -8650,6 +8650,45 @@ { .vendor = "Macronix", + .name = "MX25R6435F", + .bustype = BUS_SPI, + .manufacture_id = MACRONIX_ID, + .model_id = MACRONIX_MX25R6435F, + .total_size = 8192, + .page_size = 256, + /* OTP: 1024B total; enter 0xB1, exit 0xC1 */ + .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, + .tested = TEST_OK_PREW, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 2048} }, + .block_erase = spi_block_erase_20, + }, { + .eraseblocks = { {64 * 1024, 128} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {32 * 1024, 256} }, + .block_erase = spi_block_erase_52, + }, { + .eraseblocks = { {8 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_60, + }, { + .eraseblocks = { {8 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ + .unlock = spi_disable_blockprotect_bp3_srwd, + .write = spi_chip_write_256, + .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .voltage = {1650, 3600}, + }, + + { + .vendor = "Macronix", .name = "MX29F001B", .bustype = BUS_PARALLEL, .manufacture_id = MACRONIX_ID, diff --git a/flashchips.h b/flashchips.h index f4880d6..ecd8d7a 100644 --- a/flashchips.h +++ b/flashchips.h @@ -495,6 +495,8 @@ #define MACRONIX_MX25L3235D 0x5E16 /* MX25L3225D/MX25L3235D/MX25L3237D */ #define MACRONIX_MX25L6495F 0x9517 +#define MACRONIX_MX25R6435F 0x2817 + #define MACRONIX_MX29F001B 0x19 #define MACRONIX_MX29F001T 0x18 #define MACRONIX_MX29F002B 0x34 /* Same as MX29F002NB; N has reset pin n/c. */ -- To view, visit https://review.coreboot.org/28004 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: I664ffce6f9aa7544e17b516a1b4179d561208b2f Gerrit-Change-Number: 28004 Gerrit-PatchSet: 3 Gerrit-Owner: Nathan Rennie-Waldock <nathan.renniewaldock(a)gmail.com> Gerrit-Reviewer: Nathan Rennie-Waldock <nathan.renniewaldock(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

Change in flashrom[master]: flashchips: Add Macronix MX25U51245G
by Nico Huber (Code Review) 17 Aug '18

17 Aug '18

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/26949 ) Change subject: flashchips: Add Macronix MX25U51245G ...................................................................... flashchips: Add Macronix MX25U51245G Copy 'n paste support for Macronix MX25U51245G. I don't pretend to know a whole lot about SPI FLASH so its mostly copied from other MX25U devices and double checked a few bits and pieces against the datasheet. I have tested basic probe, read, erase and write using layout files. I tested both with 4MB@0x0000000 and 64K0@0x3f00000 (the later means I have tested 4-byte addressing). Change-Id: I2117fc205006088967f3d97644375d10db1791f1 Signed-off-by: Daniel Thompson <daniel.thompson(a)linaro.org> Reviewed-on: https://review.coreboot.org/26949 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, 50 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/flashchips.c b/flashchips.c index 17cb1b4..2bbf60f 100644 --- a/flashchips.c +++ b/flashchips.c @@ -8563,6 +8563,55 @@ { .vendor = "Macronix", + .name = "MX25U51245G", + .bustype = BUS_SPI, + .manufacture_id = MACRONIX_ID, + .model_id = MACRONIX_MX25U51245G, + .total_size = 65536, + .page_size = 256, + /* OTP: 512B factory programmed and 512B customer programmed; enter 0xB1, exit 0xC1 */ + .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI | FEATURE_4BA, + .tested = TEST_OK_PREW, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 16384} }, + .block_erase = spi_block_erase_21, + }, { + .eraseblocks = { {4 * 1024, 16384} }, + .block_erase = spi_block_erase_20, + }, { + .eraseblocks = { {32 * 1024, 2048} }, + .block_erase = spi_block_erase_5c, + }, { + .eraseblocks = { {32 * 1024, 2048} }, + .block_erase = spi_block_erase_52, + }, { + .eraseblocks = { {64 * 1024, 1024} }, + .block_erase = spi_block_erase_dc, + }, { + .eraseblocks = { {64 * 1024, 1024} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {64 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_60, + }, { + .eraseblocks = { {64 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + /* TODO: security register */ + .printlock = spi_prettyprint_status_register_bp3_srwd, /* bit6 is quad enable */ + .unlock = spi_disable_blockprotect_bp3_srwd, + .write = spi_chip_write_256, /* Multi I/O supported */ + .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ + .voltage = {1650, 2000}, + }, + + { + .vendor = "Macronix", .name = "MX25L6495F", .bustype = BUS_SPI, .manufacture_id = MACRONIX_ID, diff --git a/flashchips.h b/flashchips.h index 4dce573..f4880d6 100644 --- a/flashchips.h +++ b/flashchips.h @@ -491,6 +491,7 @@ #define MACRONIX_MX25U6435E 0x2537 /* Same as MX25U6435F */ #define MACRONIX_MX25U12835E 0x2538 /* Same as MX25U12835F */ #define MACRONIX_MX25U25635F 0x2539 +#define MACRONIX_MX25U51245G 0x253a #define MACRONIX_MX25L3235D 0x5E16 /* MX25L3225D/MX25L3235D/MX25L3237D */ #define MACRONIX_MX25L6495F 0x9517 -- To view, visit https://review.coreboot.org/26949 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: I2117fc205006088967f3d97644375d10db1791f1 Gerrit-Change-Number: 26949 Gerrit-PatchSet: 6 Gerrit-Owner: Daniel Thompson <daniel.thompson(a)linaro.org> Gerrit-Reviewer: Daniel Thompson <daniel.thompson(a)linaro.org> 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

Change in flashrom[master]: programmer: Add Developerbox/CP2104 bit bang driver
by Nico Huber (Code Review) 17 Aug '18

17 Aug '18

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/26948 ) Change subject: programmer: Add Developerbox/CP2104 bit bang driver ...................................................................... programmer: Add Developerbox/CP2104 bit bang driver The 96Boards Developerbox (a.k.a. Synquacer E-series) provides a CP2102 debug UART with its GPIO pins hooked up to the SPI NOR FLASH. The circuit is intended to provide emergency recovery functions without requiring any additional tools (such as a JTAG or SPI programmer). This was expected to be very slow (and it is) but CP2102 is much cheaper than a full dual channel USB comms chip. Read performance is roughly on par with a 2400 baud modem (between 60 and 70 minutes per megabyte if you prefer) and write performance is 50% slower still. The full recovery process, with backup and verification of 4MB data written takes between 14 and 15 hours. Thus it is only really practical as an emergency recovery tool, firmware developers will need to use an alternative programmer. Change-Id: I2547a96c1a2259ad0d52cd4b6ef42261b37cccf3 Signed-off-by: Daniel Thompson <daniel.thompson(a)linaro.org> Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-on: https://review.coreboot.org/26948 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- M Makefile A developerbox_spi.c M flashrom.c M programmer.h 4 files changed, 278 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve diff --git a/Makefile b/Makefile index cd72972..ddfd711 100644 --- a/Makefile +++ b/Makefile @@ -154,12 +154,17 @@ else override CONFIG_PONY_SPI = no endif -# Dediprog, USB-Blaster, PICkit2, CH341A and FT2232 are not supported under DOS (missing USB support). +# Dediprog, Developerbox, USB-Blaster, PICkit2, CH341A and FT2232 are not supported under DOS (missing USB support). ifeq ($(CONFIG_DEDIPROG), yes) UNSUPPORTED_FEATURES += CONFIG_DEDIPROG=yes else override CONFIG_DEDIPROG = no endif +ifeq ($(CONFIG_DEVELOPERBOX_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_DEVELOPERBOX_SPI=yes +else +override CONFIG_DEVELOPERBOX_SPI = no +endif ifeq ($(CONFIG_FT2232_SPI), yes) UNSUPPORTED_FEATURES += CONFIG_FT2232_SPI=yes else @@ -311,12 +316,17 @@ else override CONFIG_PONY_SPI = no endif -# Dediprog, USB-Blaster, PICkit2, CH341A and FT2232 are not supported with libpayload (missing libusb support). +# Dediprog, Developerbox, USB-Blaster, PICkit2, CH341A and FT2232 are not supported with libpayload (missing libusb support). ifeq ($(CONFIG_DEDIPROG), yes) UNSUPPORTED_FEATURES += CONFIG_DEDIPROG=yes else override CONFIG_DEDIPROG = no endif +ifeq ($(CONFIG_DEVELOPERBOX_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_DEVELOPERBOX_SPI=yes +else +override CONFIG_DEVELOPERBOX_SPI = no +endif ifeq ($(CONFIG_FT2232_SPI), yes) UNSUPPORTED_FEATURES += CONFIG_FT2232_SPI=yes else @@ -627,6 +637,9 @@ # Always enable Dediprog SF100 for now. CONFIG_DEDIPROG ?= yes +# Always enable Developerbox emergency recovery for now. +CONFIG_DEVELOPERBOX_SPI ?= yes + # Always enable Marvell SATA controllers for now. CONFIG_SATAMV ?= yes @@ -671,6 +684,7 @@ override CONFIG_CH341A_SPI = no override CONFIG_DEDIPROG = no override CONFIG_DIGILENT_SPI = no +override CONFIG_DEVELOPERBOX_SPI = no endif ifeq ($(CONFIG_ENABLE_LIBPCI_PROGRAMMERS), no) override CONFIG_INTERNAL = no @@ -907,6 +921,12 @@ NEED_LIBUSB1 += CONFIG_DEDIPROG endif +ifeq ($(CONFIG_DEVELOPERBOX_SPI), yes) +FEATURE_CFLAGS += -D'CONFIG_DEVELOPERBOX_SPI=1' +PROGRAMMER_OBJS += developerbox_spi.o +NEED_LIBUSB1 += CONFIG_DEVELOPERBOX_SPI +endif + ifeq ($(CONFIG_SATAMV), yes) FEATURE_CFLAGS += -D'CONFIG_SATAMV=1' PROGRAMMER_OBJS += satamv.o diff --git a/developerbox_spi.c b/developerbox_spi.c new file mode 100644 index 0000000..8482dea --- /dev/null +++ b/developerbox_spi.c @@ -0,0 +1,232 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2018 Linaro Limited + * + * 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; either version 2 of the License, or + * (at your option) any later version. + * + * 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. + */ + +/* + * Bit bang driver for the 96Boards Developerbox (a.k.a. Synquacer E-series) + * on-board debug UART. The Developerbox implements its debug UART using a + * CP2102N, a USB to UART bridge which also provides four GPIO pins. On + * Developerbox these can be hooked up to the onboard SPI NOR FLASH and used + * for emergency de-brick without any additional hardware programmer. Bit + * banging over USB is extremely slow compared to a proper SPI programmer so + * this is only practical as a de-brick tool. + * + * Schematic is available here: + * https://www.96boards.org/documentation/enterprise/developerbox/hardware-doc… + * + * To prepare a Developerbox for programming via the debug UART, DSW4 must be + * changed from the default 00000000 to 10001000 (i.e. DSW4-1 and DSW4-5 + * should be turned on). + */ + +#include "platform.h" + +#include <stdlib.h> +#include <string.h> +#include <libusb.h> +#include "programmer.h" +#include "spi.h" + +/* Bit positions for each pin. */ +#define DEVELOPERBOX_SPI_SCK 0 +#define DEVELOPERBOX_SPI_CS 1 +#define DEVELOPERBOX_SPI_MISO 2 +#define DEVELOPERBOX_SPI_MOSI 3 + +/* Config request types */ +#define REQTYPE_HOST_TO_DEVICE 0x40 +#define REQTYPE_DEVICE_TO_HOST 0xc0 + +/* Config request codes */ +#define CP210X_VENDOR_SPECIFIC 0xff + +/* CP210X_VENDOR_SPECIFIC */ +#define CP210X_WRITE_LATCH 0x37e1 +#define CP210X_READ_LATCH 0x00c2 + +const struct dev_entry devs_developerbox_spi[] = { + {0x10c4, 0xea60, OK, "Silicon Labs", "CP2102N USB to UART Bridge Controller"}, + {0}, +}; + +struct libusb_context *usb_ctx; +static libusb_device_handle *cp210x_handle; + +static int cp210x_gpio_get(void) +{ + int res; + uint8_t gpio; + + res = libusb_control_transfer(cp210x_handle, REQTYPE_DEVICE_TO_HOST, + CP210X_VENDOR_SPECIFIC, CP210X_READ_LATCH, + 0, &gpio, 1, 0); + if (res < 0) { + msg_perr("Failed to read GPIO pins (%s)\n", libusb_error_name(res)); + return 0; + } + + return gpio; +} + +static void cp210x_gpio_set(uint8_t val, uint8_t mask) +{ + int res; + uint16_t gpio; + + gpio = ((val & 0xf) << 8) | (mask & 0xf); + + /* Set relay state on the card */ + res = libusb_control_transfer(cp210x_handle, REQTYPE_HOST_TO_DEVICE, + CP210X_VENDOR_SPECIFIC, CP210X_WRITE_LATCH, + gpio, NULL, 0, 0); + if (res < 0) + msg_perr("Failed to read GPIO pins (%s)\n", libusb_error_name(res)); +} + +static void cp210x_bitbang_set_cs(int val) +{ + cp210x_gpio_set(val << DEVELOPERBOX_SPI_CS, 1 << DEVELOPERBOX_SPI_CS); +} + +static void cp210x_bitbang_set_sck(int val) +{ + cp210x_gpio_set(val << DEVELOPERBOX_SPI_SCK, 1 << DEVELOPERBOX_SPI_SCK); +} + +static void cp210x_bitbang_set_mosi(int val) +{ + cp210x_gpio_set(val << DEVELOPERBOX_SPI_MOSI, 1 << DEVELOPERBOX_SPI_MOSI); +} + +static int cp210x_bitbang_get_miso(void) +{ + return !!(cp210x_gpio_get() & (1 << DEVELOPERBOX_SPI_MISO)); +} + +static void cp210x_bitbang_set_sck_set_mosi(int sck, int mosi) +{ + cp210x_gpio_set(sck << DEVELOPERBOX_SPI_SCK | mosi << DEVELOPERBOX_SPI_MOSI, + 1 << DEVELOPERBOX_SPI_SCK | 1 << DEVELOPERBOX_SPI_MOSI); +} + +static const struct bitbang_spi_master bitbang_spi_master_cp210x = { + .type = BITBANG_SPI_MASTER_DEVELOPERBOX, + .set_cs = cp210x_bitbang_set_cs, + .set_sck = cp210x_bitbang_set_sck, + .set_mosi = cp210x_bitbang_set_mosi, + .get_miso = cp210x_bitbang_get_miso, + .set_sck_set_mosi = cp210x_bitbang_set_sck_set_mosi, +}; + +static struct libusb_device_handle *get_device_by_vid_pid_serial(uint16_t vid, uint16_t pid, + const char *serialno) +{ + struct libusb_device **list; + ssize_t count = libusb_get_device_list(usb_ctx, &list); + if (count < 0) { + msg_perr("Getting the USB device list failed (%s)!\n", libusb_error_name(count)); + return NULL; + } + + ssize_t i = 0; + for (i = 0; i < count; i++) { + struct libusb_device *dev = list[i]; + struct libusb_device_descriptor desc; + struct libusb_device_handle *handle; + + int res = libusb_get_device_descriptor(dev, &desc); + if (res != 0) { + msg_perr("Reading the USB device descriptor failed (%s)!\n", libusb_error_name(res)); + continue; + } + + if ((desc.idVendor != vid) && (desc.idProduct != pid)) + continue; + + msg_pdbg("Found USB device %04"PRIx16":%04"PRIx16" at address %d-%d.\n", + desc.idVendor, desc.idProduct, + libusb_get_bus_number(dev), libusb_get_device_address(dev)); + + res = libusb_open(dev, &handle); + if (res != 0) { + msg_perr("Opening the USB device failed (%s)!\n", libusb_error_name(res)); + continue; + } + + if (serialno) { + unsigned char myserial[64]; + res = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, myserial, + sizeof(myserial)); + if (res < 0) { + msg_perr("Reading the USB serialno failed (%s)!\n", libusb_error_name(res)); + libusb_close(handle); + continue; + } + msg_pdbg("Serial number is %s\n", myserial); + + /* Filter out any serial number that does not commence with serialno */ + if (0 != strncmp(serialno, (char *) myserial, strlen(serialno))) { + libusb_close(handle); + continue; + } + } + + libusb_free_device_list(list, 1); + return handle; + } + + libusb_free_device_list(list, 1); + return NULL; +} + +static int developerbox_spi_shutdown(void *data) +{ + libusb_close(cp210x_handle); + libusb_exit(usb_ctx); + + return 0; +} + +int developerbox_spi_init(void) +{ + libusb_init(&usb_ctx); + if (!usb_ctx) { + msg_perr("Could not initialize libusb!\n"); + return 1; + } + + char *serialno = extract_programmer_param("serial"); + if (serialno) + msg_pdbg("Looking for serial number commencing %s\n", serialno); + cp210x_handle = get_device_by_vid_pid_serial( + devs_developerbox_spi[0].vendor_id, devs_developerbox_spi[0].device_id, serialno); + free(serialno); + if (!cp210x_handle) { + msg_perr("Could not find a Developerbox programmer on USB.\n"); + goto err_exit; + } + + if (register_shutdown(developerbox_spi_shutdown, NULL)) + goto err_exit; + + if (register_spi_bitbang_master(&bitbang_spi_master_cp210x)) + goto err_exit; + + return 0; + +err_exit: + libusb_exit(usb_ctx); + return 1; +} diff --git a/flashrom.c b/flashrom.c index 1866a18..094630c 100644 --- a/flashrom.c +++ b/flashrom.c @@ -255,6 +255,18 @@ }, #endif +#if CONFIG_DEVELOPERBOX_SPI == 1 + { + .name = "developerbox", + .type = USB, + .devs.dev = devs_developerbox_spi, + .init = developerbox_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + #if CONFIG_RAYER_SPI == 1 { .name = "rayer_spi", diff --git a/programmer.h b/programmer.h index 7e530b6..300cf5f 100644 --- a/programmer.h +++ b/programmer.h @@ -73,6 +73,9 @@ #if CONFIG_DEDIPROG == 1 PROGRAMMER_DEDIPROG, #endif +#if CONFIG_DEVELOPERBOX_SPI == 1 + PROGRAMMER_DEVELOPERBOX_SPI, +#endif #if CONFIG_RAYER_SPI == 1 PROGRAMMER_RAYER_SPI, #endif @@ -172,6 +175,9 @@ #if CONFIG_OGP_SPI == 1 BITBANG_SPI_MASTER_OGP, #endif +#if CONFIG_DEVELOPERBOX_SPI == 1 + BITBANG_SPI_MASTER_DEVELOPERBOX, +#endif }; struct bitbang_spi_master { @@ -548,6 +554,12 @@ extern const struct dev_entry devs_dediprog[]; #endif +/* developerbox_spi.c */ +#if CONFIG_DEVELOPERBOX_SPI == 1 +int developerbox_spi_init(void); +extern const struct dev_entry devs_developerbox_spi[]; +#endif + /* ch341a_spi.c */ #if CONFIG_CH341A_SPI == 1 int ch341a_spi_init(void); -- To view, visit https://review.coreboot.org/26948 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: I2547a96c1a2259ad0d52cd4b6ef42261b37cccf3 Gerrit-Change-Number: 26948 Gerrit-PatchSet: 7 Gerrit-Owner: Daniel Thompson <daniel.thompson(a)linaro.org> Gerrit-Reviewer: Daniel Thompson <daniel.thompson(a)linaro.org> 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: Idwer Vollering <vidwer(a)gmail.com>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit August 2018