flashrom

flashrom@flashrom.org

3 participants
9189 discussions

[PATCH] Add support for 4-address-byte commands and block-erase 0xDC
by Mark Marshall 28 Mar '13

28 Mar '13

To support flashes that are larger than 16 MBytes we need to support '4-byte-address' program and erase commands. Signed-off-by: Mark Marshall <mark.marshall(a)omicron.at> --- chipdrivers.h | 1 + spi.h | 13 +++++ spi25.c | 175 +++++++++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 147 insertions(+), 42 deletions(-) diff --git a/chipdrivers.h b/chipdrivers.h index f0223ae..244d421 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -47,6 +47,7 @@ int spi_block_erase_52(struct flashctx *flash, unsigned int addr, unsigned int b int spi_block_erase_81(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_d7(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_d8(struct flashctx *flash, unsigned int addr, unsigned int blocklen); +int spi_block_erase_dc(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_60(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_62(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_c7(struct flashctx *flash, unsigned int addr, unsigned int blocklen); diff --git a/spi.h b/spi.h index 297125e..359756a 100644 --- a/spi.h +++ b/spi.h @@ -101,6 +101,11 @@ #define JEDEC_BE_D7_OUTSIZE 0x04 #define JEDEC_BE_D7_INSIZE 0x00 +/* Block Erase 0xdc is supported by Spansion chips. */ +#define JEDEC_BE_DC 0xdc +#define JEDEC_BE_DC_OUTSIZE 0x05 +#define JEDEC_BE_DC_INSIZE 0x00 + /* Sector Erase 0x20 is supported by Macronix/SST chips. */ #define JEDEC_SE 0x20 #define JEDEC_SE_OUTSIZE 0x04 @@ -131,11 +136,19 @@ #define JEDEC_READ_OUTSIZE 0x04 /* JEDEC_READ_INSIZE : any length */ +#define JEDEC_4_READ 0x13 +#define JEDEC_4_READ_OUTSIZE 0x05 +/* JEDEC_4_READ_INSIZE : any length */ + /* Write memory byte */ #define JEDEC_BYTE_PROGRAM 0x02 #define JEDEC_BYTE_PROGRAM_OUTSIZE 0x05 #define JEDEC_BYTE_PROGRAM_INSIZE 0x00 +#define JEDEC_4_BYTE_PROGRAM 0x12 +#define JEDEC_4_BYTE_PROGRAM_OUTSIZE 0x06 +#define JEDEC_4_BYTE_PROGRAM_INSIZE 0x00 + /* Write AAI word (SST25VF080B) */ #define JEDEC_AAI_WORD_PROGRAM 0xad #define JEDEC_AAI_WORD_PROGRAM_OUTSIZE 0x06 diff --git a/spi25.c b/spi25.c index 911dc4e..3beab3a 100644 --- a/spi25.c +++ b/spi25.c @@ -453,6 +453,50 @@ int spi_block_erase_52(struct flashctx *flash, unsigned int addr, return 0; } +/* Block size is usually 256k */ +int spi_block_erase_dc(struct flashctx *flash, unsigned int addr, + unsigned int blocklen) +{ + int result; + struct spi_command cmds[] = { + { + .writecnt = JEDEC_WREN_OUTSIZE, + .writearr = (const unsigned char[]){ JEDEC_WREN }, + .readcnt = 0, + .readarr = NULL, + }, { + .writecnt = JEDEC_BE_DC_OUTSIZE, + .writearr = (const unsigned char[]){ + JEDEC_BE_DC, + (addr >> 24) & 0xff, + (addr >> 16) & 0xff, + (addr >> 8) & 0xff, + (addr & 0xff) + }, + .readcnt = 0, + .readarr = NULL, + }, { + .writecnt = 0, + .writearr = NULL, + .readcnt = 0, + .readarr = NULL, + }}; + + result = spi_send_multicommand(flash, cmds); + if (result) { + msg_cerr("%s failed during command execution at address 0x%x\n", + __func__, addr); + return result; + } + /* Wait until the Write-In-Progress bit is cleared. + * This usually takes 100-4000 ms, so wait in 100 ms steps. + */ + while (spi_read_status_register(flash) & SPI_SR_WIP) + programmer_delay(100 * 1000); + /* FIXME: Check the status register for errors. */ + return 0; +} + /* Block size is usually * 64k for Macronix * 32k for SST @@ -719,6 +763,8 @@ erasefunc_t *spi_get_erasefn_from_opcode(uint8_t opcode) return &spi_block_erase_d7; case 0xd8: return &spi_block_erase_d8; + case 0xdc: + return &spi_block_erase_dc; default: msg_cinfo("%s: unknown erase opcode (0x%02x). Please report " "this at flashrom(a)flashrom.org\n", __func__, opcode); @@ -730,6 +776,7 @@ int spi_byte_program(struct flashctx *flash, unsigned int addr, uint8_t databyte) { int result; + uint8_t cmd[JEDEC_4_BYTE_PROGRAM_OUTSIZE]; struct spi_command cmds[] = { { .writecnt = JEDEC_WREN_OUTSIZE, @@ -737,14 +784,8 @@ int spi_byte_program(struct flashctx *flash, unsigned int addr, .readcnt = 0, .readarr = NULL, }, { - .writecnt = JEDEC_BYTE_PROGRAM_OUTSIZE, - .writearr = (const unsigned char[]){ - JEDEC_BYTE_PROGRAM, - (addr >> 16) & 0xff, - (addr >> 8) & 0xff, - (addr & 0xff), - databyte - }, + .writecnt = 0, + .writearr = NULL, .readcnt = 0, .readarr = NULL, }, { @@ -754,6 +795,32 @@ int spi_byte_program(struct flashctx *flash, unsigned int addr, .readarr = NULL, }}; + /* We always use the 4-byte commands for chips bigger than 16 + * MB as we don't know what's in the 'bank address + * register'. */ + if (flash->chip->total_size > 16 * 1024) { + + cmds[1].writecnt = JEDEC_4_BYTE_PROGRAM_OUTSIZE; + cmds[1].writearr = cmd; + + cmd[0] = JEDEC_4_BYTE_PROGRAM; + cmd[1] = (addr >> 24) & 0xff; + cmd[2] = (addr >> 16) & 0xff; + cmd[3] = (addr >> 8) & 0xff; + cmd[4] = (addr >> 0) & 0xff; + cmd[5] = databyte; + } else { + + cmds[1].writecnt = JEDEC_BYTE_PROGRAM_OUTSIZE; + cmds[1].writearr = cmd; + + cmd[0] = JEDEC_BYTE_PROGRAM; + cmd[1] = (addr >> 16) & 0xff; + cmd[2] = (addr >> 8) & 0xff; + cmd[3] = (addr >> 0) & 0xff; + cmd[4] = databyte; + } + result = spi_send_multicommand(flash, cmds); if (result) { msg_cerr("%s failed during command execution at address 0x%x\n", @@ -766,13 +833,7 @@ int spi_nbyte_program(struct flashctx *flash, unsigned int addr, uint8_t *bytes, unsigned int len) { int result; - /* FIXME: Switch to malloc based on len unless that kills speed. */ - unsigned char cmd[JEDEC_BYTE_PROGRAM_OUTSIZE - 1 + 256] = { - JEDEC_BYTE_PROGRAM, - (addr >> 16) & 0xff, - (addr >> 8) & 0xff, - (addr >> 0) & 0xff, - }; + uint8_t cmd[JEDEC_4_BYTE_PROGRAM_OUTSIZE - 1 + 512]; struct spi_command cmds[] = { { .writecnt = JEDEC_WREN_OUTSIZE, @@ -780,8 +841,8 @@ int spi_nbyte_program(struct flashctx *flash, unsigned int addr, uint8_t *bytes, .readcnt = 0, .readarr = NULL, }, { - .writecnt = JEDEC_BYTE_PROGRAM_OUTSIZE - 1 + len, - .writearr = cmd, + .writecnt = 0, + .writearr = NULL, .readcnt = 0, .readarr = NULL, }, { @@ -795,33 +856,69 @@ int spi_nbyte_program(struct flashctx *flash, unsigned int addr, uint8_t *bytes, msg_cerr("%s called for zero-length write\n", __func__); return 1; } - if (len > 256) { + if (len > 512) { msg_cerr("%s called for too long a write\n", __func__); return 1; } - memcpy(&cmd[4], bytes, len); + /* We always use the 4-byte commands for chips bigger than 16 + * MB as we don't know what's in the 'bank address + * register'. */ + if (flash->chip->total_size > 16 * 1024) { + cmds[1].writecnt = JEDEC_4_BYTE_PROGRAM_OUTSIZE - 1 + len; + cmds[1].writearr = cmd; + + cmd[0] = JEDEC_4_BYTE_PROGRAM; + cmd[1] = (addr >> 24) & 0xff; + cmd[2] = (addr >> 16) & 0xff; + cmd[3] = (addr >> 8) & 0xff; + cmd[4] = (addr >> 0) & 0xff; + + memcpy(&cmd[5], bytes, len); + } else { + cmds[1].writecnt = JEDEC_BYTE_PROGRAM_OUTSIZE - 1 + len; + cmds[1].writearr = cmd; + + cmd[0] = JEDEC_BYTE_PROGRAM; + cmd[1] = (addr >> 16) & 0xff; + cmd[2] = (addr >> 8) & 0xff; + cmd[3] = (addr >> 0) & 0xff; + + memcpy(&cmd[4], bytes, len); + } result = spi_send_multicommand(flash, cmds); if (result) { msg_cerr("%s failed during command execution at address 0x%x\n", __func__, addr); } + return result; } int spi_nbyte_read(struct flashctx *flash, unsigned int address, uint8_t *bytes, unsigned int len) { - const unsigned char cmd[JEDEC_READ_OUTSIZE] = { - JEDEC_READ, - (address >> 16) & 0xff, - (address >> 8) & 0xff, - (address >> 0) & 0xff, - }; + unsigned char cmd[JEDEC_4_READ_OUTSIZE]; + unsigned int cmd_len; + + if (flash->chip->total_size > 16 * 1024) { + cmd[0] = JEDEC_4_READ; + cmd[1] = (address >> 24) & 0xff; + cmd[2] = (address >> 16) & 0xff; + cmd[3] = (address >> 8) & 0xff; + cmd[4] = (address >> 0) & 0xff; + cmd_len = JEDEC_4_READ_OUTSIZE; + } else { + cmd[0] = JEDEC_READ; + cmd[1] = (address >> 16) & 0xff; + cmd[2] = (address >> 8) & 0xff; + cmd[3] = (address >> 0) & 0xff; + cmd_len = JEDEC_READ_OUTSIZE; + } /* Send Read */ - return spi_send_command(flash, sizeof(cmd), len, cmd, bytes); + return spi_send_command(flash, cmd_len, len, cmd, bytes); } /* @@ -873,7 +970,7 @@ int spi_write_chunked(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize) { int rc = 0; - unsigned int i, j, starthere, lenhere, towrite; + unsigned int pos, j, lenhere, towrite, page_end; /* FIXME: page_size is the wrong variable. We need max_writechunk_size * in struct flashctx to do this properly. All chips using * spi_chip_write_256 have page_size set to max_writechunk_size, so @@ -881,24 +978,18 @@ int spi_write_chunked(struct flashctx *flash, uint8_t *buf, unsigned int start, */ unsigned int page_size = flash->chip->page_size; - /* Warning: This loop has a very unusual condition and body. - * The loop needs to go through each page with at least one affected - * byte. The lowest page number is (start / page_size) since that - * division rounds down. The highest page number we want is the page - * where the last byte of the range lives. That last byte has the - * address (start + len - 1), thus the highest page number is - * (start + len - 1) / page_size. Since we want to include that last - * page as well, the loop condition uses <=. - */ - for (i = start / page_size; i <= (start + len - 1) / page_size; i++) { - /* Byte position of the first byte in the range in this page. */ - /* starthere is an offset to the base address of the chip. */ - starthere = max(start, i * page_size); + if (page_size & (page_size - 1)) { + msg_cerr("page_size not a power of 2 (%u)?\n", page_size); + } + + for (pos = start; pos < (start + len); pos += lenhere) { + /* This is the end of the current page (start of the next page). */ + page_end = (pos & ~(page_size - 1)) + page_size; /* Length of bytes in the range in this page. */ - lenhere = min(start + len, (i + 1) * page_size) - starthere; + lenhere = min(start + len, page_end) - pos; for (j = 0; j < lenhere; j += chunksize) { towrite = min(chunksize, lenhere - j); - rc = spi_nbyte_program(flash, starthere + j, buf + starthere - start + j, towrite); + rc = spi_nbyte_program(flash, pos + j, buf + pos - start + j, towrite); if (rc) break; while (spi_read_status_register(flash) & SPI_SR_WIP)

1 0

Re: [flashrom] [PATCH] Refine granularity handling in preparation of AT45DB series support.
by Mark Marshall 28 Mar '13

28 Mar '13

Hi. I'm currently struggling to understand what the write granularity is for and how it interacts with the page size? I'm also a little confused by flashrom's use of page size? I am mainly interested in SPI flash chips. For most SPI chips the "page size" is 256 bytes. I have a chip where the page size is 512 bytes. The "page size" is the amount that writes using the PP command have to be chunked by. So "spi_nbyte_program" must be used to write no more than "page size" bytes and must not cross a "page size" boundary. So far this all makes sense, apart from the "spi_chip_write_256" function, which should be named "spi_chip_write_page"? (as all chips currently have a page size of 256 this is correct at the moment, but I'm about to add one that doesn't). I think that the "chunksize" parameter in spi_write_chunked is to do with possible restrictions of some programmer hardware? This also makes sense, apart from all of the comments which are very out of date? According to the manuals of the SPI Flash chips I've looked at, when using the PP command you can program any part of a page, and the correct thing will happen (1's can only be written to 0's). So I don't see how this matches up with "write granularity", which claims that the other bytes in the granularity region will be "undefined"? Is write granularity for something else? Is there a post somewhere that I missed that explains all of this? Thanks for any help, Mark M. On 14 March 2013 12:13, Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at>wrote: > This adds a number of new granularities in a rather inelegant way. > Until we figure out how to better handle various granularities this has > to be accepted. > > It also refactors the handling of n-byte granularities by extracting the > checking code into a helper function which reduces the pain of the above > significantly. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > This is one possibility to solve the granularity issue and i think the > most likely to get the patch series in fastest... > > flash.h | 24 +++++++++++++---------- > flashrom.c | 64 > ++++++++++++++++++++++++++++++++++++++++++++++-------------- > 2 files changed, 63 insertions(+), 25 deletions(-) > > diff --git a/flash.h b/flash.h > index 9c4b0ac..845d898 100644 > --- a/flash.h > +++ b/flash.h > @@ -59,18 +59,22 @@ enum chipbustype { > }; > > /* > - * The following write granularities are known: > - * - 1 bit: Each bit can be cleared individually. > - * - 1 byte: A byte can be written once. Further writes to an already > written byte cause its contents to be > - * either undefined or to stay unchanged. > - * - 128 bytes: If less than 128 bytes are written, the rest will be > erased. Each write to a 128-byte region > - * will trigger an automatic erase before anything is written. Very > uncommon behaviour. > - * - 256 bytes: If less than 256 bytes are written, the contents of the > unwritten bytes are undefined. > + * The following enum defines possible write granularities of flash > chips. These tend to reflect the properties > + * of the actual hardware not necesserily the write function(s) defined > by the respective struct flashchip. > + * The latter might (and should) be more precisely specified, e.g. they > might bail out early if their execution > + * would result in undefined chip contents. > */ > enum write_granularity { > - write_gran_256bytes = 0, /* We assume 256 byte granularity by > default. */ > - write_gran_1bit, > - write_gran_1byte, > + /* We assume 256 byte granularity by default. */ > + write_gran_256bytes = 0,/* If less than 256 bytes are written, the > unwritten bytes are undefined. */ > + 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_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. */ > + write_gran_1024bytes, /* If less than 1024 bytes are written, > the unwritten bytes are undefined. */ > + write_gran_1056bytes, /* If less than 1056 bytes are written, > the unwritten bytes are undefined. */ > }; > > /* > diff --git a/flashrom.c b/flashrom.c > index 225b6f0..4e5f484 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -676,6 +676,23 @@ out_free: > return ret; > } > > +/* Helper function for need_erase() that focuses on granularities of n > bytes. */ > +static int need_erase_n_bytes(uint8_t *have, uint8_t *want, unsigned int > len, unsigned int n) > +{ > + unsigned int i, j, limit; > + for (j = 0; j < len / n; j++) { > + limit = min (n, len - j * n); > + /* Are 'have' and 'want' identical? */ > + if (!memcmp(have + j * n, want + j * n, limit)) > + continue; > + /* have needs to be in erased state. */ > + for (i = 0; i < limit; i++) > + if (have[j * n + i] != 0xff) > + return 1; > + } > + return 0; > +} > + > /* > * Check if the buffer @have can be programmed to the content of @want > without > * erasing. This is only possible if all chunks of size @gran are either > kept > @@ -693,7 +710,7 @@ out_free: > int need_erase(uint8_t *have, uint8_t *want, unsigned int len, enum > write_granularity gran) > { > int result = 0; > - unsigned int i, j, limit; > + unsigned int i; > > switch (gran) { > case write_gran_1bit: > @@ -711,20 +728,22 @@ int need_erase(uint8_t *have, uint8_t *want, > unsigned int len, enum write_granul > } > break; > case write_gran_256bytes: > - for (j = 0; j < len / 256; j++) { > - limit = min (256, len - j * 256); > - /* Are 'have' and 'want' identical? */ > - if (!memcmp(have + j * 256, want + j * 256, limit)) > - continue; > - /* have needs to be in erased state. */ > - for (i = 0; i < limit; i++) > - if (have[j * 256 + i] != 0xff) { > - result = 1; > - break; > - } > - if (result) > - break; > - } > + result = need_erase_n_bytes(have, want, len, 256); > + break; > + case write_gran_264bytes: > + result = need_erase_n_bytes(have, want, len, 264); > + break; > + case write_gran_512bytes: > + result = need_erase_n_bytes(have, want, len, 512); > + break; > + case write_gran_528bytes: > + result = need_erase_n_bytes(have, want, len, 528); > + break; > + case write_gran_1024bytes: > + result = need_erase_n_bytes(have, want, len, 1024); > + break; > + case write_gran_1056bytes: > + result = need_erase_n_bytes(have, want, len, 1056); > break; > default: > msg_cerr("%s: Unsupported granularity! Please report a bug > at " > @@ -772,6 +791,21 @@ static unsigned int get_next_write(uint8_t *have, > uint8_t *want, unsigned int le > case write_gran_256bytes: > stride = 256; > break; > + case write_gran_264bytes: > + stride = 264; > + break; > + case write_gran_512bytes: > + stride = 512; > + break; > + case write_gran_528bytes: > + stride = 528; > + break; > + case write_gran_1024bytes: > + stride = 1024; > + break; > + case write_gran_1056bytes: > + stride = 1056; > + break; > default: > msg_cerr("%s: Unsupported granularity! Please report a bug > at " > "flashrom(a)flashrom.org\n", __func__); > -- > Kind regards, Stefan Tauner > > > _______________________________________________ > flashrom mailing list > flashrom(a)flashrom.org > http://www.flashrom.org/mailman/listinfo/flashrom >

1 0

SPI issue on FTDI
by chethan kumar 28 Mar '13

28 Mar '13

Hi I have a question on FTDI. We are using FTDI2232H chip for programming the flash. After programming the flash we want to put the FTDI SPI lines in the MPSSE mode to tri state. Could you please let me know what should we do in order to achieve this. Is there any APIs to put FTDI lines to tri state mode? Is there any document that we can refer? Regards, Chethan

1 0

Re: [flashrom] AMD - SP5100 - take SPI ownership (1/2)
by Racine, Michel 27 Mar '13

27 Mar '13

Hello Rudolf, With your patch, I had a small compile issue (imc.c, function mbox_wait_ack, commented call to msg_pwarn). I attempted to use the exe, but it cannot turn off IMC. Not sure what you need from here. I can change the code, or gather any data you want. Output of flashrom execution: ./flashrom_imcpatch -p internal flashrom v0.9.6.1-r1564 on Linux 2.6.32-5-686 (i686) flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found chipset "AMD SB7x0/SB8x0/SB9x0". Enabling flash write... (Shutting down IMC failed!) FAILED! FATAL ERROR! Error: Programmer initialization failed. Please let me know what you suggest we do next. Thanks, Michel. -----Original Message----- From: Racine, Michel Sent: Wednesday, March 27, 2013 9:36 AM To: Rudolf Marek; roxfan Cc: frederic.temporelli(a)bull.net; wmkamp(a)datakamp.de; flashrom(a)flashrom.org; Racine, Michel Subject: RE: [flashrom] AMD - SP5100 - take SPI ownership (1/2) Hello Rudolf, I'm assuming I only need to apply the a.patch you sent (not the imc.patch) to the source for 0.9.6.1. I will test this on an AMD Persimmon board (it won't boot currently, I need a dediProg because I bricked it). I'll update soon, Cheers, Michel. -----Original Message----- From: Rudolf Marek [mailto:r.marek@assembler.cz] Sent: Tuesday, March 26, 2013 9:36 AM To: roxfan Cc: frederic.temporelli(a)bull.net; wmkamp(a)datakamp.de; flashrom(a)flashrom.org; Racine, Michel Subject: Re: [flashrom] AMD - SP5100 - take SPI ownership (1/2) Hi all I tried with IMC activated on coreboot (Hudson chipset) and it works as expected. Attached patch only tweaks messages and removes now redundant check from sb600 SPI. If IMC is active and firmware handoff fails, then it exits with fatal error. Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> It would be nice if someone else could test this (and dont forget to be able to recover from bad flash) Thanks Rudolf

1 0

Re: [flashrom] base64 encoded attachments
by Stefan Tauner 27 Mar '13

27 Mar '13

On Sun, 24 Mar 2013 19:59:23 +0400 Николай Николаев <evrinoma(a)gmail.com> wrote: > Excuse me for my mistakes. > Could you see again my patches? Hello, thanks for your refined patch and the one you sent today. There is no need to remind me of any patch, we track them semi- automatically with patchwork. It will probably take a while before anyone will look at them because there is a huge pile of unprocessed patches that were sent long before yours and/or have higher priority to the reviewers: http://patchwork.coreboot.org/project/flashrom/list/ Please be patient and/or review patches of others and give feedback to help to integrate all patches faster. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH v6] Add Altera USB-Blaster SPI programmer.
by Stefan Tauner 27 Mar '13

27 Mar '13

On Wed, 27 Mar 2013 00:44:57 +0100 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > Only Makefile changes versus v5. > I still don't get this make magic at all... > why does grepping in the .features file work which is only created when > NEED_FTDI is set to yes, which only happens after the grepping (at least > it is set one lines below NEED_FTDI...)!? the explanation (which I seem to keep forgetting forever) is the two-phase evaluation of makefile and so-called deferred expansions: http://www.gnu.org/software/make/manual/html_node/Reading-Makefiles.html With v6 it is possible to compile ft2232_spi and usbblaster_spi independently. The only thing that does not work is stuff like make distclean ; make CONFIG_FT2232_SPI=yes CONFIG_USBBLASTER_SPI=no ; make CONFIG_FT2232_SPI=no CONFIG_USBBLASTER=yes because of the enum programmer, but that is not specific to this programmer, so I have committed ~this version in r1658 eventually. Thanks Kyösti for pushing and thanks James for the initial version of the patch! -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1658 - trunk
by repository service 27 Mar '13

27 Mar '13

Author: stefanct Date: Wed Mar 27 14:00:23 2013 New Revision: 1658 URL: http://flashrom.org/trac/flashrom/changeset/1658 Log: Add Altera USB-Blaster SPI programmer. Adds support for the Altera USB-Blaster programming dongle in Active Serial (AS) mode. Tested on both original product and a clone dongle. Signed-off-by: James Laird <jhl(a)mafipulation.org> Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Added: trunk/usbblaster_spi.c (contents, props changed) Modified: trunk/Makefile trunk/README trunk/flashrom.8 trunk/flashrom.c trunk/programmer.h Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Mar 16 02:22:12 2013 (r1657) +++ trunk/Makefile Wed Mar 27 14:00:23 2013 (r1658) @@ -128,6 +128,11 @@ else override CONFIG_FT2232_SPI = no endif +ifeq ($(CONFIG_USBBLASTER_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_USBBLASTER_SPI=yes +else +override CONFIG_USBBLASTER_SPI = no +endif endif # FIXME: Should we check for Cygwin/MSVC as well? @@ -240,6 +245,11 @@ else override CONFIG_FT2232_SPI = no endif +ifeq ($(CONFIG_USBBLASTER_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_USBBLASTER_SPI=yes +else +override CONFIG_USBBLASTER_SPI = no +endif endif ifneq ($(TARGET_OS), Linux) @@ -349,6 +359,9 @@ # Always enable FT2232 SPI dongles for now. CONFIG_FT2232_SPI ?= yes +# Always enable Altera USB-Blaster dongles for now. +CONFIG_USBBLASTER_SPI ?= yes + # Always enable dummy tracing for now. CONFIG_DUMMY ?= yes @@ -474,12 +487,23 @@ endif ifeq ($(CONFIG_FT2232_SPI), yes) -FTDILIBS := $(shell pkg-config --libs libftdi 2>/dev/null || printf "%s" "-lftdi -lusb") # This is a totally ugly hack. FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'CONFIG_FT2232_SPI=1'") +NEED_FTDI := yes +PROGRAMMER_OBJS += ft2232_spi.o +endif + +ifeq ($(CONFIG_USBBLASTER_SPI), yes) +# This is a totally ugly hack. +FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'CONFIG_USBBLASTER_SPI=1'") +NEED_FTDI := yes +PROGRAMMER_OBJS += usbblaster_spi.o +endif + +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)") -PROGRAMMER_OBJS += ft2232_spi.o # We can't set NEED_USB here because that would transform libftdi auto-enabling # into a hard requirement for libusb, defeating the purpose of auto-enabling. endif @@ -799,7 +823,7 @@ features: compiler @echo "FEATURES := yes" > .features.tmp -ifeq ($(CONFIG_FT2232_SPI), yes) +ifeq ($(NEED_FTDI), yes) @printf "Checking for FTDI support... " @echo "$$FTDI_TEST" > .featuretest.c @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) $(FTDILIBS) $(LIBS) >/dev/null 2>&1 && \ Modified: trunk/README ============================================================================== --- trunk/README Sat Mar 16 02:22:12 2013 (r1657) +++ trunk/README Wed Mar 27 14:00:23 2013 (r1658) @@ -45,8 +45,8 @@ To build flashrom you need to install the following software: * pciutils+libpci (if you want support for mainboard or PCI device flashing) - * libusb (if you want FT2232 or Dediprog support) - * libftdi (if you want FT2232 support) + * libusb (if you want FT2232, Dediprog or USB-Blaster support) + * libftdi (if you want FT2232 or USB-Blaster support) Linux et al: Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Sat Mar 16 02:22:12 2013 (r1657) +++ trunk/flashrom.8 Wed Mar 27 14:00:23 2013 (r1658) @@ -220,6 +220,8 @@ .sp .BR "* linux_spi" " (for SPI flash ROMs accessible via /dev/spidevX.Y on Linux)" .sp +.BR "* usbblaster_spi" " (for SPI flash ROMs attached to an Altera USB-Blaster compatible cable)" +.sp Some programmers have optional or mandatory parameters which are described in detail in the .B PROGRAMMER SPECIFIC INFO @@ -837,7 +839,7 @@ .B buspirate_spi needs userspace access to a serial port. .sp -.BR dediprog " and " ft2232_spi +.BR dediprog ", " ft2232_spi " and " usbblaster_spi need access to the USB device via libusb. .sp .B dummy @@ -847,7 +849,7 @@ .BR gfxnvidia ", " drkaiser ", " satasii ", " satamv " and " atahpt have to be run as superuser/root, and need additional raw access permission. .sp -.BR serprog ", " buspirate_spi ", " dediprog " and " ft2232_spi +.BR serprog ", " buspirate_spi ", " dediprog ", " usbblaster_spi " and " ft2232_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 Sat Mar 16 02:22:12 2013 (r1657) +++ trunk/flashrom.c Wed Mar 27 14:00:23 2013 (r1658) @@ -308,6 +308,18 @@ }, #endif +#if CONFIG_USBBLASTER_SPI == 1 + { + .name = "usbblaster_spi", + .type = USB, + .devs.dev = devs_usbblasterspi, + .init = usbblaster_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + {0}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Sat Mar 16 02:22:12 2013 (r1657) +++ trunk/programmer.h Wed Mar 27 14:00:23 2013 (r1658) @@ -87,6 +87,9 @@ #if CONFIG_LINUX_SPI == 1 PROGRAMMER_LINUX_SPI, #endif +#if CONFIG_USBBLASTER_SPI == 1 + PROGRAMMER_USBBLASTER_SPI, +#endif PROGRAMMER_INVALID /* This must always be the last entry. */ }; @@ -431,6 +434,12 @@ extern const struct dev_entry devs_ft2232spi[]; #endif +/* usbblaster_spi.c */ +#if CONFIG_USBBLASTER_SPI == 1 +int usbblaster_spi_init(void); +extern const struct dev_entry devs_usbblasterspi[]; +#endif + /* rayer_spi.c */ #if CONFIG_RAYER_SPI == 1 int rayer_spi_init(void); @@ -509,6 +518,9 @@ #if CONFIG_SERPROG == 1 SPI_CONTROLLER_SERPROG, #endif +#if CONFIG_USBBLASTER_SPI == 1 + SPI_CONTROLLER_USBBLASTER, +#endif }; #define MAX_DATA_UNSPECIFIED 0 Added: trunk/usbblaster_spi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/usbblaster_spi.c Wed Mar 27 14:00:23 2013 (r1658) @@ -0,0 +1,225 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2012 James Laird <jhl(a)mafipulation.org> + * + * 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; version 2 of the License. + * + * 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 + */ + +/* + * Device should be connected as per "active serial" mode: + * + * +---------+------+-----------+ + * | SPI | Pin | Altera | + * +---------+------+-----------+ + * | SCLK | 1 | DCLK | + * | GND | 2,10 | GND | + * | VCC | 4 | VCC(TRGT) | + * | MISO | 7 | DATAOUT | + * | /CS | 8 | nCS | + * | MOSI | 9 | ASDI | + * +---------+------+-----------+ + * + * See also the USB-Blaster Download Cable User Guide: http://www.altera.com/literature/ug/ug_usb_blstr.pdf + */ + +#if CONFIG_USBBLASTER_SPI == 1 + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <ctype.h> +#include <ftdi.h> +#include "flash.h" +#include "programmer.h" +#include "spi.h" + +/* Please keep sorted by vendor ID, then device ID. */ +#define ALTERA_VID 0x09fb +#define ALTERA_USBBLASTER_PID 0x6001 + +const struct dev_entry devs_usbblasterspi[] = { + {ALTERA_VID, ALTERA_USBBLASTER_PID, OK, "Altera", "USB-Blaster"}, + + {} +}; + +static const struct spi_programmer spi_programmer_usbblaster; + +static struct ftdi_context ftdic; + +// command bytes +#define BIT_BYTE (1<<7) // byte mode (rather than bitbang) +#define BIT_READ (1<<6) // read request +#define BIT_LED (1<<5) +#define BIT_CS (1<<3) +#define BIT_TMS (1<<1) +#define BIT_CLK (1<<0) + +#define BUF_SIZE 64 + +/* The programmer shifts bits in the wrong order for SPI, so we use this method to reverse the bits when needed. + * http://graphics.stanford.edu/~seander/bithacks.html#ReverseByteWith32Bits */ +uint8_t reverse(uint8_t b) +{ + return ((b * 0x0802LU & 0x22110LU) | (b * 0x8020LU & 0x88440LU)) * 0x10101LU >> 16; +} + + +/* Returns 0 upon success, a negative number upon errors. */ +int usbblaster_spi_init(void) +{ + uint8_t buf[BUF_SIZE + 1]; + + if (ftdi_init(&ftdic) < 0) + return -1; + + if (ftdi_usb_open(&ftdic, ALTERA_VID, ALTERA_USBBLASTER_PID) < 0) { + msg_perr("Failed to open USB-Blaster: %s\n", ftdic.error_str); + return -1; + } + + if (ftdi_usb_reset(&ftdic) < 0) { + msg_perr("USB-Blaster reset failed\n"); + return -1; + } + + if (ftdi_set_latency_timer(&ftdic, 2) < 0) { + msg_perr("USB-Blaster set latency timer failed\n"); + return -1; + } + + if (ftdi_write_data_set_chunksize(&ftdic, 4096) < 0 || + ftdi_read_data_set_chunksize(&ftdic, BUF_SIZE) < 0) { + msg_perr("USB-Blaster set chunk size failed\n"); + return -1; + } + + memset(buf, 0, sizeof(buf)); + buf[sizeof(buf)-1] = BIT_LED | BIT_CS; + if (ftdi_write_data(&ftdic, buf, sizeof(buf)) < 0) { + msg_perr("USB-Blaster reset write failed\n"); + return -1; + } + if (ftdi_read_data(&ftdic, buf, sizeof(buf)) < 0) { + msg_perr("USB-Blaster reset read failed\n"); + return -1; + } + + register_spi_programmer(&spi_programmer_usbblaster); + return 0; +} + +static int send_write(unsigned int writecnt, const unsigned char *writearr) +{ + int i; + uint8_t buf[BUF_SIZE]; + + memset(buf, 0, sizeof(buf)); + while (writecnt) { + unsigned int n_write = min(writecnt, BUF_SIZE - 1); + msg_pspew("writing %d-byte packet\n", n_write); + + buf[0] = BIT_BYTE | (uint8_t)n_write; + for (i = 0; i < n_write; i++) { + buf[i+1] = reverse(writearr[i]); + } + if (ftdi_write_data(&ftdic, buf, n_write + 1) < 0) { + msg_perr("USB-Blaster write failed\n"); + return -1; + } + + writearr += n_write; + writecnt -= n_write; + } + return 0; +} + +static int send_read(unsigned int readcnt, unsigned char *readarr) +{ + int i; + unsigned int n_read; + uint8_t buf[BUF_SIZE]; + memset(buf, 0, sizeof(buf)); + + n_read = readcnt; + while (n_read) { + unsigned int payload_size = min(n_read, BUF_SIZE - 1); + msg_pspew("reading %d-byte packet\n", payload_size); + + buf[0] = BIT_BYTE | BIT_READ | (uint8_t)payload_size; + if (ftdi_write_data(&ftdic, buf, payload_size + 1) < 0) { + msg_perr("USB-Blaster write failed\n"); + return -1; + } + n_read -= payload_size; + }; + + n_read = readcnt; + while (n_read) { + int ret = ftdi_read_data(&ftdic, readarr, n_read); + if (ret < 0) { + msg_perr("USB-Blaster read failed\n"); + return -1; + } + for (i = 0; i < ret; i++) { + readarr[i] = reverse(readarr[i]); + } + n_read -= ret; + readarr += ret; + } + return 0; +} + +/* Returns 0 upon success, a negative number upon errors. */ +static int usbblaster_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, + const unsigned char *writearr, unsigned char *readarr) +{ + uint8_t cmd; + int ret = 0; + + cmd = BIT_LED; // asserts /CS + if (ftdi_write_data(&ftdic, &cmd, 1) < 0) { + msg_perr("USB-Blaster enable chip select failed\n"); + ret = -1; + } + + if (!ret && writecnt) + ret = send_write(writecnt, writearr); + + if (!ret && readcnt) + ret = send_read(readcnt, readarr); + + cmd = BIT_CS; + if (ftdi_write_data(&ftdic, &cmd, 1) < 0) { + msg_perr("USB-Blaster disable chip select failed\n"); + ret = -1; + } + + return ret; +} + + +static const struct spi_programmer spi_programmer_usbblaster = { + .type = SPI_CONTROLLER_USBBLASTER, + .max_data_read = 256, + .max_data_write = 256, + .command = usbblaster_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, +}; + +#endif

1 0

solved similar-but-different chips
by Николай Николаев 27 Mar '13

27 Mar '13

If we detected Multiple flash chips than We can easy save all chips in dynamic list - pflashes. and we will not have a restrictions with number chips This is Dynamic List to sorted by Volage beginnig from minimal value. Also I added to dynamic list the new parameter HEAD. This is link on head of Dynamic List. I added a new key "-F" or "--enum" for trying choice chip automatically from array of Multiple chips with identical value model_id. Now we can easy introduce a new chips with identical value model_id and different chip names, reading, writing and other function. for example: if we have a three chips M50FLW040A - already exists .name = "M50FLW040A", .model_id = ST_M50FLW040A, ... .read = read_memmapped; .volage = { 3000, 3600 }, M50FLW040B - is fairy chip .name = "M50FLW040A", .model_id = ST_M50FLW040A, ... .read = read_memmapped_040B; .volage = { 4500, 5500 }, M50FLW040C - is fairy chip .name = "M50FLW040A", .model_id = ST_M50FLW040A, ... .read = read_memmapped_040C; .volage = { 1690, 1900 }, and we want to add them to file flashrom.c just will do it now runnig the programm and see the array of Multiple chips =OUT================================================================================== ./flashrom --programmer=internal --r bios.img -o rezult flashrom v0.9.6.1-r1657 on Linux 2.6.32-220.el6.x86_64 (x86_64) flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found chipset "Intel ICH7/ICH7R". Enabling flash write... OK. Found ST flash chip "M50FLW040A" (512 kB, LPC, FWH) at physical address 0xfff80000. Found ST flash chip "M50FLW040B" (512 kB, LPC, FWH) at physical address 0xfff80000. Found ST flash chip "M50FLW040C" (512 kB, LPC, FWH) at physical address 0xfff80000. Multiple flash chips were detected: "M50FLW040C" with minimal single supply voltage 1690mV "M50FLW040A" with minimal single supply voltage 3000mV "M50FLW040B" with minimal single supply voltage 4500mV Please specify which chip to use with the -c <chipname> option or use the -F enumeration option.for trying choice chip automatically =END================================================================================== now running with key "-F" =OUT================================================================================== ./flashrom --programmer=internal --r bios.img -o rezult -F flashrom v0.9.6.1-r1657 on Linux 2.6.32-220.el6.x86_64 (x86_64) flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found chipset "Intel ICH7/ICH7R". Enabling flash write... OK. Found ST flash chip "M50FLW040A" (512 kB, LPC, FWH) at physical address 0xfff80000. Found ST flash chip "M50FLW040B" (512 kB, LPC, FWH) at physical address 0xfff80000. Found ST flash chip "M50FLW040C" (512 kB, LPC, FWH) at physical address 0xfff80000. Multiple flash chips were detected: "M50FLW040C" with minimal single supply voltage 1690mV "M50FLW040A" with minimal single supply voltage 3000mV "M50FLW040B" with minimal single supply voltage 4500mV Please specify which chip to use with the -c <chipname> option or use the -F enumeration option.for trying choice chip automatically === This flash part has status UNTESTED 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 part. Please include the flashrom output with the additional -V option for all operations you tested (-V, -Vr, -VE, -Vw), and mention which mainboard or programmer you tested. Please mention your board in the subject line. Thanks for your help! Reading flash "M50FLW040C" with minimal single supply voltage 1690mV... done. =END================================================================================== We found chips and we trying read data from every chip while will not be successful operation read. and i hope we will not need a reinvent the wheel with names of similar chips like a N25Q064..1E and puzzle over designation MX25U6435F and MX25L6439E -- With best regards Nikolay Nikolaev С Уважением Николаев Николай

1 0

[PATCH v5] Add Altera USB-Blaster SPI programmer.
by Kyösti Mälkki 27 Mar '13

27 Mar '13

Rebased on Revision 1650. There remains a minor glitch with Makefile: If one sets CONFIG_FT2322_SPI=no, also USB-Blaster support will be disabled. In my opinion fixing this is not within the scope of this patch. Adds support for the Altera USB-Blaster programming dongle in Active Serial (AS) mode. Tested on both original product and a clone dongle. Signed-off-by: James Laird <jhl(a)mafipulation.org> Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- Makefile | 23 ++++++ README | 4 +- flashrom.8 | 6 +- flashrom.c | 12 +++ programmer.h | 12 +++ usbblaster_spi.c | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 278 insertions(+), 4 deletions(-) create mode 100644 usbblaster_spi.c diff --git a/Makefile b/Makefile index b948996..f7aaf95 100644 --- a/Makefile +++ b/Makefile @@ -128,6 +128,11 @@ UNSUPPORTED_FEATURES += CONFIG_FT2232_SPI=yes else override CONFIG_FT2232_SPI = no endif +ifeq ($(CONFIG_USBBLASTER_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_USBBLASTER_SPI=yes +else +override CONFIG_USBBLASTER_SPI = no +endif endif # FIXME: Should we check for Cygwin/MSVC as well? @@ -240,6 +245,11 @@ UNSUPPORTED_FEATURES += CONFIG_FT2232_SPI=yes else override CONFIG_FT2232_SPI = no endif +ifeq ($(CONFIG_USBBLASTER_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_USBBLASTER_SPI=yes +else +override CONFIG_USBBLASTER_SPI = no +endif endif ifneq ($(TARGET_OS), Linux) @@ -349,6 +359,9 @@ CONFIG_ATAHPT ?= no # Always enable FT2232 SPI dongles for now. CONFIG_FT2232_SPI ?= yes +# Always enable Altera USB-Blaster dongles for now. +CONFIG_USBBLASTER_SPI ?= yes + # Always enable dummy tracing for now. CONFIG_DUMMY ?= yes @@ -484,6 +497,16 @@ PROGRAMMER_OBJS += ft2232_spi.o # into a hard requirement for libusb, defeating the purpose of auto-enabling. endif +ifeq ($(CONFIG_USBBLASTER_SPI), yes) +FTDILIBS := $(shell pkg-config --libs libftdi 2>/dev/null || printf "%s" "-lftdi -lusb") +# This is a totally ugly hack. +FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'CONFIG_USBBLASTER_SPI=1'") +FEATURE_LIBS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "$(FTDILIBS)") +PROGRAMMER_OBJS += usbblaster_spi.o +# We can't set NEED_USB here because that would transform libftdi auto-enabling +# into a hard requirement for libusb, defeating the purpose of auto-enabling. +endif + ifeq ($(CONFIG_DUMMY), yes) FEATURE_CFLAGS += -D'CONFIG_DUMMY=1' PROGRAMMER_OBJS += dummyflasher.o diff --git a/README b/README index 8e812be..7f24cca 100644 --- a/README +++ b/README @@ -45,8 +45,8 @@ Build Instructions To build flashrom you need to install the following software: * pciutils+libpci (if you want support for mainboard or PCI device flashing) - * libusb (if you want FT2232 or Dediprog support) - * libftdi (if you want FT2232 support) + * libusb (if you want FT2232, Dediprog or USB-Blaster support) + * libftdi (if you want FT2232 or USB-Blaster support) Linux et al: diff --git a/flashrom.8 b/flashrom.8 index c6c518e..feb70d6 100644 --- a/flashrom.8 +++ b/flashrom.8 @@ -220,6 +220,8 @@ bitbanging adapter) .sp .BR "* linux_spi" " (for SPI flash ROMs accessible via /dev/spidevX.Y on Linux)" .sp +.BR "* usbblaster_spi" " (for SPI flash ROMs attached to an Altera USB-Blaster compatible cable)" +.sp Some programmers have optional or mandatory parameters which are described in detail in the .B PROGRAMMER SPECIFIC INFO @@ -837,7 +839,7 @@ 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 " and " ft2232_spi +.BR dediprog ", " ft2232_spi " and " usbblaster_spi need access to the USB device via libusb. .sp .B dummy @@ -847,7 +849,7 @@ needs no access permissions at all. .BR gfxnvidia ", " drkaiser ", " satasii ", " satamv " and " atahpt have to be run as superuser/root, and need additional raw access permission. .sp -.BR serprog ", " buspirate_spi ", " dediprog " and " ft2232_spi +.BR serprog ", " buspirate_spi ", " dediprog ", " usbblaster_spi " and " ft2232_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 e1be398..e787197 100644 --- a/flashrom.c +++ b/flashrom.c @@ -308,6 +308,18 @@ const struct programmer_entry programmer_table[] = { }, #endif +#if CONFIG_USBBLASTER_SPI == 1 + { + .name = "usbblaster_spi", + .type = USB, + .devs.dev = devs_usbblasterspi, + .init = usbblaster_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .delay = internal_delay, + }, +#endif + {0}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; diff --git a/programmer.h b/programmer.h index 51a8c80..dd2ba30 100644 --- a/programmer.h +++ b/programmer.h @@ -87,6 +87,9 @@ enum programmer { #if CONFIG_LINUX_SPI == 1 PROGRAMMER_LINUX_SPI, #endif +#if CONFIG_USBBLASTER_SPI == 1 + PROGRAMMER_USBBLASTER_SPI, +#endif PROGRAMMER_INVALID /* This must always be the last entry. */ }; @@ -431,6 +434,12 @@ int ft2232_spi_init(void); extern const struct dev_entry devs_ft2232spi[]; #endif +/* usbblaster_spi.c */ +#if CONFIG_USBBLASTER_SPI == 1 +int usbblaster_spi_init(void); +extern const struct dev_entry devs_usbblasterspi[]; +#endif + /* rayer_spi.c */ #if CONFIG_RAYER_SPI == 1 int rayer_spi_init(void); @@ -509,6 +518,9 @@ enum spi_controller { #if CONFIG_SERPROG == 1 SPI_CONTROLLER_SERPROG, #endif +#if CONFIG_USBBLASTER_SPI == 1 + SPI_CONTROLLER_USBBLASTER, +#endif }; #define MAX_DATA_UNSPECIFIED 0 diff --git a/usbblaster_spi.c b/usbblaster_spi.c new file mode 100644 index 0000000..53eb7d5 --- /dev/null +++ b/usbblaster_spi.c @@ -0,0 +1,225 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2012 James Laird <jhl(a)mafipulation.org> + * + * 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; version 2 of the License. + * + * 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 + */ + +/* + * Device should be connected as per "active serial" mode: + * + * +---------+------+-----------+ + * | SPI | Pin | Altera | + * +---------+------+-----------+ + * | SCLK | 1 | DCLK | + * | GND | 2,10 | GND | + * | VCC | 4 | VCC(TRGT) | + * | MISO | 7 | DATAOUT | + * | /CS | 8 | nCS | + * | MOSI | 9 | ASDI | + * +---------+------+-----------+ + * + * See also the USB-Blaster Download Cable User Guide: http://www.altera.com/literature/ug/ug_usb_blstr.pdf + */ + +#if CONFIG_USBBLASTER_SPI == 1 + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <ctype.h> +#include <ftdi.h> +#include "flash.h" +#include "programmer.h" +#include "spi.h" + +/* Please keep sorted by vendor ID, then device ID. */ +#define ALTERA_VID 0x09fb +#define ALTERA_USBBLASTER_PID 0x6001 + +const struct dev_entry devs_usbblasterspi[] = { + {ALTERA_VID, ALTERA_USBBLASTER_PID, OK, "Altera", "USB-Blaster"}, + + {} +}; + +static const struct spi_programmer spi_programmer_usbblaster; + +static struct ftdi_context ftdic; + +// command bytes +#define BIT_BYTE (1<<7) // byte mode (rather than bitbang) +#define BIT_READ (1<<6) // read request +#define BIT_LED (1<<5) +#define BIT_CS (1<<3) +#define BIT_TMS (1<<1) +#define BIT_CLK (1<<0) + +#define BUF_SIZE 64 + +/* The programmer shifts bits in the wrong order for SPI, so we use this method to reverse the bits when needed. + * http://graphics.stanford.edu/~seander/bithacks.html#ReverseByteWith32Bits */ +uint8_t reverse(uint8_t b) +{ + return ((b * 0x0802LU & 0x22110LU) | (b * 0x8020LU & 0x88440LU)) * 0x10101LU >> 16; +} + + +/* Returns 0 upon success, a negative number upon errors. */ +int usbblaster_spi_init(void) +{ + uint8_t buf[BUF_SIZE + 1]; + + if (ftdi_init(&ftdic) < 0) + return -1; + + if (ftdi_usb_open(&ftdic, ALTERA_VID, ALTERA_USBBLASTER_PID) < 0) { + msg_perr("Failed to open USB-Blaster: %s\n", ftdic.error_str); + return -1; + } + + if (ftdi_usb_reset(&ftdic) < 0) { + msg_perr("USB-Blaster reset failed\n"); + return -1; + } + + if (ftdi_set_latency_timer(&ftdic, 2) < 0) { + msg_perr("USB-Blaster set latency timer failed\n"); + return -1; + } + + if (ftdi_write_data_set_chunksize(&ftdic, 4096) < 0 || + ftdi_read_data_set_chunksize(&ftdic, BUF_SIZE) < 0) { + msg_perr("USB-Blaster set chunk size failed\n"); + return -1; + } + + memset(buf, 0, sizeof(buf)); + buf[sizeof(buf)-1] = BIT_LED | BIT_CS; + if (ftdi_write_data(&ftdic, buf, sizeof(buf)) < 0) { + msg_perr("USB-Blaster reset write failed\n"); + return -1; + } + if (ftdi_read_data(&ftdic, buf, sizeof(buf)) < 0) { + msg_perr("USB-Blaster reset read failed\n"); + return -1; + } + + register_spi_programmer(&spi_programmer_usbblaster); + return 0; +} + +static int send_write(unsigned int writecnt, const unsigned char *writearr) +{ + int i; + uint8_t buf[BUF_SIZE]; + + memset(buf, 0, sizeof(buf)); + while (writecnt) { + unsigned int n_write = min(writecnt, BUF_SIZE - 1); + msg_pspew("writing %d-byte packet\n", n_write); + + buf[0] = BIT_BYTE | (uint8_t)n_write; + for (i = 0; i < n_write; i++) { + buf[i+1] = reverse(writearr[i]); + } + if (ftdi_write_data(&ftdic, buf, n_write + 1) < 0) { + msg_perr("USB-Blaster write failed\n"); + return -1; + } + + writearr += n_write; + writecnt -= n_write; + } + return 0; +} + +static int send_read(unsigned int readcnt, unsigned char *readarr) +{ + int i; + unsigned int n_read; + uint8_t buf[BUF_SIZE]; + memset(buf, 0, sizeof(buf)); + + n_read = readcnt; + while (n_read) { + unsigned int payload_size = min(n_read, BUF_SIZE - 1); + msg_pspew("reading %d-byte packet\n", payload_size); + + buf[0] = BIT_BYTE | BIT_READ | (uint8_t)payload_size; + if (ftdi_write_data(&ftdic, buf, payload_size + 1) < 0) { + msg_perr("USB-Blaster write failed\n"); + return -1; + } + n_read -= payload_size; + }; + + n_read = readcnt; + while (n_read) { + int ret = ftdi_read_data(&ftdic, readarr, n_read); + if (ret < 0) { + msg_perr("USB-Blaster read failed\n"); + return -1; + } + for (i = 0; i < ret; i++) { + readarr[i] = reverse(readarr[i]); + } + n_read -= ret; + readarr += ret; + } + return 0; +} + +/* Returns 0 upon success, a negative number upon errors. */ +static int usbblaster_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, + const unsigned char *writearr, unsigned char *readarr) +{ + uint8_t cmd; + int ret = 0; + + cmd = BIT_LED; // asserts /CS + if (ftdi_write_data(&ftdic, &cmd, 1) < 0) { + msg_perr("USB-Blaster enable chip select failed\n"); + ret = -1; + } + + if (!ret && writecnt) + ret = send_write(writecnt, writearr); + + if (!ret && readcnt) + ret = send_read(readcnt, readarr); + + cmd = BIT_CS; + if (ftdi_write_data(&ftdic, &cmd, 1) < 0) { + msg_perr("USB-Blaster disable chip select failed\n"); + ret = -1; + } + + return ret; +} + + +static const struct spi_programmer spi_programmer_usbblaster = { + .type = SPI_CONTROLLER_USBBLASTER, + .max_data_read = 256, + .max_data_write = 256, + .command = usbblaster_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, +}; + +#endif -- 1.8.1.1

2 1

Re: [flashrom] FAILED: GENE 5315 Rev.B
by Idwer Vollering 25 Mar '13

25 Mar '13

2013/3/25 sergey <serg99666(a)mail.ru>: > > I send you URL of upload. Next time, hit "reply to all" as well, so your reply ends up at all recipients instead of just me. Thanks. > AwardBios: http://paste.flashrom.org/view.php?id=1562 . > > Coreboot: http://paste.flashrom.org/view.php?id=1563. > > Programming flash chip ended of success after start "modprobe msr". Thank > you for the support. > >

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom