flashrom November 2015

flashrom@flashrom.org

27 participants
78 discussions

Re: [flashrom] [PATCH] Use nanosleep() instead of usleep() where available.
by Stefan Tauner 13 Nov '15

13 Nov '15

On Sun, 1 Nov 2015 05:16:27 +0100 Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> wrote: > usleep() has been obsolete for quite a while. > The only target where it is currently used without alternative is DOS. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Committed in r1899. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH] Add (implicit) support for musl libc.
by Stefan Tauner 13 Nov '15

13 Nov '15

On Sat, 31 Oct 2015 21:50:59 +0100 Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> wrote: > This is mostly achieved by fixing or refining the inclusion of header > files and replacing glibc-specific ifdefs with more generic ones. > > - <sys/io.h>: Contains iopl(2) and x86 I/O port access functions (inb, outb etc). > Generally Linux-specific but also availble on debian/kFreeBSD. > Provided by glibc as well as musl and uclibc. > Include it if we are running Linux or if glibc is detected. > - <sys/fcntl.h>: should be (and is) replaced by <fcntl.h> (without the > "sys" prefix). > - <linux/spi/spidev.h>: Does not include all necessary headers, namely > _IOC_SIZEBITS that is used in the definition of > SPI_MSGSIZE is not brought in via <linux/ioctl.h> > but instead we relied so far on glibc's including > it via <sys/ioctl.h>. Change that to explicitly > including <linux/ioctl.h>. > - <endian.h>: Would also be available in musl but there is no easy way > to detect it so we do not try yet. > > The bug report and initial patches were > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou(a)trabucayre.com> > > Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Committed in r1898. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1899 - trunk
by repository service 13 Nov '15

13 Nov '15

Author: stefanct Date: Sat Nov 14 03:55:22 2015 New Revision: 1899 URL: http://flashrom.org/trac/flashrom/changeset/1899 Log: Use nanosleep() instead of usleep() where available. usleep() has been obsolete for quite a while. The only target that uses it without alternative is DOS. 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/udelay.c Modified: trunk/udelay.c ============================================================================== --- trunk/udelay.c Sat Nov 14 03:55:12 2015 (r1898) +++ trunk/udelay.c Sat Nov 14 03:55:22 2015 (r1899) @@ -22,6 +22,7 @@ #ifndef __LIBPAYLOAD__ #include <unistd.h> +#include <time.h> #include <sys/time.h> #include <stdlib.h> #include <limits.h> @@ -174,9 +175,11 @@ { #if IS_WINDOWS Sleep((usecs + 999) / 1000); -#else +#elif defined(__DJGPP__) sleep(usecs / 1000000); usleep(usecs % 1000000); +#else + nanosleep(&(struct timespec){usecs / 1000000, (usecs * 1000) % 1000000000UL}, NULL); #endif }

1 0

[commit] r1898 - trunk
by repository service 13 Nov '15

13 Nov '15

Author: stefanct Date: Sat Nov 14 03:55:12 2015 New Revision: 1898 URL: http://flashrom.org/trac/flashrom/changeset/1898 Log: Add (implicit) support for musl libc. This is mostly achieved by fixing or refining the inclusion of header files and replacing glibc-specific ifdefs with more generic ones. - <sys/io.h>: Contains iopl(2) and x86 I/O port access functions (inb, outb etc). Generally Linux-specific but also availble on debian/kFreeBSD. Provided by glibc as well as musl and uclibc. Include it if we are running Linux or if glibc is detected. - <sys/fcntl.h>: should be (and is) replaced by <fcntl.h> (without the "sys" prefix). - <linux/spi/spidev.h>: Does not include all necessary headers, namely _IOC_SIZEBITS that is used in the definition of SPI_MSGSIZE is not brought in via <linux/ioctl.h> but instead we relied so far on glibc's including it via <sys/ioctl.h>. Change that to explicitly including <linux/ioctl.h>. - <endian.h>: Would also be available in musl but there is no easy way to detect it so we do not try yet. The bug report and initial patches were Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou(a)trabucayre.com> 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/hwaccess.h trunk/linux_spi.c Modified: trunk/hwaccess.h ============================================================================== --- trunk/hwaccess.h Fri Oct 16 04:16:20 2015 (r1897) +++ trunk/hwaccess.h Sat Nov 14 03:55:12 2015 (r1898) @@ -26,12 +26,6 @@ #include "platform.h" -#if IS_X86 -#if defined(__GLIBC__) -#include <sys/io.h> -#endif -#endif - #if NEED_PCI == 1 /* * libpci headers use the variable name "index" which triggers shadowing @@ -115,6 +109,7 @@ #if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__) /* Nonstandard libc-specific macros for determining endianness. */ +/* musl provides an endian.h as well... but it can not be detected from within C. */ #if defined(__GLIBC__) #include <endian.h> #if BYTE_ORDER == LITTLE_ENDIAN @@ -204,6 +199,13 @@ #if NEED_PCI == 1 #if IS_X86 +/* sys/io.h provides iopl(2) and x86 I/O port access functions (inb, outb etc). + * It is included in glibc (thus available also on debian/kFreeBSD) but also in other libcs that mimic glibc, + * e.g. musl and uclibc. */ +#if defined(__linux__) || defined(__GLIBC__) +#include <sys/io.h> +#endif + #define __FLASHROM_HAVE_OUTB__ 1 /* for iopl and outb under Solaris */ Modified: trunk/linux_spi.c ============================================================================== --- trunk/linux_spi.c Fri Oct 16 04:16:20 2015 (r1897) +++ trunk/linux_spi.c Sat Nov 14 03:55:12 2015 (r1898) @@ -22,13 +22,14 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <sys/fcntl.h> +#include <fcntl.h> #include <errno.h> #include <ctype.h> #include <unistd.h> +#include <sys/ioctl.h> #include <linux/types.h> #include <linux/spi/spidev.h> -#include <sys/ioctl.h> +#include <linux/ioctl.h> #include "flash.h" #include "chipdrivers.h" #include "programmer.h"

1 0

Re: [flashrom] Error write Spansion S25FL023P0XMFI011
by Stefan Tauner 12 Nov '15

12 Nov '15

On Thu, 12 Nov 2015 13:07:54 +0200 Daniel Stelian Dobre <dobredanielstelian(a)gmail.com> wrote: > Hello, > > I have a little problem writeing Spansion S25FL023P0XMFI011 (32Mb). > I am using flashrom-0.9.6.1-r1705 and the DLP-USB1232H. > > The schematic is http://flashrom.org/File:Dlp_usb1232h_spi_programmer.jpg > > it works to reat the momty but when i try to write it it gives this error: > > *C:\Users\mxxxxx\Desktop\PirateBuss\flashrom-0.9.6.1-r1705-mingw\flashrom-0.9.6.1* > *-r1705-mingw>flashrom -p ft2232_spi:type=2232H,port=A -w S25FL_ORIG.mcs* > *flashrom v0.9.6.1-r1704 on Windows 6.1 (x86)* > *flashrom is free software, get the source code at http://www.flashrom.org > <http://www.flashrom.org>* > > *Calibrating delay loop... OK.* > *Found Spansion flash chip "S25FL032A/P" (4096 kB, SPI) on ft2232_spi.* > *Error: Image size (936773 B) doesn't match the flash chip's size (4194304 > B)!* > > Any ideas ? That you should not try to write random files to your flash chip... I think the error message is quite clear? -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] Will FlashROM support SPI programmer based on CH341A?
by Stefan Tauner 12 Nov '15

12 Nov '15

On Tue, 10 Nov 2015 17:55:08 +0300 Sergey SFH <arhichief(a)gmail.com> wrote: > Greatings. I want to buy SPI FLASH programmer based on CH341A. Will > FlashROM work with this type of programmers? And if it will, how I have to > use FlashROM with this programmer? Hi Sergey, it does not yet, but it will eventually. I have a programmer with that chip and some code but it is not completely ready. And it is in this state since July and I did not find time to complete it yet. So to be honest... it might take another few months until I finish it. There is another open source utility that supports the programmer but is a bit limited compared to flashrom. You can find the other software here: https://github.com/setarcos/ch341prog -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

Error write Spansion S25FL023P0XMFI011
by Daniel Stelian Dobre 12 Nov '15

12 Nov '15

Hello, I have a little problem writeing Spansion S25FL023P0XMFI011 (32Mb). I am using flashrom-0.9.6.1-r1705 and the DLP-USB1232H. The schematic is http://flashrom.org/File:Dlp_usb1232h_spi_programmer.jpg it works to reat the momty but when i try to write it it gives this error: *C:\Users\mxxxxx\Desktop\PirateBuss\flashrom-0.9.6.1-r1705-mingw\flashrom-0.9.6.1* *-r1705-mingw>flashrom -p ft2232_spi:type=2232H,port=A -w S25FL_ORIG.mcs* *flashrom v0.9.6.1-r1704 on Windows 6.1 (x86)* *flashrom is free software, get the source code at http://www.flashrom.org <http://www.flashrom.org>* *Calibrating delay loop... OK.* *Found Spansion flash chip "S25FL032A/P" (4096 kB, SPI) on ft2232_spi.* *Error: Image size (936773 B) doesn't match the flash chip's size (4194304 B)!* Any ideas ? *Best regards,* *Daniel Stelian Dobre*

1 0

New Log
by Jose Luis León 11 Nov '15

11 Nov '15

New Log flashrom -p serprog:dev=/dev/ttyACM0:115200 -o test.txt

1 0

[PATCH 1/3] 128 bytes write granularity support
by Paul Kocialkowski 11 Nov '15

11 Nov '15

Some chips such as the ENE KB9012 internal flash require a write granularity of 128 bytes. Signed-off-by: Paul Kocialkowski <contact(a)paulk.fr> --- flash.h | 1 + flashrom.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/flash.h b/flash.h index 2c2839f..24861ba 100644 --- a/flash.h +++ b/flash.h @@ -85,6 +85,7 @@ enum write_granularity { write_gran_1bit, /* Each bit can be cleared individually. */ write_gran_1byte, /* A byte can be written once. Further writes to an already written byte cause * its contents to be either undefined or to stay unchanged. */ + write_gran_128bytes, /* If less than 128 bytes are written, the unwritten bytes are undefined. */ write_gran_264bytes, /* If less than 264 bytes are written, the unwritten bytes are undefined. */ write_gran_512bytes, /* If less than 512 bytes are written, the unwritten bytes are undefined. */ write_gran_528bytes, /* If less than 528 bytes are written, the unwritten bytes are undefined. */ diff --git a/flashrom.c b/flashrom.c index d51a44c..c9c7e31 100644 --- a/flashrom.c +++ b/flashrom.c @@ -781,6 +781,9 @@ int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum break; } break; + case write_gran_128bytes: + result = need_erase_gran_bytes(have, want, len, 128); + break; case write_gran_256bytes: result = need_erase_gran_bytes(have, want, len, 256); break; @@ -847,6 +850,9 @@ static unsigned int get_next_write(const uint8_t *have, const uint8_t *want, uns case write_gran_1byte_implicit_erase: stride = 1; break; + case write_gran_128bytes: + stride = 128; + break; case write_gran_256bytes: stride = 256; break; -- 1.9.1

4 16

[PATCH v2 1/2] Flag-driven erased bit value
by Paul Kocialkowski 11 Nov '15

11 Nov '15

Most flash chips are erased to ones and programmed to zeros. However, some other flash chips, such as the ENE KB9012 internal flash, work the opposite way. Signed-off-by: Paul Kocialkowski <contact(a)paulk.fr> --- flash.h | 5 ++++- flashrom.c | 39 +++++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/flash.h b/flash.h index 24861ba..55d02de 100644 --- a/flash.h +++ b/flash.h @@ -123,6 +123,9 @@ enum write_granularity { #define FEATURE_WRSR_EITHER (FEATURE_WRSR_EWSR | FEATURE_WRSR_WREN) #define FEATURE_OTP (1 << 8) #define FEATURE_QPI (1 << 9) +#define FEATURE_ERASED_ZERO (1 << 10) + +#define ERASED_VALUE(flash) ((flash->chip->feature_bits & FEATURE_ERASED_ZERO) ? 0x00 : 0xff) enum test_state { OK = 0, @@ -275,7 +278,7 @@ int probe_flash(struct registered_master *mst, int startchip, struct flashctx *f int read_flash_to_file(struct flashctx *flash, const char *filename); char *extract_param(const char *const *haystack, const char *needle, const char *delim); int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int start, unsigned int len); -int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum write_granularity gran); +int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum write_granularity gran, const uint8_t erased_value); void print_version(void); void print_buildinfo(void); void print_banner(void); diff --git a/flashrom.c b/flashrom.c index c9c7e31..bd8ef3f 100644 --- a/flashrom.c +++ b/flashrom.c @@ -673,12 +673,13 @@ int check_erased_range(struct flashctx *flash, unsigned int start, { int ret; uint8_t *cmpbuf = malloc(len); + const uint8_t erased_value = ERASED_VALUE(flash); if (!cmpbuf) { msg_gerr("Could not allocate memory!\n"); exit(1); } - memset(cmpbuf, 0xff, len); + memset(cmpbuf, erased_value, len); ret = verify_range(flash, cmpbuf, start, len); free(cmpbuf); return ret; @@ -731,7 +732,7 @@ out_free: } /* Helper function for need_erase() that focuses on granularities of gran bytes. */ -static int need_erase_gran_bytes(const uint8_t *have, const uint8_t *want, unsigned int len, unsigned int gran) +static int need_erase_gran_bytes(const uint8_t *have, const uint8_t *want, unsigned int len, unsigned int gran, const uint8_t erased_value) { unsigned int i, j, limit; for (j = 0; j < len / gran; j++) { @@ -741,7 +742,7 @@ static int need_erase_gran_bytes(const uint8_t *have, const uint8_t *want, unsig continue; /* have needs to be in erased state. */ for (i = 0; i < limit; i++) - if (have[j * gran + i] != 0xff) + if (have[j * gran + i] != erased_value) return 1; } return 0; @@ -761,7 +762,7 @@ static int need_erase_gran_bytes(const uint8_t *have, const uint8_t *want, unsig * @gran write granularity (enum, not count) * @return 0 if no erase is needed, 1 otherwise */ -int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum write_granularity gran) +int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum write_granularity gran, const uint8_t erased_value) { int result = 0; unsigned int i; @@ -776,31 +777,31 @@ int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum break; case write_gran_1byte: for (i = 0; i < len; i++) - if ((have[i] != want[i]) && (have[i] != 0xff)) { + if ((have[i] != want[i]) && (have[i] != erased_value)) { result = 1; break; } break; case write_gran_128bytes: - result = need_erase_gran_bytes(have, want, len, 128); + result = need_erase_gran_bytes(have, want, len, 128, erased_value); break; case write_gran_256bytes: - result = need_erase_gran_bytes(have, want, len, 256); + result = need_erase_gran_bytes(have, want, len, 256, erased_value); break; case write_gran_264bytes: - result = need_erase_gran_bytes(have, want, len, 264); + result = need_erase_gran_bytes(have, want, len, 264, erased_value); break; case write_gran_512bytes: - result = need_erase_gran_bytes(have, want, len, 512); + result = need_erase_gran_bytes(have, want, len, 512, erased_value); break; case write_gran_528bytes: - result = need_erase_gran_bytes(have, want, len, 528); + result = need_erase_gran_bytes(have, want, len, 528, erased_value); break; case write_gran_1024bytes: - result = need_erase_gran_bytes(have, want, len, 1024); + result = need_erase_gran_bytes(have, want, len, 1024, erased_value); break; case write_gran_1056bytes: - result = need_erase_gran_bytes(have, want, len, 1056); + result = need_erase_gran_bytes(have, want, len, 1056, erased_value); break; case write_gran_1byte_implicit_erase: /* Do not erase, handle content changes from anything->0xff by writing 0xff. */ @@ -1424,6 +1425,7 @@ static int erase_and_write_block_helper(struct flashctx *flash, unsigned int starthere = 0, lenhere = 0; int ret = 0, skip = 1, writecount = 0; enum write_granularity gran = flash->chip->gran; + const uint8_t erased_value = ERASED_VALUE(flash); /* curcontents and newcontents are opaque to walk_eraseregions, and * need to be adjusted here to keep the impression of proper abstraction @@ -1431,7 +1433,7 @@ static int erase_and_write_block_helper(struct flashctx *flash, curcontents += start; newcontents += start; msg_cdbg(":"); - if (need_erase(curcontents, newcontents, len, gran)) { + if (need_erase(curcontents, newcontents, len, gran, erased_value)) { msg_cdbg("E"); ret = erasefn(flash, start, len); if (ret) @@ -1441,7 +1443,7 @@ static int erase_and_write_block_helper(struct flashctx *flash, return -1; } /* Erase was successful. Adjust curcontents. */ - memset(curcontents, 0xff, len); + memset(curcontents, erased_value, len); skip = 0; } /* get_next_write() sets starthere to a new value after the call. */ @@ -1938,6 +1940,7 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it, int ret = 0; unsigned long size = flash->chip->total_size * 1024; int read_all_first = 1; /* FIXME: Make this configurable. */ + const uint8_t erased_value = ERASED_VALUE(flash); if (chip_safety_check(flash, force, read_it, write_it, erase_it, verify_it)) { msg_cerr("Aborting.\n"); @@ -1964,15 +1967,15 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it, msg_gerr("Out of memory!\n"); exit(1); } - /* Assume worst case: All bits are 0. */ - memset(oldcontents, 0x00, size); + /* Assume worst case: All bits are not erased. */ + memset(oldcontents, ~erased_value, size); newcontents = malloc(size); if (!newcontents) { msg_gerr("Out of memory!\n"); exit(1); } - /* Assume best case: All bits should be 1. */ - memset(newcontents, 0xff, size); + /* Assume best case: All bits should be erased. */ + memset(newcontents, erased_value, size); /* Side effect of the assumptions above: Default write action is erase * because newcontents looks like a completely erased chip, and * oldcontents being completely 0x00 means we have to erase everything -- 2.4.3

2 5

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom November 2015