May 2021 - flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: mstarddc_spi.c: Drop mstarddc_ prefix for spi data struct members
by Anastasia Klimchuk (Code Review) 10 May '21

10 May '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/54034 ) Change subject: mstarddc_spi.c: Drop mstarddc_ prefix for spi data struct members ...................................................................... mstarddc_spi.c: Drop mstarddc_ prefix for spi data struct members The name of the struct already contains mstarddc_ prefix, so prefix doesn't need to be repeated in members names. BUG=b:185191942 TEST=builds Change-Id: Ic04b14ce502917ae3b959cf2acf23d58b8752d47 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M mstarddc_spi.c 1 file changed, 15 insertions(+), 15 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/34/54034/1 diff --git a/mstarddc_spi.c b/mstarddc_spi.c index ca42659..8a8866c 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -32,9 +32,9 @@ #include "spi.h" struct mstarddc_spi_data { - int mstarddc_fd; - int mstarddc_addr; - int mstarddc_doreset; + int fd; + int addr; + int doreset; }; // MSTAR DDC Commands @@ -49,9 +49,9 @@ struct mstarddc_spi_data *mstarddc_data = data; // Reset, disables ISP mode - if (mstarddc_data->mstarddc_doreset == 1) { + if (mstarddc_data->doreset == 1) { uint8_t cmd = MSTARDDC_SPI_RESET; - if (write(mstarddc_data->mstarddc_fd, &cmd, 1) < 0) { + if (write(mstarddc_data->fd, &cmd, 1) < 0) { msg_perr("Error sending reset command: errno %d.\n", errno); return -1; @@ -62,7 +62,7 @@ "or an error occurred.\n"); } - if (close(mstarddc_data->mstarddc_fd) < 0) { + if (close(mstarddc_data->fd) < 0) { msg_perr("Error closing device: errno %d.\n", errno); return -1; } @@ -89,7 +89,7 @@ if (!ret && writecnt) { cmd[0] = MSTARDDC_SPI_WRITE; memcpy(cmd + 1, writearr, writecnt); - if (write(mstarddc_data->mstarddc_fd, cmd, writecnt + 1) < 0) { + if (write(mstarddc_data->fd, cmd, writecnt + 1) < 0) { msg_perr("Error sending write command: errno %d.\n", errno); ret = -1; @@ -103,16 +103,16 @@ cmd[0] = MSTARDDC_SPI_READ; i2c_data.nmsgs = 2; i2c_data.msgs = msg; - i2c_data.msgs[0].addr = mstarddc_data->mstarddc_addr; + i2c_data.msgs[0].addr = mstarddc_data->addr; i2c_data.msgs[0].len = 1; i2c_data.msgs[0].flags = 0; i2c_data.msgs[0].buf = cmd; - i2c_data.msgs[1].addr = mstarddc_data->mstarddc_addr; + i2c_data.msgs[1].addr = mstarddc_data->addr; i2c_data.msgs[1].len = readcnt; i2c_data.msgs[1].flags = I2C_M_RD; i2c_data.msgs[1].buf = readarr; - if (ioctl(mstarddc_data->mstarddc_fd, I2C_RDWR, &i2c_data) < 0) { + if (ioctl(mstarddc_data->fd, I2C_RDWR, &i2c_data) < 0) { msg_perr("Error sending read command: errno %d.\n", errno); ret = -1; @@ -121,7 +121,7 @@ if (!ret && (writecnt || readcnt)) { cmd[0] = MSTARDDC_SPI_END; - if (write(mstarddc_data->mstarddc_fd, cmd, 1) < 0) { + if (write(mstarddc_data->fd, cmd, 1) < 0) { msg_perr("Error sending end command: errno %d.\n", errno); ret = -1; @@ -131,7 +131,7 @@ /* Do not reset if something went wrong, as it might prevent from * retrying flashing. */ if (ret != 0) - mstarddc_data->mstarddc_doreset = 0; + mstarddc_data->doreset = 0; if (cmd) free(cmd); @@ -235,9 +235,9 @@ ret = -1; goto out; } - mstarddc_data->mstarddc_fd = mstarddc_fd; - mstarddc_data->mstarddc_addr = mstarddc_addr; - mstarddc_data->mstarddc_doreset = mstarddc_doreset; + mstarddc_data->fd = mstarddc_fd; + mstarddc_data->addr = mstarddc_addr; + mstarddc_data->doreset = mstarddc_doreset; spi_master_mstarddc.data = mstarddc_data; // Register shutdown function -- To view, visit https://review.coreboot.org/c/flashrom/+/54034 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic04b14ce502917ae3b959cf2acf23d58b8752d47 Gerrit-Change-Number: 54034 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: mstarddc_spi.c: Refactor singleton states into reentrant pattern
by Anastasia Klimchuk (Code Review) 10 May '21

10 May '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/54033 ) Change subject: mstarddc_spi.c: Refactor singleton states into reentrant pattern ...................................................................... mstarddc_spi.c: Refactor singleton states into reentrant pattern Move global singleton states into a struct and store within the spi_master data field for the life-time of the driver. This is one of the steps on the way to move spi_master data memory management behind the initialisation API, for more context see other patches under the same topic "register_master_api". BUG=b:185191942 TEST=builds Change-Id: Ia0e5f6879bfbfac591a40119ee3e0942a5cbc4b9 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M mstarddc_spi.c 1 file changed, 37 insertions(+), 14 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/33/54033/1 diff --git a/mstarddc_spi.c b/mstarddc_spi.c index c041bd3..ca42659 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -31,9 +31,11 @@ #include "programmer.h" #include "spi.h" -static int mstarddc_fd; -static int mstarddc_addr; -static int mstarddc_doreset = 1; +struct mstarddc_spi_data { + int mstarddc_fd; + int mstarddc_addr; + int mstarddc_doreset; +}; // MSTAR DDC Commands #define MSTARDDC_SPI_WRITE 0x10 @@ -44,10 +46,12 @@ /* Returns 0 upon success, a negative number upon errors. */ static int mstarddc_spi_shutdown(void *data) { + struct mstarddc_spi_data *mstarddc_data = data; + // Reset, disables ISP mode - if (mstarddc_doreset == 1) { + if (mstarddc_data->mstarddc_doreset == 1) { uint8_t cmd = MSTARDDC_SPI_RESET; - if (write(mstarddc_fd, &cmd, 1) < 0) { + if (write(mstarddc_data->mstarddc_fd, &cmd, 1) < 0) { msg_perr("Error sending reset command: errno %d.\n", errno); return -1; @@ -58,10 +62,12 @@ "or an error occurred.\n"); } - if (close(mstarddc_fd) < 0) { + if (close(mstarddc_data->mstarddc_fd) < 0) { msg_perr("Error closing device: errno %d.\n", errno); return -1; } + + free(data); return 0; } @@ -72,6 +78,7 @@ const unsigned char *writearr, unsigned char *readarr) { + struct mstarddc_spi_data *mstarddc_data = flash->mst->spi.data; int ret = 0; uint8_t *cmd = malloc((writecnt + 1) * sizeof(uint8_t)); if (cmd == NULL) { @@ -82,7 +89,7 @@ if (!ret && writecnt) { cmd[0] = MSTARDDC_SPI_WRITE; memcpy(cmd + 1, writearr, writecnt); - if (write(mstarddc_fd, cmd, writecnt + 1) < 0) { + if (write(mstarddc_data->mstarddc_fd, cmd, writecnt + 1) < 0) { msg_perr("Error sending write command: errno %d.\n", errno); ret = -1; @@ -96,16 +103,16 @@ cmd[0] = MSTARDDC_SPI_READ; i2c_data.nmsgs = 2; i2c_data.msgs = msg; - i2c_data.msgs[0].addr = mstarddc_addr; + i2c_data.msgs[0].addr = mstarddc_data->mstarddc_addr; i2c_data.msgs[0].len = 1; i2c_data.msgs[0].flags = 0; i2c_data.msgs[0].buf = cmd; - i2c_data.msgs[1].addr = mstarddc_addr; + i2c_data.msgs[1].addr = mstarddc_data->mstarddc_addr; i2c_data.msgs[1].len = readcnt; i2c_data.msgs[1].flags = I2C_M_RD; i2c_data.msgs[1].buf = readarr; - if (ioctl(mstarddc_fd, I2C_RDWR, &i2c_data) < 0) { + if (ioctl(mstarddc_data->mstarddc_fd, I2C_RDWR, &i2c_data) < 0) { msg_perr("Error sending read command: errno %d.\n", errno); ret = -1; @@ -114,7 +121,7 @@ if (!ret && (writecnt || readcnt)) { cmd[0] = MSTARDDC_SPI_END; - if (write(mstarddc_fd, cmd, 1) < 0) { + if (write(mstarddc_data->mstarddc_fd, cmd, 1) < 0) { msg_perr("Error sending end command: errno %d.\n", errno); ret = -1; @@ -124,7 +131,7 @@ /* Do not reset if something went wrong, as it might prevent from * retrying flashing. */ if (ret != 0) - mstarddc_doreset = 0; + mstarddc_data->mstarddc_doreset = 0; if (cmd) free(cmd); @@ -132,7 +139,7 @@ return ret; } -static const struct spi_master spi_master_mstarddc = { +static struct spi_master spi_master_mstarddc = { .max_data_read = 256, .max_data_write = 256, .command = mstarddc_spi_send_command, @@ -146,6 +153,10 @@ int mstarddc_spi_init(void) { int ret = 0; + int mstarddc_fd; + int mstarddc_addr; + int mstarddc_doreset = 1; + struct mstarddc_spi_data *mstarddc_data; // Get device, address from command-line char *i2c_device = extract_programmer_param("dev"); @@ -217,8 +228,20 @@ goto out; } } + + mstarddc_data = calloc(1, sizeof(*mstarddc_data)); + if (!mstarddc_data) { + msg_perr("Unable to allocate space for SPI master data\n"); + ret = -1; + goto out; + } + mstarddc_data->mstarddc_fd = mstarddc_fd; + mstarddc_data->mstarddc_addr = mstarddc_addr; + mstarddc_data->mstarddc_doreset = mstarddc_doreset; + spi_master_mstarddc.data = mstarddc_data; + // Register shutdown function - register_shutdown(mstarddc_spi_shutdown, NULL); + register_shutdown(mstarddc_spi_shutdown, mstarddc_data); // Register programmer register_spi_master(&spi_master_mstarddc); -- To view, visit https://review.coreboot.org/c/flashrom/+/54033 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia0e5f6879bfbfac591a40119ee3e0942a5cbc4b9 Gerrit-Change-Number: 54033 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: tests: Add unit test to run init/shutdown for mec1308.c, ene_lpc.c
by Nico Huber (Code Review) 10 May '21

10 May '21

Attention is currently required from: Angel Pons, Anastasia Klimchuk. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/51487 ) Change subject: tests: Add unit test to run init/shutdown for mec1308.c, ene_lpc.c ...................................................................... Patch Set 13: (2 comments) File tests/io_mock.h: https://review.coreboot.org/c/flashrom/+/51487/comment/02bb9f7c_8a1c3db6 PS13, Line 37: unsigned char I took these types from a Linux manual page, is there something wrong with them? I think we should stay as close as possible to real implementations. File tests/tests.c: https://review.coreboot.org/c/flashrom/+/51487/comment/e4831c0c_fff9d64a PS13, Line 26: static struct io_mock *current_io = NULL; This could just be `const`, I guess, as there is no intention to change the struct contents? and also to fix the warning. -- To view, visit https://review.coreboot.org/c/flashrom/+/51487 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3af612defe1af3850dfc1626a208d873e3a3eddc Gerrit-Change-Number: 51487 Gerrit-PatchSet: 13 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Simon Glass <sjg(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Mon, 10 May 2021 17:18:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: tests: Add unit test to run init/shutdown for mec1308.c, ene_lpc.c
by Simon Glass (Code Review) 10 May '21

10 May '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk. Simon Glass has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/51487 ) Change subject: tests: Add unit test to run init/shutdown for mec1308.c, ene_lpc.c ...................................................................... Patch Set 13: Code-Review+1 (1 comment) Patchset: PS13: another option is just to submit it. It seems like a good first step -- To view, visit https://review.coreboot.org/c/flashrom/+/51487 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3af612defe1af3850dfc1626a208d873e3a3eddc Gerrit-Change-Number: 51487 Gerrit-PatchSet: 13 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Simon Glass <sjg(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Mon, 10 May 2021 16:11:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: dummyflasher.c: Fix buses_supported branching
by Edward O'Callaghan (Code Review) 10 May '21

10 May '21

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/54018 ) Change subject: dummyflasher.c: Fix buses_supported branching ...................................................................... dummyflasher.c: Fix buses_supported branching Fix get_data_from_context() s.t. we return back the correct handle based on the respective bus bit field BUG=none BRANCH=none TEST=none Change-Id: I252aa318bca17ea2aaa963365624568c50765d2a Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M dummyflasher.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/18/54018/1 diff --git a/dummyflasher.c b/dummyflasher.c index ec5060d..4e8f094 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -175,10 +175,12 @@ static struct emu_data* get_data_from_context(const struct flashctx *flash) { - if (dummy_buses_supported & (BUS_PARALLEL | BUS_LPC | BUS_FWH)) + if (dummy_buses_supported & BUS_NONSPI) return (struct emu_data *)flash->mst->par.data; else if (dummy_buses_supported & BUS_SPI) return (struct emu_data *)flash->mst->spi.data; + else if (dummy_buses_supported & BUS_PROG) + return (struct emu_data *)flash->mst->opaque.data; return NULL; /* buses was set to BUS_NONE. */ } -- To view, visit https://review.coreboot.org/c/flashrom/+/54018 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I252aa318bca17ea2aaa963365624568c50765d2a Gerrit-Change-Number: 54018 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: tests: Add unit test to run init/shutdown for mec1308.c, ene_lpc.c
by Edward O'Callaghan (Code Review) 10 May '21

10 May '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk, Simon Glass. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/51487 ) Change subject: tests: Add unit test to run init/shutdown for mec1308.c, ene_lpc.c ...................................................................... Patch Set 13: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/51487 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3af612defe1af3850dfc1626a208d873e3a3eddc Gerrit-Change-Number: 51487 Gerrit-PatchSet: 13 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Simon Glass <sjg(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Simon Glass <sjg(a)chromium.org> Gerrit-Comment-Date: Mon, 10 May 2021 11:07:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: digilent_spi.c: Refactor singleton states into reentrant pattern
by Edward O'Callaghan (Code Review) 10 May '21

10 May '21

Attention is currently required from: Nico Huber, Angel Pons, Anastasia Klimchuk. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/54012 ) Change subject: digilent_spi.c: Refactor singleton states into reentrant pattern ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/54012 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I91b842913d4402a4a1bec896f19c2fe1f34772b1 Gerrit-Change-Number: 54012 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Mon, 10 May 2021 09:43:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in flashrom[master]: digilent_spi.c: Refactor singleton states into reentrant pattern
by Anastasia Klimchuk (Code Review) 10 May '21

10 May '21

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/54012 ) Change subject: digilent_spi.c: Refactor singleton states into reentrant pattern ...................................................................... digilent_spi.c: Refactor singleton states into reentrant pattern Move global singleton states into a struct and store within the spi_master data field for the life-time of the driver. This is one of the steps on the way to move spi_master data memory management behind the initialisation API, for more context see other patches under the same topic "register_master_api". BUG=b:185191942 TEST=builds Change-Id: I91b842913d4402a4a1bec896f19c2fe1f34772b1 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M digilent_spi.c 1 file changed, 58 insertions(+), 47 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/12/54012/1 diff --git a/digilent_spi.c b/digilent_spi.c index 0f7a9da..91a28b0 100644 --- a/digilent_spi.c +++ b/digilent_spi.c @@ -45,8 +45,10 @@ #define DATA_WRITE_EP 0x03 #define DATA_READ_EP 0x84 -static struct libusb_device_handle *handle = NULL; -static bool reset_board; +struct digilent_spi_data { + struct libusb_device_handle *handle; + bool reset_board; +}; #define DIGILENT_VID 0x1443 #define DIGILENT_JTAG_PID 0x0007 @@ -97,7 +99,7 @@ CMD_SPI_TX_END = 0x87, }; -static int do_command(uint8_t *req, int req_len, uint8_t *res, int res_len) +static int do_command(uint8_t *req, int req_len, uint8_t *res, int res_len, struct libusb_device_handle *handle) { int tx_len = 0; int ret; @@ -133,41 +135,41 @@ return 0; } -static int gpio_open(void) +static int gpio_open(struct libusb_device_handle *handle) { uint8_t req[] = { 0x00, CMD_GPIO, CMD_GPIO_OPEN, 0x00 }; uint8_t res[2]; - return do_command(req, sizeof(req), res, sizeof(res)); + return do_command(req, sizeof(req), res, sizeof(res), handle); } -static int gpio_set_dir(uint8_t direction) +static int gpio_set_dir(uint8_t direction, struct libusb_device_handle *handle) { uint8_t req[] = { 0x00, CMD_GPIO, CMD_GPIO_SET_DIR, 0x00, direction, 0x00, 0x00, 0x00 }; uint8_t res[6]; - return do_command(req, sizeof(req), res, sizeof(res)); + return do_command(req, sizeof(req), res, sizeof(res), handle); } -static int gpio_set_value(uint8_t value) +static int gpio_set_value(uint8_t value, struct libusb_device_handle *handle) { uint8_t req[] = { 0x00, CMD_GPIO, CMD_GPIO_SET_VAL, 0x00, value, 0x00, 0x00, 0x00 }; uint8_t res[2]; - return do_command(req, sizeof(req), res, sizeof(res)); + return do_command(req, sizeof(req), res, sizeof(res), handle); } -static int spi_open(void) +static int spi_open(struct libusb_device_handle *handle) { uint8_t req[] = { 0x00, CMD_SPI, CMD_SPI_OPEN, 0x00 }; uint8_t res[2]; - return do_command(req, sizeof(req), res, sizeof(res)); + return do_command(req, sizeof(req), res, sizeof(res), handle); } -static int spi_set_speed(uint32_t speed) +static int spi_set_speed(uint32_t speed, struct libusb_device_handle *handle) { uint8_t req[] = { 0x00, CMD_SPI, CMD_SPI_SET_SPEED, 0x00, (speed) & 0xff, @@ -178,7 +180,7 @@ uint32_t real_speed; int ret; - ret = do_command(req, sizeof(req), res, sizeof(res)); + ret = do_command(req, sizeof(req), res, sizeof(res), handle); if (ret) return ret; @@ -189,23 +191,23 @@ return 0; } -static int spi_set_mode(uint8_t mode) +static int spi_set_mode(uint8_t mode, struct libusb_device_handle *handle) { uint8_t req[] = { 0x00, CMD_SPI, CMD_SPI_SET_MODE, 0x00, mode }; uint8_t res[2]; - return do_command(req, sizeof(req), res, sizeof(res)); + return do_command(req, sizeof(req), res, sizeof(res), handle); } -static int spi_set_cs(uint8_t cs) +static int spi_set_cs(uint8_t cs, struct libusb_device_handle *handle) { uint8_t req[] = { 0x00, CMD_SPI, CMD_SPI_SET_CS, 0x00, cs }; uint8_t res[2]; - return do_command(req, sizeof(req), res, sizeof(res)); + return do_command(req, sizeof(req), res, sizeof(res), handle); } -static int spi_start_io(uint8_t read_follows, uint32_t write_len) +static int spi_start_io(uint8_t read_follows, uint32_t write_len, struct libusb_device_handle *handle) { uint8_t req[] = { 0x00, CMD_SPI, CMD_SPI_START_IO, 0x00, 0x00, 0x00, /* meaning unknown */ @@ -216,17 +218,17 @@ (write_len >> 24) & 0xff }; uint8_t res[2]; - return do_command(req, sizeof(req), res, sizeof(res)); + return do_command(req, sizeof(req), res, sizeof(res), handle); } -static int spi_tx_end(uint8_t read_follows, uint32_t tx_len) +static int spi_tx_end(uint8_t read_follows, uint32_t tx_len, struct libusb_device_handle *handle) { uint8_t req[] = { 0x00, CMD_SPI, CMD_SPI_TX_END, 0x00 }; uint8_t res[read_follows ? 10 : 6]; int ret; uint32_t count; - ret = do_command(req, sizeof(req), res, sizeof(res)); + ret = do_command(req, sizeof(req), res, sizeof(res), handle); if (ret != 0) return ret; @@ -265,19 +267,20 @@ int tx_len = 0; uint8_t buf[len]; uint8_t read_follows = readcnt > 0 ? 1 : 0; + struct digilent_spi_data *digilent_data = flash->mst->spi.data; memcpy(buf, writearr, writecnt); memset(buf + writecnt, 0xff, readcnt); - ret = spi_set_cs(0); + ret = spi_set_cs(0, digilent_data->handle); if (ret != 0) return ret; - ret = spi_start_io(read_follows, writecnt); + ret = spi_start_io(read_follows, writecnt, digilent_data->handle); if (ret != 0) return ret; - ret = libusb_bulk_transfer(handle, DATA_WRITE_EP, buf, len, &tx_len, USB_TIMEOUT); + ret = libusb_bulk_transfer(digilent_data->handle, DATA_WRITE_EP, buf, len, &tx_len, USB_TIMEOUT); if (ret != 0) { msg_perr("%s: failed to write data: '%s'\n", __func__, libusb_error_name(ret)); return -1; @@ -288,7 +291,7 @@ } if (read_follows) { - ret = libusb_bulk_transfer(handle, DATA_READ_EP, buf, len, &tx_len, USB_TIMEOUT); + ret = libusb_bulk_transfer(digilent_data->handle, DATA_READ_EP, buf, len, &tx_len, USB_TIMEOUT); if (ret != 0) { msg_perr("%s: failed to read data: '%s'\n", __func__, libusb_error_name(ret)); return -1; @@ -299,11 +302,11 @@ } } - ret = spi_tx_end(read_follows, len); + ret = spi_tx_end(read_follows, len, digilent_data->handle); if (ret != 0) return ret; - ret = spi_set_cs(1); + ret = spi_set_cs(1, digilent_data->handle); if (ret != 0) return ret; @@ -312,7 +315,7 @@ return 0; } -static const struct spi_master spi_master_digilent_spi = { +static struct spi_master spi_master_digilent_spi = { .features = SPI_MASTER_4BA, .max_data_read = 252, .max_data_write = 252, @@ -326,16 +329,18 @@ static int digilent_spi_shutdown(void *data) { - if (reset_board) - gpio_set_dir(0); + struct digilent_spi_data *digilent_data = data; - libusb_close(handle); - handle = NULL; + if (digilent_data->reset_board) + gpio_set_dir(0, digilent_data->handle); + libusb_close(digilent_data->handle); + + free(data); return 0; } -static bool default_reset(void) +static bool default_reset(struct libusb_device_handle *handle) { char board[17]; @@ -373,11 +378,8 @@ char *p; uint32_t speed_hz = spispeeds[0].speed; int i; - - if (handle != NULL) { - msg_cerr("%s: handle already set! Please report a bug at flashrom(a)flashrom.org\n", __func__); - return -1; - } + struct libusb_device_handle *handle = NULL; + bool reset_board; int32_t ret = libusb_init(NULL); if (ret < 0) { @@ -425,32 +427,41 @@ if (p && strlen(p)) reset_board = (p[0] == '1'); else - reset_board = default_reset(); + reset_board = default_reset(handle); free(p); + if (reset_board) { - if (gpio_open() != 0) + if (gpio_open(handle) != 0) goto close_handle; - if (gpio_set_dir(1) != 0) + if (gpio_set_dir(1, handle) != 0) goto close_handle; - if (gpio_set_value(0) != 0) + if (gpio_set_value(0, handle) != 0) goto close_handle; } - if (spi_open() != 0) + if (spi_open(handle) != 0) goto close_handle; - if (spi_set_speed(speed_hz) != 0) + if (spi_set_speed(speed_hz, handle) != 0) goto close_handle; - if (spi_set_mode(0x00) != 0) + if (spi_set_mode(0x00, handle) != 0) goto close_handle; - register_shutdown(digilent_spi_shutdown, NULL); + struct digilent_spi_data *digilent_data = calloc(1, sizeof(*digilent_data)); + if (!digilent_data) { + msg_perr("Unable to allocate space for SPI master data\n"); + goto close_handle; + } + digilent_data->reset_board = reset_board; + digilent_data->handle = handle; + spi_master_digilent_spi.data = digilent_data; + + register_shutdown(digilent_spi_shutdown, digilent_data); register_spi_master(&spi_master_digilent_spi); return 0; close_handle: libusb_close(handle); - handle = NULL; return -1; } -- To view, visit https://review.coreboot.org/c/flashrom/+/54012 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I91b842913d4402a4a1bec896f19c2fe1f34772b1 Gerrit-Change-Number: 54012 Gerrit-PatchSet: 1 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: flashchips.c: add support for W25Q32JW..IM
by Edward O'Callaghan (Code Review) 10 May '21

10 May '21

Attention is currently required from: Nikolai Artemiev. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/53946 ) Change subject: flashchips.c: add support for W25Q32JW..IM ...................................................................... Patch Set 4: Code-Review+2 (1 comment) File flashchips.c: https://review.coreboot.org/c/flashrom/+/53946/comment/e1487d94_e01061de PS1, Line 17583: ..IM > Ah, I see the datasheet now. […] ni845x_spi.c and dediprog.c uses voltage afaik. We have a dediprog auto-detect feature I have been meaning to get someone to clean up so it can be upstreamed. It's a lot more clean now than it use to be so we could probably send it soon. That said, I think the one-off programming with external programmers sometimes being marginal is a frequent thing that is actually harmless in practice. The components are tested to withstand this sort of thing for short periods of time. "Not great, not terrible". One day soon we should work out a way to deal with the detection of these parts that share common vid,did pairs if possible? -- To view, visit https://review.coreboot.org/c/flashrom/+/53946 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7425e12658dd69c4ec8d3309dd591d09a935bb4d Gerrit-Change-Number: 53946 Gerrit-PatchSet: 4 Gerrit-Owner: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Mon, 10 May 2021 09:27:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Comment-In-Reply-To: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-MessageType: comment

1 0

Change in flashrom[master]: realtek_mst_i2c_spi.c: Rename `PAGE_SIZE` macro
by Edward O'Callaghan (Code Review) 10 May '21

10 May '21

Attention is currently required from: Angel Pons. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/53998 ) Change subject: realtek_mst_i2c_spi.c: Rename `PAGE_SIZE` macro ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File realtek_mst_i2c_spi.c: https://review.coreboot.org/c/flashrom/+/53998/comment/d3bc4d69_088a59aa PS1, Line 31: REALTEK > Huh, sure Tell me about it :| -- To view, visit https://review.coreboot.org/c/flashrom/+/53998 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I043e3d8c2d2498e94b5e7577a7378c8c3e0e6c81 Gerrit-Change-Number: 53998 Gerrit-PatchSet: 2 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Mon, 10 May 2021 08:27:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit May 2021