February 2023 - flashrom-gerrit

[S] Change in flashrom[master]: jedec.c: Provide better lexical scope to itermediates
by Thomas Heijligen (Code Review) 27 Feb '23

27 Feb '23

Attention is currently required from: Edward O'Callaghan. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73285 ) Change subject: jedec.c: Provide better lexical scope to itermediates ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/73285 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8e01d471bb33a933b80760df2c69a4bf3589ba76 Gerrit-Change-Number: 73285 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Mon, 27 Feb 2023 10:25:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: jedec.c: Tidy up whitespace and line wraps
by Thomas Heijligen (Code Review) 27 Feb '23

27 Feb '23

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/73284 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: jedec.c: Tidy up whitespace and line wraps ...................................................................... jedec.c: Tidy up whitespace and line wraps Change-Id: I3f18609709e59cdfc5a853c6e1ae5f53aecacc1a Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/73284 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> --- M jedec.c 1 file changed, 20 insertions(+), 7 deletions(-) Approvals: build bot (Jenkins): Verified Stefan Reinauer: Looks good to me, approved Thomas Heijligen: Looks good to me, approved diff --git a/jedec.c b/jedec.c index bb617e0..01c401f 100644 --- a/jedec.c +++ b/jedec.c @@ -305,11 +305,11 @@ int erase_sector_jedec(struct flashctx *flash, unsigned int page, unsigned int size) { - /* Issue the Sector Erase command */ + /* Issue the Sector Erase command */ issuecmd(flash, 0x80, 0); issuecmd(flash, 0x30, page); - /* wait for Toggle bit ready */ + /* Wait for Toggle bit ready */ toggle_ready_jedec_slow(flash); /* FIXME: Check the status register for errors. */ @@ -318,11 +318,11 @@ int erase_block_jedec(struct flashctx *flash, unsigned int block, unsigned int size) { - /* Issue the Sector Erase command */ + /* Issue the Block Erase command */ issuecmd(flash, 0x80, 0); issuecmd(flash, 0x50, block); - /* wait for Toggle bit ready */ + /* Wait for Toggle bit ready */ toggle_ready_jedec_slow(flash); /* FIXME: Check the status register for errors. */ @@ -333,12 +333,11 @@ int erase_chip_block_jedec(struct flashctx *flash, unsigned int addr, unsigned int blocksize) { if ((addr != 0) || (blocksize != flash->chip->total_size * 1024)) { - msg_cerr("%s called with incorrect arguments\n", - __func__); + msg_cerr("%s called with incorrect arguments\n", __func__); return -1; } - /* Issue the JEDEC Chip Erase command */ + /* Issue the JEDEC Chip Erase command */ issuecmd(flash, 0x80, 0); issuecmd(flash, 0x10, 0); -- To view, visit https://review.coreboot.org/c/flashrom/+/73284 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3f18609709e59cdfc5a853c6e1ae5f53aecacc1a Gerrit-Change-Number: 73284 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: jedec.c: Tidy up whitespace and line wraps
by Thomas Heijligen (Code Review) 27 Feb '23

27 Feb '23

Attention is currently required from: Edward O'Callaghan. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73284 ) Change subject: jedec.c: Tidy up whitespace and line wraps ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/73284 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3f18609709e59cdfc5a853c6e1ae5f53aecacc1a Gerrit-Change-Number: 73284 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Mon, 27 Feb 2023 10:24:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: jedec.c: Add a little more const correctness
by Thomas Heijligen (Code Review) 27 Feb '23

27 Feb '23

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/73283 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: jedec.c: Add a little more const correctness ...................................................................... jedec.c: Add a little more const correctness Change-Id: Ic9a76ce3734bd83399c95478a7c0bfc081211124 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/73283 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> --- M jedec.c 1 file changed, 18 insertions(+), 5 deletions(-) Approvals: build bot (Jenkins): Verified Stefan Reinauer: Looks good to me, approved Thomas Heijligen: Looks good to me, approved diff --git a/jedec.c b/jedec.c index 2cdde61..bb617e0 100644 --- a/jedec.c +++ b/jedec.c @@ -123,7 +123,7 @@ int probe_jedec_29gl(struct flashctx *flash) { const unsigned int mask = getaddrmask(flash->chip); - chipaddr bios = flash->virtual_memory; + const chipaddr bios = flash->virtual_memory; const struct flashchip *chip = flash->chip; /* Reset chip to a clean slate */ @@ -381,9 +381,8 @@ unsigned int i; int failed = 0; chipaddr dst = flash->virtual_memory + start; - chipaddr olddst; + const chipaddr olddst = dst; - olddst = dst; for (i = 0; i < len; i++) { if (write_byte_program_jedec_common(flash, src, dst)) failed = 1; @@ -452,8 +451,8 @@ * write_jedec have page_size set to max_writechunk_size, so * we're OK for now. */ - unsigned int page_size = flash->chip->page_size; - unsigned int nwrites = (start + len - 1) / page_size; + const unsigned int page_size = flash->chip->page_size; + const unsigned int nwrites = (start + len - 1) / page_size; /* Warning: This loop has a very unusual condition and body. * The loop needs to go through each page with at least one affected -- To view, visit https://review.coreboot.org/c/flashrom/+/73283 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic9a76ce3734bd83399c95478a7c0bfc081211124 Gerrit-Change-Number: 73283 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: jedec.c: Add a little more const correctness
by Thomas Heijligen (Code Review) 27 Feb '23

27 Feb '23

Attention is currently required from: Edward O'Callaghan. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73283 ) Change subject: jedec.c: Add a little more const correctness ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/73283 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic9a76ce3734bd83399c95478a7c0bfc081211124 Gerrit-Change-Number: 73283 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Mon, 27 Feb 2023 10:23:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: jedec.c: Rename func to jedec_write_page()
by Thomas Heijligen (Code Review) 27 Feb '23

27 Feb '23

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/73282 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: jedec.c: Rename func to jedec_write_page() ...................................................................... jedec.c: Rename func to jedec_write_page() Change-Id: I1be83d5974e305bddceaa34b64e982b774ade0d2 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/73282 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> --- M jedec.c 1 file changed, 16 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Stefan Reinauer: Looks good to me, approved Thomas Heijligen: Looks good to me, approved diff --git a/jedec.c b/jedec.c index f9442ec..2cdde61 100644 --- a/jedec.c +++ b/jedec.c @@ -396,7 +396,7 @@ return failed; } -static int write_page_write_jedec_common(struct flashctx *flash, const uint8_t *src, +static int jedec_write_page(struct flashctx *flash, const uint8_t *src, unsigned int start, unsigned int page_size) { int tries = 0, failed; @@ -471,7 +471,7 @@ /* Length of bytes in the range in this page. */ lenhere = min(start + len, (i + 1) * page_size) - starthere; - if (write_page_write_jedec_common(flash, buf + starthere - start, starthere, lenhere)) + if (jedec_write_page(flash, buf + starthere - start, starthere, lenhere)) return 1; update_progress(flash, FLASHROM_PROGRESS_WRITE, i + 1, nwrites + 1); } -- To view, visit https://review.coreboot.org/c/flashrom/+/73282 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1be83d5974e305bddceaa34b64e982b774ade0d2 Gerrit-Change-Number: 73282 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: jedec.c: Rename func to jedec_write_page()
by Thomas Heijligen (Code Review) 27 Feb '23

27 Feb '23

Attention is currently required from: Edward O'Callaghan. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73282 ) Change subject: jedec.c: Rename func to jedec_write_page() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/73282 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1be83d5974e305bddceaa34b64e982b774ade0d2 Gerrit-Change-Number: 73282 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Mon, 27 Feb 2023 10:20:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: jedec.c: Drop branching non-zero programmer_delay() operands
by Thomas Heijligen (Code Review) 27 Feb '23

27 Feb '23

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/72692 ) Change subject: jedec.c: Drop branching non-zero programmer_delay() operands ...................................................................... jedec.c: Drop branching non-zero programmer_delay() operands The programmer_delay() function is already tolerant upon zero delay values and will simply just return with a NOP. Therefore there is no need to branch. Change-Id: Ic547669bb16e6ace4fe283e07345fc2d7075d63e Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/72692 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> --- M jedec.c 1 file changed, 23 insertions(+), 10 deletions(-) Approvals: build bot (Jenkins): Verified Stefan Reinauer: Looks good to me, approved Thomas Heijligen: Looks good to me, approved diff --git a/jedec.c b/jedec.c index 6ae767a..f9442ec 100644 --- a/jedec.c +++ b/jedec.c @@ -43,8 +43,7 @@ tmp1 = chip_readb(flash, dst) & 0x40; while (i++ < 0xFFFFFFF) { - if (delay) - programmer_delay(flash, delay); + programmer_delay(flash, delay); tmp2 = chip_readb(flash, dst) & 0x40; if (tmp1 == tmp2) { break; @@ -203,8 +202,7 @@ * mode completely. Allow the chip to finish this before seeing a * reset command. */ - if (probe_timing_enter) - programmer_delay(flash, probe_timing_enter); + programmer_delay(flash, probe_timing_enter); /* Reset chip to a clean slate */ if ((chip->feature_bits & FEATURE_RESET_MASK) == FEATURE_LONG_RESET) { chip_writeb(flash, 0xAA, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); @@ -215,8 +213,7 @@ programmer_delay(flash, 10); } chip_writeb(flash, 0xF0, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); - if (probe_timing_exit) - programmer_delay(flash, probe_timing_exit); + programmer_delay(flash, probe_timing_exit); /* Issue JEDEC Product ID Entry command */ chip_writeb(flash, 0xAA, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); @@ -226,8 +223,7 @@ if (probe_timing_enter) programmer_delay(flash, 10); chip_writeb(flash, 0x90, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); - if (probe_timing_enter) - programmer_delay(flash, probe_timing_enter); + programmer_delay(flash, probe_timing_enter); /* Read product ID */ id1 = chip_readb(flash, bios + (0x00 << shifted)); @@ -257,8 +253,7 @@ programmer_delay(flash, 10); } chip_writeb(flash, 0xF0, bios + ((shifted ? 0x2AAA : 0x5555) & mask)); - if (probe_timing_exit) - programmer_delay(flash, probe_timing_exit); + programmer_delay(flash, probe_timing_exit); msg_cdbg("%s: id1 0x%02x, id2 0x%02x", __func__, largeid1, largeid2); if (!oddparity(id1)) -- To view, visit https://review.coreboot.org/c/flashrom/+/72692 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic547669bb16e6ace4fe283e07345fc2d7075d63e Gerrit-Change-Number: 72692 Gerrit-PatchSet: 3 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: jedec.c: Drop branching non-zero programmer_delay() operands
by Thomas Heijligen (Code Review) 27 Feb '23

27 Feb '23

Attention is currently required from: Edward O'Callaghan. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/72692 ) Change subject: jedec.c: Drop branching non-zero programmer_delay() operands ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/72692 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic547669bb16e6ace4fe283e07345fc2d7075d63e Gerrit-Change-Number: 72692 Gerrit-PatchSet: 2 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Mon, 27 Feb 2023 10:19:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in flashrom[master]: ch347_spi: Add initial support for the WCH CH347
by Thomas Heijligen (Code Review) 27 Feb '23

27 Feb '23

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/70573 ) Change subject: ch347_spi: Add initial support for the WCH CH347 ...................................................................... ch347_spi: Add initial support for the WCH CH347 Add support for the WCH CH347, a high-speed USB to bus converter supporting multiple protocols interfaces including SPI. Currently only mode 1 (vendor defined communication interface) is supported, mode 2 (USB HID communication interface) support will be added later. The code is currently hard coded to use CS1 and a SPI clock of 15 MHz, though there are 2 CS lines and 6 other GPIO lines available, as well as a configurable clock divisor for up to 60MHz operation. Support for these will be exposed through programmer parameters in later commits. This currently uses the synchronous libusb API. Performance seems to be alright so far, if it becomes an issue I may switch to the asynchronous API. Tested with a MX25L1606E flash chip Signed-off-by: Nicholas Chin <nic.c3.14(a)gmail.com> Change-Id: I31b86c41076cc45d4a416a73fa1131350fb745ba Reviewed-on: https://review.coreboot.org/c/flashrom/+/70573 Reviewed-by: Thomas Heijligen <src(a)posteo.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M MAINTAINERS M Makefile A ch347_spi.c M flashrom.8.tmpl M include/programmer.h M meson.build M meson_options.txt M programmer_table.c M test_build.sh 9 files changed, 413 insertions(+), 9 deletions(-) Approvals: build bot (Jenkins): Verified Thomas Heijligen: Looks good to me, approved diff --git a/MAINTAINERS b/MAINTAINERS index d1c4629..03f12b8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -122,6 +122,11 @@ S: Maintained F: sb600spi.c +CH347 +M: Nicholas Chin <nic.c3.14(a)gmail.com> +S: Maintained +F: ch347_spi.c + I2C PROGRAMMERS M: Peter Marheine <pmarheine(a)chromium.org> S: Supported diff --git a/Makefile b/Makefile index a7200dd..5283fea 100644 --- a/Makefile +++ b/Makefile @@ -157,6 +157,7 @@ DEPENDS_ON_LIBUSB1 := \ CONFIG_CH341A_SPI \ + CONFIG_CH347_SPI \ CONFIG_DEDIPROG \ CONFIG_DEVELOPERBOX_SPI \ CONFIG_DIGILENT_SPI \ @@ -521,6 +522,9 @@ # Winchiphead CH341A CONFIG_CH341A_SPI ?= yes +# Winchiphead CH347 +CONFIG_CH347_SPI ?= yes + # Digilent Development board JTAG CONFIG_DIGILENT_SPI ?= yes @@ -814,6 +818,11 @@ ACTIVE_PROGRAMMERS += ch341a_spi endif +ifeq ($(CONFIG_CH347_SPI), yes) +FEATURE_FLAGS += -D'CONFIG_CH347_SPI=1' +PROGRAMMER_OBJS += ch347_spi.o +endif + ifeq ($(CONFIG_DIGILENT_SPI), yes) FEATURE_FLAGS += -D'CONFIG_DIGILENT_SPI=1' PROGRAMMER_OBJS += digilent_spi.o diff --git a/ch347_spi.c b/ch347_spi.c new file mode 100644 index 0000000..c3326b0 --- /dev/null +++ b/ch347_spi.c @@ -0,0 +1,345 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2022 Nicholas Chin <nic.c3.14(a)gmail.com> + * + * 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. + */ + +#include <string.h> +#include <stdlib.h> +#include <libusb.h> +#include "platform.h" +#include "programmer.h" +#include "flash.h" + +#define CH347_CMD_SPI_SET_CFG 0xC0 +#define CH347_CMD_SPI_CS_CTRL 0xC1 +#define CH347_CMD_SPI_OUT_IN 0xC2 +#define CH347_CMD_SPI_IN 0xC3 +#define CH347_CMD_SPI_OUT 0xC4 +#define CH347_CMD_SPI_GET_CFG 0xCA + +#define CH347_CS_ASSERT 0x00 +#define CH347_CS_DEASSERT 0x40 +#define CH347_CS_CHANGE 0x80 +#define CH347_CS_IGNORE 0x00 + +#define WRITE_EP 0x06 +#define READ_EP 0x86 + +#define MODE_1_IFACE 2 +#define MODE_2_IFACE 1 + +/* The USB descriptor says the max transfer size is 512 bytes, but the + * vendor driver only seems to transfer a maximum of 510 bytes at once, + * leaving 507 bytes for data as the command + length take up 3 bytes + */ +#define CH347_PACKET_SIZE 510 +#define CH347_MAX_DATA_LEN (CH347_PACKET_SIZE - 3) + +struct ch347_spi_data { + struct libusb_device_handle *handle; +}; + +/* TODO: Add support for HID mode */ +static const struct dev_entry devs_ch347_spi[] = { + {0x1A86, 0x55DB, OK, "QinHeng Electronics", "USB To UART+SPI+I2C"}, + {0} +}; + +static int ch347_spi_shutdown(void *data) +{ + struct ch347_spi_data *ch347_data = data; + + /* TODO: Set this depending on the mode */ + int spi_interface = MODE_1_IFACE; + libusb_release_interface(ch347_data->handle, spi_interface); + libusb_attach_kernel_driver(ch347_data->handle, spi_interface); + libusb_close(ch347_data->handle); + libusb_exit(NULL); + + free(data); + return 0; +} + +static int ch347_cs_control(struct ch347_spi_data *ch347_data, uint8_t cs1, uint8_t cs2) +{ + uint8_t cmd[13] = { + [0] = CH347_CMD_SPI_CS_CTRL, + /* payload length, uint16 LSB: 10 */ + [1] = 10, + [3] = cs1, + [8] = cs2 + }; + + int32_t ret = libusb_bulk_transfer(ch347_data->handle, WRITE_EP, cmd, sizeof(cmd), NULL, 1000); + if (ret < 0) { + msg_perr("Could not change CS!\n"); + return -1; + } + return 0; +} + + +static int ch347_write(struct ch347_spi_data *ch347_data, unsigned int writecnt, const uint8_t *writearr) +{ + unsigned int data_len; + int packet_len; + int transferred; + int ret; + uint8_t resp_buf[4] = {0}; + uint8_t buffer[CH347_PACKET_SIZE] = {0}; + unsigned int bytes_written = 0; + + while (bytes_written < writecnt) { + data_len = min(CH347_MAX_DATA_LEN, writecnt - bytes_written ); + packet_len = data_len + 3; + + buffer[0] = CH347_CMD_SPI_OUT; + buffer[1] = (data_len) & 0xFF; + buffer[2] = ((data_len) & 0xFF00) >> 8; + memcpy(buffer + 3, writearr + bytes_written, data_len); + + ret = libusb_bulk_transfer(ch347_data->handle, WRITE_EP, buffer, packet_len, &transferred, 1000); + if (ret < 0 || transferred != packet_len) { + msg_perr("Could not send write command\n"); + return -1; + } + + ret = libusb_bulk_transfer(ch347_data->handle, READ_EP, resp_buf, sizeof(resp_buf), NULL, 1000); + if (ret < 0) { + msg_perr("Could not receive write command response\n"); + return -1; + } + bytes_written += data_len; + } + return 0; +} + +static int ch347_read(struct ch347_spi_data *ch347_data, unsigned int readcnt, uint8_t *readarr) +{ + uint8_t *read_ptr = readarr; + int ret; + int transferred; + unsigned int bytes_read = 0; + uint8_t buffer[CH347_PACKET_SIZE] = {0}; + uint8_t command_buf[7] = { + [0] = CH347_CMD_SPI_IN, + [1] = 4, + [2] = 0, + [3] = readcnt & 0xFF, + [4] = (readcnt & 0xFF00) >> 8, + [5] = (readcnt & 0xFF0000) >> 16, + [6] = (readcnt & 0xFF000000) >> 24 + }; + + ret = libusb_bulk_transfer(ch347_data->handle, WRITE_EP, command_buf, sizeof(command_buf), &transferred, 1000); + if (ret < 0 || transferred != sizeof(command_buf)) { + msg_perr("Could not send read command\n"); + return -1; + } + + while (bytes_read < readcnt) { + ret = libusb_bulk_transfer(ch347_data->handle, READ_EP, buffer, CH347_PACKET_SIZE, &transferred, 1000); + if (ret < 0) { + msg_perr("Could not read data\n"); + return -1; + } + if (transferred > CH347_PACKET_SIZE) { + msg_perr("libusb bug: bytes received overflowed buffer\n"); + return -1; + } + /* Response: u8 command, u16 data length, then the data that was read */ + if (transferred < 3) { + msg_perr("CH347 returned an invalid response to read command\n"); + return -1; + } + int ch347_data_length = read_le16(buffer, 1); + if (transferred - 3 < ch347_data_length) { + msg_perr("CH347 returned less data than data length header indicates\n"); + return -1; + } + bytes_read += ch347_data_length; + if (bytes_read > readcnt) { + msg_perr("CH347 returned more bytes than requested\n"); + return -1; + } + memcpy(read_ptr, buffer + 3, ch347_data_length); + read_ptr += ch347_data_length; + } + return 0; +} + +static int ch347_spi_send_command(const struct flashctx *flash, unsigned int writecnt, + unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) +{ + struct ch347_spi_data *ch347_data = flash->mst->spi.data; + int ret = 0; + + ch347_cs_control(ch347_data, CH347_CS_ASSERT | CH347_CS_CHANGE, CH347_CS_IGNORE); + if (writecnt) { + ret = ch347_write(ch347_data, writecnt, writearr); + if (ret < 0) { + msg_perr("CH347 write error\n"); + return -1; + } + } + if (readcnt) { + ret = ch347_read(ch347_data, readcnt, readarr); + if (ret < 0) { + msg_perr("CH347 read error\n"); + return -1; + } + } + ch347_cs_control(ch347_data, CH347_CS_DEASSERT | CH347_CS_CHANGE, CH347_CS_IGNORE); + + return 0; +} + +static int32_t ch347_spi_config(struct ch347_spi_data *ch347_data, uint8_t divisor) +{ + int32_t ret; + uint8_t buff[29] = { + [0] = CH347_CMD_SPI_SET_CFG, + [1] = (sizeof(buff) - 3) & 0xFF, + [2] = ((sizeof(buff) - 3) & 0xFF00) >> 8, + /* Not sure what these two bytes do, but the vendor + * drivers seem to unconditionally set these values + */ + [5] = 4, + [6] = 1, + /* Clock polarity: bit 1 */ + [9] = 0, + /* Clock phase: bit 0 */ + [11] = 0, + /* Another mystery byte */ + [14] = 2, + /* Clock divisor: bits 5:3 */ + [15] = (divisor & 0x7) << 3, + /* Bit order: bit 7, 0=MSB */ + [17] = 0, + /* Yet another mystery byte */ + [19] = 7, + /* CS polarity: bit 7 CS2, bit 6 CS1. 0 = active low */ + [24] = 0 + }; + + ret = libusb_bulk_transfer(ch347_data->handle, WRITE_EP, buff, sizeof(buff), NULL, 1000); + if (ret < 0) { + msg_perr("Could not configure SPI interface\n"); + } + + /* FIXME: Not sure if the CH347 sends error responses for + * invalid config data, if so the code should check + */ + ret = libusb_bulk_transfer(ch347_data->handle, READ_EP, buff, sizeof(buff), NULL, 1000); + if (ret < 0) { + msg_perr("Could not receive configure SPI command response\n"); + } + return ret; +} + +static const struct spi_master spi_master_ch347_spi = { + .features = SPI_MASTER_4BA, + .max_data_read = MAX_DATA_READ_UNLIMITED, + .max_data_write = MAX_DATA_WRITE_UNLIMITED, + .command = ch347_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, + .shutdown = ch347_spi_shutdown, + .probe_opcode = default_spi_probe_opcode, +}; + +/* Largely copied from ch341a_spi.c */ +static int ch347_spi_init(const struct programmer_cfg *cfg) +{ + struct ch347_spi_data *ch347_data = calloc(1, sizeof(*ch347_data)); + if (!ch347_data) { + msg_perr("Could not allocate space for SPI data\n"); + return 1; + } + + int32_t ret = libusb_init(NULL); + if (ret < 0) { + msg_perr("Could not initialize libusb!\n"); + free(ch347_data); + return 1; + } + + /* Enable information, warning, and error messages (only). */ +#if LIBUSB_API_VERSION < 0x01000106 + libusb_set_debug(NULL, 3); +#else + libusb_set_option(NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO); +#endif + + uint16_t vid = devs_ch347_spi[0].vendor_id; + uint16_t pid = devs_ch347_spi[0].device_id; + ch347_data->handle = libusb_open_device_with_vid_pid(NULL, vid, pid); + if (ch347_data->handle == NULL) { + msg_perr("Couldn't open device %04x:%04x.\n", vid, pid); + free(ch347_data); + return 1; + } + + /* TODO: set based on mode */ + /* Mode 1 uses interface 2 for the SPI interface */ + int spi_interface = MODE_1_IFACE; + + ret = libusb_detach_kernel_driver(ch347_data->handle, spi_interface); + if (ret != 0 && ret != LIBUSB_ERROR_NOT_FOUND) + msg_pwarn("Cannot detach the existing USB driver. Claiming the interface may fail. %s\n", + libusb_error_name(ret)); + + ret = libusb_claim_interface(ch347_data->handle, spi_interface); + if (ret != 0) { + msg_perr("Failed to claim interface 2: '%s'\n", libusb_error_name(ret)); + goto error_exit; + } + + struct libusb_device *dev; + if (!(dev = libusb_get_device(ch347_data->handle))) { + msg_perr("Failed to get device from device handle.\n"); + goto error_exit; + } + + struct libusb_device_descriptor desc; + ret = libusb_get_device_descriptor(dev, &desc); + if (ret < 0) { + msg_perr("Failed to get device descriptor: '%s'\n", libusb_error_name(ret)); + goto error_exit; + } + + msg_pdbg("Device revision is %d.%01d.%01d\n", + (desc.bcdDevice >> 8) & 0x00FF, + (desc.bcdDevice >> 4) & 0x000F, + (desc.bcdDevice >> 0) & 0x000F); + + /* TODO: add programmer cfg for things like CS pin and divisor */ + if (ch347_spi_config(ch347_data, 2) < 0) + goto error_exit; + + return register_spi_master(&spi_master_ch347_spi, ch347_data); + +error_exit: + ch347_spi_shutdown(ch347_data); + return 1; +} + +const struct programmer_entry programmer_ch347_spi = { + .name = "ch347_spi", + .type = USB, + .devs.dev = devs_ch347_spi, + .init = ch347_spi_init, +}; diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl index dd4864d..d740db8 100644 --- a/flashrom.8.tmpl +++ b/flashrom.8.tmpl @@ -417,6 +417,8 @@ .sp .BR "* ch341a_spi" " (for SPI flash ROMs attached to WCH CH341A)" .sp +.BR "* ch347_spi" " (for SPI flash ROMs attached to WCH CH347)" +.sp .BR "* digilent_spi" " (for SPI flash ROMs attached to iCEblink40 development boards)" .sp .BR "* jlink_spi" " (for SPI flash ROMs attached to SEGGER J-Link and compatible devices)" @@ -1368,6 +1370,10 @@ The WCH CH341A programmer does not support any parameters currently. SPI frequency is fixed at 2 MHz, and CS0 is used as per the device. .SS +.BR "ch347_spi " programmer +The WCH CH347 programmer does not currently support any parameters. SPI frequency is fixed at 2 MHz, and CS0 is +used as per the device. +.SS .BR "ni845x_spi " programmer .IP An optional diff --git a/include/programmer.h b/include/programmer.h index 19363c2..f72f1d7 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -61,6 +61,7 @@ extern const struct programmer_entry programmer_atavia; extern const struct programmer_entry programmer_buspirate_spi; extern const struct programmer_entry programmer_ch341a_spi; +extern const struct programmer_entry programmer_ch347_spi; extern const struct programmer_entry programmer_dediprog; extern const struct programmer_entry programmer_developerbox; extern const struct programmer_entry programmer_digilent_spi; diff --git a/meson.build b/meson.build index 83fc120..d20f24c 100644 --- a/meson.build +++ b/meson.build @@ -201,6 +201,12 @@ 'test_srcs' : files('tests/ch341a_spi.c'), 'flags' : [ '-DCONFIG_CH341A_SPI=1' ], }, + 'ch347_spi' : { + 'deps' : [ libusb1 ], + 'groups' : [ group_usb, group_external ], + 'srcs' : files('ch347_spi.c'), + 'flags' : [ '-DCONFIG_CH347_SPI=1' ], + }, 'dediprog' : { 'deps' : [ libusb1 ], 'groups' : [ group_usb, group_external ], diff --git a/meson_options.txt b/meson_options.txt index 10427c8..307b551 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,7 +10,7 @@ 'auto', 'all', 'group_internal', 'group_external', 'group_ftdi', 'group_i2c', 'group_jlink', 'group_pci', 'group_serial', 'group_usb', - 'asm106x', 'atahpt', 'atapromise', 'atavia', 'buspirate_spi', 'ch341a_spi', 'dediprog', + 'asm106x', 'atahpt', 'atapromise', 'atavia', 'buspirate_spi', 'ch341a_spi', 'ch347_spi','dediprog', 'developerbox_spi', 'digilent_spi', 'dirtyjtag_spi', 'drkaiser', 'dummy', 'ft2232_spi', 'gfxnvidia', 'internal', 'it8212', 'jlink_spi', 'linux_mtd', 'linux_spi', 'mediatek_i2c_spi', 'mstarddc_spi', 'nic3com', 'nicintel', 'nicintel_eeprom', 'nicintel_spi', 'nicnatsemi', diff --git a/programmer_table.c b/programmer_table.c index 0935167..79acd77 100644 --- a/programmer_table.c +++ b/programmer_table.c @@ -156,6 +156,10 @@ &programmer_ch341a_spi, #endif +#if CONFIG_CH347_SPI == 1 + &programmer_ch347_spi, +#endif + #if CONFIG_DIGILENT_SPI == 1 &programmer_digilent_spi, #endif diff --git a/test_build.sh b/test_build.sh index 0e9d704..9b490dc 100755 --- a/test_build.sh +++ b/test_build.sh @@ -10,15 +10,15 @@ PICKIT2_SPI STLINKV3_SPI PARADE_LSPCON MEDIATEK_I2C_SPI REALTEK_MST_I2C_SPI DUMMY \ DRKAISER NICREALTEK NICNATSEMI NICINTEL NICINTEL_SPI NICINTEL_EEPROM OGP_SPI \ BUSPIRATE_SPI DEDIPROG DEVELOPERBOX_SPI SATAMV LINUX_MTD LINUX_SPI IT8212 \ - CH341A_SPI DIGILENT_SPI DIRTYJTAG_SPI JLINK_SPI ASM106X" + CH341A_SPI CH347_SPI DIGILENT_SPI DIRTYJTAG_SPI JLINK_SPI ASM106X" -meson_programmer_opts="all auto group_ftdi group_i2c group_jlink group_pci group_serial group_usb \ - atahpt atapromise atavia buspirate_spi ch341a_spi dediprog developerbox_spi \ - digilent_spi dirtyjtag_spi drkaiser dummy ft2232_spi gfxnvidia internal it8212 \ - jlink_spi linux_mtd linux_spi parade_lspcon mediatek_i2c_spi mstarddc_spi \ - nic3com nicintel nicintel_eeprom nicintel_spi nicnatsemi nicrealtek \ - ogp_spi pickit2_spi pony_spi raiden_debug_spi rayer_spi realtek_mst_i2c_spi \ - satamv satasii serprog stlinkv3_spi usbblaster_spi asm106x" +meson_programmer_opts="all auto group_ftdi group_i2c group_jlink group_pci group_serial group_usb \ + atahpt atapromise atavia buspirate_spi ch341a_spi ch347_spi dediprog \ + developerbox_spi digilent_spi dirtyjtag_spi drkaiser dummy ft2232_spi \ + gfxnvidia internal it8212 jlink_spi linux_mtd linux_spi parade_lspcon \ + mediatek_i2c_spi mstarddc_spi nic3com nicintel nicintel_eeprom nicintel_spi \ + nicnatsemi nicrealtek ogp_spi pickit2_spi pony_spi raiden_debug_spi rayer_spi \ + realtek_mst_i2c_spi satamv satasii serprog stlinkv3_spi usbblaster_spi asm106x" if [ "$(basename "${CC}")" = "ccc-analyzer" ] || [ -n "${COVERITY_OUTPUT}" ]; then -- To view, visit https://review.coreboot.org/c/flashrom/+/70573 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I31b86c41076cc45d4a416a73fa1131350fb745ba Gerrit-Change-Number: 70573 Gerrit-PatchSet: 10 Gerrit-Owner: Nicholas Chin <nic.c3.14(a)gmail.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: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Nicholas Chin <nic.c3.14(a)gmail.com> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: qianfan <qianfanguijin(a)163.com> Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit February 2023