- flashrom - mail.coreboot.org

[commit] r1924 - trunk
by repository service 07 Feb '16

07 Feb '16

Author: stefanct Date: Sun Feb 7 04:35:04 2016 New Revision: 1924 URL: http://flashrom.org/trac/flashrom/changeset/1924 Log: Fix compilation on non-i386 architectures on OpenBSD. We use a header for MSR accesses on AMD Geodes that does only exist on 32 bit x86 machines. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/physmap.c Modified: trunk/physmap.c ============================================================================== --- trunk/physmap.c Mon Feb 1 01:27:25 2016 (r1923) +++ trunk/physmap.c Sun Feb 7 04:35:04 2016 (r1924) @@ -457,7 +457,7 @@ /* Clear MSR file descriptor. */ fd_msr = -1; } -#elif defined(__OpenBSD__) /* This does only work for certain AMD Geode LX systems see amdmsr(4). */ +#elif defined(__OpenBSD__) && defined (__i386__) /* This does only work for certain AMD Geode LX systems see amdmsr(4). */ #include <sys/ioctl.h> #include <machine/amdmsr.h>

1 0

Cannot compile flashrom for windows
by Bio 03 Feb '16

03 Feb '16

Hello, I'm having trouble with flashrom, i have a working ft2232 board and i correctly connected a spi flash on it on port A I also correctly installed the libusb drivers for the board So i found a compiled version of flashrom for windows v0.9.6.1-r1705 I run it with this command flashrom -p ft2232_spi:type=2232H,port=A And i get this: flashrom v0.9.6.1-r1704 on Windows 6.1 (x86) flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. No EEPROM/flash device found. Note: flashrom can never write if the flash chip isn't found automatically. I then decided to try port B, so i wired the flash chip on port B and used this command flashrom -p ft2232_spi:type=2232H,port=B And i get this: flashrom v0.9.6.1-r1704 on Windows 6.1 (x86) flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Unable to reset FTDI device (USB device unavailable). Unable to set latency timer (USB device unavailable). Unable to set bitmode to SPI (USB device unavailable). ftdi_write_data: -666, USB device unavailable Error: Programmer initialization failed. The chip i'm trying to work with is a MACRONIX_MX25L25635F, specified in the flashchips.h line 478 of the source code v0.9.8 #define MACRONIX_MX25L25635F 0x2019 /* Same as MX25L25639F, but the latter seems to not support REMS */ So i decided to cross compile the new version 0.9.8 for windows thinking that maybe the v0.9.6.1 doesn't recognise my chip ? Anyway i installed mingw and used msys64 to get all the packages and update everything correctly, i also put the libusb and libftdi in the bin, lib and include directory, i think everything is installed correctly but... When i try to compileflashrom with make i get this error $ make Files don't seem to be under version control. Replacing all version templates with 0.9.8-r1888. Package libftdi was not found in the pkg-config search path. Perhaps you should add the directory containing `libftdi.pc' to the PKG_CONFIG_PATH environment variable No package 'libftdi' found Checking for a C compiler... found. Target arch is x86 Target OS is MinGW Checking for libusb-0.1/libusb-compat headers... found. Checking if libusb-0.1 is usable... yes. Checking for FTDI support... found. Checking for FT232H support in libftdi... not found. Checking for utsname support... not found. make[1]: Entering directory `/c/flashrom/util/ich_descriptors_tool' make[1]: Nothing to be done for `all'. make[1]: Leaving directory `/c/flashrom/util/ich_descriptors_tool' And if i try with make CC=i686-w64-mingw32-gcc i get this error $ make CC=i686-w64-mingw32-gcc Files don't seem to be under version control. Replacing all version templates with 0.9.8-r1888. Package libftdi was not found in the pkg-config search path. Perhaps you should add the directory containing `libftdi.pc' to the PKG_CONFIG_PATH environment variable No package 'libftdi' found Checking for a C compiler... found. Target arch is x86 Target OS is MinGW Checking for libusb-0.1/libusb-compat headers... In file included from c:/MinGW/i686-w64-mingw32/include/stddef.h:7:0, from c:/MinGW/lib/gcc/i686-w64-mingw32/5.2.0/include/stddef.h:1, from c:/MinGW/include/stdlib.h:22, from c:/MinGW/include/lusb0_usb.h:4, from .test.c:3: c:/MinGW/i686-w64-mingw32/include/crtdefs.h:123:19: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'typedef' __MINGW_EXTENSION typedef __int64 __time64_t; ^ c:/MinGW/i686-w64-mingw32/include/crtdefs.h:138:9: error: unknown type name '__time64_t' typedef __time64_t time_t; ^ not found. Please install libusb-0.1 headers or libusb-compat headers. See README for more information. make: *** [hwlibs] Error 1 Could you help me out to compile le latest version of flashrom please ? Thanks a lot for reading me Best regards

3 2

[PATCH] Add flash chip definition for ESI ES25P40 and ES25P80
by Hatim Kanchwala 02 Feb '16

02 Feb '16

Signed-off-by: Hatim Kanchwala <hatim(a)hatimak.me> -- Index: flashchips.c =================================================================== --- flashchips.c (revision 1919) +++ flashchips.c (working copy) @@ -5273,4 +5273,67 @@ { + .vendor = "ESI", + .name = "ES25P40", + .bustype = BUS_SPI, + .manufacture_id = EXCEL_ID_NOPREFIX, + .model_id = EXCEL_ES25P40, + .total_size = 512, + .page_size = 256, + /* 256-byte paramter page separate from memory array */ + /* Supports read (0x53), fast read (0x5B), erase (0xD5) and program (0x52) parameter page instructions. */ + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 8} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .printlock = spi_prettyprint_status_register_bp2_srwd, + .unlock = spi_disable_blockprotect_bp2_srwd, + .write = spi_chip_write_256, + .read = spi_chip_read, /* Fast Read (0x0B) supported */ + .voltage = {2700, 3600}, + }, + + + { + .vendor = "ESI", + .name = "ES25P80", + .bustype = BUS_SPI, + .manufacture_id = EXCEL_ID_NOPREFIX, + .model_id = EXCEL_ES25P80, + .total_size = 1024, + .page_size = 256, + /* 256-byte paramter page separate from memory array */ + /* Supports read (0x53), fast read (0x5B), erase (0xD5) and program (0x52) parameter page instructions. */ + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 16} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .printlock = spi_prettyprint_status_register_bp2_srwd, + .unlock = spi_disable_blockprotect_bp2_srwd, + .write = spi_chip_write_256, + .read = spi_chip_read, /* Fast Read (0x0B) supported */ + .voltage = {2700, 3600}, + }, + + { .vendor = "Fujitsu", .name = "MBM29F004BC", -- Regards, Hatim Kanchwala http://hatimak.me B. Tech. Electrical Engineering Indian Institute of Technology Patna

2 3

Re: [flashrom] image size
by Stefan Tauner 01 Feb '16

01 Feb '16

On Mon, 25 Jan 2016 22:37:18 +0000 Simon Ramage <freeballsdeuce(a)yahoo.co.uk> wrote: > Hello, hope you can help me, I have bricked my chromebox, been using a > pomona clip via a raspberry pi on my spi, running flashrom, which finds my > winbond chip but when i try to write to it, flashrom comes back with an > error saying "image size (4096 B) doesn't match the flash chip's size > (8388608 B)!" That would mean that you try to write a 4 kB file to an 8 MB flash chip. flashrom won't allow that for good reasons. It seems like you are confusing two files IMHO. The 4 kB file is probably just the flash descriptor but that alone is probably not what you want to write. > and when i go to the properties of the image it is similar to > the chip's size. I certainly doubt that. It is more likely that you are comparing something else than flashrom does (i.e. you are looking at the wrong file). > Have tried using hex editor on windows and flashing that > format but keep getting same error message, hope you can help me with > regard to this, thankyou. You probably want to use a pre-built image by John Lewis. They should have the correct size... -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 2

[commit] r1923 - trunk
by repository service 01 Feb '16

01 Feb '16

Author: stefanct Date: Mon Feb 1 01:27:25 2016 New Revision: 1923 URL: http://flashrom.org/trac/flashrom/changeset/1923 Log: Add support for ESI ES25P40, ES25P80 and ES25P16. Signed-off-by: Hatim Kanchwala <hatim(a)hatimak.me> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/flashchips.c Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Mon Feb 1 00:17:35 2016 (r1922) +++ trunk/flashchips.c Mon Feb 1 01:27:25 2016 (r1923) @@ -5353,6 +5353,99 @@ }, { + .vendor = "ESI", + .name = "ES25P40", + .bustype = BUS_SPI, + .manufacture_id = EXCEL_ID_NOPREFIX, + .model_id = EXCEL_ES25P40, + .total_size = 512, + .page_size = 256, + /* 256-byte paramter page separate from memory array: + * supports read (0x53), fast read (0x5B), erase (0xD5) and program (0x52) instructions. */ + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 8} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .printlock = spi_prettyprint_status_register_bp2_srwd, + .unlock = spi_disable_blockprotect_bp2_srwd, + .write = spi_chip_write_256, + .read = spi_chip_read, /* Fast Read (0x0B) supported */ + .voltage = {2700, 3600}, + }, + + { + .vendor = "ESI", + .name = "ES25P80", + .bustype = BUS_SPI, + .manufacture_id = EXCEL_ID_NOPREFIX, + .model_id = EXCEL_ES25P80, + .total_size = 1024, + .page_size = 256, + /* 256-byte paramter page separate from memory array: + * supports read (0x53), fast read (0x5B), erase (0xD5) and program (0x52) instructions. */ + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 16} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .printlock = spi_prettyprint_status_register_bp2_srwd, + .unlock = spi_disable_blockprotect_bp2_srwd, + .write = spi_chip_write_256, + .read = spi_chip_read, /* Fast Read (0x0B) supported */ + .voltage = {2700, 3600}, + }, + + { + .vendor = "ESI", + .name = "ES25P16", + .bustype = BUS_SPI, + .manufacture_id = EXCEL_ID_NOPREFIX, + .model_id = EXCEL_ES25P16, + .total_size = 2 * 1024, + .page_size = 256, + /* 256-byte paramter page separate from memory array: + * supports read (0x53), fast read (0x5B), erase (0xD5) and program (0x52) instructions. */ + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 32} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {2 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .printlock = spi_prettyprint_status_register_bp2_srwd, + .unlock = spi_disable_blockprotect_bp2_srwd, + .write = spi_chip_write_256, + .read = spi_chip_read, /* Fast Read (0x0B) supported */ + .voltage = {2700, 3600}, + }, + + { .vendor = "Fujitsu", .name = "MBM29F004BC", .bustype = BUS_PARALLEL,

1 0

[PATCH] Add flash chip definition for ESI ES25P16
by Hatim Kanchwala 01 Feb '16

01 Feb '16

Signed-off-by: Hatim Kanchwala <hatim(a)hatimak.me> -- Index: flashchips.c =================================================================== --- flashchips.c (revision 1919) +++ flashchips.c (working copy) @@ -5273,4 +5273,35 @@ { + .vendor = "ESI", + .name = "ES25P16", + .bustype = BUS_SPI, + .manufacture_id = EXCEL_ID_NOPREFIX, + .model_id = EXCEL_ES25P16, + .total_size = 2 * 1024, + .page_size = 256, + /* 256-byte paramter page separate from memory array */ + /* Supports read (0x53), fast read (0x5B), erase (0xD5) and program (0x52) parameter page instructions. */ + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 32} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {1024 * 2048, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .printlock = spi_prettyprint_status_register_bp2_srwd, + .unlock = spi_disable_blockprotect_bp2_srwd, + .write = spi_chip_write_256, + .read = spi_chip_read, /* Fast Read (0x0B) supported */ + .voltage = {2700, 3600}, + }, + + { .vendor = "Fujitsu", .name = "MBM29F004BC", -- Regards, Hatim Kanchwala http://hatimak.me B. Tech. Electrical Engineering Indian Institute of Technology Patna

2 1

Re: [flashrom] Not detecting Am29F010 using 3Com PCI nic
by Stefan Tauner 01 Feb '16

01 Feb '16

On Sat, 1 Aug 2015 08:34:58 +0200 "Ignatius Grippa" <ignatiusgrippa(a)gmx.com> wrote: > I found a solution that works. > I changed the AM29F010A/B entry inside flashchips.c > Under ".feature_bits" I removed FEATURE_ADDR_2AA leaving only FEATURE_EITHER_RESET, After recompiling, flashrom now detects my Am29F010 and it also successfully reads and writes! > I'm not a programmer so I can't explain why this works but it does. Hi, that feature flag changes the behavior of the probe command and is exactly what was needed to get the AM29F010 version to work, thanks for digging this up. I have created a patch that splits the old definition into two, which allows to distinguish the chips. I'd be glad if you could test it if you still have the hardware. The patch is attached. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 1

[commit] r1922 - trunk
by repository service 01 Feb '16

01 Feb '16

Author: stefanct Date: Mon Feb 1 00:17:35 2016 New Revision: 1922 URL: http://flashrom.org/trac/flashrom/changeset/1922 Log: Separate Am29F0xx from Am29F0xxA/B definitions. The earlier versions of the chip require 0x2AAA for probes thus split the definitions and set them to untested to provoke reports. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/flashchips.c trunk/flashchips.h Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Sun Jan 31 23:10:29 2016 (r1921) +++ trunk/flashchips.c Mon Feb 1 00:17:35 2016 (r1922) @@ -59,14 +59,41 @@ { .vendor = "AMD", + .name = "Am29F010", + .bustype = BUS_PARALLEL, + .manufacture_id = AMD_ID, + .model_id = AMD_AM29F010, + .total_size = 128, + .page_size = 16 * 1024, + .feature_bits = FEATURE_SHORT_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {16 * 1024, 8} }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {128 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + .voltage = {4500, 5500}, + }, + + { + .vendor = "AMD", .name = "Am29F010A/B", .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, - .model_id = AMD_AM29F010B, /* Same as Am29F010A */ + .model_id = AMD_AM29F010, .total_size = 128, .page_size = 16 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PRE, + .tested = TEST_UNTESTED, .probe = probe_jedec, .probe_timing = TIMING_ZERO, .block_erasers = @@ -177,10 +204,37 @@ { .vendor = "AMD", + .name = "Am29F040", + .bustype = BUS_PARALLEL, + .manufacture_id = AMD_ID, + .model_id = AMD_AM29F040, + .total_size = 512, + .page_size = 64 * 1024, + .feature_bits = FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 8} }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + .voltage = {4500, 5500}, + }, + + { + .vendor = "AMD", .name = "Am29F040B", .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, - .model_id = AMD_AM29F040B, + .model_id = AMD_AM29F040, .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, @@ -204,10 +258,37 @@ { .vendor = "AMD", + .name = "Am29F080", + .bustype = BUS_PARALLEL, + .manufacture_id = AMD_ID, + .model_id = AMD_AM29F080, + .total_size = 1024, + .page_size = 64 * 1024, + .feature_bits = FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 16} }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {1024 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + .voltage = {4500, 5500}, + }, + + { + .vendor = "AMD", .name = "Am29F080B", .bustype = BUS_PARALLEL, .manufacture_id = AMD_ID, - .model_id = AMD_AM29F080B, + .model_id = AMD_AM29F080, .total_size = 1024, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, Modified: trunk/flashchips.h ============================================================================== --- trunk/flashchips.h Sun Jan 31 23:10:29 2016 (r1921) +++ trunk/flashchips.h Mon Feb 1 00:17:35 2016 (r1922) @@ -64,9 +64,9 @@ #define AMD_AM29F004BB 0x7B #define AMD_AM29F004BT 0x77 #define AMD_AM29F016D 0xAD -#define AMD_AM29F010B 0x20 /* Same as Am29F010A */ -#define AMD_AM29F040B 0xA4 -#define AMD_AM29F080B 0xD5 +#define AMD_AM29F010 0x20 /* Same as Am29F010A and Am29F010B */ +#define AMD_AM29F040 0xA4 /* Same as AM29F040B */ +#define AMD_AM29F080 0xD5 /* Same as Am29F080B */ #define AMD_AM29F200BB 0x57 #define AMD_AM29F200BT 0x51 #define AMD_AM29F400BB 0xAB

1 0

Re: [flashrom] [PATCH] Add infrastructure to support libusb-1.0.
by Stefan Tauner 31 Jan '16

31 Jan '16

On Wed, 27 Jan 2016 03:20:53 +0200 Urja Rannikko <urjaman(a)gmail.com> wrote: > With manpage improvements and all :) no really i had trouble finding > stuff to comment on, > most of this I cant really test right now, but i know it builds and > LGTM (and the older version I did test on linux and windows, so...) > > Acked-by: Urja Rannikko <urjaman(a)gmail.com> Thanks, r1920 -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1921 - trunk
by repository service 31 Jan '16

31 Jan '16

Author: stefanct Date: Sun Jan 31 23:10:29 2016 New Revision: 1921 URL: http://flashrom.org/trac/flashrom/changeset/1921 Log: Add support for WCH CH341A as an SPI programmer. Signed-off-by: Urja Rannikko <urjaman(a)gmail.com> Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Urja Rannikko <urjaman(a)gmail.com> Added: trunk/ch341a_spi.c (contents, props changed) Modified: trunk/Makefile trunk/flashrom.8.tmpl trunk/flashrom.c trunk/programmer.h Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Jan 31 23:10:14 2016 (r1920) +++ trunk/Makefile Sun Jan 31 23:10:29 2016 (r1921) @@ -157,7 +157,7 @@ else override CONFIG_PONY_SPI = no endif -# Dediprog, USB-Blaster, PICkit2 and FT2232 are not supported under DOS (missing USB support). +# Dediprog, USB-Blaster, PICkit2, CH341A and FT2232 are not supported under DOS (missing USB support). ifeq ($(CONFIG_DEDIPROG), yes) UNSUPPORTED_FEATURES += CONFIG_DEDIPROG=yes else @@ -178,6 +178,11 @@ else override CONFIG_PICKIT2_SPI = no endif +ifeq ($(CONFIG_CH341A_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_CH341A_SPI=yes +else +override CONFIG_CH341A_SPI = no +endif endif # FIXME: Should we check for Cygwin/MSVC as well? @@ -303,7 +308,7 @@ else override CONFIG_PONY_SPI = no endif -# Dediprog, USB-Blaster, PICkit2 and FT2232 are not supported with libpayload (missing libusb support) +# Dediprog, USB-Blaster, PICkit2, CH341A and FT2232 are not supported with libpayload (missing libusb support) ifeq ($(CONFIG_DEDIPROG), yes) UNSUPPORTED_FEATURES += CONFIG_DEDIPROG=yes else @@ -324,6 +329,11 @@ else override CONFIG_PICKIT2_SPI = no endif +ifeq ($(CONFIG_CH341A_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_CH341A_SPI=yes +else +override CONFIG_CH341A_SPI = no +endif endif ifneq ($(TARGET_OS), Linux) @@ -505,6 +515,9 @@ # Always enable ITE IT8212F PATA controllers for now. CONFIG_IT8212 ?= yes +# Winchiphead CH341A +CONFIG_CH341A_SPI ?= yes + # Disable wiki printing by default. It is only useful if you have wiki access. CONFIG_PRINT_WIKI ?= no @@ -751,6 +764,12 @@ PROGRAMMER_OBJS += mstarddc_spi.o endif +ifeq ($(CONFIG_CH341A_SPI), yes) +FEATURE_CFLAGS += -D'CONFIG_CH341A_SPI=1' +PROGRAMMER_OBJS += ch341a_spi.o +NEED_LIBUSB1 := yes +endif + ifeq ($(NEED_SERIAL), yes) LIB_OBJS += serial.o endif Added: trunk/ch341a_spi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/ch341a_spi.c Sun Jan 31 23:10:29 2016 (r1921) @@ -0,0 +1,535 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2011 asbokid <ballymunboy(a)gmail.com> + * Copyright (C) 2014 Pluto Yang <yangyj.ee(a)gmail.com> + * Copyright (C) 2015-2016 Stefan Tauner + * Copyright (C) 2015 Urja Rannikko <urjaman(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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <string.h> +#include <libusb.h> +#include "flash.h" +#include "programmer.h" + +/* LIBUSB_CALL ensures the right calling conventions on libusb callbacks. + * However, the macro is not defined everywhere. m( + */ +#ifndef LIBUSB_CALL +#define LIBUSB_CALL +#endif + +#define USB_TIMEOUT 1000 /* 1000 ms is plenty and we have no backup strategy anyway. */ +#define WRITE_EP 0x02 +#define READ_EP 0x82 + +#define CH341_PACKET_LENGTH 0x20 +#define CH341_MAX_PACKETS 256 +#define CH341_MAX_PACKET_LEN (CH341_PACKET_LENGTH * CH341_MAX_PACKETS) + +#define CH341A_CMD_SET_OUTPUT 0xA1 +#define CH341A_CMD_IO_ADDR 0xA2 +#define CH341A_CMD_PRINT_OUT 0xA3 +#define CH341A_CMD_SPI_STREAM 0xA8 +#define CH341A_CMD_SIO_STREAM 0xA9 +#define CH341A_CMD_I2C_STREAM 0xAA +#define CH341A_CMD_UIO_STREAM 0xAB + +#define CH341A_CMD_I2C_STM_START 0x74 +#define CH341A_CMD_I2C_STM_STOP 0x75 +#define CH341A_CMD_I2C_STM_OUT 0x80 +#define CH341A_CMD_I2C_STM_IN 0xC0 +#define CH341A_CMD_I2C_STM_MAX ( min( 0x3F, CH341_PACKET_LENGTH ) ) +#define CH341A_CMD_I2C_STM_SET 0x60 // bit 2: SPI with two data pairs D5,D4=out, D7,D6=in +#define CH341A_CMD_I2C_STM_US 0x40 +#define CH341A_CMD_I2C_STM_MS 0x50 +#define CH341A_CMD_I2C_STM_DLY 0x0F +#define CH341A_CMD_I2C_STM_END 0x00 + +#define CH341A_CMD_UIO_STM_IN 0x00 +#define CH341A_CMD_UIO_STM_DIR 0x40 +#define CH341A_CMD_UIO_STM_OUT 0x80 +#define CH341A_CMD_UIO_STM_US 0xC0 +#define CH341A_CMD_UIO_STM_END 0x20 + +#define CH341A_STM_I2C_20K 0x00 +#define CH341A_STM_I2C_100K 0x01 +#define CH341A_STM_I2C_400K 0x02 +#define CH341A_STM_I2C_750K 0x03 +#define CH341A_STM_SPI_DBL 0x04 + + +/* Number of parallel IN transfers. 32 seems to produce the most stable throughput on Windows. */ +#define USB_IN_TRANSFERS 32 + +/* We need to use many queued IN transfers for any resemblance of performance (especially on Windows) + * because USB spec says that transfers end on non-full packets and the device sends the 31 reply + * data bytes to each 32-byte packet with command + 31 bytes of data... */ +static struct libusb_transfer *transfer_out = NULL; +static struct libusb_transfer *transfer_ins[USB_IN_TRANSFERS] = {0}; + +/* Accumulate delays to be plucked between CS deassertion and CS assertions. */ +static unsigned int stored_delay_us = 0; + +static struct libusb_device_handle *handle = NULL; + +const struct dev_entry devs_ch341a_spi[] = { + {0x1A86, 0x5512, OK, "Winchiphead (WCH)", "CH341A"}, + + {0}, +}; + +enum trans_state {TRANS_ACTIVE = -2, TRANS_ERR = -1, TRANS_IDLE = 0}; + +static void print_hex(const void *buf, size_t len) +{ + size_t i; + for (i = 0; i < len; i++) { + msg_pspew(" %02x", ((uint8_t *)buf)[i]); + if (i % CH341_PACKET_LENGTH == CH341_PACKET_LENGTH - 1) + msg_pspew("\n"); + } +} + +static void cb_common(const char *func, struct libusb_transfer *transfer) +{ + int *transfer_cnt = (int*)transfer->user_data; + + if (transfer->status == LIBUSB_TRANSFER_CANCELLED) { + /* Silently ACK and exit. */ + *transfer_cnt = TRANS_IDLE; + return; + } + + if (transfer->status != LIBUSB_TRANSFER_COMPLETED) { + msg_perr("\n%s: error: %s\n", func, libusb_error_name(transfer->status)); + *transfer_cnt = TRANS_ERR; + } else { + *transfer_cnt = transfer->actual_length; + } +} + +/* callback for bulk out async transfer */ +static void LIBUSB_CALL cb_out(struct libusb_transfer *transfer) +{ + cb_common(__func__, transfer); +} + +/* callback for bulk in async transfer */ +static void LIBUSB_CALL cb_in(struct libusb_transfer *transfer) +{ + cb_common(__func__, transfer); +} + +static int32_t usb_transfer(const char *func, unsigned int writecnt, unsigned int readcnt, const uint8_t *writearr, uint8_t *readarr) +{ + if (handle == NULL) + return -1; + + int state_out = TRANS_IDLE; + transfer_out->buffer = (uint8_t*)writearr; + transfer_out->length = writecnt; + transfer_out->user_data = &state_out; + + /* Schedule write first */ + if (writecnt > 0) { + state_out = TRANS_ACTIVE; + int ret = libusb_submit_transfer(transfer_out); + if (ret) { + msg_perr("%s: failed to submit OUT transfer: %s\n", func, libusb_error_name(ret)); + state_out = TRANS_ERR; + goto err; + } + } + + /* Handle all asynchronous packets as long as we have stuff to write or read. The write(s) simply need + * to complete but we need to scheduling reads as long as we are not done. */ + unsigned int free_idx = 0; /* The IN transfer we expect to be free next. */ + unsigned int in_idx = 0; /* The IN transfer we expect to be completed next. */ + unsigned int in_done = 0; + unsigned int in_active = 0; + unsigned int out_done = 0; + uint8_t *in_buf = readarr; + int state_in[USB_IN_TRANSFERS] = {0}; + do { + /* Schedule new reads as long as there are free transfers and unscheduled bytes to read. */ + while ((in_done + in_active) < readcnt && state_in[free_idx] == TRANS_IDLE) { + unsigned int cur_todo = min(CH341_PACKET_LENGTH - 1, readcnt - in_done - in_active); + transfer_ins[free_idx]->length = cur_todo; + transfer_ins[free_idx]->buffer = in_buf; + transfer_ins[free_idx]->user_data = &state_in[free_idx]; + int ret = libusb_submit_transfer(transfer_ins[free_idx]); + if (ret) { + state_in[free_idx] = TRANS_ERR; + msg_perr("%s: failed to submit IN transfer: %s\n", + func, libusb_error_name(ret)); + goto err; + } + in_buf += cur_todo; + in_active += cur_todo; + state_in[free_idx] = TRANS_ACTIVE; + free_idx = (free_idx + 1) % USB_IN_TRANSFERS; /* Increment (and wrap around). */ + } + + /* Actually get some work done. */ + libusb_handle_events_timeout(NULL, &(struct timeval){1, 0}); + + /* Check for the write */ + if (out_done < writecnt) { + if (state_out == TRANS_ERR) { + goto err; + } else if (state_out > 0) { + out_done += state_out; + state_out = TRANS_IDLE; + } + } + /* Check for completed transfers. */ + while (state_in[in_idx] != TRANS_IDLE && state_in[in_idx] != TRANS_ACTIVE) { + if (state_in[in_idx] == TRANS_ERR) { + goto err; + } + /* If a transfer is done, record the number of bytes read and reuse it later. */ + in_done += state_in[in_idx]; + in_active -= state_in[in_idx]; + state_in[in_idx] = TRANS_IDLE; + in_idx = (in_idx + 1) % USB_IN_TRANSFERS; /* Increment (and wrap around). */ + } + } while ((out_done < writecnt) || (in_done < readcnt)); + + if (out_done > 0) { + msg_pspew("Wrote %d bytes:\n", out_done); + print_hex(writearr, out_done); + msg_pspew("\n\n"); + } + if (in_done > 0) { + msg_pspew("Read %d bytes:\n", in_done); + print_hex(readarr, in_done); + msg_pspew("\n\n"); + } + return 0; +err: + /* Clean up on errors. */ + msg_perr("%s: Failed to %s %d bytes\n", func, (state_out == TRANS_ERR) ? "write" : "read", + (state_out == TRANS_ERR) ? writecnt : readcnt); + /* First, we must cancel any ongoing requests and wait for them to be canceled. */ + if ((writecnt > 0) && (state_out == TRANS_ACTIVE)) { + if (libusb_cancel_transfer(transfer_out) != 0) + state_out = TRANS_ERR; + } + if (readcnt > 0) { + unsigned int i; + for (i = 0; i < USB_IN_TRANSFERS; i++) { + if (state_in[i] == TRANS_ACTIVE) + if (libusb_cancel_transfer(transfer_ins[i]) != 0) + state_in[i] = TRANS_ERR; + } + } + + /* Wait for cancellations to complete. */ + while (1) { + bool finished = true; + if ((writecnt > 0) && (state_out == TRANS_ACTIVE)) + finished = false; + if (readcnt > 0) { + unsigned int i; + for (i = 0; i < USB_IN_TRANSFERS; i++) { + if (state_in[i] == TRANS_ACTIVE) + finished = false; + } + } + if (finished) + break; + libusb_handle_events_timeout(NULL, &(struct timeval){1, 0}); + } + return -1; +} + +/* Set the I2C bus speed (speed(b1b0): 0 = 20kHz; 1 = 100kHz, 2 = 400kHz, 3 = 750kHz). + * Set the SPI bus data width (speed(b2): 0 = Single, 1 = Double). */ +static int32_t config_stream(uint32_t speed) +{ + if (handle == NULL) + return -1; + + uint8_t buf[] = { + CH341A_CMD_I2C_STREAM, + CH341A_CMD_I2C_STM_SET | (speed & 0x7), + CH341A_CMD_I2C_STM_END + }; + + int32_t ret = usb_transfer(__func__, sizeof(buf), 0, buf, NULL); + if (ret < 0) { + msg_perr("Could not configure stream interface.\n"); + } + return ret; +} + +/* ch341 requires LSB first, swap the bit order before send and after receive */ +static uint8_t swap_byte(uint8_t x) +{ + x = ((x >> 1) & 0x55) | ((x << 1) & 0xaa); + x = ((x >> 2) & 0x33) | ((x << 2) & 0xcc); + x = ((x >> 4) & 0x0f) | ((x << 4) & 0xf0); + return x; +} + +/* The assumed map between UIO command bits, pins on CH341A chip and pins on SPI chip: + * UIO CH341A SPI CH341A SPI name + * 0 D0/15 CS/1 (CS0) + * 1 D1/16 unused (CS1) + * 2 D2/17 unused (CS2) + * 3 D3/18 SCK/6 (DCK) + * 4 D4/19 unused (DOUT2) + * 5 D5/20 SI/5 (DOUT) + * - The UIO stream commands seem to only have 6 bits of output, and D6/D7 are the SPI inputs, + * mapped as follows: + * D6/21 unused (DIN2) + * D7/22 SO/2 (DIN) + */ +static int32_t enable_pins(bool enable) +{ + uint8_t buf[] = { + CH341A_CMD_UIO_STREAM, + CH341A_CMD_UIO_STM_OUT | 0x37, // CS high (all of them), SCK=0, DOUT*=1 + CH341A_CMD_UIO_STM_DIR | (enable ? 0x3F : 0x00), // Interface output enable / disable + CH341A_CMD_UIO_STM_END, + }; + + int32_t ret = usb_transfer(__func__, sizeof(buf), 0, buf, NULL); + if (ret < 0) { + msg_perr("Could not %sable output pins.\n", enable ? "en" : "dis"); + } + return ret; +} + +/* De-assert and assert CS in one operation. */ +static void pluck_cs(uint8_t *ptr) +{ + /* This was measured to give a minumum deassertion time of 2.25 us, + * >20x more than needed for most SPI chips (100ns). */ + int delay_cnt = 2; + if (stored_delay_us) { + delay_cnt = (stored_delay_us * 4) / 3; + stored_delay_us = 0; + } + *ptr++ = CH341A_CMD_UIO_STREAM; + *ptr++ = CH341A_CMD_UIO_STM_OUT | 0x37; /* deasserted */ + int i; + for (i = 0; i < delay_cnt; i++) + *ptr++ = CH341A_CMD_UIO_STM_OUT | 0x37; /* "delay" */ + *ptr++ = CH341A_CMD_UIO_STM_OUT | 0x36; /* asserted */ + *ptr++ = CH341A_CMD_UIO_STM_END; +} + +void ch341a_spi_delay(unsigned int usecs) +{ + /* There is space for 28 bytes instructions of 750 ns each in the CS packet (32 - 4 for the actual CS + * instructions), thus max 21 us, but we avoid getting too near to this boundary and use + * internal_delay() for durations over 20 us. */ + if ((usecs + stored_delay_us) > 20) { + unsigned int inc = 20 - stored_delay_us; + internal_delay(usecs - inc); + usecs = inc; + } + stored_delay_us += usecs; +} + +static int ch341a_spi_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) +{ + if (handle == NULL) + return -1; + + /* How many packets ... */ + const size_t packets = (writecnt + readcnt + CH341_PACKET_LENGTH - 2) / (CH341_PACKET_LENGTH - 1); + + /* We pluck CS/timeout handling into the first packet thus we need to allocate one extra package. */ + uint8_t wbuf[packets+1][CH341_PACKET_LENGTH]; + uint8_t rbuf[writecnt + readcnt]; + /* Initialize the write buffer to zero to prevent writing random stack contents to device. */ + memset(wbuf[0], 0, CH341_PACKET_LENGTH); + + uint8_t *ptr = wbuf[0]; + /* CS usage is optimized by doing both transitions in one packet. + * Final transition to deselected state is in the pin disable. */ + pluck_cs(ptr); + unsigned int write_left = writecnt; + unsigned int read_left = readcnt; + unsigned int p; + for (p = 0; p < packets; p++) { + unsigned int write_now = min(CH341_PACKET_LENGTH - 1, write_left); + unsigned int read_now = min ((CH341_PACKET_LENGTH - 1) - write_now, read_left); + ptr = wbuf[p+1]; + *ptr++ = CH341A_CMD_SPI_STREAM; + unsigned int i; + for (i = 0; i < write_now; ++i) + *ptr++ = swap_byte(*writearr++); + if (read_now) { + memset(ptr, 0xFF, read_now); + read_left -= read_now; + } + write_left -= write_now; + } + + int32_t ret = usb_transfer(__func__, CH341_PACKET_LENGTH + packets + writecnt + readcnt, + writecnt + readcnt, wbuf[0], rbuf); + if (ret < 0) + return -1; + + unsigned int i; + for (i = 0; i < readcnt; i++) { + *readarr++ = swap_byte(rbuf[writecnt + i]); + } + + return 0; +} + +static const struct spi_master spi_master_ch341a_spi = { + .type = SPI_CONTROLLER_CH341A_SPI, + /* flashrom's current maximum is 256 B. CH341A was tested on Linux and Windows to accept atleast + * 128 kB. Basically there should be no hard limit because transfers are broken up into USB packets + * sent to the device and most of their payload streamed via SPI. */ + .max_data_read = 4 * 1024, + .max_data_write = 4 * 1024, + .command = ch341a_spi_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, +}; + +static int ch341a_spi_shutdown(void *data) +{ + if (handle == NULL) + return -1; + + enable_pins(false); + libusb_free_transfer(transfer_out); + transfer_out = NULL; + int i; + for (i = 0; i < USB_IN_TRANSFERS; i++) { + libusb_free_transfer(transfer_ins[i]); + transfer_ins[i] = NULL; + } + libusb_release_interface(handle, 0); + libusb_close(handle); + libusb_exit(NULL); + handle = NULL; + return 0; +} + +int ch341a_spi_init(void) +{ + if (handle != NULL) { + msg_cerr("%s: handle already set! Please report a bug at flashrom(a)flashrom.org\n", __func__); + return -1; + } + + int32_t ret = libusb_init(NULL); + if (ret < 0) { + msg_perr("Couldnt initialize libusb!\n"); + return -1; + } + + libusb_set_debug(NULL, 3); // Enable information, warning and error messages (only). + + uint16_t vid = devs_ch341a_spi[0].vendor_id; + uint16_t pid = devs_ch341a_spi[0].device_id; + handle = libusb_open_device_with_vid_pid(NULL, vid, pid); + if (handle == NULL) { + msg_perr("Couldn't open device %04x:%04x.\n", vid, pid); + return -1; + } + +/* libusb_detach_kernel_driver() and friends basically only work on Linux. We simply try to detach on Linux + * without a lot of passion here. If that works fine else we will fail on claiming the interface anyway. */ +#if IS_LINUX + ret = libusb_detach_kernel_driver(handle, 0); + if (ret == LIBUSB_ERROR_NOT_SUPPORTED) { + msg_pwarn("Detaching kernel drivers is not supported. Further accesses may fail.\n"); + } else if (ret != 0 && ret != LIBUSB_ERROR_NOT_FOUND) { + msg_pwarn("Failed to detach kernel driver: '%s'. Further accesses will probably fail.\n", + libusb_error_name(ret)); + } +#endif + + ret = libusb_claim_interface(handle, 0); + if (ret != 0) { + msg_perr("Failed to claim interface 0: '%s'\n", libusb_error_name(ret)); + goto close_handle; + } + + struct libusb_device *dev; + if (!(dev = libusb_get_device(handle))) { + msg_perr("Failed to get device from device handle.\n"); + goto close_handle; + } + + 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 release_interface; + } + + msg_pdbg("Device revision is %d.%01d.%01d\n", + (desc.bcdDevice >> 8) & 0x00FF, + (desc.bcdDevice >> 4) & 0x000F, + (desc.bcdDevice >> 0) & 0x000F); + + /* Allocate and pre-fill transfer structures. */ + transfer_out = libusb_alloc_transfer(0); + if (!transfer_out) { + msg_perr("Failed to alloc libusb OUT transfer\n"); + goto release_interface; + } + int i; + for (i = 0; i < USB_IN_TRANSFERS; i++) { + transfer_ins[i] = libusb_alloc_transfer(0); + if (transfer_ins[i] == NULL) { + msg_perr("Failed to alloc libusb IN transfer %d\n", i); + goto dealloc_transfers; + } + } + /* We use these helpers but dont fill the actual buffer yet. */ + libusb_fill_bulk_transfer(transfer_out, handle, WRITE_EP, NULL, 0, cb_out, NULL, USB_TIMEOUT); + for (i = 0; i < USB_IN_TRANSFERS; i++) + libusb_fill_bulk_transfer(transfer_ins[i], handle, READ_EP, NULL, 0, cb_in, NULL, USB_TIMEOUT); + + if ((config_stream(CH341A_STM_I2C_100K) < 0) || (enable_pins(true) < 0)) + goto dealloc_transfers; + + register_shutdown(ch341a_spi_shutdown, NULL); + register_spi_master(&spi_master_ch341a_spi); + + return 0; + +dealloc_transfers: + for (i = 0; i < USB_IN_TRANSFERS; i++) { + if (transfer_ins[i] == NULL) + break; + libusb_free_transfer(transfer_ins[i]); + transfer_ins[i] = NULL; + } + libusb_free_transfer(transfer_out); + transfer_out = NULL; +release_interface: + libusb_release_interface(handle, 0); +close_handle: + libusb_close(handle); + handle = NULL; + return -1; +} Modified: trunk/flashrom.8.tmpl ============================================================================== --- trunk/flashrom.8.tmpl Sun Jan 31 23:10:14 2016 (r1920) +++ trunk/flashrom.8.tmpl Sun Jan 31 23:10:29 2016 (r1921) @@ -271,6 +271,8 @@ .sp .BR "* pickit2_spi" " (for SPI flash ROMs accessible via Microchip PICkit2)" .sp +.BR "* ch341a_spi" " (for SPI flash ROMs attached to WCH CH341A)" +.sp Some programmers have optional or mandatory parameters which are described in detail in the .B PROGRAMMER-SPECIFIC INFORMATION @@ -1019,6 +1021,10 @@ parameter, once the flash read/write operation you intended to perform has completed successfully. .sp Please also note that the mstarddc_spi driver only works on Linux. +.SS +.BR "ch341a_spi " programmer +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. .SH EXAMPLES To back up and update your BIOS, run .sp @@ -1078,6 +1084,9 @@ .BR dediprog ", " ft2232_spi ", " usbblaster_spi " and " pickit2_spi need access to the respective USB device via libusb API version 0.1. .sp +.BR ch341a_spi +needs access to the respective USB device via libusb API version 1.0. +.sp .B dummy needs no access permissions at all. .sp @@ -1085,7 +1094,8 @@ .BR gfxnvidia ", " drkaiser ", " satasii ", " satamv ", " atahpt ", " atavia " and " atapromise have to be run as superuser/root, and need additional raw access permission. .sp -.BR serprog ", " buspirate_spi ", " dediprog ", " usbblaster_spi ", " ft2232_spi " and " pickit2_spi +.BR serprog ", " buspirate_spi ", " dediprog ", " usbblaster_spi ", " ft2232_spi ", " pickit2_spi " and " \ +ch341a_spi can be run as normal user on most operating systems if appropriate device permissions are set. .sp Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sun Jan 31 23:10:14 2016 (r1920) +++ trunk/flashrom.c Sun Jan 31 23:10:29 2016 (r1921) @@ -392,6 +392,18 @@ }, #endif +#if CONFIG_CH341A_SPI == 1 + { + .name = "ch341a_spi", + .type = USB, + .devs.dev = devs_ch341a_spi, + .init = ch341a_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = ch341a_spi_delay, + }, +#endif + {0}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Sun Jan 31 23:10:14 2016 (r1920) +++ trunk/programmer.h Sun Jan 31 23:10:29 2016 (r1921) @@ -108,6 +108,9 @@ #if CONFIG_PICKIT2_SPI == 1 PROGRAMMER_PICKIT2_SPI, #endif +#if CONFIG_CH341A_SPI == 1 + PROGRAMMER_CH341A_SPI, +#endif PROGRAMMER_INVALID /* This must always be the last entry. */ }; @@ -526,6 +529,13 @@ int dediprog_init(void); #endif +/* ch341a_spi.c */ +#if CONFIG_CH341A_SPI == 1 +int ch341a_spi_init(void); +void ch341a_spi_delay(unsigned int usecs); +extern const struct dev_entry devs_ch341a_spi[]; +#endif + /* flashrom.c */ struct decode_sizes { uint32_t parallel; @@ -585,6 +595,9 @@ #if CONFIG_PICKIT2_SPI == 1 SPI_CONTROLLER_PICKIT2, #endif +#if CONFIG_CH341A_SPI == 1 + SPI_CONTROLLER_CH341A_SPI, +#endif }; #define MAX_DATA_UNSPECIFIED 0

1 0

[commit] r1920 - trunk
by repository service 31 Jan '16

31 Jan '16

Author: stefanct Date: Sun Jan 31 23:10:14 2016 New Revision: 1920 URL: http://flashrom.org/trac/flashrom/changeset/1920 Log: Add infrastructure to support libusb-1.0. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Urja Rannikko <urjaman(a)gmail.com> Modified: trunk/Makefile trunk/flashrom.8.tmpl Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Jan 24 23:37:10 2016 (r1919) +++ trunk/Makefile Sun Jan 31 23:10:14 2016 (r1920) @@ -794,6 +794,23 @@ USBLIBS := $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" ; $(PKG_CONFIG) --libs libusb || printf "%s" "-lusb") endif +ifeq ($(NEED_LIBUSB1), yes) +CHECK_LIBUSB1 = yes +FEATURE_CFLAGS += -D'NEED_LIBUSB1=1' +# FreeBSD and DragonflyBSD use a reimplementation of libusb-1.0 that is simply called libusb +ifeq ($(TARGET_OS),$(filter $(TARGET_OS),FreeBSD DragonFlyBSD)) +USB1LIBS += -lusb +else +ifeq ($(TARGET_OS),NetBSD) +CPPFLAGS += -I/usr/pkg/include/libusb-1.0 +USB1LIBS += -lusb-1.0 +else +USB1LIBS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; pkg-config --libs libusb-1.0 || printf "%s" "-lusb-1.0") +CPPFLAGS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; pkg-config --cflags-only-I libusb-1.0 || printf "%s" "-I/usr/include/libusb-1.0") +endif +endif +endif + ifeq ($(CONFIG_PRINT_WIKI), yes) FEATURE_CFLAGS += -D'CONFIG_PRINT_WIKI=1' CLI_OBJS += print_wiki.o @@ -813,7 +830,7 @@ endif $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) - $(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) + $(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) libflashrom.a: $(LIBFLASHROM_OBJS) $(AR) rcs $@ $^ @@ -934,6 +951,20 @@ endef export LIBUSB0_TEST + +define LIBUSB1_TEST +#include <stddef.h> +#include <libusb.h> +int main(int argc, char **argv) +{ + (void)argc; + (void)argv; + libusb_init(NULL); + return 0; +} +endef +export LIBUSB1_TEST + hwlibs: compiler @printf "" > .libdeps ifeq ($(CHECK_LIBPCI), yes) @@ -981,6 +1012,24 @@ echo "See README for more information."; echo; \ rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 @rm -f .test.c .test.o .test$(EXEC_SUFFIX) +endif +ifeq ($(CHECK_LIBUSB1), yes) + @printf "Checking for libusb-1.0 headers... " | tee -a $(BUILD_DETAILS_FILE) + @echo "$$LIBUSB1_TEST" > .test.c + @printf "\nexec: %s\n" "$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o" >>$(BUILD_DETAILS_FILE) + @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ + echo "found." || { echo "not found."; echo; \ + echo "Please install libusb-1.0 headers."; \ + echo "See README for more information."; echo; \ + rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 + @printf "Checking if libusb-1.0 is usable... " | tee -a $(BUILD_DETAILS_FILE) + @printf "\nexec: %s\n" "$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USB1LIBS)" >>$(BUILD_DETAILS_FILE) + @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USB1LIBS) >&2 && \ + echo "yes." || { echo "no."; \ + echo "Please install libusb-1.0."; \ + echo "See README for more information."; echo; \ + rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 + @rm -f .test.c .test.o .test$(EXEC_SUFFIX) endif .features: features Modified: trunk/flashrom.8.tmpl ============================================================================== --- trunk/flashrom.8.tmpl Sun Jan 24 23:37:10 2016 (r1919) +++ trunk/flashrom.8.tmpl Sun Jan 31 23:10:14 2016 (r1920) @@ -1076,7 +1076,7 @@ needs userspace access to a serial port. .sp .BR dediprog ", " ft2232_spi ", " usbblaster_spi " and " pickit2_spi -need access to the USB device via libusb. +need access to the respective USB device via libusb API version 0.1. .sp .B dummy needs no access permissions at all.

1 0

W836xx: your board name: flashrom -V
by Glen Davis 31 Jan '16

31 Jan '16

flashrom v0.9.6.1-r1705 on Linux 3.14.27-100.fc19.i686 (i686) flashrom is free software, get the source code at http://www.flashrom.org flashrom was built with libpci 3.2.0, GCC 4.8.1 20130717 (Red Hat 4.8.1-5), little endian Command line (1 args): flashrom -V Using default programmer "internal". Calibrating delay loop... OS timer resolution is 2 usecs, 491M loops per second, 10 myus = 11 us, 100 myus = 100 us, 1000 myus = 1001 us, 10000 myus = 10666 us, 8 myus = 9 us, OK. Initializing internal programmer No coreboot table found. DMI string system-manufacturer: "HP" DMI string system-product-name: "ProLiant DL145 G2" DMI string system-version: "-1 " DMI string baseboard-manufacturer: "Wistron Corporation" DMI string baseboard-product-name: "K85NL" DMI string baseboard-version: "-1 " DMI string chassis-type: "Main Server Chassis" W836xx enter config mode worked or we were already in config mode. W836xx leave config mode had no effect. Active config mode, unknown reg 0x20 ID: 35. Please send the output of "flashrom -V" to flashrom(a)flashrom.org with W836xx: your board name: flashrom -V as the subject to help us finish support for your Super I/O. Thanks. Found chipset "NVIDIA CK804" with PCI ID 10de:0051. Enabling flash write... OK. The following protocols are supported: Non-SPI. Probing for AMD Am29F010A/B, 128 kB: probe_jedec_common: id1 0xeb, id2 0xfd, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F002(N)BB, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F002(N)BT, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F016D, 2048 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F040B, 512 kB: probe_jedec_common: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F080B, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV001BB, 128 kB: probe_jedec_common: id1 0xeb, id2 0xfd, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV001BT, 128 kB: probe_jedec_common: id1 0xeb, id2 0xfd, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV002BB, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV002BT, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV004BB, 512 kB: probe_jedec_common: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV004BT, 512 kB: probe_jedec_common: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV008BB, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV008BT, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV040B, 512 kB: probe_jedec_common: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV081B, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A29002B, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A29002T, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A29040B, 512 kB: probe_jedec_common: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A49LF040A, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Atmel AT29C512, 64 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Atmel AT29C010A, 128 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Atmel AT29C020, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Atmel AT29C040A, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Atmel AT49BV512, 64 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Atmel AT49F002(N), 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Atmel AT49F002(N)T, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Atmel AT49(H)F010, 128 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Atmel AT49F020, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Atmel AT49F040, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Eon EN29F002(A)(N)B, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Eon EN29F002(A)(N)T, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Eon EN29LV640B, 8192 kB: probe_en29lv640b: id1 0xffff, id2 0x00ff Probing for Fujitsu MBM29F004BC, 512 kB: probe_jedec_common: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F004TC, 512 kB: probe_jedec_common: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F400BC, 512 kB: probe_m29f400bt: id1 0x66, id2 0xe0 Probing for Fujitsu MBM29F400TC, 512 kB: probe_m29f400bt: id1 0x66, id2 0xe0 Probing for Hyundai HY29F002T, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Hyundai HY29F002B, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Hyundai HY29F040A, 512 kB: probe_jedec_common: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F001BN/BX-B, 128 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Intel 28F001BN/BX-T, 128 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Intel 28F002BC/BL/BV/BX-T, 256 kB: probe_82802ab: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F008S3/S5/SC, 512 kB: probe_82802ab: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F004B5/BE/BV/BX-B, 512 kB: probe_82802ab: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F004B5/BE/BV/BX-T, 512 kB: probe_82802ab: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F400BV/BX/CE/CV-B, 512 kB: probe_82802ab: id1 0x66, id2 0xe0, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F400BV/BX/CE/CV-T, 512 kB: probe_82802ab: id1 0x66, id2 0xe0, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AB, 512 kB: probe_82802ab: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AC, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F001B, 128 kB: probe_jedec_common: id1 0xeb, id2 0xfd, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F001T, 128 kB: probe_jedec_common: id1 0xeb, id2 0xfd, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F002(N)B, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F002(N)T, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F040, 512 kB: probe_jedec_common: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29LV040, 512 kB: probe_jedec_common: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29C51000B, 64 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for MoselVitelic V29C51000T, 64 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for MoselVitelic V29C51400B, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for MoselVitelic V29C51400T, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for MoselVitelic V29LC51000, 64 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for MoselVitelic V29LC51001, 128 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for MoselVitelic V29LC51002, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for PMC Pm29F002T, 256 kB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm29F002B, 256 kB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV010, 128 kB: probe_jedec_common: id1 0xeb, id2 0xfd, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV020, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV040, 512 kB: probe_jedec_common: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV512, 64 kB: probe_jedec_common: id1 0x4e, id2 0x41, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm49FL002, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for PMC Pm49FL004, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Sharp LH28F008BJT-BTLZ1, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Sharp LHF00L04, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST28SF040A, 512 kB: probe_82802ab: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST29EE010, 128 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST29LE010, 128 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST29EE020A, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST29LE020, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST39SF512, 64 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST39SF010A, 128 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST39SF020A, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST39SF040, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST39VF512, 64 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST39VF010, 128 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST39VF020, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST39VF040, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST39VF080, 1024 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST49LF002A/B, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST49LF003A/B, 384 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST49LF004A/B, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST49LF004C, 512 kB: probe_82802ab: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF008A, 1024 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST49LF008C, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF016C, 2048 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF020, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST49LF020A, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST49LF040, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST49LF040B, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SST SST49LF080A, 1024 kB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0xbf, id2 0x5b Found SST flash chip "SST49LF080A" (1024 kB, LPC) at physical address 0xfff00000. Probing for SST SST49LF160C, 2048 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F002B, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F002T/NT, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F040B, 512 kB: probe_jedec_common: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F400BB, 512 kB: probe_m29f400bt: id1 0x66, id2 0xe0 Probing for ST M29F400BT, 512 kB: probe_m29f400bt: id1 0x66, id2 0xe0 Probing for ST M29W010B, 128 kB: probe_jedec_common: id1 0xeb, id2 0xfd, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29W040B, 512 kB: probe_jedec_common: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29W512B, 64 kB: probe_jedec_common: id1 0x4e, id2 0x41, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040A, 512 kB: probe_82802ab: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040B, 512 kB: probe_82802ab: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080A, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080B, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW002, 256 kB: probe_82802ab: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW016, 2048 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW040, 512 kB: probe_82802ab: id1 0x66, id2 0x76, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW080, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50LPW116, 2048 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51001B, 128 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SyncMOS/MoselVitelic {F,S,V}29C51001T, 128 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SyncMOS/MoselVitelic {F,S,V}29C51002B, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SyncMOS/MoselVitelic {F,S,V}29C51002T, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SyncMOS/MoselVitelic {F,S,V}29C51004B, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SyncMOS/MoselVitelic {F,S,V}29C51004T, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SyncMOS/MoselVitelic {S,V}29C31004B, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for SyncMOS/MoselVitelic {S,V}29C31004T, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for TI TMS29F002RB, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for TI TMS29F002RT, 256 kB: probe_jedec_common: id1 0x5c, id2 0xbc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W29C010(M)/W29C011A/W29EE011/W29EE012-old, 128 kB: Old Winbond W29* probe method disabled because the probing sequence puts the AMIC A49LF040A in a funky state. Use 'flashrom -c W29C010(M)/W29C011A/W29EE011/W29EE012-old' if you have a board with such a chip. Probing for Winbond W29C010(M)/W29C011A/W29EE011/W29EE012, 128 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W29C020(C)/W29C022, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W29C040/P, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W39F010, 128 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W39L010, 128 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W39L020, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W39L040, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W39V040A, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W39V040B, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W39V040C, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W39V040FA, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W39V040FB, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W39V040FC, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W39V080A, 1024 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W49F002U/N, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W49F020, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W49V002A, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W49V002FA, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W39V080FA, 1024 kB: probe_jedec_common: id1 0xbf, id2 0x5b Probing for Winbond W39V080FA (dual mode), 512 kB: probe_jedec_common: id1 0xbf, id2 0x5b Found SST flash chip "SST49LF080A" (1024 kB, LPC). No operations were specified. Restoring PCI config space for 00:01:0 reg 0x6d

1 0

Re: [flashrom] [v3,2/2] ENE KB9012 EC flashrom patch - Bug report
by Paul Kocialkowski 31 Jan '16

31 Jan '16

Le samedi 30 janvier 2016 à 19:50 +0100, Idwer Vollering a écrit : > 2016-01-30 19:06 GMT+01:00 John Brown <multitor4(a)gmail.com>: > > Good day! I applied your most recent KB9012 flashrom patch to the > > latest > > flashrom copy, and tried to compile it for testing with my KB9012 > > chip. > > However, I have encountered the following error: > > > > flashchips.c:3209:19: error: 'FEATURE_ERASED_ZERO' undeclared here > > (not in a > > function) > > .feature_bits = FEATURE_ERASED_ZERO, > > ^ > > make: *** [flashchips.o] Error 1 > > > > FEATURE_ERASED_ZERO is not declared anywhere, neither in latest > > flashrom > > revisions, nor in older flashrom revisions. Dont know why nobody > > noticed > > this problem before me... > > It is defined in a pending patch: > http://www.flashrom.org/pipermail/flashrom/2015-November/013969.html That's right, that patch is indeed needed. My tree is at: http://git.code.paulk.fr/gitweb/?p=flashrom.git;a=shortl og;h=refs/heads/next (next branch) > > > > Then, I thought it could be a good idea to replace this undeclared > > value > > with zero: > > .feature_bits = 0, > > FEATURE_ERASED_ZERO definitely does not equal 0. That feature is required to properly program the chip, indeed! -- Paul Kocialkowski, Replicant developer Replicant is a fully free Android distribution running on several devices, a free software mobile operating system putting the emphasis on freedom and privacy/security. Website: https://www.replicant.us/ Blog: https://blog.replicant.us/ Wiki/tracker/forums: https://redmine.replicant.us/

1 0

W836xx: your board name: flashrom -V
by Christopher M. Penalver 30 Jan '16

30 Jan '16

You may already be aware, but I wanted to post as this was advised as per the flashrom program. sudo flashrom -V -p internal flashrom v0.9.7-r1852 on Linux 4.3.0-7-generic (x86_64) flashrom is free software, get the source code at http://www.flashrom.org flashrom was built with libpci 3.3.1, GCC 5.2.1 20151022, little endian Command line (3 args): flashrom -V -p internal Calibrating delay loop... OS timer resolution is 1 usecs, 3029M loops per second, delay more than 10% too short (got 84% of expected delay), recalculating... 3199M loops per second, delay more than 10% too short (got 89% of expected delay), recalculating... 3097M loops per second, delay more than 10% too short (got 87% of expected delay), recalculating... 2844M loops per second, delay more than 10% too short (got 89% of expected delay), recalculating... 3143M loops per second, delay loop is unreliable, trying to continue 10 myus = 10 us, 100 myus = 93 us, 1000 myus = 1325 us, 10000 myus = 11085 us, 4 myus = 5 us, OK. Initializing internal programmer No coreboot table found. Using Internal DMI decoder. DMI string chassis-type: "Notebook" Laptop detected via DMI. DMI string system-manufacturer: "TOSHIBA" DMI string system-product-name: "Satellite S55-C" DMI string system-version: "PSPTJU-006005" DMI string baseboard-manufacturer: "FF50 " DMI string baseboard-product-name: "06F1 " DMI string baseboard-version: "Type2 - Board Version" W836xx enter config mode worked or we were already in config mode. W836xx leave config mode had no effect. Active config mode, unknown reg 0x20 ID: fc. Please send the output of "flashrom -V -p internal" to flashrom(a)flashrom.org with W836xx: your board name: flashrom -V as the subject to help us finish support for your Super I/O. Thanks. ======================================================================== WARNING! You seem to be running flashrom on an unsupported laptop. Laptops, notebooks and netbooks are difficult to support and we recommend to use the vendor flashing utility. The embedded controller (EC) in these machines often interacts badly with flashing. See the manpage and http://www.flashrom.org/Laptops for details. If flash is shared with the EC, erase is guaranteed to brick your laptop and write may brick your laptop. Read and probe may irritate your EC and cause fan failure, backlight failure and sudden poweroff. You have been warned. ======================================================================== Aborting. Error: Programmer initialization failed. Christopher M. Penalver E-Mail: christopher.m.penalver(a)gmail.com

1 0

Re: [flashrom] [v3,2/2] ENE KB9012 EC flashrom patch - Bug report
by Idwer Vollering 30 Jan '16

30 Jan '16

2016-01-30 19:06 GMT+01:00 John Brown <multitor4(a)gmail.com>: > Good day! I applied your most recent KB9012 flashrom patch to the latest > flashrom copy, and tried to compile it for testing with my KB9012 chip. > However, I have encountered the following error: > > flashchips.c:3209:19: error: 'FEATURE_ERASED_ZERO' undeclared here (not in a > function) > .feature_bits = FEATURE_ERASED_ZERO, > ^ > make: *** [flashchips.o] Error 1 > > FEATURE_ERASED_ZERO is not declared anywhere, neither in latest flashrom > revisions, nor in older flashrom revisions. Dont know why nobody noticed > this problem before me... It is defined in a pending patch: http://www.flashrom.org/pipermail/flashrom/2015-November/013969.html > > Then, I thought it could be a good idea to replace this undeclared value > with zero: > .feature_bits = 0, FEATURE_ERASED_ZERO definitely does not equal 0.

1 0

[v3,2/2] ENE KB9012 EC flashrom patch - Bug report
by John Brown 30 Jan '16

30 Jan '16

Good day! I applied your most recent KB9012 flashrom patch to the latest flashrom copy, and tried to compile it for testing with my KB9012 chip. However, I have encountered the following error: flashchips.c:3209:19: error: 'FEATURE_ERASED_ZERO' undeclared here (not in a function) .feature_bits = FEATURE_ERASED_ZERO, ^ make: *** [flashchips.o] Error 1 FEATURE_ERASED_ZERO is not declared anywhere, neither in latest flashrom revisions, nor in older flashrom revisions. Dont know why nobody noticed this problem before me... Then, I thought it could be a good idea to replace this undeclared value with zero: .feature_bits = 0, Flashrom compiled successfully after this change, but unfortunately it cannot properly detect KB9012 chip that is attached to Bus Pirate through KB9012 adapter. Important log part is attached below (interesting, why it has not printed RDID stuff while probing for ENE KB9012) ... Probing for Atmel AT45DB642D, 8192 kB: RDID byte 0 parity violation. probe_spi_rdid_generic: id1 0xff, id2 0xffff Probing for ENE KB9012 (EDI), 128 kB: Probing for ESMT F25L008A, 1024 kB: RDID byte 0 parity violation. probe_spi_rdid_generic: id1 0xff, id2 0xffff Probing for ESMT F25L32PA, 4096 kB: RDID byte 0 parity violation. probe_spi_rdid_generic: id1 0xff, id2 0xffff ... Probing for Generic unknown SPI chip (REMS), 0 kB: probe_spi_rems: id1 0x7f, id2 0xff Found Generic flash chip "unknown SPI chip (REMS)" (0 kB, SPI) on buspirate_spi. Found Generic flash chip "unknown SPI chip (REMS)" (0 kB, SPI). === This flash part has status NOT WORKING for operations: PROBE READ ERASE WRITE The test status of this chip may have been updated in the latest development version of flashrom. If you are running the latest development version, please email a report to flashrom(a)flashrom.org if any of the above operations work correctly for you with this flash chip. Please include the flashrom log file for all operations you tested (see the man page for details), and mention which mainboard or programmer you tested in the subject line. Thanks for your help! Read is not working on this chip. Continuing anyway. flashrom has no read function for this flash chip. Aborting. Raw bitbang mode version 1 Bus Pirate shutdown completed.

1 0

[PATCH] Fix compilation on non-i386 architectures on OpenBSD.
by Stefan Tauner 30 Jan '16

30 Jan '16

We use a header for MSR accesses on AMD Geodes that does only exist on 32 bit x86 machines. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- physmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) I have not checked other uses of MSRs in flashrom... are there any? Could we use the FreeBSD code path for them or even completely instead the current Geode-specific implementation? diff --git a/physmap.c b/physmap.c index ca5afd0..a261ccd 100644 --- a/physmap.c +++ b/physmap.c @@ -457,7 +457,7 @@ void cleanup_cpu_msr(void) /* Clear MSR file descriptor. */ fd_msr = -1; } -#elif defined(__OpenBSD__) /* This does only work for certain AMD Geode LX systems see amdmsr(4). */ +#elif defined(__OpenBSD__) && defined (__i386__) /* This does only work for certain AMD Geode LX systems see amdmsr(4). */ #include <sys/ioctl.h> #include <machine/amdmsr.h> -- Kind regards, Stefan Tauner

1 0

W836xx:MS-9121: flashrom -V
by Ohm Base 29 Jan '16

29 Jan '16

flashrom v0.9.6.1-r1563 on Linux 3.13.0-76-generic (i686) flashrom is free software, get the source code at http://www.flashrom.org flashrom was built with libpci 3.1.9, GCC 4.7.1, little endian Command line (3 args): flashrom -p internal -V Calibrating delay loop... OS timer resolution is 1 usecs, 1639M loops per second, 10 myus = 10 us, 100 myus = 247 us, 1000 myus = 2459 us, 10000 myus = 12874 us, 4 myus = 4 us, OK. Initializing internal programmer No coreboot table found. DMI string system-manufacturer: "IBM" DMI string system-product-name: "-[622122U]-" DMI string system-version: " 1.0" DMI string baseboard-manufacturer: "IBM" DMI string baseboard-product-name: "MS-9121" DMI string baseboard-version: " 1.0" DMI string chassis-type: "Tower" W836xx enter config mode worked or we were already in config mode. W836xx leave config mode had no effect. Active config mode, unknown reg 0x20 ID: e9. Please send the output of "flashrom -V" to flashrom(a)flashrom.org with W836xx: your board name: flashrom -V as the subject to help us finish support for your Super I/O. Thanks. Found chipset "Intel ICH4/ICH4-L" with PCI ID 8086:24c0. Enabling flash write... BIOS Lock Enable: disabled, BIOS Write Enable: disabled, BIOS_CNTL is 0x0 OK. The following protocols are supported: FWH. Probing for Atmel AT49LH002, 256 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AB, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AC, 1024 kB: probe_82802ab: id1 0x49, id2 0x4d, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm49FL002, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5a Probing for PMC Pm49FL004, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5a Probing for Sharp LHF00L04, 1024 kB: probe_82802ab: id1 0x49, id2 0x4d, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF002A/B, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5a Probing for SST SST49LF003A/B, 384 kB: probe_jedec_common: id1 0xbf, id2 0x5a Probing for SST SST49LF004A/B, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5a Probing for SST SST49LF004C, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF008A, 1024 kB: probe_jedec_common: id1 0xbf, id2 0x5a Found SST flash chip "SST49LF008A" (1024 kB, FWH) at physical address 0xfff00000. Lock status for 0x000000 (size 0x010000) is 01, write locked Lock status for 0x010000 (size 0x010000) is 01, write locked Lock status for 0x020000 (size 0x010000) is 01, write locked Lock status for 0x030000 (size 0x010000) is 01, write locked Lock status for 0x040000 (size 0x010000) is 01, write locked Lock status for 0x050000 (size 0x010000) is 01, write locked Lock status for 0x060000 (size 0x010000) is 01, write locked Lock status for 0x070000 (size 0x010000) is 01, write locked Lock status for 0x080000 (size 0x010000) is 01, write locked Lock status for 0x090000 (size 0x010000) is 01, write locked Lock status for 0x0a0000 (size 0x010000) is 01, write locked Lock status for 0x0b0000 (size 0x010000) is 01, write locked Lock status for 0x0c0000 (size 0x010000) is 01, write locked Lock status for 0x0d0000 (size 0x010000) is 01, write locked Lock status for 0x0e0000 (size 0x010000) is 01, write locked Lock status for 0x0f0000 (size 0x010000) is 01, write locked Probing for SST SST49LF008C, 1024 kB: probe_82802ab: id1 0x49, id2 0x4d, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF016C, 2048 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040A, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040B, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080A, 1024 kB: probe_82802ab: id1 0x49, id2 0x4d, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080B, 1024 kB: probe_82802ab: id1 0x49, id2 0x4d, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW002, 256 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW016, 2048 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW040, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW080, 1024 kB: probe_82802ab: id1 0x49, id2 0x4d, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040FA, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5a Probing for Winbond W39V040FB, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5a Probing for Winbond W39V040FC, 512 kB: probe_jedec_common: id1 0xbf, id2 0x5a Probing for Winbond W49V002FA, 256 kB: probe_jedec_common: id1 0xbf, id2 0x5a Probing for Winbond W39V080FA, 1024 kB: probe_jedec_common: id1 0xbf, id2 0x5a Probing for Winbond W39V080FA (dual mode), 512 kB: probe_jedec_common: id1 0xbf, id2 0x5a Found SST flash chip "SST49LF008A" (1024 kB, FWH). No operations were specified. Restoring PCI config space for 00:1f:0 reg 0x4e

1 0

Re: [flashrom] [PATCH] Add infrastructure to support libusb-1.0.
by Urja Rannikko 27 Jan '16

27 Jan '16

Hi, On Tue, Jan 19, 2016 at 1:23 AM, Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> wrote: > Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> > --- > Makefile | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- > flashrom.8.tmpl | 2 +- > 2 files changed, 51 insertions(+), 2 deletions(-) > > I have added some quirks for the BSDs and refined the test case: > I previously forgot to include stddef.h to import NULL. > On FreeBSD and DragonFlyBSD there is a tool available called pkgconf > that is similar to pkg-config but it must be installed explicitly > and the default shell does not support export etc... I don't think > it is worth it at the moment. > > diff --git a/Makefile b/Makefile > index b4c6d86..5f4a1b6 100644 > --- a/Makefile > +++ b/Makefile > @@ -783,6 +783,23 @@ FEATURE_CFLAGS += -D'NEED_USB=1' > USBLIBS := $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" ; $(PKG_CONFIG) --libs libusb || printf "%s" "-lusb") > endif > > +ifeq ($(NEED_LIBUSB1), yes) > +CHECK_LIBUSB1 = yes > +FEATURE_CFLAGS += -D'NEED_LIBUSB1=1' > +# FreeBSD and DragonflyBSD use a reimplementation of libusb-1.0 that is simply called libusb > +ifeq ($(TARGET_OS),$(filter $(TARGET_OS),FreeBSD DragonFlyBSD)) > +USB1LIBS += -lusb > +else > +ifeq ($(TARGET_OS),NetBSD) > +CPPFLAGS += -I/usr/pkg/include/libusb-1.0 > +USB1LIBS += -lusb-1.0 > +else > +USB1LIBS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; pkg-config --libs libusb-1.0 || printf "%s" "-lusb-1.0") > +CPPFLAGS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; pkg-config --cflags-only-I libusb-1.0 || printf "%s" "-I/usr/include/libusb-1.0") > +endif > +endif > +endif > + > ifeq ($(CONFIG_PRINT_WIKI), yes) > FEATURE_CFLAGS += -D'CONFIG_PRINT_WIKI=1' > CLI_OBJS += print_wiki.o > @@ -802,7 +819,7 @@ ifeq ($(ARCH), x86) > endif > > $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) > - $(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) > + $(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) > > libflashrom.a: $(LIBFLASHROM_OBJS) > $(AR) rcs $@ $^ > @@ -923,6 +940,20 @@ int main(int argc, char **argv) > endef > export LIBUSB0_TEST > > + > +define LIBUSB1_TEST > +#include <stddef.h> > +#include <libusb.h> > +int main(int argc, char **argv) > +{ > + (void)argc; > + (void)argv; > + libusb_init(NULL); > + return 0; > +} > +endef > +export LIBUSB1_TEST > + > hwlibs: compiler > @printf "" > .libdeps > ifeq ($(CHECK_LIBPCI), yes) > @@ -971,6 +1002,24 @@ ifeq ($(CHECK_LIBUSB0), yes) > rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 > @rm -f .test.c .test.o .test$(EXEC_SUFFIX) > endif > +ifeq ($(CHECK_LIBUSB1), yes) > + @printf "Checking for libusb-1.0 headers... " | tee -a $(BUILD_DETAILS_FILE) > + @echo "$$LIBUSB1_TEST" > .test.c > + @printf "\nexec: %s\n" "$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o" >>$(BUILD_DETAILS_FILE) > + @{ { { { { $(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >&2 && \ > + echo "found." || { echo "not found."; echo; \ > + echo "Please install libusb-1.0 headers."; \ > + echo "See README for more information."; echo; \ > + rm -f .test.c .test.o; exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 > + @printf "Checking if libusb-1.0 is usable... " | tee -a $(BUILD_DETAILS_FILE) > + @printf "\nexec: %s\n" "$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USB1LIBS)" >>$(BUILD_DETAILS_FILE) > + @{ { { { { $(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USB1LIBS) >&2 && \ > + echo "yes." || { echo "no."; \ > + echo "Please install libusb-1.0."; \ > + echo "See README for more information."; echo; \ > + rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1; }; } 2>>$(BUILD_DETAILS_FILE); echo $? >&3 ; } | tee -a $(BUILD_DETAILS_FILE) >&4; } 3>&1;} | { read rc ; exit ${rc}; } } 4>&1 > + @rm -f .test.c .test.o .test$(EXEC_SUFFIX) > +endif > > .features: features > > diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl > index 517c00e..a7eb9ca 100644 > --- a/flashrom.8.tmpl > +++ b/flashrom.8.tmpl > @@ -1070,7 +1070,7 @@ needs TCP access to the network or userspace access to a serial port. > needs userspace access to a serial port. > .sp > .BR dediprog ", " ft2232_spi ", " usbblaster_spi " and " pickit2_spi > -need access to the USB device via libusb. > +need access to the respective USB device via libusb API version 0.1. With manpage improvements and all :) no really i had trouble finding stuff to comment on, most of this I cant really test right now, but i know it builds and LGTM (and the older version I did test on linux and windows, so...) Acked-by: Urja Rannikko <urjaman(a)gmail.com> -- Urja Rannikko

1 0

Re: [flashrom] [PATCH 3/3] Add support for WCH CH341A as an SPI programmer.
by Urja Rannikko 27 Jan '16

27 Jan '16

Hi, Review-ish... with some only-commentary included too. On Mon, Jan 18, 2016 at 1:28 AM, Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> wrote: > Signed-off-by: Urja Rannikko <urjaman(a)gmail.com> > Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> > --- > Makefile | 23 ++- > ch341a_spi.c | 531 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > flashrom.8.tmpl | 12 +- > flashrom.c | 12 ++ > programmer.h | 13 ++ > 5 files changed, 588 insertions(+), 3 deletions(-) > create mode 100644 ch341a_spi.c > > diff --git a/Makefile b/Makefile > index 6862200..676bb66 100644 > --- a/Makefile > +++ b/Makefile > @@ -157,7 +157,7 @@ UNSUPPORTED_FEATURES += CONFIG_PONY_SPI=yes > else > override CONFIG_PONY_SPI = no > endif > -# Dediprog, USB-Blaster, PICkit2 and FT2232 are not supported under DOS (missing USB support). > +# Dediprog, USB-Blaster, PICkit2, CH341A and FT2232 are not supported under DOS (missing USB support). > ifeq ($(CONFIG_DEDIPROG), yes) > UNSUPPORTED_FEATURES += CONFIG_DEDIPROG=yes > else > @@ -178,6 +178,11 @@ UNSUPPORTED_FEATURES += CONFIG_PICKIT2_SPI=yes > else > override CONFIG_PICKIT2_SPI = no > endif > +ifeq ($(CONFIG_CH341A_SPI), yes) > +UNSUPPORTED_FEATURES += CONFIG_CH341A_SPI=yes > +else > +override CONFIG_CH341A_SPI = no > +endif > endif > > # FIXME: Should we check for Cygwin/MSVC as well? > @@ -301,7 +306,7 @@ UNSUPPORTED_FEATURES += CONFIG_PONY_SPI=yes > else > override CONFIG_PONY_SPI = no > endif > -# Dediprog, USB-Blaster, PICkit2 and FT2232 are not supported with libpayload (missing libusb support) > +# Dediprog, USB-Blaster, PICkit2, CH341A and FT2232 are not supported with libpayload (missing libusb support) > ifeq ($(CONFIG_DEDIPROG), yes) > UNSUPPORTED_FEATURES += CONFIG_DEDIPROG=yes > else > @@ -322,6 +327,11 @@ UNSUPPORTED_FEATURES += CONFIG_PICKIT2_SPI=yes > else > override CONFIG_PICKIT2_SPI = no > endif > +ifeq ($(CONFIG_CH341A_SPI), yes) > +UNSUPPORTED_FEATURES += CONFIG_CH341A_SPI=yes > +else > +override CONFIG_CH341A_SPI = no > +endif > endif > > ifneq ($(TARGET_OS), Linux) > @@ -500,6 +510,9 @@ CONFIG_LINUX_SPI ?= yes > # Always enable ITE IT8212F PATA controllers for now. > CONFIG_IT8212 ?= yes > > +# Winchiphead CH341A > +CONFIG_CH341A_SPI ?= yes > + > # Disable wiki printing by default. It is only useful if you have wiki access. > CONFIG_PRINT_WIKI ?= no > > @@ -740,6 +753,12 @@ NEED_LINUX_I2C := yes > PROGRAMMER_OBJS += mstarddc_spi.o > endif > > +ifeq ($(CONFIG_CH341A_SPI), yes) > +FEATURE_CFLAGS += -D'CONFIG_CH341A_SPI=1' > +PROGRAMMER_OBJS += ch341a_spi.o > +NEED_LIBUSB1 := yes > +endif > + > ifeq ($(NEED_SERIAL), yes) > LIB_OBJS += serial.o > endif > diff --git a/ch341a_spi.c b/ch341a_spi.c > new file mode 100644 > index 0000000..36282ed > --- /dev/null > +++ b/ch341a_spi.c > @@ -0,0 +1,531 @@ > +/* > + * This file is part of the flashrom project. > + * > + * Copyright (C) 2011 asbokid <ballymunboy(a)gmail.com> > + * Copyright (C) 2014 Pluto Yang <yangyj.ee(a)gmail.com> > + * Copyright (C) 2015-2016 Stefan Tauner > + * Copyright (C) 2015 Urja Rannikko <urjaman(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. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > + */ > + > +#include <string.h> > +#include <libusb.h> > +#include "flash.h" > +#include "programmer.h" > + > +/* LIBUSB_CALL ensures the right calling conventions on libusb callbacks. > + * However, the macro is not defined everywhere. m( > + */ > +#ifndef LIBUSB_CALL > +#define LIBUSB_CALL > +#endif > + > +#define USB_TIMEOUT 1000 /* 1000 ms is plenty and we have no backup strategy anyway. */ > +#define WRITE_EP 0x02 > +#define READ_EP 0x82 > + > +#define CH341_PACKET_LENGTH 0x20 > +#define CH341_MAX_PACKETS 256 > +#define CH341_MAX_PACKET_LEN (CH341_PACKET_LENGTH * CH341_MAX_PACKETS) > + > +#define CH341A_CMD_SET_OUTPUT 0xA1 > +#define CH341A_CMD_IO_ADDR 0xA2 > +#define CH341A_CMD_PRINT_OUT 0xA3 > +#define CH341A_CMD_SPI_STREAM 0xA8 > +#define CH341A_CMD_SIO_STREAM 0xA9 > +#define CH341A_CMD_I2C_STREAM 0xAA > +#define CH341A_CMD_UIO_STREAM 0xAB > + > +#define CH341A_CMD_I2C_STM_START 0x74 > +#define CH341A_CMD_I2C_STM_STOP 0x75 > +#define CH341A_CMD_I2C_STM_OUT 0x80 > +#define CH341A_CMD_I2C_STM_IN 0xC0 > +#define CH341A_CMD_I2C_STM_MAX ( min( 0x3F, CH341_PACKET_LENGTH ) ) > +#define CH341A_CMD_I2C_STM_SET 0x60 // bit 2: SPI with two data pairs D5,D4=out, D7,D6=in > +#define CH341A_CMD_I2C_STM_US 0x40 > +#define CH341A_CMD_I2C_STM_MS 0x50 > +#define CH341A_CMD_I2C_STM_DLY 0x0F > +#define CH341A_CMD_I2C_STM_END 0x00 > + > +#define CH341A_CMD_UIO_STM_IN 0x00 > +#define CH341A_CMD_UIO_STM_DIR 0x40 > +#define CH341A_CMD_UIO_STM_OUT 0x80 > +#define CH341A_CMD_UIO_STM_US 0xC0 > +#define CH341A_CMD_UIO_STM_END 0x20 > + > +#define CH341A_STM_I2C_20K 0x00 > +#define CH341A_STM_I2C_100K 0x01 > +#define CH341A_STM_I2C_400K 0x02 > +#define CH341A_STM_I2C_750K 0x03 > +#define CH341A_STM_SPI_DBL 0x04 > + > + > +/* Number of parallel IN transfers. 32 seems to produce the most stable throughput on Windows. */ > +#define USB_IN_TRANSFERS 32 > + > +/* We need to use many queued IN transfers for any resemblance of performance (especially on Windows) > + * because USB spec says that transfers end on non-full packets and the device sends the 31 reply > + * data bytes to each 32-byte packet with command + 31 bytes of data... */ > +static struct libusb_transfer *transfer_out = NULL; > +static struct libusb_transfer *transfer_ins[USB_IN_TRANSFERS] = {0}; > + > +/* Accumulate delays to be plucked between CS deassertion and CS assertions. */ > +static unsigned int stored_delay_us = 0; > + > +static struct libusb_device_handle *handle = NULL; > + > +const struct dev_entry devs_ch341a_spi[] = { > + {0x1A86, 0x5512, OK, "Winchiphead (WCH)", "CH341A"}, > + > + {0}, > +}; > + > +enum trans_state {TRANS_ACTIVE = -2, TRANS_ERR = -1, TRANS_IDLE = 0}; > + > +static void print_hex(const void *buf, size_t len) > +{ > + size_t i; > + for (i = 0; i < len; i++) { > + msg_pspew(" %02x", ((uint8_t *)buf)[i]); > + if (i % CH341_PACKET_LENGTH == CH341_PACKET_LENGTH - 1) > + msg_pspew("\n"); > + } > +} > + > +static void cb_common(const char *func, struct libusb_transfer *transfer) > +{ > + int *transfer_cnt = (int*)transfer->user_data; > + > + if (transfer->status == LIBUSB_TRANSFER_CANCELLED) { > + /* Silently ACK and exit. */ > + *transfer_cnt = TRANS_IDLE; > + return; > + } > + > + if (transfer->status != LIBUSB_TRANSFER_COMPLETED) { > + msg_perr("\n%s: error: %s\n", func, libusb_error_name(transfer->status)); > + *transfer_cnt = TRANS_ERR; > + } else { > + *transfer_cnt = transfer->actual_length; > + } > +} > + > +/* callback for bulk out async transfer */ > +static void LIBUSB_CALL cb_out(struct libusb_transfer *transfer) > +{ > + cb_common(__func__, transfer); > +} > + > +/* callback for bulk in async transfer */ > +static void LIBUSB_CALL cb_in(struct libusb_transfer *transfer) > +{ > + cb_common(__func__, transfer); > +} > + > +static int32_t usb_transfer(const char *func, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) > +{ > + if (handle == NULL) > + return -1; > + > + int state_out = TRANS_IDLE; > + transfer_out->buffer = (uint8_t*)writearr; > + transfer_out->length = writecnt; > + transfer_out->user_data = &state_out; > + > + /* Schedule write first */ > + if (writecnt > 0) { > + state_out = TRANS_ACTIVE; > + int ret = libusb_submit_transfer(transfer_out); > + if (ret) { > + msg_perr("%s: failed to submit OUT transfer: %s\n", func, libusb_error_name(ret)); > + state_out = TRANS_ERR; > + goto err; > + } > + } > + > + /* Handle all asynchronous packets as long as we have stuff to write or read. The write(s) simply need > + * to complete but we need to scheduling reads as long as we are not done. */ > + unsigned int free_idx = 0; /* The IN transfer we expect to be free next. */ > + unsigned int in_idx = 0; /* The IN transfer we expect to be completed next. */ > + unsigned int in_done = 0; > + unsigned int in_active = 0; > + unsigned int out_done = 0; > + int state_in[USB_IN_TRANSFERS] = {0}; > + do { > + /* Schedule new reads as long as there are free transfers and unscheduled bytes to read. */ > + while ((in_done + in_active) < readcnt && state_in[free_idx] == TRANS_IDLE) { > + unsigned int cur_todo = min(CH341_PACKET_LENGTH - 1, readcnt - in_done - in_active); > + transfer_ins[free_idx]->length = cur_todo; > + transfer_ins[free_idx]->buffer = readarr; > + transfer_ins[free_idx]->user_data = &state_in[free_idx]; > + int ret = libusb_submit_transfer(transfer_ins[free_idx]); > + if (ret) { > + state_in[free_idx] = TRANS_ERR; > + msg_perr("%s: failed to submit IN transfer: %s\n", > + func, libusb_error_name(ret)); > + goto err; > + } > + readarr += cur_todo; > + in_active += cur_todo; > + state_in[free_idx] = TRANS_ACTIVE; > + free_idx = (free_idx + 1) % USB_IN_TRANSFERS; /* Increment (and wrap around). */ Yeah this obvious construct is something I didnt use because I'm such an embedded guy that I'd never ever use % in performance related code... (i think i had some if idx>=USB_IN_TRANSFERS) idx = 0 thing)... thanks for making it saner. > + } > + > + /* Actually get some work done. */ > + libusb_handle_events_timeout(NULL, &(struct timeval){1, 0}); > + > + /* Check for the write */ > + if (out_done < writecnt) { > + if (state_out == TRANS_ERR) { > + goto err; > + } else if (state_out > 0) { > + out_done += state_out; > + state_out = TRANS_IDLE; > + } > + } > + /* Check for completed transfers. */ > + while (state_in[in_idx] != TRANS_IDLE && state_in[in_idx] != TRANS_ACTIVE) { > + if (state_in[in_idx] == TRANS_ERR) { > + goto err; > + } > + /* If a transfer is done, record the number of bytes read and reuse it later. */ > + in_done += state_in[in_idx]; > + in_active -= state_in[in_idx]; > + state_in[in_idx] = TRANS_IDLE; > + in_idx = (in_idx + 1) % USB_IN_TRANSFERS; /* Increment (and wrap around). */ > + } > + } while ((out_done < writecnt) || (in_done < readcnt)); > + > + if (out_done > 0) { > + msg_pspew("Wrote %d bytes:\n", out_done); > + print_hex(writearr, out_done); > + msg_pspew("\n\n"); > + } > + if (in_done > 0) { > + msg_pspew("Read %d bytes:\n", in_done); > + print_hex(readarr, in_done); > + msg_pspew("\n\n"); > + } > + return 0; > +err: > + /* Clean up on errors. */ > + msg_perr("%s: Failed to %s %d bytes\n", func, (state_out == TRANS_ERR) ? "write" : "read", > + (state_out == TRANS_ERR) ? writecnt : readcnt); > + /* First, we must cancel any ongoing requests and wait for them to be canceled. */ > + if ((writecnt > 0) && (state_out == TRANS_ACTIVE)) { > + if (libusb_cancel_transfer(transfer_out) != 0) > + state_out = TRANS_ERR; > + } > + if (readcnt > 0) { > + unsigned int i; > + for (i = 0; i < USB_IN_TRANSFERS; i++) { > + if (state_in[i] == TRANS_ACTIVE) > + if (libusb_cancel_transfer(transfer_ins[i]) != 0) > + state_in[i] = TRANS_ERR; > + } > + } > + > + /* Wait for cancellations to complete. */ > + while (1) { > + bool finished = true; > + if ((writecnt > 0) && (state_out == TRANS_ACTIVE)) > + finished = false; > + if (readcnt > 0) { > + unsigned int i; > + for (i = 0; i < USB_IN_TRANSFERS; i++) { > + if (state_in[i] == TRANS_ACTIVE) > + finished = false; > + } > + } > + if (finished) > + break; > + libusb_handle_events_timeout(NULL, &(struct timeval){1, 0}); > + } > + return -1; > +} > + > +/* Set the I2C bus speed (speed(b1b0): 0 = 20kHz; 1 = 100kHz, 2 = 400kHz, 3 = 750kHz). > + * Set the SPI bus data width (speed(b2): 0 = Single, 1 = Double). */ > +static int32_t config_stream(uint32_t speed) > +{ > + if (handle == NULL) > + return -1; > + > + uint8_t buf[] = { > + CH341A_CMD_I2C_STREAM, > + CH341A_CMD_I2C_STM_SET | (speed & 0x7), > + CH341A_CMD_I2C_STM_END > + }; > + > + int32_t ret = usb_transfer(__func__, sizeof(buf), 0, buf, NULL); > + if (ret < 0) { > + msg_perr("Could not configure stream interface.\n"); > + } > + return ret; > +} > + > +/* ch341 requires LSB first, swap the bit order before send and after receive */ > +static uint8_t swap_byte(uint8_t x) > +{ > + x = ((x >> 1) & 0x55) | ((x << 1) & 0xaa); > + x = ((x >> 2) & 0x33) | ((x << 2) & 0xcc); > + x = ((x >> 4) & 0x0f) | ((x << 4) & 0xf0); > + return x; > +} > + > +/* The assumed map between UIO command bits, pins on CH341A chip and pins on SPI chip: > + * UIO CH341A SPI CH341A SPI name > + * 0 D0/15 CS/1 (CS0) > + * 1 D1/16 unused (CS1) > + * 2 D2/17 unused (CS2) > + * 3 D3/18 SCK/6 (DCK) > + * 4 D4/19 unused (DOUT2) > + * 5 D5/20 SI/5 (DOUT) > + * - The UIO stream commands seem to only have 6 bits of output, and D6/D7 are the SPI inputs, > + * mapped as follows: > + * D6/21 unused (DIN2) > + * D7/22 SO/2 (DIN) > + */ > +static int32_t enable_pins(bool enable) > +{ > + uint8_t buf[] = { > + CH341A_CMD_UIO_STREAM, > + CH341A_CMD_UIO_STM_OUT | 0x37, // CS high (all of them), SCK=0, DOUT*=1 > + CH341A_CMD_UIO_STM_DIR | (enable ? 0x3F : 0x00), // Interface output enable / disable > + CH341A_CMD_UIO_STM_END, > + }; > + > + int32_t ret = usb_transfer(__func__, sizeof(buf), 0, buf, NULL); > + if (ret < 0) { > + msg_perr("Could not %sable output pins.\n", enable ? "en" : "dis"); > + } > + return ret; > +} > + > +/* De-assert and assert CS in one operation. */ > +static void pluck_cs(uint8_t *ptr) > +{ > + /* This was measured to give a minumum deassertion time of 2.25 us, > + * >20x more than needed for most SPI chips (100ns). */ > + int delay_cnt = 2; > + if (stored_delay_us) { > + delay_cnt = (stored_delay_us * 4) / 3; > + stored_delay_us = 0; > + } > + *ptr++ = CH341A_CMD_UIO_STREAM; > + *ptr++ = CH341A_CMD_UIO_STM_OUT | 0x37; /* deasserted */ > + int i; > + for (i = 0; i < delay_cnt; i++) > + *ptr++ = CH341A_CMD_UIO_STM_OUT | 0x37; /* "delay" */ > + *ptr++ = CH341A_CMD_UIO_STM_OUT | 0x36; /* asserted */ > + *ptr++ = CH341A_CMD_UIO_STM_END; > +} > + > +void ch341a_spi_delay(unsigned int usecs) > +{ > + /* There is space for 28 bytes instructions of 750 ns each in the CS packet (32 - 4 for the actual CS > + * instructions), thus max 21 us, but we avoid getting too near to this boundary and use > + * internal_delay() for durations over 20 us. */ > + if ((usecs + stored_delay_us) > 20) { > + unsigned int inc = 20 - stored_delay_us; > + internal_delay(usecs - inc); > + usecs = inc; > + } > + stored_delay_us += usecs; > +} > + I had a fancier delay implementation done (all the way upto ms scale using the I2C commands), but since i didnt get that fully tested, this one will do, i'll post it as an improvement later. > +static int ch341a_spi_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) > +{ > + if (handle == NULL) > + return -1; > + > + /* How many packets ... */ > + const size_t packets = (writecnt + readcnt + CH341_PACKET_LENGTH - 2) / (CH341_PACKET_LENGTH - 1); > + > + uint8_t wbuf[packets+1][CH341_PACKET_LENGTH]; > + uint8_t rbuf[writecnt + readcnt]; > + memset(wbuf[0], 0, CH341_PACKET_LENGTH); // dont want to write stack random to device... > + > + uint8_t *ptr = wbuf[0]; > + /* CS usage is optimized by doing both transitions in one packet. > + * Final transition to deselected state is in the pin disable. */ > + pluck_cs(ptr); > + unsigned int write_left = writecnt; > + unsigned int read_left = readcnt; > + unsigned int p; > + for (p = 0; p < packets; p++) { > + unsigned int write_now = min(CH341_PACKET_LENGTH - 1, write_left); > + unsigned int read_now = min ((CH341_PACKET_LENGTH - 1) - write_now, read_left); > + ptr = wbuf[p+1]; > + *ptr++ = CH341A_CMD_SPI_STREAM; > + unsigned int i; > + for (i = 0; i < write_now; ++i) > + *ptr++ = swap_byte(*writearr++); > + if (read_now) { > + memset(ptr, 0xFF, read_now); > + read_left -= read_now; > + } > + write_left -= write_now; > + } > + > + int32_t ret = usb_transfer(__func__, CH341_PACKET_LENGTH + packets + writecnt + readcnt, > + writecnt + readcnt, wbuf[0], rbuf); > + if (ret < 0) > + return -1; > + > + unsigned int i; > + for (i = 0; i < readcnt; i++) { > + /* FIXME: does working on words instead of bytes improve speed? */ ... drop the comment? i dont really care, but i think our consensus on IRC was that a words-wide implementation would have more issues (alignment and such) than performance. Or make a comment with that info. > + *readarr++ = swap_byte(rbuf[writecnt + i]); > + } > + > + return 0; > +} > + > +static const struct spi_master spi_master_ch341a_spi = { > + .type = SPI_CONTROLLER_CH341A_SPI, > + /* TODO: flashrom's current maximum is 256 B. Device was tested on Linux to accept atleast 16 kB. */ > + .max_data_read = 16 * 1024, > + .max_data_write = 16 * 1024, On linux. Not on windows usb "stack" i think... set these back to 1k? Or test for the limit (maybe something like 4k?) and change the 1000ms timeout, since i think the big packet would timeout on windows if nothing else failed... > + .command = ch341a_spi_spi_send_command, > + .multicommand = default_spi_send_multicommand, > + .read = default_spi_read, > + .write_256 = default_spi_write_256, > + .write_aai = default_spi_write_aai, > +}; > + > +static int ch341a_spi_shutdown(void *data) > +{ > + if (handle == NULL) > + return -1; > + > + enable_pins(false); > + libusb_free_transfer(transfer_out); > + transfer_out = NULL; > + int i; > + for (i = 0; i < USB_IN_TRANSFERS; i++) { > + libusb_free_transfer(transfer_ins[i]); > + transfer_ins[i] = NULL; > + } > + libusb_release_interface(handle, 0); > + libusb_close(handle); > + libusb_exit(NULL); > + handle = NULL; > + return 0; > +} > + > +int ch341a_spi_init(void) > +{ > + if (handle != NULL) { > + msg_cerr("%s: handle already set! Please report a bug at flashrom(a)flashrom.org\n", __func__); > + return -1; > + } > + > + int32_t ret = libusb_init(NULL); > + if (ret < 0) { > + msg_perr("Couldnt initialize libusb!\n"); > + return -1; > + } > + > + libusb_set_debug(NULL, 3); // Enable information, warning and error messages (only). > + > + uint16_t vid = devs_ch341a_spi[0].vendor_id; > + uint16_t pid = devs_ch341a_spi[0].device_id; > + handle = libusb_open_device_with_vid_pid(NULL, vid, pid); > + if (handle == NULL) { > + msg_perr("Couldn't open device %04x:%04x.\n", vid, pid); > + return -1; > + } > + > +/* libusb_detach_kernel_driver() and friends basically only work on Linux. We simply try to detach on Linux > + * without a lot of passion here. If that works fine else we will fail on claiming the interface anyway. */ > +#if IS_LINUX > + ret = libusb_detach_kernel_driver(handle, 0); > + if (ret == LIBUSB_ERROR_NOT_SUPPORTED) { > + msg_pwarn("Detaching kernel drivers is not supported. Further accesses may fail.\n"); > + } else if (ret != 0 && ret != LIBUSB_ERROR_NOT_FOUND) { > + msg_pwarn("Failed to detach kernel driver: '%s'. Further accesses will probably fail.\n", > + libusb_error_name(ret)); > + } > +#endif > + > + ret = libusb_claim_interface(handle, 0); > + if (ret != 0) { > + msg_perr("Failed to claim interface 0: '%s'\n", libusb_error_name(ret)); > + goto close_handle; > + } > + > + struct libusb_device *dev; > + if (!(dev = libusb_get_device(handle))) { > + msg_perr("Failed to get device from device handle.\n"); > + goto close_handle; > + } > + > + 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 release_interface; > + } > + > + msg_pdbg("Device revision is %d.%01d.%01d\n", > + (desc.bcdDevice >> 8) & 0x00FF, > + (desc.bcdDevice >> 4) & 0x000F, > + (desc.bcdDevice >> 0) & 0x000F); > + > + /* Allocate and pre-fill transfer structures. */ > + transfer_out = libusb_alloc_transfer(0); > + if (!transfer_out) { > + msg_perr("Failed to alloc libusb OUT transfer\n"); > + goto release_interface; > + } > + int i; > + for (i = 0; i < USB_IN_TRANSFERS; i++) { > + transfer_ins[i] = libusb_alloc_transfer(0); > + if (transfer_ins[i] == NULL) { > + msg_perr("Failed to alloc libusb IN transfer %d\n", i); > + goto dealloc_transfers; > + } > + } > + /* We use these helpers but dont fill the actual buffer yet. */ > + libusb_fill_bulk_transfer(transfer_out, handle, WRITE_EP, NULL, 0, cb_out, NULL, USB_TIMEOUT); > + for (i = 0; i < USB_IN_TRANSFERS; i++) > + libusb_fill_bulk_transfer(transfer_ins[i], handle, READ_EP, NULL, 0, cb_in, NULL, USB_TIMEOUT); > + > + if ((config_stream(CH341A_STM_I2C_100K) < 0) || (enable_pins(true) < 0)) > + goto dealloc_transfers; > + > + register_shutdown(ch341a_spi_shutdown, NULL); > + register_spi_master(&spi_master_ch341a_spi); > + > + return 0; > + > +dealloc_transfers: > + for (i = 0; i < USB_IN_TRANSFERS; i++) { > + if (transfer_ins[i] == NULL) > + break; > + libusb_free_transfer(transfer_ins[i]); > + transfer_ins[i] = NULL; > + } > + libusb_free_transfer(transfer_out); > + transfer_out = NULL; > +release_interface: > + libusb_release_interface(handle, 0); > +close_handle: > + libusb_close(handle); > + handle = NULL; > + return -1; > +} > diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl > index 7c8c70c..0dd8322 100644 > --- a/flashrom.8.tmpl > +++ b/flashrom.8.tmpl > @@ -269,6 +269,8 @@ bitbanging adapter) > .sp > .BR "* pickit2_spi" " (for SPI flash ROMs accessible via Microchip PICkit2)" > .sp > +.BR "* ch341a_spi" " (for SPI flash ROMs attached to WCH CH341A)" > +.sp > Some programmers have optional or mandatory parameters which are described > in detail in the > .B PROGRAMMER-SPECIFIC INFORMATION > @@ -1013,6 +1015,10 @@ an operation), without the > parameter, once the flash read/write operation you intended to perform has completed successfully. > .sp > Please also note that the mstarddc_spi driver only works on Linux. > +.SS > +.BR "ch341a_spi " programmer > +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. > .SH EXAMPLES > To back up and update your BIOS, run > .sp > @@ -1072,6 +1078,9 @@ needs userspace access to a serial port. > .BR dediprog ", " ft2232_spi ", " usbblaster_spi " and " pickit2_spi > need access to the respective USB device via libusb-0.1. > .sp > +.BR ch341a_spi > +needs access to the respective USB device via libusb-1.0. > +.sp > .B dummy > needs no access permissions at all. > .sp > @@ -1079,7 +1088,8 @@ needs no access permissions at all. > .BR gfxnvidia ", " drkaiser ", " satasii ", " satamv ", " atahpt" and " atavia > have to be run as superuser/root, and need additional raw access permission. > .sp > -.BR serprog ", " buspirate_spi ", " dediprog ", " usbblaster_spi ", " ft2232_spi " and " pickit2_spi > +.BR serprog ", " buspirate_spi ", " dediprog ", " usbblaster_spi ", " ft2232_spi ", " pickit2_spi " and " \ > +ch341a_spi > can be run as normal user on most operating systems if appropriate device > permissions are set. > .sp > diff --git a/flashrom.c b/flashrom.c > index 3853e19..0ff088f 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -380,6 +380,18 @@ const struct programmer_entry programmer_table[] = { > }, > #endif > > +#if CONFIG_CH341A_SPI == 1 > + { > + .name = "ch341a_spi", > + .type = USB, > + .devs.dev = devs_ch341a_spi, > + .init = ch341a_spi_init, > + .map_flash_region = fallback_map, > + .unmap_flash_region = fallback_unmap, > + .delay = ch341a_spi_delay, > + }, > +#endif > + > {0}, /* This entry corresponds to PROGRAMMER_INVALID. */ > }; > > diff --git a/programmer.h b/programmer.h > index 97f0ffa..b9f8708 100644 > --- a/programmer.h > +++ b/programmer.h > @@ -105,6 +105,9 @@ enum programmer { > #if CONFIG_PICKIT2_SPI == 1 > PROGRAMMER_PICKIT2_SPI, > #endif > +#if CONFIG_CH341A_SPI == 1 > + PROGRAMMER_CH341A_SPI, > +#endif > PROGRAMMER_INVALID /* This must always be the last entry. */ > }; > > @@ -516,6 +519,13 @@ int linux_spi_init(void); > int dediprog_init(void); > #endif > > +/* ch341a_spi.c */ > +#if CONFIG_CH341A_SPI == 1 > +int ch341a_spi_init(void); > +void ch341a_spi_delay(unsigned int usecs); > +extern const struct dev_entry devs_ch341a_spi[]; > +#endif > + > /* flashrom.c */ > struct decode_sizes { > uint32_t parallel; > @@ -575,6 +585,9 @@ enum spi_controller { > #if CONFIG_PICKIT2_SPI == 1 > SPI_CONTROLLER_PICKIT2, > #endif > +#if CONFIG_CH341A_SPI == 1 > + SPI_CONTROLLER_CH341A_SPI, > +#endif > }; > > #define MAX_DATA_UNSPECIFIED 0 > -- > Kind regards, Stefan Tauner > With atleast the limits dropped (or tested), this is: Acked-by: Urja Rannikko <urjaman(a)gmail.com> -- Urja

1 0

image size
by Simon Ramage 25 Jan '16

25 Jan '16

Hello, hope you can help me, I have bricked my chromebox, been using a pomona clip via a raspberry pi on my spi, running flashrom, which finds my winbond chip but when i try to write to it, flashrom comes back with an error saying "image size (4096 B) doesn't match the flash chip's size (8388608 B)!" and when i go to the properties of the image it is similar to the chip's size. Have tried using hex editor on windows and flashing that format but keep getting same error message, hope you can help me with regard to this, thankyou.

1 0

[PATCH 3/3] dediprog: port to libusb1 and use asynchronous bulk transfers for reading.
by Stefan Tauner 24 Jan '16

24 Jan '16

This patch is based on Nico Huber's original version that was rebased by David Hendricks for Chromium OS in Change-Id: I84384b9d8ed53911657cf2293733531a6e11fd23 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- Makefile | 2 +- dediprog.c | 284 +++++++++++++++++++++++++++++++++++++++----------------- flashrom.8.tmpl | 5 +- pickit2_spi.c | 5 +- 4 files changed, 204 insertions(+), 92 deletions(-) Tested on Linux natively as well as with Windows XP in a Virtual Box VM. There was really no speed up as is. Reads are already quite fast compared to writes (which are limited by small block sizes). Do we really want this anyway? diff --git a/Makefile b/Makefile index 8f3b672..1774b92 100644 --- a/Makefile +++ b/Makefile @@ -729,7 +729,7 @@ endif ifeq ($(CONFIG_DEDIPROG), yes) FEATURE_CFLAGS += -D'CONFIG_DEDIPROG=1' PROGRAMMER_OBJS += dediprog.o -NEED_USB := yes +NEED_LIBUSB1 := yes endif ifeq ($(CONFIG_SATAMV), yes) diff --git a/dediprog.c b/dediprog.c index 60f4d4f..b222c0f 100644 --- a/dediprog.c +++ b/dediprog.c @@ -26,25 +26,28 @@ #include <string.h> #include <limits.h> #include <errno.h> - -#if IS_WINDOWS -#include <lusb0_usb.h> -#else -#include <usb.h> -#endif - +#include <libusb.h> #include "flash.h" #include "chipdrivers.h" #include "programmer.h" #include "spi.h" +/* LIBUSB_CALL ensures the right calling conventions on libusb callbacks. + * However, the macro is not defined everywhere. m( + */ +#ifndef LIBUSB_CALL +#define LIBUSB_CALL +#endif + #define FIRMWARE_VERSION(x,y,z) ((x << 16) | (y << 8) | z) #define DEFAULT_TIMEOUT 3000 -#define REQTYPE_OTHER_OUT (USB_ENDPOINT_OUT | 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; +#define DEDIPROG_ASYNC_TRANSFERS 8 /* at most 8 asynchronous transfers */ +#define REQTYPE_OTHER_OUT (LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_OTHER) /* 0x43 */ +#define REQTYPE_OTHER_IN (LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_OTHER) /* 0xC3 */ +#define REQTYPE_EP_OUT (LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_ENDPOINT) /* 0x42 */ +#define REQTYPE_EP_IN (LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_ENDPOINT) /* 0xC2 */ +struct libusb_context *usb_ctx; +static libusb_device_handle *dediprog_handle; static int dediprog_in_endpoint; static int dediprog_out_endpoint; @@ -144,6 +147,22 @@ enum dediprog_standalone_mode { static int dediprog_firmwareversion = FIRMWARE_VERSION(0, 0, 0); enum dediprog_devtype dediprog_devicetype = DEV_UNKNOWN; +#if defined(LIBUSB_MAJOR) && defined(LIBUSB_MINOR) && defined(LIBUSB_MICRO) && \ + LIBUSB_MAJOR <= 1 && LIBUSB_MINOR == 0 && LIBUSB_MICRO < 9 +/* Quick and dirty replacement for missing libusb_error_name in libusb < 1.0.9 */ +const char * LIBUSB_CALL libusb_error_name(int error_code) +{ + if (error_code >= INT16_MIN && error_code <= INT16_MAX) { + /* 18 chars for text, rest for number (16 b should be enough), sign, nullbyte. */ + static char my_libusb_error[18 + 5 + 2]; + sprintf(my_libusb_error, "libusb error code %i", error_code); + return my_libusb_error; + } else { + return "UNKNOWN"; + } +} +#endif + /* Returns true if firmware (and thus hardware) supports the "new" protocol */ static bool is_new_prot(void) { @@ -157,35 +176,93 @@ static bool is_new_prot(void) } } +struct dediprog_transfer_status { + int error; /* OK if 0, ERROR else */ + unsigned int queued_idx; + unsigned int finished_idx; +}; + +static void LIBUSB_CALL dediprog_bulk_read_cb(struct libusb_transfer *const transfer) +{ + struct dediprog_transfer_status *const status = (struct dediprog_transfer_status *)transfer->user_data; + if (transfer->status != LIBUSB_TRANSFER_COMPLETED) { + status->error = 1; + msg_perr("SPI bulk read failed!\n"); + } + ++status->finished_idx; +} + +static int dediprog_bulk_read_poll(const struct dediprog_transfer_status *const status, const int finish) +{ + if (status->finished_idx >= status->queued_idx) + return 0; + + do { + struct timeval timeout = { 10, 0 }; + const int ret = libusb_handle_events_timeout(usb_ctx, &timeout); + if (ret < 0) { + msg_perr("Polling read events failed: %i %s!\n", ret, libusb_error_name(ret)); + return 1; + } + } while (finish && (status->finished_idx < status->queued_idx)); + return 0; +} + 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); + return libusb_control_transfer(dediprog_handle, REQTYPE_EP_IN, cmd, value, idx, + (unsigned 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); + return libusb_control_transfer(dediprog_handle, REQTYPE_EP_OUT, cmd, value, idx, + (unsigned char *)bytes, size, DEFAULT_TIMEOUT); } -/* Might be useful for other USB devices as well. static for now. */ -/* device parameter allows user to specify one device of multiple installed */ -static struct usb_device *get_device_by_vid_pid(uint16_t vid, uint16_t pid, unsigned int device) + +/* Might be useful for other USB devices as well. static for now. + * num parameter allows user to specify one device of multiple installed */ +static struct libusb_device_handle *get_device_by_vid_pid_number(uint16_t vid, uint16_t pid, unsigned int num) { - struct usb_bus *bus; - struct usb_device *dev; - - for (bus = usb_get_busses(); bus; bus = bus->next) - for (dev = bus->devices; dev; dev = dev->next) - if ((dev->descriptor.idVendor == vid) && - (dev->descriptor.idProduct == pid)) { - if (device == 0) - return dev; - device--; + struct libusb_device **list; + ssize_t count = libusb_get_device_list(usb_ctx, &list); + if (count < 0) { + msg_perr("Getting the USB device list failed (%s)!\n", libusb_error_name(count)); + return NULL; + } + + struct libusb_device_handle *handle = NULL; + ssize_t i = 0; + for (i = 0; i < count; i++) { + struct libusb_device *dev = list[i]; + struct libusb_device_descriptor desc; + int err = libusb_get_device_descriptor(dev, &desc); + if (err != 0) { + msg_perr("Reading the USB device descriptor failed (%s)!\n", libusb_error_name(err)); + libusb_free_device_list(list, 1); + return NULL; + } + if ((desc.idVendor == vid) && (desc.idProduct == pid)) { + msg_pdbg("Found USB device %04"PRIx16":%04"PRIx16" at address %d-%d.\n", + desc.idVendor, desc.idProduct, + libusb_get_bus_number(dev), libusb_get_device_address(dev)); + if (num == 0) { + err = libusb_open(dev, &handle); + if (err != 0) { + msg_perr("Opening the USB device failed (%s)!\n", + libusb_error_name(err)); + libusb_free_device_list(list, 1); + return NULL; + } + break; } + num--; + } + } + libusb_free_device_list(list, 1); - return NULL; + return handle; } /* This function sets the GPIOs connected to the LEDs as well as IO1-IO4. */ @@ -219,7 +296,7 @@ static int dediprog_set_leds(int leds) } 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, libusb_error_name(ret)); return 1; } @@ -332,10 +409,16 @@ static void fill_rw_cmd_payload(uint8_t *data_packet, unsigned int count, uint8_ */ static int dediprog_spi_bulk_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { + int err = 1; + /* chunksize must be 512, other sizes will NOT work at all. */ const unsigned int chunksize = 512; const unsigned int count = len / chunksize; + struct dediprog_transfer_status status = { 0, 0, 0 }; + struct libusb_transfer *transfers[DEDIPROG_ASYNC_TRANSFERS] = { NULL, }; + struct libusb_transfer *transfer; + if ((start % chunksize) || (len % chunksize)) { msg_perr("%s: Unaligned start=%i, len=%i! Please report a bug at flashrom(a)flashrom.org\n", __func__, start, len); @@ -352,23 +435,59 @@ static int dediprog_spi_bulk_read(struct flashctx *flash, uint8_t *buf, unsigned int ret = dediprog_write(CMD_READ, value, idx, data_packet, sizeof(data_packet)); if (ret != sizeof(data_packet)) { - msg_perr("Command Read SPI Bulk failed, %i %s!\n", ret, usb_strerror()); + msg_perr("Command Read SPI Bulk failed, %i %s!\n", ret, libusb_error_name(ret)); return 1; } + /* + * Ring buffer of bulk transfers. + * Poll until at least one transfer is ready, + * schedule next transfers until buffer is full. + */ + + /* Allocate bulk transfers. */ unsigned int i; - for (i = 0; i < count; i++) { - ret = usb_bulk_read(dediprog_handle, 0x80 | dediprog_in_endpoint, - (char *)buf + i * chunksize, chunksize, - DEFAULT_TIMEOUT); - if (ret != chunksize) { - msg_perr("SPI bulk read %i failed, expected %i, got %i %s!\n", - i, chunksize, ret, usb_strerror()); - return 1; + for (i = 0; i < min(DEDIPROG_ASYNC_TRANSFERS, count); ++i) { + transfers[i] = libusb_alloc_transfer(0); + if (!transfers[i]) { + msg_perr("Allocating libusb transfer %i failed: %s!\n", i, libusb_error_name(ret)); + goto err_free; + } + } + + /* Now transfer requested chunks using libusb's asynchronous interface. */ + while (!status.error && (status.queued_idx < count)) { + while ((status.queued_idx - status.finished_idx) < DEDIPROG_ASYNC_TRANSFERS) { + transfer = transfers[status.queued_idx % DEDIPROG_ASYNC_TRANSFERS]; + libusb_fill_bulk_transfer(transfer, dediprog_handle, 0x80 | dediprog_in_endpoint, + (unsigned char *)buf + status.queued_idx * chunksize, chunksize, + dediprog_bulk_read_cb, &status, DEFAULT_TIMEOUT); + transfer->flags |= LIBUSB_TRANSFER_SHORT_NOT_OK; + ret = libusb_submit_transfer(transfer); + if (ret < 0) { + msg_perr("Submitting SPI bulk read %i failed: %s!\n", + status.queued_idx, libusb_error_name(ret)); + goto err_free; + } + ++status.queued_idx; } + if (dediprog_bulk_read_poll(&status, 0)) + goto err_free; } - - return 0; + /* Wait for transfers to finish. */ + if (dediprog_bulk_read_poll(&status, 1)) + goto err_free; + /* Check if everything has been transmitted. */ + if ((status.finished_idx < count) || status.error) + goto err_free; + + err = 0; + +err_free: + dediprog_bulk_read_poll(&status, 1); + for (i = 0; i < DEDIPROG_ASYNC_TRANSFERS; ++i) + if (transfers[i]) libusb_free_transfer(transfers[i]); + return err; } static int dediprog_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) @@ -455,19 +574,20 @@ static int dediprog_spi_bulk_write(struct flashctx *flash, const uint8_t *buf, u fill_rw_cmd_payload(data_packet, count, dedi_spi_cmd, &value, &idx, start); int ret = dediprog_write(CMD_WRITE, value, idx, data_packet, sizeof(data_packet)); if (ret != sizeof(data_packet)) { - msg_perr("Command Write SPI Bulk failed, %i %s!\n", ret, - usb_strerror()); + msg_perr("Command Write SPI Bulk failed, %s!\n", libusb_error_name(ret)); return 1; } unsigned int i; for (i = 0; i < count; i++) { - char usbbuf[512]; + unsigned char usbbuf[512]; memcpy(usbbuf, buf + i * chunksize, chunksize); memset(usbbuf + chunksize, 0xff, sizeof(usbbuf) - chunksize); // fill up with 0xFF - ret = usb_bulk_write(dediprog_handle, dediprog_out_endpoint, usbbuf, 512, DEFAULT_TIMEOUT); - if (ret != 512) { - msg_perr("SPI bulk write failed, expected %i, got %i %s!\n", 512, ret, usb_strerror()); + int transferred; + ret = libusb_bulk_transfer(dediprog_handle, dediprog_out_endpoint, usbbuf, 512, &transferred, + DEFAULT_TIMEOUT); + if ((ret < 0) || (transferred != 512)) { + msg_perr("SPI bulk write failed, expected %i, got %s!\n", 512, libusb_error_name(ret)); return 1; } } @@ -568,7 +688,7 @@ static int dediprog_spi_send_command(struct flashctx *flash, ret = dediprog_write(CMD_TRANSCEIVE, value, idx, writearr, writecnt); if (ret != writecnt) { msg_perr("Send SPI failed, expected %i, got %i %s!\n", - writecnt, ret, usb_strerror()); + writecnt, ret, libusb_error_name(ret)); return 1; } if (readcnt == 0) // If we don't require a response, we are done here @@ -584,7 +704,7 @@ static int dediprog_spi_send_command(struct flashctx *flash, } ret = dediprog_read(CMD_TRANSCEIVE, value, idx, readarr, readcnt); if (ret != readcnt) { - msg_perr("Receive SPI failed, expected %i, got %i %s!\n", readcnt, ret, usb_strerror()); + msg_perr("Receive SPI failed, expected %i, got %i %s!\n", readcnt, ret, libusb_error_name(ret)); return 1; } return 0; @@ -633,11 +753,11 @@ static int dediprog_check_devicestring(void) * than V6.0.0. Newer programmers (including all SF600s) do not support it. */ static int dediprog_set_voltage(void) { - char buf[1] = {0}; - int ret = usb_control_msg(dediprog_handle, REQTYPE_OTHER_IN, CMD_SET_VOLTAGE, 0x0, 0x0, + unsigned char buf[1] = {0}; + int ret = libusb_control_transfer(dediprog_handle, REQTYPE_OTHER_IN, CMD_SET_VOLTAGE, 0x0, 0x0, buf, 0x1, DEFAULT_TIMEOUT); if (ret < 0) { - msg_perr("Command Set Voltage failed (%s)!\n", usb_strerror()); + msg_perr("Command Set Voltage failed (%s)!\n", libusb_error_name(ret)); return 1; } if ((ret != 1) || (buf[0] != 0x6f)) { @@ -658,7 +778,7 @@ static int dediprog_standalone_mode(void) msg_pdbg2("Disabling standalone mode.\n"); ret = dediprog_write(CMD_SET_STANDALONE, LEAVE_STANDALONE_MODE, 0, NULL, 0); if (ret) { - msg_perr("Failed to disable standalone mode: %s\n", usb_strerror()); + msg_perr("Failed to disable standalone mode: %s\n", libusb_error_name(ret)); return 1; } @@ -678,7 +798,7 @@ static int dediprog_command_b(void) 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()); + msg_perr("Command B failed (%s)!\n", libusb_error_name(ret)); return 1; } if ((ret != 0x3) || (buf[0] != 0xff) || (buf[1] != 0xff) || @@ -693,10 +813,9 @@ static int dediprog_command_b(void) static int set_target_flash(enum dediprog_target target) { - int ret = usb_control_msg(dediprog_handle, REQTYPE_EP_OUT, CMD_SET_TARGET, target, 0, - NULL, 0, DEFAULT_TIMEOUT); + int ret = dediprog_write(CMD_SET_TARGET, target, 0, NULL, 0); if (ret != 0) { - msg_perr("set_target_flash failed (%s)!\n", usb_strerror()); + msg_perr("set_target_flash failed (%s)!\n", libusb_error_name(ret)); return 1; } return 0; @@ -710,7 +829,7 @@ static bool dediprog_get_button(void) 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()); + msg_perr("Could not get button state (%s)!\n", libusb_error_name(ret)); return 1; } return buf[0] != 1; @@ -785,20 +904,18 @@ static int dediprog_shutdown(void *data) if (dediprog_set_spi_voltage(0x0)) return 1; - if (usb_release_interface(dediprog_handle, 0)) { + if (libusb_release_interface(dediprog_handle, 0)) { msg_perr("Could not release USB interface!\n"); return 1; } - if (usb_close(dediprog_handle)) { - msg_perr("Could not close USB device!\n"); - return 1; - } + libusb_close(dediprog_handle); + libusb_exit(usb_ctx); + return 0; } int dediprog_init(void) { - struct usb_device *dev; char *voltage, *device, *spispeed, *target_str; int spispeed_idx = 1; int millivolt = 3500; @@ -880,35 +997,29 @@ int dediprog_init(void) free(target_str); /* Here comes the USB stuff. */ - usb_init(); - usb_find_busses(); - usb_find_devices(); - dev = get_device_by_vid_pid(0x0483, 0xdada, (unsigned int) usedevice); - if (!dev) { - msg_perr("Could not find a Dediprog SF100 on USB!\n"); + libusb_init(&usb_ctx); + if (!usb_ctx) { + msg_perr("Could not initialize libusb!\n"); return 1; } - msg_pdbg("Found USB device (%04x:%04x).\n", - dev->descriptor.idVendor, dev->descriptor.idProduct); - dediprog_handle = usb_open(dev); + dediprog_handle = get_device_by_vid_pid_number(0x0483, 0xdada, (unsigned int) usedevice); if (!dediprog_handle) { - msg_perr("Could not find a Dediprog programmer on USB: %s\n", usb_strerror()); + msg_perr("Could not find a Dediprog programmer on USB.\n"); + libusb_exit(usb_ctx); return 1; } - ret = usb_set_configuration(dediprog_handle, 1); - if (ret < 0) { - msg_perr("Could not set USB device configuration: %i %s\n", - ret, usb_strerror()); - if (usb_close(dediprog_handle)) - msg_perr("Could not close USB device!\n"); + ret = libusb_set_configuration(dediprog_handle, 1); + if (ret != 0) { + msg_perr("Could not set USB device configuration: %i %s\n", ret, libusb_error_name(ret)); + libusb_close(dediprog_handle); + libusb_exit(usb_ctx); return 1; } - ret = usb_claim_interface(dediprog_handle, 0); + ret = libusb_claim_interface(dediprog_handle, 0); if (ret < 0) { - msg_perr("Could not claim USB device interface %i: %i %s\n", - 0, ret, usb_strerror()); - if (usb_close(dediprog_handle)) - msg_perr("Could not close USB device!\n"); + msg_perr("Could not claim USB device interface %i: %i %s\n", 0, ret, libusb_error_name(ret)); + libusb_close(dediprog_handle); + libusb_exit(usb_ctx); return 1; } @@ -952,4 +1063,3 @@ int dediprog_init(void) return 0; } - diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl index db25910..958e759 100644 --- a/flashrom.8.tmpl +++ b/flashrom.8.tmpl @@ -1075,9 +1075,12 @@ needs TCP access to the network or userspace access to a serial port. .B buspirate_spi needs userspace access to a serial port. .sp -.BR dediprog ", " ft2232_spi ", " usbblaster_spi " and " pickit2_spi +.BR ft2232_spi ", " usbblaster_spi " and " pickit2_spi need access to the respective USB device via libusb API version 0.1. .sp +.BR dediprog +needs access to the respective USB device via libusb API version 1.0. +.sp .B dummy needs no access permissions at all. .sp diff --git a/pickit2_spi.c b/pickit2_spi.c index fb03b02..e5f7bed 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -95,9 +95,8 @@ static usb_dev_handle *pickit2_handle; #define SCR_VDD_OFF 0xFE #define SCR_VDD_ON 0xFF -/* Copied from dediprog.c */ -/* Might be useful for other USB devices as well. static for now. */ -/* device parameter allows user to specify one device of multiple installed */ +/* Might be useful for other USB devices as well. static for now. + * device parameter allows user to specify one device of multiple installed */ static struct usb_device *get_device_by_vid_pid(uint16_t vid, uint16_t pid, unsigned int device) { struct usb_bus *bus; -- Kind regards, Stefan Tauner

1 0

[PATCH 2/3] dediprog: use command 0x0B (set voltage) only on older SF100s.
by Stefan Tauner 24 Jan '16

24 Jan '16

As per e-mail with Dediprog, command 0x0B (which is not listed in the command spec) is used to set voltage level on older Dediprogs. SF100 V6.0.0 and newer as well as all SF600 programmers do not support it. This patch renames dediprog_device_init() to something more appropriate and adds comments for clarity, and only runs it conditionally if we cannot query the devicestring initially. Based on ChromiumOS' Change-Id: I42de7d28401d7ad5be8fcf8a8c165e2614a45960 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- dediprog.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) What does it really do...? :/ diff --git a/dediprog.c b/dediprog.c index 8c7e21a..60f4d4f 100644 --- a/dediprog.c +++ b/dediprog.c @@ -82,6 +82,7 @@ enum dediprog_cmds { CMD_READ_PROG_INFO = 0x08, CMD_SET_VCC = 0x09, CMD_SET_STANDALONE = 0x0A, + CMD_SET_VOLTAGE = 0x0B, /* Only in firmware older than 6.0.0 */ CMD_GET_BUTTON = 0x11, CMD_GET_UID = 0x12, CMD_SET_CS = 0x14, @@ -628,22 +629,22 @@ static int dediprog_check_devicestring(void) return 0; } -static int dediprog_device_init(void) +/* Only use dediprog_set_voltage on SF100 programmers with firmware older + * than V6.0.0. Newer programmers (including all SF600s) do not support it. */ +static int dediprog_set_voltage(void) { - int ret; - char buf[0x1]; - - memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, REQTYPE_OTHER_IN, 0x0B, 0x0, 0x0, + char buf[1] = {0}; + int ret = usb_control_msg(dediprog_handle, REQTYPE_OTHER_IN, CMD_SET_VOLTAGE, 0x0, 0x0, buf, 0x1, DEFAULT_TIMEOUT); if (ret < 0) { - msg_perr("Command A failed (%s)!\n", usb_strerror()); + msg_perr("Command Set Voltage failed (%s)!\n", usb_strerror()); return 1; } - if ((ret != 0x1) || (buf[0] != 0x6f)) { + if ((ret != 1) || (buf[0] != 0x6f)) { msg_perr("Unexpected response to init!\n"); return 1; } + return 0; } @@ -914,11 +915,14 @@ int dediprog_init(void) if (register_shutdown(dediprog_shutdown, NULL)) return 1; - /* Perform basic setup. */ - if (dediprog_device_init()) - return 1; - if (dediprog_check_devicestring()) - return 1; + /* Try reading the devicestring. If that fails and the device is old (FW < 6.0.0, which we can not know) + * then we need to try the "set voltage" command and then attempt to read the devicestring again. */ + if (dediprog_check_devicestring()) { + if (dediprog_set_voltage()) + return 1; + if (dediprog_check_devicestring()) + return 1; + } /* SF100 only has 1 endpoint for in/out, SF600 uses two separate endpoints instead. */ dediprog_in_endpoint = 2; -- Kind regards, Stefan Tauner

1 0

[PATCH 1/3] dediprog: add support for SF600.
by Stefan Tauner 24 Jan '16

24 Jan '16

This patch is based on a number of changes by David Woodhouse and David Hendricks. SF600 uses two bulk endpoints, 1 for out and 2 for in unlike the SF100 that uses only a single one. This patch make endpoint usage more explicit and sets the in/out endpoint(s) appropriately for SF100 and SF600. Also, change all SF100-specific strings in messages and. leave standalone mode on SF600s. Signed-off-by: David Woodhouse <David.Woodhouse(a)intel.com> Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- dediprog.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 14 deletions(-) diff --git a/dediprog.c b/dediprog.c index d18ce36..8c7e21a 100644 --- a/dediprog.c +++ b/dediprog.c @@ -45,7 +45,14 @@ #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_endpoint; +static int dediprog_in_endpoint; +static int dediprog_out_endpoint; + +enum dediprog_devtype { + DEV_UNKNOWN = 0, + DEV_SF100 = 100, + DEV_SF600 = 600, +}; enum dediprog_leds { LED_INVALID = -1, @@ -127,16 +134,26 @@ enum dediprog_writemode { WRITE_MODE_4B_ADDR_256B_PAGE_PGM_FLAGS = 12, }; +enum dediprog_standalone_mode { + ENTER_STANDALONE_MODE = 0, + LEAVE_STANDALONE_MODE = 1, +}; + static int dediprog_firmwareversion = FIRMWARE_VERSION(0, 0, 0); +enum dediprog_devtype dediprog_devicetype = DEV_UNKNOWN; /* Returns true if firmware (and thus hardware) supports the "new" protocol */ static bool is_new_prot(void) { - /* if (SF100) */ - return dediprog_firmwareversion >= FIRMWARE_VERSION(5, 5, 0); - /* else if (SF600) - return dediprog_firmwareversion >= FIRMWARE_VERSION(6, 9, 0); */ + switch (dediprog_devicetype) { + case DEV_SF100: + return dediprog_firmwareversion >= FIRMWARE_VERSION(5, 5, 0); + case DEV_SF600: + return dediprog_firmwareversion >= FIRMWARE_VERSION(6, 9, 0); + default: + return 0; + } } static int dediprog_read(enum dediprog_cmds cmd, unsigned int value, unsigned int idx, uint8_t *bytes, size_t size) @@ -340,7 +357,7 @@ static int dediprog_spi_bulk_read(struct flashctx *flash, uint8_t *buf, unsigned unsigned int i; for (i = 0; i < count; i++) { - ret = usb_bulk_read(dediprog_handle, 0x80 | dediprog_endpoint, + ret = usb_bulk_read(dediprog_handle, 0x80 | dediprog_in_endpoint, (char *)buf + i * chunksize, chunksize, DEFAULT_TIMEOUT); if (ret != chunksize) { @@ -447,7 +464,7 @@ static int dediprog_spi_bulk_write(struct flashctx *flash, const uint8_t *buf, u char usbbuf[512]; memcpy(usbbuf, buf + i * chunksize, chunksize); memset(usbbuf + chunksize, 0xff, sizeof(usbbuf) - chunksize); // fill up with 0xFF - ret = usb_bulk_write(dediprog_handle, dediprog_endpoint, usbbuf, 512, DEFAULT_TIMEOUT); + ret = usb_bulk_write(dediprog_handle, dediprog_out_endpoint, usbbuf, 512, DEFAULT_TIMEOUT); if (ret != 512) { msg_perr("SPI bulk write failed, expected %i, got %i %s!\n", 512, ret, usb_strerror()); return 1; @@ -575,7 +592,6 @@ static int dediprog_spi_send_command(struct flashctx *flash, static int dediprog_check_devicestring(void) { int ret; - int fw[3]; char buf[0x11]; /* Command Receive Device String. */ @@ -586,16 +602,24 @@ static int dediprog_check_devicestring(void) } buf[0x10] = '\0'; msg_pdbg("Found a %s\n", buf); - if (memcmp(buf, "SF100", 0x5) != 0) { - msg_perr("Device not a SF100!\n"); + if (memcmp(buf, "SF100", 0x5) == 0) + dediprog_devicetype = DEV_SF100; + else if (memcmp(buf, "SF600", 0x5) == 0) + dediprog_devicetype = DEV_SF600; + else { + msg_perr("Device not a SF100 or SF600!\n"); return 1; } - if (sscanf(buf, "SF100 V:%d.%d.%d ", &fw[0], &fw[1], &fw[2]) != 3) { + + int sfnum; + int fw[3]; + if (sscanf(buf, "SF%d V:%d.%d.%d ", &sfnum, &fw[0], &fw[1], &fw[2]) != 4 || + sfnum != dediprog_devicetype) { msg_perr("Unexpected firmware version string '%s'\n", buf); return 1; } /* Only these major versions were tested. */ - if (fw[0] < 2 || fw[0] > 6) { + if (fw[0] < 2 || fw[0] > 7) { msg_perr("Unexpected firmware version %d.%d.%d!\n", fw[0], fw[1], fw[2]); return 1; } @@ -623,6 +647,23 @@ static int dediprog_device_init(void) return 0; } +static int dediprog_standalone_mode(void) +{ + int ret; + + if (dediprog_devicetype != DEV_SF600) + return 0; + + msg_pdbg2("Disabling standalone mode.\n"); + ret = dediprog_write(CMD_SET_STANDALONE, LEAVE_STANDALONE_MODE, 0, NULL, 0); + if (ret) { + msg_perr("Failed to disable standalone mode: %s\n", usb_strerror()); + return 1; + } + + return 0; +} + #if 0 /* Something. * Present in eng_detect_blink.log with firmware 3.1.8 @@ -737,6 +778,7 @@ static const struct spi_master spi_master_dediprog = { static int dediprog_shutdown(void *data) { dediprog_firmwareversion = FIRMWARE_VERSION(0, 0, 0); + dediprog_devicetype = DEV_UNKNOWN; /* URB 28. Command Set SPI Voltage to 0. */ if (dediprog_set_spi_voltage(0x0)) @@ -849,7 +891,7 @@ int dediprog_init(void) dev->descriptor.idVendor, dev->descriptor.idProduct); dediprog_handle = usb_open(dev); if (!dediprog_handle) { - msg_perr("Could not open USB device: %s\n", usb_strerror()); + msg_perr("Could not find a Dediprog programmer on USB: %s\n", usb_strerror()); return 1; } ret = usb_set_configuration(dediprog_handle, 1); @@ -868,7 +910,6 @@ int dediprog_init(void) msg_perr("Could not close USB device!\n"); return 1; } - dediprog_endpoint = 2; if (register_shutdown(dediprog_shutdown, NULL)) return 1; @@ -879,6 +920,13 @@ int dediprog_init(void) if (dediprog_check_devicestring()) return 1; + /* SF100 only has 1 endpoint for in/out, SF600 uses two separate endpoints instead. */ + dediprog_in_endpoint = 2; + if (dediprog_devicetype == DEV_SF100) + dediprog_out_endpoint = 2; + else + dediprog_out_endpoint = 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_check_devicestring() has queried the device and set dediprog_firmwareversion. */ @@ -892,6 +940,9 @@ int dediprog_init(void) return 1; } + if (dediprog_standalone_mode()) + return 1; + if (register_spi_master(&spi_master_dediprog) || dediprog_set_leds(LED_NONE)) return 1; -- Kind regards, Stefan Tauner

1 0

[PATCH 1/4] Bump dediprog driver to use libusb-1.0
by Kyösti Mälkki 24 Jan '16

24 Jan '16

From: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Am 21.02.2013 01:46 schrieb Carl-Daniel Hailfinger: > Hi Nico, > > thanks for your patch. > > Am 16.11.2012 11:28 schrieb Nico Huber: >> > This patch tracks the changes in the libusb interface. Nothing changed >> > in the behaviour of the driver, so far. >> > >> > It will be used by a follow-up patch. It's based on "Enable spi clock >> > setting in dediprog driver". >> > >> > Signed-off-by: Nico Huber <nico.huber(a)secunet.com> > Review follows. > The Makefile part checked for libusb 0.1, but it set the linker > parameter for libusb 1.0. > The code assumed that libusb_error_name() is always available, but that > function was only introduced in libusb 1.0.9. > There was a conflict between the added device parameter for multiple > Dedipro SF100 devices on one PC (r1628) and the removal of > get_device_by_vid_pid(). > > I have fixed and forward ported the code, please check that it works and > looks sane. > > This patch is completely untested, I only checked whether it compiles. > If it works for you and looks sane, please tell me so I can commit. > > Signed-off-by: Nico Huber <nico.huber(a)secunet.com> New version. Fixed error messages and incomplete cleanup in the error case. libusb header file location is still something I have to fix in another iteration. Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> --- Makefile | 58 +++++++++----- dediprog.c | 258 +++++++++++++++++++++++++++++++++---------------------------- 2 files changed, 178 insertions(+), 138 deletions(-) diff --git a/Makefile b/Makefile index 07fefc0..96a7987 100644 --- a/Makefile +++ b/Makefile @@ -117,7 +117,7 @@ UNSUPPORTED_FEATURES += CONFIG_PONY_SPI=yes else override CONFIG_PONY_SPI = no endif -# Dediprog and FT2232 are not supported under DOS (missing USB support). +# Dediprog and FT2232 are not supported under DOS (missing libusb support). ifeq ($(CONFIG_DEDIPROG), yes) UNSUPPORTED_FEATURES += CONFIG_DEDIPROG=yes else @@ -504,8 +504,9 @@ ifeq ($(NEED_FTDI), yes) FTDILIBS := $(shell pkg-config --libs libftdi 2>/dev/null || printf "%s" "-lftdi -lusb") FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FT232H := yes" .features && printf "%s" "-D'HAVE_FT232H=1'") FEATURE_LIBS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "$(FTDILIBS)") -# We can't set NEED_USB here because that would transform libftdi auto-enabling +# We can't set NEED_LIBUSB1 here because that would transform libftdi auto-enabling # into a hard requirement for libusb, defeating the purpose of auto-enabling. +# Besides that, the old libftdi requires libusb 0.1, not libusb 1.0. endif ifeq ($(CONFIG_DUMMY), yes) @@ -558,7 +559,7 @@ endif ifeq ($(CONFIG_DEDIPROG), yes) FEATURE_CFLAGS += -D'CONFIG_DEDIPROG=1' PROGRAMMER_OBJS += dediprog.o -NEED_USB := yes +NEED_LIBUSB1 := yes endif ifeq ($(CONFIG_SATAMV), yes) @@ -613,10 +614,12 @@ endif endif endif -ifeq ($(NEED_USB), yes) -CHECK_LIBUSB0 = yes -FEATURE_CFLAGS += -D'NEED_USB=1' -USBLIBS := $(shell pkg-config --libs libusb 2>/dev/null || printf "%s" "-lusb") +ifeq ($(NEED_LIBUSB1), yes) +CHECK_LIBUSB1 = yes +FEATURE_CFLAGS += -D'NEED_LIBUSB1=1' +FEATURE_CFLAGS += $(shell pkg-config --cflags libusb-1.0 2>/dev/null) +USBLIBS := $(shell pkg-config --libs libusb-1.0 2>/dev/null || printf "%s" "-lusb-1.0") +FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "LIBUSB1_ERROR_NAME := yes" .features && printf "%s" "-D'LIBUSB_HAVE_ERROR_NAME=1'") endif ifeq ($(CONFIG_PRINT_WIKI), yes) @@ -711,17 +714,17 @@ int main(int argc, char **argv) endef export LIBPCI_TEST -define LIBUSB0_TEST -#include <usb.h> +define LIBUSB1_TEST +#include <libusb.h> int main(int argc, char **argv) { (void) argc; (void) argv; - usb_init(); + libusb_init(NULL); return 0; } endef -export LIBUSB0_TEST +export LIBUSB1_TEST hwlibs: compiler @printf "" > .libdeps @@ -744,18 +747,18 @@ ifeq ($(CHECK_LIBPCI), yes) rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1) ) @rm -f .test.c .test.o .test$(EXEC_SUFFIX) endif -ifeq ($(CHECK_LIBUSB0), yes) - @printf "Checking for libusb-0.1/libusb-compat headers... " - @echo "$$LIBUSB0_TEST" > .test.c - @$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >/dev/null && \ +ifeq ($(CHECK_LIBUSB1), yes) + @printf "Checking for libusb-1.0 headers... " + @echo "$$LIBUSB1_TEST" > .test.c + @$(CC) -c $(CPPFLAGS) $(FEATURE_CFLAGS) $(CFLAGS) .test.c -o .test.o >/dev/null && \ echo "found." || ( echo "not found."; echo; \ - echo "Please install libusb-0.1 headers or libusb-compat headers."; \ + echo "Please install libusb-1.0 headers."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1) - @printf "Checking if libusb-0.1 is usable... " + @printf "Checking if libusb-1.0 is usable... " @$(CC) $(LDFLAGS) .test.o -o .test$(EXEC_SUFFIX) $(LIBS) $(USBLIBS) >/dev/null && \ echo "yes." || ( echo "no."; \ - echo "Please install libusb-0.1 or libusb-compat."; \ + echo "Please install libusb-1.0."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o .test$(EXEC_SUFFIX); exit 1) @rm -f .test.c .test.o .test$(EXEC_SUFFIX) @@ -777,6 +780,18 @@ ifneq ($(UNSUPPORTED_FEATURES), ) @false endif +define LIBUSB1_ERROR_NAME_TEST +#include <libusb.h> +int main(int argc, char **argv) +{ + (void) argc; + (void) argv; + libusb_error_name(0); + return 0; +} +endef +export LIBUSB1_ERROR_NAME_TEST + define FTDI_TEST #include <ftdi.h> struct ftdi_context *ftdic = NULL; @@ -823,6 +838,13 @@ export LINUX_SPI_TEST features: compiler @echo "FEATURES := yes" > .features.tmp +ifeq ($(CHECK_LIBUSB1), yes) + @printf "Checking for libusb_error_name support in libusb-1.0... " + @echo "$$LIBUSB1_ERROR_NAME_TEST" >> .featuretest.c + @$(CC) $(CPPFLAGS) $(FEATURE_CFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) $(USBLIBS) $(LIBS) >/dev/null 2>&1 && \ + ( echo "found."; echo "LIBUSB1_ERROR_NAME := yes" >> .features.tmp ) || \ + ( echo "not found." ) +endif ifeq ($(NEED_FTDI), yes) @printf "Checking for FTDI support... " @echo "$$FTDI_TEST" > .featuretest.c diff --git a/dediprog.c b/dediprog.c index ae86810..c33dc10 100644 --- a/dediprog.c +++ b/dediprog.c @@ -2,6 +2,7 @@ * This file is part of the flashrom project. * * Copyright (C) 2010 Carl-Daniel Hailfinger + * 2012 secunet Security Networks AG * * 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 @@ -21,7 +22,8 @@ #include <string.h> #include <limits.h> #include <errno.h> -#include <usb.h> +#include <stdlib.h> +#include <libusb.h> #include "flash.h" #include "chipdrivers.h" #include "programmer.h" @@ -29,7 +31,8 @@ #define FIRMWARE_VERSION(x,y,z) ((x << 16) | (y << 8) | z) #define DEFAULT_TIMEOUT 3000 -static usb_dev_handle *dediprog_handle; +static libusb_context *usb_ctx; +static libusb_device_handle *dediprog_handle; static int dediprog_firmwareversion; static int dediprog_endpoint; @@ -47,27 +50,63 @@ static void print_hex(void *buf, size_t len) } #endif +#ifndef LIBUSB_HAVE_ERROR_NAME +/* Quick and dirty replacement for missing libusb_error_name in older libusb 1.0. */ +const char *libusb_error_name(int error_code) +{ + /* 18 chars for text, rest for number, sign, nullbyte. */ + static char my_libusb_error[18 + 3 * sizeof(int) + 2]; + + sprintf(my_libusb_error, "libusb error code %i", error_code); + return my_libusb_error; +} +#endif + /* Might be useful for other USB devices as well. static for now. */ /* device parameter allows user to specify one device of multiple installed */ -static struct usb_device *get_device_by_vid_pid(uint16_t vid, uint16_t pid, unsigned int device) +static struct libusb_device_handle *get_device_by_vid_pid_number(uint16_t vid, uint16_t pid, unsigned int num) { - struct usb_bus *bus; - struct usb_device *dev; - - for (bus = usb_get_busses(); bus; bus = bus->next) - for (dev = bus->devices; dev; dev = dev->next) - if ((dev->descriptor.idVendor == vid) && - (dev->descriptor.idProduct == pid)) { - if (device == 0) - return dev; - device--; + struct libusb_device **list; + ssize_t i = 0; + int err = 0; + struct libusb_device_handle *handle = NULL; + struct libusb_device_descriptor desc = {}; + ssize_t count = libusb_get_device_list(usb_ctx, &list); + + if (count < 0) { + msg_perr("Getting the USB device list failed (%s)!\n", libusb_error_name(count)); + return NULL; + } + + for (i = 0; i < count; i++) { + struct libusb_device *dev = list[i]; + err = libusb_get_device_descriptor(dev, &desc); + if (err != 0) { + msg_perr("Reading the USB device descriptor failed (%s)!\n", libusb_error_name(err)); + libusb_free_device_list(list, 1); + return NULL; + } + if ((desc.idVendor == vid) && (desc.idProduct == pid)) { + msg_pdbg("Found USB device %04hx:%04hx at address %hhx-%hhx.\n", desc.idVendor, + desc.idProduct, libusb_get_bus_number(dev), libusb_get_device_address(dev)); + if (num == 0) { + err = libusb_open(dev, &handle); + if (err != 0) { + msg_perr("Opening the USB device failed (%s)!\n", + libusb_error_name(err)); + libusb_free_device_list(list, 1); + return NULL; + } + break; } + num--; + } + } + libusb_free_device_list(list, 1); - return NULL; + return handle; } -//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) @@ -101,11 +140,10 @@ static int dediprog_set_leds(int leds) target_leds = leds; } - ret = usb_control_msg(dediprog_handle, 0x42, 0x07, 0x09, target_leds, - NULL, 0x0, DEFAULT_TIMEOUT); + ret = libusb_control_transfer(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, libusb_error_name(ret)); return 1; } @@ -144,8 +182,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 = libusb_control_transfer(dediprog_handle, 0x42, 0x9, voltage_selector, + 0xff, NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { msg_perr("Command Set SPI Voltage 0x%x failed!\n", voltage_selector); @@ -188,8 +226,8 @@ static int dediprog_set_spi_speed(unsigned int spispeed_idx) msg_pdbg("SPI speed is %sHz\n", spispeeds[spispeed_idx].name); - ret = usb_control_msg(dediprog_handle, 0x42, 0x61, spispeeds[spispeed_idx].speed, 0xff, - NULL, 0x0, DEFAULT_TIMEOUT); + ret = libusb_control_transfer(dediprog_handle, 0x42, 0x61, spispeeds[spispeed_idx].speed, 0xff, + NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { msg_perr("Command Set SPI Speed 0x%x failed!\n", spispeeds[spispeed_idx].speed); return 1; @@ -205,15 +243,15 @@ static int dediprog_set_spi_speed(unsigned int spispeed_idx) static int dediprog_spi_bulk_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { - int ret; + int ret, transferred; unsigned int i; /* 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}; + const unsigned char count_and_chunk[] = { + count & 0xff, (count >> 8) & 0xff, + chunksize & 0xff, (chunksize >> 8) & 0xff + }; if ((start % chunksize) || (len % chunksize)) { msg_perr("%s: Unaligned start=%i, len=%i! Please report a bug " @@ -227,22 +265,20 @@ 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, - start / 0x10000, (char *)count_and_chunk, - sizeof(count_and_chunk), DEFAULT_TIMEOUT); + ret = libusb_control_transfer(dediprog_handle, 0x42, 0x20, start % 0x10000, start / 0x10000, + (unsigned 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()); + msg_perr("Command Read SPI Bulk failed, %i %s!\n", ret, libusb_error_name(ret)); return 1; } for (i = 0; i < count; i++) { - ret = usb_bulk_read(dediprog_handle, 0x80 | dediprog_endpoint, - (char *)buf + i * chunksize, chunksize, - DEFAULT_TIMEOUT); - if (ret != chunksize) { - msg_perr("SPI bulk read %i failed, expected %i, got %i " - "%s!\n", i, chunksize, ret, usb_strerror()); + ret = libusb_bulk_transfer(dediprog_handle, 0x80 | dediprog_endpoint, + buf + i * chunksize, chunksize, &transferred, DEFAULT_TIMEOUT); + if ((ret < 0) || (transferred != chunksize)) { + msg_perr("SPI bulk read %i failed, expected %i, got %i %s!\n", + i, chunksize, ret, libusb_error_name(ret)); return 1; } } @@ -306,7 +342,7 @@ static int dediprog_spi_read(struct flashctx *flash, uint8_t *buf, static int dediprog_spi_bulk_write(struct flashctx *flash, uint8_t *buf, unsigned int chunksize, unsigned int start, unsigned int len, uint8_t dedi_spi_cmd) { - int ret; + int ret, transferred; unsigned int i; /* USB transfer size must be 512, other sizes will NOT work at all. * chunksize is the real data size per USB bulk transfer. The remaining @@ -314,7 +350,7 @@ static int dediprog_spi_bulk_write(struct flashctx *flash, uint8_t *buf, unsigne */ const unsigned int count = len / chunksize; const char count_and_cmd[] = {count & 0xff, (count >> 8) & 0xff, 0x00, dedi_spi_cmd}; - char usbbuf[512]; + unsigned char usbbuf[512]; /* * We should change this check to @@ -339,23 +375,21 @@ static int dediprog_spi_bulk_write(struct flashctx *flash, uint8_t *buf, unsigne /* 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, - (char *)count_and_cmd, sizeof(count_and_cmd), DEFAULT_TIMEOUT); + ret = libusb_control_transfer(dediprog_handle, 0x42, 0x30, start % 0x10000, start / 0x10000, + (unsigned 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, - usb_strerror()); + msg_perr("Command Write SPI Bulk failed, %i %s!\n", ret, libusb_error_name(ret)); return 1; } for (i = 0; i < count; i++) { memset(usbbuf, 0xff, sizeof(usbbuf)); memcpy(usbbuf, buf + i * chunksize, chunksize); - ret = usb_bulk_write(dediprog_handle, dediprog_endpoint, - usbbuf, 512, - DEFAULT_TIMEOUT); - if (ret != 512) { - msg_perr("SPI bulk write failed, expected %i, got %i " - "%s!\n", 512, ret, usb_strerror()); + ret = libusb_bulk_transfer(dediprog_handle, dediprog_endpoint, + usbbuf, 512, &transferred, DEFAULT_TIMEOUT); + if ((ret < 0) || (transferred != 512)) { + msg_perr("SPI bulk write failed, expected %i, got %i %s!\n", + 512, ret, libusb_error_name(ret)); return 1; } } @@ -444,23 +478,20 @@ static int dediprog_spi_send_command(struct flashctx *flash, msg_perr("Untested 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 = libusb_control_transfer(dediprog_handle, 0x42, 0x1, 0xff, readcnt ? 0x1 : 0x0, + (unsigned char *)writearr, writecnt, DEFAULT_TIMEOUT); if (ret != writecnt) { - msg_perr("Send SPI failed, expected %i, got %i %s!\n", - writecnt, ret, usb_strerror()); + msg_perr("Send SPI failed, expected %i, got %i %s!\n", writecnt, ret, libusb_error_name(ret)); return 1; } if (!readcnt) return 0; memset(readarr, 0, readcnt); - ret = usb_control_msg(dediprog_handle, 0xc2, 0x01, 0xbb8, 0x0000, - (char *)readarr, readcnt, DEFAULT_TIMEOUT); + ret = libusb_control_transfer(dediprog_handle, 0xc2, 0x01, 0xbb8, 0x0000, + readarr, readcnt, DEFAULT_TIMEOUT); if (ret != readcnt) { - msg_perr("Receive SPI failed, expected %i, got %i %s!\n", - readcnt, ret, usb_strerror()); + msg_perr("Receive SPI failed, expected %i, got %i %s!\n", readcnt, ret, libusb_error_name(ret)); return 1; } return 0; @@ -470,22 +501,18 @@ static int dediprog_check_devicestring(void) { int ret; int fw[3]; - char buf[0x11]; + unsigned char buf[0x11]; /* Command Prepare Receive Device String. */ memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc3, 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"); + ret = libusb_control_transfer(dediprog_handle, 0xc3, 0x7, 0x0, 0xef03, buf, 0x1, DEFAULT_TIMEOUT); + if ((ret != 0x1) || (buf[0] != 0xff)) { + msg_perr("Unexpected response to Command Prepare Receive Device String!\n"); return 1; } /* Command Receive Device String. */ memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc2, 0x8, 0xff, 0xff, buf, - 0x10, DEFAULT_TIMEOUT); + ret = libusb_control_transfer(dediprog_handle, 0xc2, 0x8, 0xff, 0xff, buf, 0x10, DEFAULT_TIMEOUT); if (ret != 0x10) { msg_perr("Incomplete/failed Command Receive Device String!\n"); return 1; @@ -496,7 +523,7 @@ static int dediprog_check_devicestring(void) msg_perr("Device not a SF100!\n"); return 1; } - if (sscanf(buf, "SF100 V:%d.%d.%d ", &fw[0], &fw[1], &fw[2]) != 3) { + if (sscanf((const char *)buf, "SF100 V:%d.%d.%d ", &fw[0], &fw[1], &fw[2]) != 3) { msg_perr("Unexpected firmware version string!\n"); return 1; } @@ -517,13 +544,12 @@ static int dediprog_check_devicestring(void) static int dediprog_command_a(void) { int ret; - char buf[0x1]; + unsigned char buf[0x1]; memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc3, 0xb, 0x0, 0x0, buf, - 0x1, DEFAULT_TIMEOUT); + ret = libusb_control_transfer(dediprog_handle, 0xc3, 0xb, 0x0, 0x0, buf, 0x1, DEFAULT_TIMEOUT); if (ret < 0) { - msg_perr("Command A failed (%s)!\n", usb_strerror()); + msg_perr("Command A failed (%s)!\n", libusb_error_name(ret)); return 1; } if ((ret != 0x1) || (buf[0] != 0x6f)) { @@ -541,13 +567,12 @@ static int dediprog_command_a(void) static int dediprog_command_b(void) { int ret; - char buf[0x3]; + unsigned char buf[0x3]; memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc3, 0x7, 0x0, 0xef00, buf, - 0x3, DEFAULT_TIMEOUT); + ret = libusb_control_transfer(dediprog_handle, 0xc3, 0x7, 0x0, 0xef00, buf, 0x3, DEFAULT_TIMEOUT); if (ret < 0) { - msg_perr("Command B failed (%s)!\n", usb_strerror()); + msg_perr("Command B failed (%s)!\n", libusb_error_name(ret)); return 1; } if ((ret != 0x3) || (buf[0] != 0xff) || (buf[1] != 0xff) || @@ -569,10 +594,9 @@ static int dediprog_command_c(void) { int ret; - ret = usb_control_msg(dediprog_handle, 0x42, 0x4, 0x0, 0x0, NULL, - 0x0, DEFAULT_TIMEOUT); + ret = libusb_control_transfer(dediprog_handle, 0x42, 0x4, 0x0, 0x0, NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { - msg_perr("Command C failed (%s)!\n", usb_strerror()); + msg_perr("Command C failed (%s)!\n", libusb_error_name(ret)); return 1; } return 0; @@ -587,17 +611,16 @@ static int dediprog_command_c(void) static int dediprog_command_f(int timeout) { int ret; - char buf[0x1]; + unsigned char buf[0x1]; memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc2, 0x11, 0xff, 0xff, buf, - 0x1, timeout); + ret = libusb_control_transfer(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()); + msg_perr("Command F failed (%s)!\n", libusb_error_name(ret)); return 1; } return 0; @@ -611,9 +634,9 @@ static int dediprog_command_g(void) { int ret; - ret = usb_control_msg(dediprog_handle, 0x42, 0x07, 0x09, 0x03, NULL, 0x0, DEFAULT_TIMEOUT); + ret = libusb_control_transfer(dediprog_handle, 0x42, 0x07, 0x09, 0x03, NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { - msg_perr("Command G failed (%s)!\n", usb_strerror()); + msg_perr("Command G failed (%s)!\n", libusb_error_name(ret)); return 1; } return 0; @@ -628,9 +651,9 @@ static int dediprog_command_h(void) { int ret; - ret = usb_control_msg(dediprog_handle, 0x42, 0x07, 0x09, 0x05, NULL, 0x0, DEFAULT_TIMEOUT); + ret = libusb_control_transfer(dediprog_handle, 0x42, 0x07, 0x09, 0x05, NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { - msg_perr("Command H failed (%s)!\n", usb_strerror()); + msg_perr("Command H failed (%s)!\n", libusb_error_name(ret)); return 1; } return 0; @@ -645,9 +668,9 @@ static int dediprog_command_i(void) { int ret; - ret = usb_control_msg(dediprog_handle, 0x42, 0x07, 0x09, 0x06, NULL, 0x0, DEFAULT_TIMEOUT); + ret = libusb_control_transfer(dediprog_handle, 0x42, 0x07, 0x09, 0x06, NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { - msg_perr("Command I failed (%s)!\n", usb_strerror()); + msg_perr("Command I failed (%s)!\n", libusb_error_name(ret)); return 1; } return 0; @@ -665,9 +688,9 @@ static int dediprog_command_j(void) { int ret; - ret = usb_control_msg(dediprog_handle, 0x42, 0x07, 0x09, 0x07, NULL, 0x0, DEFAULT_TIMEOUT); + ret = libusb_control_transfer(dediprog_handle, 0x42, 0x07, 0x09, 0x07, NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { - msg_perr("Command J failed (%s)!\n", usb_strerror()); + msg_perr("Command J failed (%s)!\n", libusb_error_name(ret)); return 1; } return 0; @@ -770,21 +793,18 @@ static int dediprog_shutdown(void *data) if (dediprog_set_spi_voltage(0x0)) return 1; - if (usb_release_interface(dediprog_handle, 0)) { + if (libusb_release_interface(dediprog_handle, 0)) { msg_perr("Could not release USB interface!\n"); return 1; } - if (usb_close(dediprog_handle)) { - msg_perr("Could not close USB device!\n"); - return 1; - } + libusb_close(dediprog_handle); + libusb_exit(usb_ctx); return 0; } /* URB numbers refer to the first log ever captured. */ int dediprog_init(void) { - struct usb_device *dev; char *voltage, *device, *spispeed; int spispeed_idx = 2; int millivolt = 3500; @@ -842,31 +862,29 @@ int dediprog_init(void) free(device); /* Here comes the USB stuff. */ - usb_init(); - usb_find_busses(); - usb_find_devices(); - dev = get_device_by_vid_pid(0x0483, 0xdada, (unsigned int) usedevice); - if (!dev) { + libusb_init(&usb_ctx); + if (!usb_ctx) { + msg_perr("Could not initialize libusb!\n"); + return 1; + } + dediprog_handle = get_device_by_vid_pid_number(0x0483, 0xdada, (unsigned int) usedevice); + if (!dediprog_handle) { msg_perr("Could not find a Dediprog SF100 on USB!\n"); + libusb_exit(usb_ctx); return 1; } - msg_pdbg("Found USB device (%04x:%04x).\n", - dev->descriptor.idVendor, dev->descriptor.idProduct); - dediprog_handle = usb_open(dev); - ret = usb_set_configuration(dediprog_handle, 1); - if (ret < 0) { - msg_perr("Could not set USB device configuration: %i %s\n", - ret, usb_strerror()); - if (usb_close(dediprog_handle)) - msg_perr("Could not close USB device!\n"); + ret = libusb_set_configuration(dediprog_handle, 1); + if (ret != 0) { + msg_perr("Could not set USB device configuration: %i %s\n", ret, libusb_error_name(ret)); + libusb_close(dediprog_handle); + libusb_exit(usb_ctx); return 1; } - ret = usb_claim_interface(dediprog_handle, 0); + ret = libusb_claim_interface(dediprog_handle, 0); if (ret < 0) { - msg_perr("Could not claim USB device interface %i: %i %s\n", - 0, ret, usb_strerror()); - if (usb_close(dediprog_handle)) - msg_perr("Could not close USB device!\n"); + msg_perr("Could not claim USB device interface %i: %i %s\n", 0, ret, libusb_error_name(ret)); + libusb_close(dediprog_handle); + libusb_exit(usb_ctx); return 1; } dediprog_endpoint = 2; -- 1.8.1.1

2 6

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom