flashrom June 2015

flashrom@flashrom.org

30 participants
88 discussions

by Stefan Tauner

On Sun, 21 Jun 2015 14:35:33 +0300 Julian Shulika <hercares(a)gmail.com> wrote: > Hello! Please, advise external programmer which can be bought on ebay or > aliexpress. Thank you Any supported by flashrom if you don't plan to use it all the time (like for firmware development). Otherwise it depends very much on the use cases... for coreboot development I would recommend a Beaglebone Black because it is very versatile (e.g. works as EHCI debug device too), fast and not too expensive. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

6 years, 3 months

Re: [flashrom] Reading the GPU ROM on a mid-2014 15" rMBP from Linux/Mac

by Stefan Tauner

On Tue, 23 Jun 2015 14:09:02 +0800 Ry <ryanblonna3(a)gmail.com> wrote: > Hi Stefan, > > Thank your very much! I was able to extract the ROM using the mapped memory > method listed at the end of that article. I am sort of bummed out by the > generated ROM file however, because it does not seem to support EFI > according to this article: > http://vfio.blogspot.com/2014/08/does-my-graphics-card-rom-support-efi.html. > Does this sound right? > I have no idea, sorry. I don't see how the EFI support of the VBIOS is related to QEMU pass-through at all... but in any case, I can't help you with that. Asking the QEMU or KVM guys is probably a better option. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

6 years, 3 months

Re: [flashrom] Reading the GPU ROM on a mid-2014 15" rMBP from Linux/Mac

by Stefan Tauner

Hello Ryan, you might be able to achieve what you want by following one of the procedures described in the coreboot wiki, especially http://coreboot.org/VGA_support#UEFI_Method Good luck! -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

6 years, 3 months

[PATCH] spi25: ignore 0x00 as a manufacturer id in the generic match

by Urja Rannikko

Saying that manufacturer id 0x00 is an "unknown SPI chip" just confuses people with external programmers without a proper connection to a chip and makes them think flashrom doesnt support the chip they're trying to use. Also causes unnecessary -c requirement with a multiple-slot (FWH/LPC and SPI) serprog device i was testing. Signed-off-by: Urja Rannikko <urjaman(a)gmail.com> --- spi25.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spi25.c b/spi25.c index 673bdf5..af4b6db 100644 --- a/spi25.c +++ b/spi25.c @@ -156,7 +156,7 @@ static int probe_spi_rdid_generic(struct flashctx *flash, int bytes) return 1; /* Test if there is any vendor ID. */ - if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff) + if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff && id1 != 0x00) return 1; return 0; @@ -212,7 +212,7 @@ int probe_spi_rems(struct flashctx *flash) return 1; /* Test if there is any vendor ID. */ - if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff) + if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff && id1 != 0x00) return 1; return 0; -- 2.3.1

6 years, 3 months

[commit] r1893 - trunk

by repository service

Author: stefanct Date: Tue Jun 23 01:59:15 2015 New Revision: 1893 URL: http://flashrom.org/trac/flashrom/changeset/1893 Log: spi25: ignore 0x00 as a manufacturer id in the generic match. Saying that manufacturer id 0x00 is an "unknown SPI chip" just confuses people with external programmers without a proper connection to a chip and makes them think flashrom doesn't support the chip they're trying to use. Also causes unnecessary -c requirement with a multiple-slot (FWH/LPC and SPI) serprog device i was testing. Signed-off-by: Urja Rannikko <urjaman(a)gmail.com> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/spi25.c Modified: trunk/spi25.c ============================================================================== --- trunk/spi25.c Sat Jun 20 13:53:10 2015 (r1892) +++ trunk/spi25.c Tue Jun 23 01:59:15 2015 (r1893) @@ -156,7 +156,7 @@ return 1; /* Test if there is any vendor ID. */ - if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff) + if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff && id1 != 0x00) return 1; return 0; @@ -212,7 +212,7 @@ return 1; /* Test if there is any vendor ID. */ - if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff) + if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff && id1 != 0x00) return 1; return 0;

6 years, 3 months

[PATCH 5/5] dediprog: Enable by default.

by Stefan Tauner

Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c439d8d..e7c8fde 100644 --- a/Makefile +++ b/Makefile @@ -469,8 +469,8 @@ CONFIG_OGP_SPI ?= yes # Always enable Bus Pirate SPI for now. CONFIG_BUSPIRATE_SPI ?= yes -# Disable Dediprog SF100 until support is complete and tested. -CONFIG_DEDIPROG ?= no +# Always enable Dediprog SF100 for now. +CONFIG_DEDIPROG ?= yes # Always enable Marvell SATA controllers for now. CONFIG_SATAMV ?= yes -- Kind regards, Stefan Tauner

6 years, 3 months

[PATCH 4/5] dediprog: Support new communication protocol.

by Stefan Tauner

There are some changed commands, so adjust the code to support these. Use helper functions to reduce duplication in libusb calls. Based on the following chromiumos change: Change-Id: Ibd1e27d9e8273ba879b9b5d95675b99596255c89 Signed-off-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- dediprog.c | 128 ++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 80 insertions(+), 48 deletions(-) diff --git a/dediprog.c b/dediprog.c index a6801be..9fbd985 100644 --- a/dediprog.c +++ b/dediprog.c @@ -130,16 +130,26 @@ enum dediprog_writemode { static int dediprog_firmwareversion = FIRMWARE_VERSION(0, 0, 0); -#if 0 -/* Might be useful for other pieces of code as well. */ -static void print_hex(void *buf, size_t len) +/* Returns true if firmware (and thus hardware) supports the "new" protocol */ +static bool is_new_prot(void) { - size_t i; + /* if (SF100) */ + return dediprog_firmwareversion >= FIRMWARE_VERSION(5, 5, 0); + /* else if (SF600) + return dediprog_firmwareversion >= FIRMWARE_VERSION(6, 9, 0); */ +} - for (i = 0; i < len; i++) - msg_pdbg(" %02x", ((uint8_t *)buf)[i]); +static int dediprog_read(enum dediprog_cmds cmd, unsigned int value, unsigned int idx, uint8_t *bytes, size_t size) +{ + return usb_control_msg(dediprog_handle, REQTYPE_EP_IN, cmd, value, idx, + (char *)bytes, size, DEFAULT_TIMEOUT); +} + +static int dediprog_write(enum dediprog_cmds cmd, unsigned int value, unsigned int idx, const uint8_t *bytes, size_t size) +{ + return usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, cmd, value, idx, + (char *)bytes, size, DEFAULT_TIMEOUT); } -#endif /* Might be useful for other USB devices as well. static for now. */ /* device parameter allows user to specify one device of multiple installed */ @@ -166,24 +176,30 @@ static int dediprog_set_leds(int leds) if (leds < LED_NONE || leds > LED_ALL) leds = LED_ALL; - /* Older Dediprogs with 2.x.x and 3.x.x firmware only had - * two LEDs, and they were reversed. So map them around if - * we have an old device. On those devices the LEDs map as - * follows: + /* Older Dediprogs with 2.x.x and 3.x.x firmware only had two LEDs, assigned to different bits. So map + * them around if we have an old device. On those devices the LEDs map as follows: * bit 2 == 0: green light is on. - * bit 0 == 0: red light is on. + * bit 0 == 0: red light is on. + * + * Additionally, the command structure has changed with the "new" protocol. + * + * FIXME: take IO pins into account */ - int target_leds; - if (dediprog_firmwareversion < FIRMWARE_VERSION(5,0,0)) { - target_leds = ((leds & LED_ERROR) >> 2) | - ((leds & LED_PASS) << 2); + int target_leds, ret; + if (is_new_prot()) { + target_leds = (leds ^ 7) << 8; + ret = dediprog_write(CMD_SET_IO_LED, target_leds, 0, NULL, 0); } else { - target_leds = leds; + if (dediprog_firmwareversion < FIRMWARE_VERSION(5, 0, 0)) { + target_leds = ((leds & LED_ERROR) >> 2) | ((leds & LED_PASS) << 2); + } else { + target_leds = leds; + } + target_leds ^= 7; + + ret = dediprog_write(CMD_SET_IO_LED, 0x9, target_leds, NULL, 0); } - target_leds ^= 7; - int ret = usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, CMD_SET_IO_LED, 0x09, target_leds, - NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { msg_perr("Command Set LED 0x%x failed (%s)!\n", leds, usb_strerror()); return 1; @@ -222,8 +238,7 @@ static int dediprog_set_spi_voltage(int millivolt) /* Wait some time as the original driver does. */ programmer_delay(200 * 1000); } - ret = usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, CMD_SET_VCC, voltage_selector, 0, - NULL, 0x0, DEFAULT_TIMEOUT); + ret = dediprog_write(CMD_SET_VCC, voltage_selector, 0, NULL, 0); if (ret != 0x0) { msg_perr("Command Set SPI Voltage 0x%x failed!\n", voltage_selector); @@ -263,8 +278,7 @@ static int dediprog_set_spi_speed(unsigned int spispeed_idx) const struct dediprog_spispeeds *spispeed = &spispeeds[spispeed_idx]; msg_pdbg("SPI speed is %sHz\n", spispeed->name); - int ret = usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, CMD_SET_SPI_CLK, spispeed->speed, 0xff, - NULL, 0x0, DEFAULT_TIMEOUT); + int ret = dediprog_write(CMD_SET_SPI_CLK, spispeed->speed, 0, NULL, 0); if (ret != 0x0) { msg_perr("Command Set SPI Speed 0x%x failed!\n", spispeed->speed); return 1; @@ -285,10 +299,7 @@ static int dediprog_spi_bulk_read(struct flashctx *flash, uint8_t *buf, /* chunksize must be 512, other sizes will NOT work at all. */ const unsigned int chunksize = 0x200; const unsigned int count = len / chunksize; - const char count_and_chunk[] = {count & 0xff, - (count >> 8) & 0xff, - chunksize & 0xff, - (chunksize >> 8) & 0xff}; + unsigned int cmd_len; if ((start % chunksize) || (len % chunksize)) { msg_perr("%s: Unaligned start=%i, len=%i! Please report a bug " @@ -299,15 +310,34 @@ static int dediprog_spi_bulk_read(struct flashctx *flash, uint8_t *buf, /* No idea if the hardware can handle empty reads, so chicken out. */ if (!len) return 0; - /* Command Read SPI Bulk. No idea which read command is used on the - * SPI side. - */ - ret = usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, CMD_READ, start % 0x10000, - start / 0x10000, (char *)count_and_chunk, - sizeof(count_and_chunk), DEFAULT_TIMEOUT); - if (ret != sizeof(count_and_chunk)) { - msg_perr("Command Read SPI Bulk failed, %i %s!\n", ret, - usb_strerror()); + /* Command Read SPI Bulk. */ + if (is_new_prot()) { + const uint8_t read_cmd[] = { + count & 0xff, + (count >> 8) & 0xff, + 0, + READ_MODE_FAST, + 0, + 0, + start & 0xff, + (start >> 8) & 0xff, + (start >> 16) & 0xff, + (start >> 24) & 0xff, + }; + + cmd_len = sizeof(read_cmd); + ret = dediprog_write(CMD_READ, 0, 0, read_cmd, cmd_len); + } else { + const uint8_t read_cmd[] = {count & 0xff, + (count >> 8) & 0xff, + chunksize & 0xff, + (chunksize >> 8) & 0xff}; + + cmd_len = sizeof(read_cmd); + ret = dediprog_write(CMD_READ, start % 0x10000, start / 0x10000, read_cmd, cmd_len); + } + if (ret != cmd_len) { + msg_perr("Command Read SPI Bulk failed, %i %s!\n", ret, usb_strerror()); return 1; } @@ -515,8 +545,12 @@ static int dediprog_spi_send_command(struct flashctx *flash, return 1; } - ret = usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, CMD_TRANSCEIVE, 0, readcnt ? 0x1 : 0x0, - (char *)writearr, writecnt, DEFAULT_TIMEOUT); + /* New protocol has the read flag as value while the old protocol had it in the index field. */ + if (is_new_prot()) { + ret = dediprog_write(CMD_TRANSCEIVE, readcnt ? 1 : 0, 0, writearr, writecnt); + } else { + ret = dediprog_write(CMD_TRANSCEIVE, 0, readcnt ? 1 : 0, writearr, writecnt); + } if (ret != writecnt) { msg_perr("Send SPI failed, expected %i, got %i %s!\n", writecnt, ret, usb_strerror()); @@ -525,8 +559,7 @@ static int dediprog_spi_send_command(struct flashctx *flash, if (readcnt == 0) return 0; - ret = usb_control_msg(dediprog_handle, REQTYPE_EP_IN, CMD_TRANSCEIVE, 0, 0, - (char *)readarr, readcnt, DEFAULT_TIMEOUT); + ret = dediprog_read(CMD_TRANSCEIVE, 0, 0, readarr, readcnt); if (ret != readcnt) { msg_perr("Receive SPI failed, expected %i, got %i %s!\n", readcnt, ret, usb_strerror()); @@ -553,8 +586,7 @@ static int dediprog_check_devicestring(void) } #endif /* Command Receive Device String. */ - ret = usb_control_msg(dediprog_handle, REQTYPE_EP_IN, CMD_READ_PROG_INFO, 0, 0, - buf, 0x10, DEFAULT_TIMEOUT); + ret = dediprog_read(CMD_READ_PROG_INFO, 0, 0, (uint8_t *)buf, 0x10); if (ret != 0x10) { msg_perr("Incomplete/failed Command Receive Device String!\n"); return 1; @@ -566,16 +598,16 @@ static int dediprog_check_devicestring(void) return 1; } if (sscanf(buf, "SF100 V:%d.%d.%d ", &fw[0], &fw[1], &fw[2]) != 3) { - msg_perr("Unexpected firmware version string!\n"); + msg_perr("Unexpected firmware version string '%s'\n", buf); return 1; } - /* Only these versions were tested. */ - if (fw[0] < 2 || fw[0] > 5) { - msg_perr("Unexpected firmware version %d.%d.%d!\n", fw[0], - fw[1], fw[2]); + /* Only these major versions were tested. */ + if (fw[0] < 2 || fw[0] > 6) { + msg_perr("Unexpected firmware version %d.%d.%d!\n", fw[0], fw[1], fw[2]); return 1; } dediprog_firmwareversion = FIRMWARE_VERSION(fw[0], fw[1], fw[2]); + return 0; } -- Kind regards, Stefan Tauner

6 years, 3 months

[PATCH 3/5] dediprog: Show UID.

by Stefan Tauner

Whatever that is... To that end, send the respective command and print result with a "new" helpers.c function. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- dediprog.c | 19 +++++++++++++++++++ flash.h | 1 + helpers.c | 7 +++++++ 3 files changed, 27 insertions(+) diff --git a/dediprog.c b/dediprog.c index ce7ff7a..a6801be 100644 --- a/dediprog.c +++ b/dediprog.c @@ -730,6 +730,18 @@ static int dediprog_shutdown(void *data) return 0; } +/* Return the 8-byte UID for the flash */ +static int get_uid(uint8_t buf[8]) +{ + int ret = dediprog_read(CMD_GET_UID, 0, 0, buf, 8); + if (ret != 8) { + msg_perr("get_uid failed (%s)!\n", usb_strerror()); + return 1; + } + + return 0; +} + /* URB numbers refer to the first log ever captured. */ int dediprog_init(void) { @@ -872,6 +884,13 @@ int dediprog_init(void) return 1; } + uint8_t uid[8]; + if (get_uid(uid) != 0) + return 1; + msg_pdbg("UID:"); + print_hex_buf(uid, sizeof(uid)); + msg_pdbg("\n"); + register_spi_master(&spi_master_dediprog); dediprog_set_leds(LED_NONE); diff --git a/flash.h b/flash.h index 2c2839f..f7bd94b 100644 --- a/flash.h +++ b/flash.h @@ -251,6 +251,7 @@ void print_supported_wiki(void); /* helpers.c */ uint32_t address_to_bits(uint32_t addr); +void print_hex_buf(uint8_t *buf, size_t len); int bitcount(unsigned long a); int max(int a, int b); int min(int a, int b); diff --git a/helpers.c b/helpers.c index 7a146c3..a82ba55 100644 --- a/helpers.c +++ b/helpers.c @@ -34,6 +34,13 @@ uint32_t address_to_bits(uint32_t addr) return 32 - lzb; } +void print_hex_buf(uint8_t *buf, size_t len) +{ + size_t i; + for (i = 0; i < len; i++) + msg_pdbg(" %02x", buf[i]); +} + int bitcount(unsigned long a) { int i = 0; -- Kind regards, Stefan Tauner

6 years, 3 months

[PATCH 2/5] dediprog: Tidy up commands and remove dead nonsense code.

by Stefan Tauner

Use names for the commands and request types instead of magic numbers and remove some of the unnecessary unexplained arguments. Also, cleanup the nonsense code left over from RE. Most of it can not explained by official documentation and was recorded with ancient firmware/software. Based on the following chromiumos changes: Change-Id: I80a0dcdf40eedc89da48fb2c54cd9d9fd13e6fa1 Change-Id: If61bac2c8194b3ec30a80422d871842c66f0cd74 Signed-off-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- dediprog.c | 386 +++++++++++++++++++++---------------------------------------- 1 file changed, 132 insertions(+), 254 deletions(-) diff --git a/dediprog.c b/dediprog.c index b45e061..ce7ff7a 100644 --- a/dediprog.c +++ b/dediprog.c @@ -2,6 +2,8 @@ * This file is part of the flashrom project. * * Copyright (C) 2010 Carl-Daniel Hailfinger + * Copyright (C) 2015 Simon Glass + * Copyright (C) 2015 Stefan Tauner * * 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 @@ -38,13 +40,14 @@ #define FIRMWARE_VERSION(x,y,z) ((x << 16) | (y << 8) | z) #define DEFAULT_TIMEOUT 3000 +#define REQTYPE_OTHER_OUT (USB_ENDPOINT_IN | USB_TYPE_VENDOR | USB_RECIP_OTHER) /* 0x43 */ +#define REQTYPE_OTHER_IN (USB_ENDPOINT_IN | USB_TYPE_VENDOR | USB_RECIP_OTHER) /* 0xC3 */ +#define REQTYPE_EP_OUT (USB_ENDPOINT_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT) /* 0x42 */ +#define REQTYPE_EP_IN (USB_ENDPOINT_IN | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT) /* 0xC2 */ static usb_dev_handle *dediprog_handle; static int dediprog_firmwareversion; static int dediprog_endpoint; -#define DEDI_SPI_CMD_PAGEWRITE 0x1 -#define DEDI_SPI_CMD_AAIWRITE 0x4 - enum dediprog_leds { LED_INVALID = -1, LED_NONE = 0, @@ -54,6 +57,77 @@ enum dediprog_leds { LED_ALL = 7, }; +/* IO bits for CMD_SET_IO_LED message */ +enum dediprog_ios { + IO1 = 1 << 0, + IO2 = 1 << 1, + IO3 = 1 << 2, + IO4 = 1 << 3, +}; + +enum dediprog_cmds { + CMD_TRANSCEIVE = 0x01, + CMD_POLL_STATUS_REG = 0x02, + CMD_SET_VPP = 0x03, + CMD_SET_TARGET = 0x04, + CMD_READ_EEPROM = 0x05, + CMD_WRITE_EEPROM = 0x06, + CMD_SET_IO_LED = 0x07, + CMD_READ_PROG_INFO = 0x08, + CMD_SET_VCC = 0x09, + CMD_SET_STANDALONE = 0x0A, + CMD_GET_BUTTON = 0x11, + CMD_GET_UID = 0x12, + CMD_SET_CS = 0x14, + CMD_IO_MODE = 0x15, + CMD_FW_UPDATE = 0x1A, + CMD_FPGA_UPDATE = 0x1B, + CMD_READ_FPGA_VERSION = 0x1C, + CMD_SET_HOLD = 0x1D, + CMD_READ = 0x20, + CMD_WRITE = 0x30, + CMD_WRITE_AT45DB = 0x31, + CMD_NAND_WRITE = 0x32, + CMD_NAND_READ = 0x33, + CMD_SET_SPI_CLK = 0x61, + CMD_CHECK_SOCKET = 0x62, + CMD_DOWNLOAD_PRJ = 0x63, + CMD_READ_PRJ_NAME = 0x64, + // New protocol/firmware only + CMD_CHECK_SDCARD = 0x65, + CMD_READ_PRJ = 0x66, +}; + +enum dediprog_target { + FLASH_TYPE_APPLICATION_FLASH_1 = 0, + FLASH_TYPE_FLASH_CARD, + FLASH_TYPE_APPLICATION_FLASH_2, +}; + +enum dediprog_readmode { + READ_MODE_STD = 1, + READ_MODE_FAST = 2, + READ_MODE_ATMEL45 = 3, + READ_MODE_4B_ADDR_FAST = 4, + READ_MODE_4B_ADDR_FAST_0x0C = 5, /* New protocol only */ +}; + +enum dediprog_writemode { + WRITE_MODE_PAGE_PGM = 1, + WRITE_MODE_PAGE_WRITE = 2, + WRITE_MODE_1B_AAI = 3, + WRITE_MODE_2B_AAI = 4, + WRITE_MODE_128B_PAGE = 5, + WRITE_MODE_PAGE_AT26DF041 = 6, + WRITE_MODE_SILICON_BLUE_FPGA = 7, + WRITE_MODE_64B_PAGE_NUMONYX_PCM = 8, /* unit of length 512 bytes */ + WRITE_MODE_4B_ADDR_256B_PAGE_PGM = 9, + WRITE_MODE_32B_PAGE_PGM_MXIC_512K = 10, /* unit of length 512 bytes */ + WRITE_MODE_4B_ADDR_256B_PAGE_PGM_0x12 = 11, + WRITE_MODE_4B_ADDR_256B_PAGE_PGM_FLAGS = 12, +}; + + static int dediprog_firmwareversion = FIRMWARE_VERSION(0, 0, 0); #if 0 @@ -86,8 +160,6 @@ static struct usb_device *get_device_by_vid_pid(uint16_t vid, uint16_t pid, unsi return NULL; } -//int usb_control_msg(usb_dev_handle *dev, int requesttype, int request, int value, int index, char *bytes, int size, int timeout); - /* This function sets the GPIOs connected to the LEDs as well as IO1-IO4. */ static int dediprog_set_leds(int leds) { @@ -110,7 +182,8 @@ static int dediprog_set_leds(int leds) } target_leds ^= 7; - int ret = usb_control_msg(dediprog_handle, 0x42, 0x07, 0x09, target_leds, NULL, 0x0, DEFAULT_TIMEOUT); + int ret = usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, CMD_SET_IO_LED, 0x09, target_leds, + NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { msg_perr("Command Set LED 0x%x failed (%s)!\n", leds, usb_strerror()); return 1; @@ -149,8 +222,8 @@ static int dediprog_set_spi_voltage(int millivolt) /* Wait some time as the original driver does. */ programmer_delay(200 * 1000); } - ret = usb_control_msg(dediprog_handle, 0x42, 0x9, voltage_selector, - 0xff, NULL, 0x0, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, CMD_SET_VCC, voltage_selector, 0, + NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { msg_perr("Command Set SPI Voltage 0x%x failed!\n", voltage_selector); @@ -180,13 +253,6 @@ static const struct dediprog_spispeeds spispeeds[] = { { NULL, 0x0 }, }; -/* After dediprog_set_spi_speed, the original app always calls - * dediprog_set_spi_voltage(0) and then - * dediprog_check_devicestring() four times in a row. - * After that, dediprog_command_a() is called. - * This looks suspiciously like the microprocessor in the SF100 has to be - * restarted/reinitialized in case the speed changes. - */ static int dediprog_set_spi_speed(unsigned int spispeed_idx) { if (dediprog_firmwareversion < FIRMWARE_VERSION(5, 0, 0)) { @@ -194,12 +260,13 @@ static int dediprog_set_spi_speed(unsigned int spispeed_idx) return 0; } - msg_pdbg("SPI speed is %s Hz\n", spispeeds[spispeed_idx].name); + const struct dediprog_spispeeds *spispeed = &spispeeds[spispeed_idx]; + msg_pdbg("SPI speed is %sHz\n", spispeed->name); - int ret = usb_control_msg(dediprog_handle, 0x42, 0x61, spispeeds[spispeed_idx].speed, 0xff, + int ret = usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, CMD_SET_SPI_CLK, spispeed->speed, 0xff, NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { - msg_perr("Command Set SPI Speed 0x%x failed!\n", spispeeds[spispeed_idx].speed); + msg_perr("Command Set SPI Speed 0x%x failed!\n", spispeed->speed); return 1; } return 0; @@ -235,7 +302,7 @@ static int dediprog_spi_bulk_read(struct flashctx *flash, uint8_t *buf, /* Command Read SPI Bulk. No idea which read command is used on the * SPI side. */ - ret = usb_control_msg(dediprog_handle, 0x42, 0x20, start % 0x10000, + ret = usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, CMD_READ, start % 0x10000, start / 0x10000, (char *)count_and_chunk, sizeof(count_and_chunk), DEFAULT_TIMEOUT); if (ret != sizeof(count_and_chunk)) { @@ -344,7 +411,7 @@ static int dediprog_spi_bulk_write(struct flashctx *flash, const uint8_t *buf, u /* Command Write SPI Bulk. No idea which write command is used on the * SPI side. */ - ret = usb_control_msg(dediprog_handle, 0x42, 0x30, start % 0x10000, start / 0x10000, + ret = usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, CMD_WRITE, start % 0x10000, start / 0x10000, (char *)count_and_cmd, sizeof(count_and_cmd), DEFAULT_TIMEOUT); if (ret != sizeof(count_and_cmd)) { msg_perr("Command Write SPI Bulk failed, %i %s!\n", ret, @@ -422,12 +489,12 @@ static int dediprog_spi_write(struct flashctx *flash, const uint8_t *buf, static int dediprog_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { - return dediprog_spi_write(flash, buf, start, len, DEDI_SPI_CMD_PAGEWRITE); + return dediprog_spi_write(flash, buf, start, len, WRITE_MODE_PAGE_PGM); } static int dediprog_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { - return dediprog_spi_write(flash, buf, start, len, DEDI_SPI_CMD_AAIWRITE); + return dediprog_spi_write(flash, buf, start, len, WRITE_MODE_2B_AAI); } static int dediprog_spi_send_command(struct flashctx *flash, @@ -439,29 +506,26 @@ static int dediprog_spi_send_command(struct flashctx *flash, int ret; msg_pspew("%s, writecnt=%i, readcnt=%i\n", __func__, writecnt, readcnt); - /* Paranoid, but I don't want to be blamed if anything explodes. */ - if (writecnt > 16) { - msg_perr("Untested writecnt=%i, aborting.\n", writecnt); + if (writecnt > UINT16_MAX) { + msg_perr("Invalid writecnt=%i, aborting.\n", writecnt); return 1; } - /* 16 byte reads should work. */ - if (readcnt > 16) { - msg_perr("Untested readcnt=%i, aborting.\n", readcnt); + if (readcnt > UINT16_MAX) { + msg_perr("Invalid readcnt=%i, aborting.\n", readcnt); return 1; } - ret = usb_control_msg(dediprog_handle, 0x42, 0x1, 0xff, - readcnt ? 0x1 : 0x0, (char *)writearr, writecnt, - DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, CMD_TRANSCEIVE, 0, readcnt ? 0x1 : 0x0, + (char *)writearr, writecnt, DEFAULT_TIMEOUT); if (ret != writecnt) { msg_perr("Send SPI failed, expected %i, got %i %s!\n", writecnt, ret, usb_strerror()); return 1; } - if (!readcnt) + if (readcnt == 0) return 0; - memset(readarr, 0, readcnt); - ret = usb_control_msg(dediprog_handle, 0xc2, 0x01, 0xbb8, 0x0000, + + ret = usb_control_msg(dediprog_handle, REQTYPE_EP_IN, CMD_TRANSCEIVE, 0, 0, (char *)readarr, readcnt, DEFAULT_TIMEOUT); if (ret != readcnt) { msg_perr("Receive SPI failed, expected %i, got %i %s!\n", @@ -477,27 +541,27 @@ static int dediprog_check_devicestring(void) int fw[3]; char buf[0x11]; +#if 0 /* Command Prepare Receive Device String. */ - memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc3, 0x7, 0x0, 0xef03, buf, - 0x1, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, REQTYPE_OTHER_IN, 0x7, 0x0, 0xef03, + buf, 0x1, DEFAULT_TIMEOUT); /* The char casting is needed to stop gcc complaining about an always true comparison. */ if ((ret != 0x1) || (buf[0] != (char)0xff)) { msg_perr("Unexpected response to Command Prepare Receive Device" " String!\n"); return 1; } +#endif /* Command Receive Device String. */ - memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc2, 0x8, 0xff, 0xff, buf, - 0x10, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, REQTYPE_EP_IN, CMD_READ_PROG_INFO, 0, 0, + buf, 0x10, DEFAULT_TIMEOUT); if (ret != 0x10) { msg_perr("Incomplete/failed Command Receive Device String!\n"); return 1; } buf[0x10] = '\0'; msg_pdbg("Found a %s\n", buf); - if (memcmp(buf, "SF100", 0x5)) { + if (memcmp(buf, "SF100", 0x5) != 0) { msg_perr("Device not a SF100!\n"); return 1; } @@ -515,24 +579,20 @@ static int dediprog_check_devicestring(void) return 0; } -/* Command A seems to be some sort of device init. It is either followed by - * dediprog_check_devicestring (often) or Command A (often) or - * Command F (once). - */ -static int dediprog_command_a(void) +static int dediprog_device_init(void) { int ret; char buf[0x1]; memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc3, 0xb, 0x0, 0x0, buf, - 0x1, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, REQTYPE_OTHER_IN, 0x0B, 0x0, 0x0, + buf, 0x1, DEFAULT_TIMEOUT); if (ret < 0) { msg_perr("Command A failed (%s)!\n", usb_strerror()); return 1; } if ((ret != 0x1) || (buf[0] != 0x6f)) { - msg_perr("Unexpected response to Command A!\n"); + msg_perr("Unexpected response to init!\n"); return 1; } return 0; @@ -548,9 +608,8 @@ static int dediprog_command_b(void) int ret; char buf[0x3]; - memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc3, 0x7, 0x0, 0xef00, buf, - 0x3, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, REQTYPE_OTHER_IN, 0x7, 0x0, 0xef00, + buf, 0x3, DEFAULT_TIMEOUT); if (ret < 0) { msg_perr("Command B failed (%s)!\n", usb_strerror()); return 1; @@ -565,120 +624,29 @@ static int dediprog_command_b(void) } #endif -/* Command Chip Select is only sent after dediprog_check_devicestring, but not after every - * invocation of dediprog_check_devicestring. It is only sent after the first - * dediprog_command_a(); dediprog_check_devicestring() sequence in each session. - * Bit #1 of the value changes the chip select: 0 is target 1, 1 is target 2 and parameter target can be 1 or 2 - * respectively. We don't know how to encode "3, Socket" and "0, reference card" yet. On SF100 the vendor - * software "DpCmd 6.0.4.06" selects target 2 when requesting 3 (which is unavailable on that hardware). - */ -static int dediprog_chip_select(int target) +static int set_target_flash(enum dediprog_target target) { - int ret; - uint16_t value = ((target - 1) & 1) << 1; - msg_pdbg("Selecting target chip %i\n", target); - ret = usb_control_msg(dediprog_handle, 0x42, 0x4, value, 0x0, NULL, - 0x0, DEFAULT_TIMEOUT); - if (ret != 0x0) { - msg_perr("Command Chip Select failed (%s)!\n", usb_strerror()); + int ret = usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, CMD_SET_TARGET, target, 0, + NULL, 0, DEFAULT_TIMEOUT); + if (ret != 0) { + msg_perr("set_target_flash failed (%s)!\n", usb_strerror()); return 1; } return 0; } #if 0 -/* Very strange. Seems to be a programmer keepalive or somesuch. - * Wait unsuccessfully for timeout ms to read one byte. - * Is usually called after setting voltage to 0. - * Present in all logs with Firmware 2.1.1 and 3.1.8 - */ -static int dediprog_command_f(int timeout) +/* Returns true if the button is currently pressed. */ +static bool dediprog_get_button(void) { - int ret; - char buf[0x1]; - - memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc2, 0x11, 0xff, 0xff, buf, - 0x1, timeout); - /* This check is most probably wrong. Command F always causes a timeout - * in the logs, so we should check for timeout instead of checking for - * success. - */ - if (ret != 0x1) { - msg_perr("Command F failed (%s)!\n", usb_strerror()); - return 1; - } - return 0; -} - -/* Start/stop blinking? - * Present in eng_detect_blink.log with firmware 3.1.8 - * Preceded by Command J - */ -static int dediprog_command_g(void) -{ - int ret; - - ret = usb_control_msg(dediprog_handle, 0x42, 0x07, 0x09, 0x03, NULL, 0x0, DEFAULT_TIMEOUT); - if (ret != 0x0) { - msg_perr("Command G failed (%s)!\n", usb_strerror()); - return 1; - } - return 0; -} - -/* Something. - * Present in all logs with firmware 5.1.5 - * Always preceded by Command Receive Device String - * Always followed by Command Set SPI Voltage nonzero - */ -static int dediprog_command_h(void) -{ - int ret; - - ret = usb_control_msg(dediprog_handle, 0x42, 0x07, 0x09, 0x05, NULL, 0x0, DEFAULT_TIMEOUT); - if (ret != 0x0) { - msg_perr("Command H failed (%s)!\n", usb_strerror()); + char buf[1]; + int ret = usb_control_msg(dediprog_handle, REQTYPE_EP_IN, CMD_GET_BUTTON, 0, 0, + buf, 0x1, DEFAULT_TIMEOUT); + if (ret != 0) { + msg_perr("Could not get button state (%s)!\n", usb_strerror()); return 1; } - return 0; -} - -/* Shutdown for firmware 5.x? - * Present in all logs with firmware 5.1.5 - * Often preceded by a SPI operation (Command Read SPI Bulk or Receive SPI) - * Always followed by Command Set SPI Voltage 0x0000 - */ -static int dediprog_command_i(void) -{ - int ret; - - ret = usb_control_msg(dediprog_handle, 0x42, 0x07, 0x09, 0x06, NULL, 0x0, DEFAULT_TIMEOUT); - if (ret != 0x0) { - msg_perr("Command I failed (%s)!\n", usb_strerror()); - return 1; - } - return 0; -} - -/* Start/stop blinking? - * Present in all logs with firmware 5.1.5 - * Always preceded by Command Receive Device String on 5.1.5 - * Always followed by Command Set SPI Voltage nonzero on 5.1.5 - * Present in eng_detect_blink.log with firmware 3.1.8 - * Preceded by Command B in eng_detect_blink.log - * Followed by Command G in eng_detect_blink.log - */ -static int dediprog_command_j(void) -{ - int ret; - - ret = usb_control_msg(dediprog_handle, 0x42, 0x07, 0x09, 0x07, NULL, 0x0, DEFAULT_TIMEOUT); - if (ret != 0x0) { - msg_perr("Command J failed (%s)!\n", usb_strerror()); - return 1; - } - return 0; + return buf[0] != 1; } #endif @@ -730,28 +698,6 @@ static int parse_voltage(char *voltage) return millivolt; } -static int dediprog_setup(long target) -{ - /* URB 6. Command A. */ - if (dediprog_command_a()) { - return 1; - } - /* URB 7. Command A. */ - if (dediprog_command_a()) { - return 1; - } - /* URB 8. Command Prepare Receive Device String. */ - /* URB 9. Command Receive Device String. */ - if (dediprog_check_devicestring()) { - return 1; - } - /* URB 10. Command Chip Select */ - if (dediprog_chip_select(target)) { - return 1; - } - return 0; -} - static const struct spi_master spi_master_dediprog = { .type = SPI_CONTROLLER_DEDIPROG, .max_data_read = MAX_DATA_UNSPECIFIED, @@ -767,13 +713,6 @@ static int dediprog_shutdown(void *data) { msg_pspew("%s\n", __func__); -#if 0 - /* Shutdown on firmware 5.x */ - if (dediprog_firmwareversion == 5) - if (dediprog_command_i()) - return 1; -#endif - dediprog_firmwareversion = FIRMWARE_VERSION(0, 0, 0); /* URB 28. Command Set SPI Voltage to 0. */ @@ -819,6 +758,7 @@ int dediprog_init(void) } free(spispeed); } + voltage = extract_programmer_param("voltage"); if (voltage) { millivolt = parse_voltage(voltage); @@ -914,90 +854,28 @@ int dediprog_init(void) return 1; /* Perform basic setup. */ - if (dediprog_setup(target)) { + if (dediprog_device_init()) + return 1; + if (dediprog_check_devicestring()) return 1; - } /* Set all possible LEDs as soon as possible to indicate activity. * Because knowing the firmware version is required to set the LEDs correctly we need to this after * dediprog_setup() has queried the device and set dediprog_firmwareversion. */ dediprog_set_leds(LED_ALL); - /* After setting voltage and speed, perform setup again. */ - if (dediprog_set_spi_voltage(0) || dediprog_set_spi_speed(spispeed_idx) || dediprog_setup(target)) { - dediprog_set_leds(LED_ERROR); - return 1; - } - - /* URB 11. Command Set SPI Voltage. */ - if (dediprog_set_spi_voltage(millivolt)) { + /* Select target/socket, frequency and VCC. */ + if (set_target_flash(FLASH_TYPE_APPLICATION_FLASH_1) || + dediprog_set_spi_speed(spispeed_idx) || + dediprog_set_spi_voltage(millivolt)) { dediprog_set_leds(LED_ERROR); return 1; } register_spi_master(&spi_master_dediprog); - /* RE leftover, leave in until the driver is complete. */ -#if 0 - /* Execute RDID by hand if you want to test it. */ - dediprog_do_stuff(); -#endif - dediprog_set_leds(LED_NONE); return 0; } -#if 0 -/* Leftovers from reverse engineering. Keep for documentation purposes until - * completely understood. - */ -static int dediprog_do_stuff(void) -{ - char buf[0x4]; - /* SPI command processing starts here. */ - - /* URB 12. Command Send SPI. */ - /* URB 13. Command Receive SPI. */ - memset(buf, 0, sizeof(buf)); - /* JEDEC RDID */ - msg_pdbg("Sending RDID\n"); - buf[0] = JEDEC_RDID; - if (dediprog_spi_send_command(JEDEC_RDID_OUTSIZE, JEDEC_RDID_INSIZE, - (unsigned char *)buf, (unsigned char *)buf)) - return 1; - msg_pdbg("Receiving response: "); - print_hex(buf, JEDEC_RDID_INSIZE); - /* URB 14-27 are more SPI commands. */ - /* URB 28. Command Set SPI Voltage. */ - if (dediprog_set_spi_voltage(0x0)) - return 1; - /* URB 29-38. Command F, unsuccessful wait. */ - if (dediprog_command_f(544)) - return 1; - /* URB 39. Command Set SPI Voltage. */ - if (dediprog_set_spi_voltage(0x10)) - return 1; - /* URB 40. Command Set SPI Speed. */ - if (dediprog_set_spi_speed(0x2)) - return 1; - /* URB 41 is just URB 28. */ - /* URB 42,44,46,48,51,53 is just URB 8. */ - /* URB 43,45,47,49,52,54 is just URB 9. */ - /* URB 50 is just URB 6/7. */ - /* URB 55-131 is just URB 29-38. (wait unsuccessfully for 4695 (maybe 4751) ms)*/ - /* URB 132,134 is just URB 6/7. */ - /* URB 133 is just URB 29-38. */ - /* URB 135 is just URB 8. */ - /* URB 136 is just URB 9. */ - /* URB 137 is just URB 11. */ - - /* Command Start Bulk Read. Data is u16 blockcount, u16 blocksize. */ - /* Command Start Bulk Write. Data is u16 blockcount, u16 blocksize. */ - /* Bulk transfer sizes for Command Start Bulk Read/Write are always - * 512 bytes, rest is filled with 0xff. - */ - - return 0; -} -#endif -- Kind regards, Stefan Tauner

6 years, 3 months

[PATCH 1/5] dediprog: Invert the LED polarity in the code.

by Stefan Tauner

Previously we have used low-active macros (because the hardware and old protocol were so too) and set every single LED explicitly although we only used a limited number of combinations. Using an enumeration for commonly used values instead makes things easier. Based on the following chromiumos change: Change-Id: Ie481a583e623cdc45e3649a4db69b15570f65a7b Signed-off-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- dediprog.c | 101 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/dediprog.c b/dediprog.c index 851dbae..b45e061 100644 --- a/dediprog.c +++ b/dediprog.c @@ -45,6 +45,17 @@ static int dediprog_endpoint; #define DEDI_SPI_CMD_PAGEWRITE 0x1 #define DEDI_SPI_CMD_AAIWRITE 0x4 +enum dediprog_leds { + LED_INVALID = -1, + LED_NONE = 0, + LED_PASS = 1 << 0, + LED_BUSY = 1 << 1, + LED_ERROR = 1 << 2, + LED_ALL = 7, +}; + +static int dediprog_firmwareversion = FIRMWARE_VERSION(0, 0, 0); + #if 0 /* Might be useful for other pieces of code as well. */ static void print_hex(void *buf, size_t len) @@ -77,24 +88,11 @@ static struct usb_device *get_device_by_vid_pid(uint16_t vid, uint16_t pid, unsi //int usb_control_msg(usb_dev_handle *dev, int requesttype, int request, int value, int index, char *bytes, int size, int timeout); -/* Set/clear LEDs on dediprog */ -#define PASS_ON (0 << 0) -#define PASS_OFF (1 << 0) -#define BUSY_ON (0 << 1) -#define BUSY_OFF (1 << 1) -#define ERROR_ON (0 << 2) -#define ERROR_OFF (1 << 2) -static int current_led_status = -1; - +/* This function sets the GPIOs connected to the LEDs as well as IO1-IO4. */ static int dediprog_set_leds(int leds) { - int ret, target_leds; - - if (leds < 0 || leds > 7) - leds = 0; // Bogus value, enable all LEDs - - if (leds == current_led_status) - return 0; + if (leds < LED_NONE || leds > LED_ALL) + leds = LED_ALL; /* Older Dediprogs with 2.x.x and 3.x.x firmware only had * two LEDs, and they were reversed. So map them around if @@ -103,23 +101,21 @@ static int dediprog_set_leds(int leds) * bit 2 == 0: green light is on. * bit 0 == 0: red light is on. */ + int target_leds; if (dediprog_firmwareversion < FIRMWARE_VERSION(5,0,0)) { - target_leds = ((leds & ERROR_OFF) >> 2) | - ((leds & PASS_OFF) << 2); + target_leds = ((leds & LED_ERROR) >> 2) | + ((leds & LED_PASS) << 2); } else { target_leds = leds; } - ret = usb_control_msg(dediprog_handle, 0x42, 0x07, 0x09, target_leds, - NULL, 0x0, DEFAULT_TIMEOUT); + target_leds ^= 7; + int ret = usb_control_msg(dediprog_handle, 0x42, 0x07, 0x09, target_leds, NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { - msg_perr("Command Set LED 0x%x failed (%s)!\n", - leds, usb_strerror()); + msg_perr("Command Set LED 0x%x failed (%s)!\n", leds, usb_strerror()); return 1; } - current_led_status = leds; - return 0; } @@ -271,26 +267,22 @@ static int dediprog_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int residue = start % chunksize ? chunksize - start % chunksize : 0; unsigned int bulklen; - dediprog_set_leds(PASS_OFF|BUSY_ON|ERROR_OFF); + dediprog_set_leds(LED_BUSY); if (residue) { msg_pdbg("Slow read for partial block from 0x%x, length 0x%x\n", start, residue); ret = spi_read_chunked(flash, buf, start, residue, 16); - if (ret) { - dediprog_set_leds(PASS_OFF|BUSY_OFF|ERROR_ON); - return ret; - } + if (ret) + goto err; } /* Round down. */ bulklen = (len - residue) / chunksize * chunksize; ret = dediprog_spi_bulk_read(flash, buf + residue, start + residue, bulklen); - if (ret) { - dediprog_set_leds(PASS_OFF|BUSY_OFF|ERROR_ON); - return ret; - } + if (ret) + goto err; len -= residue + bulklen; if (len) { @@ -298,14 +290,15 @@ static int dediprog_spi_read(struct flashctx *flash, uint8_t *buf, start, len); ret = spi_read_chunked(flash, buf + residue + bulklen, start + residue + bulklen, len, 16); - if (ret) { - dediprog_set_leds(PASS_OFF|BUSY_OFF|ERROR_ON); - return ret; - } + if (ret) + goto err; } - dediprog_set_leds(PASS_ON|BUSY_OFF|ERROR_OFF); + dediprog_set_leds(LED_PASS); return 0; +err: + dediprog_set_leds(LED_ERROR); + return ret; } /* Bulk write interface, will write multiple chunksize byte chunks aligned to chunksize bytes. @@ -383,7 +376,7 @@ static int dediprog_spi_write(struct flashctx *flash, const uint8_t *buf, unsigned int residue = start % chunksize ? chunksize - start % chunksize : 0; unsigned int bulklen; - dediprog_set_leds(PASS_OFF|BUSY_ON|ERROR_OFF); + dediprog_set_leds(LED_BUSY); if (chunksize != 256) { msg_pdbg("Page sizes other than 256 bytes are unsupported as " @@ -398,7 +391,7 @@ static int dediprog_spi_write(struct flashctx *flash, const uint8_t *buf, /* No idea about the real limit. Maybe 12, maybe more. */ ret = spi_write_chunked(flash, buf, start, residue, 12); if (ret) { - dediprog_set_leds(PASS_OFF|BUSY_OFF|ERROR_ON); + dediprog_set_leds(LED_ERROR); return ret; } } @@ -406,10 +399,10 @@ static int dediprog_spi_write(struct flashctx *flash, const uint8_t *buf, /* Round down. */ bulklen = (len - residue) / chunksize * chunksize; ret = dediprog_spi_bulk_write(flash, buf + residue, chunksize, start + residue, bulklen, dedi_spi_cmd); - if (ret) { - dediprog_set_leds(PASS_OFF|BUSY_OFF|ERROR_ON); - return ret; - } + if (ret) + dediprog_set_leds(LED_ERROR); + else + dediprog_set_leds(LED_PASS); len -= residue + bulklen; if (len) { @@ -418,12 +411,12 @@ static int dediprog_spi_write(struct flashctx *flash, const uint8_t *buf, ret = spi_write_chunked(flash, buf + residue + bulklen, start + residue + bulklen, len, 12); if (ret) { - dediprog_set_leds(PASS_OFF|BUSY_OFF|ERROR_ON); + dediprog_set_leds(LED_ERROR); return ret; } } - dediprog_set_leds(PASS_ON|BUSY_OFF|ERROR_OFF); + dediprog_set_leds(LED_PASS); return 0; } @@ -781,6 +774,8 @@ static int dediprog_shutdown(void *data) return 1; #endif + dediprog_firmwareversion = FIRMWARE_VERSION(0, 0, 0); + /* URB 28. Command Set SPI Voltage to 0. */ if (dediprog_set_spi_voltage(0x0)) return 1; @@ -918,23 +913,25 @@ int dediprog_init(void) if (register_shutdown(dediprog_shutdown, NULL)) return 1; - dediprog_set_leds(PASS_ON|BUSY_ON|ERROR_ON); - /* Perform basic setup. */ if (dediprog_setup(target)) { - dediprog_set_leds(PASS_OFF|BUSY_OFF|ERROR_ON); return 1; } + /* Set all possible LEDs as soon as possible to indicate activity. + * Because knowing the firmware version is required to set the LEDs correctly we need to this after + * dediprog_setup() has queried the device and set dediprog_firmwareversion. */ + dediprog_set_leds(LED_ALL); + /* After setting voltage and speed, perform setup again. */ if (dediprog_set_spi_voltage(0) || dediprog_set_spi_speed(spispeed_idx) || dediprog_setup(target)) { - dediprog_set_leds(PASS_OFF|BUSY_OFF|ERROR_ON); + dediprog_set_leds(LED_ERROR); return 1; } /* URB 11. Command Set SPI Voltage. */ if (dediprog_set_spi_voltage(millivolt)) { - dediprog_set_leds(PASS_OFF|BUSY_OFF|ERROR_ON); + dediprog_set_leds(LED_ERROR); return 1; } @@ -946,7 +943,7 @@ int dediprog_init(void) dediprog_do_stuff(); #endif - dediprog_set_leds(PASS_OFF|BUSY_OFF|ERROR_OFF); + dediprog_set_leds(LED_NONE); return 0; } -- Kind regards, Stefan Tauner

6 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom June 2015