flashrom

flashrom@flashrom.org

7 participants
9163 discussions

Re: [flashrom] Rayer_SPI and xilinx buffered dlc5 cable
by Stefan Tauner 28 Aug '13

28 Aug '13

On Tue, 26 Feb 2013 11:55:44 +1100 Andrew Tarabaras <andytara12(a)gmail.com> wrote: > Hi, > > Just a heads up that the rayer_spi module wont work with a buffered xilinx > DLC cable. There is a pull down buffer in the MISO ( Data In ) line which > is enabled when pin 6 of the parallel port is pulled low. > > I dont have time to be submitting patches, fix it or not I dont mind. > > These are the changes I made. > […] > > Cheers, hope it will help stop someone else spending hours debugging > something that doesn't work. Hm, I wonder if it ever worked. The original patch was sent to us by Jakab Peter in 2010. Jakab: do you remember flashrom? :) As far as I can see the official documentation of the xilinx cable always mentions the buffer. Do you have a cheap clone or a very old version of the original cable? Eventually I would like to know if pin6 of the printer port is connected to anything in your cable. If not (or if it is even equal to the buffered version and you just forgot to mention that change) we could just disable the pull down by default on the xilinx type and remove the need for another type. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

[PATCH 1/5] rayer_spi: Create list of programmer types
by Kyösti Mälkki 28 Aug '13

28 Aug '13

Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- rayer_spi.c | 106 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 45 deletions(-) diff --git a/rayer_spi.c b/rayer_spi.c index b312610..b4ef205 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -37,21 +37,48 @@ #include "programmer.h" #include "hwaccess.h" -enum rayer_type { - TYPE_RAYER, - TYPE_XILINX_DLC5, -}; - /* We have two sets of pins, out and in. The numbers for both sets are * independent and are bitshift values, not real pin numbers. * Default settings are for the RayeR hardware. */ -/* Pins for master->slave direction */ -static int rayer_cs_bit = 5; -static int rayer_sck_bit = 6; -static int rayer_mosi_bit = 7; -/* Pins for slave->master direction */ -static int rayer_miso_bit = 6; + +struct rayer_programmer { + const char * type; + const enum test_state status; + const char * description; + const void * private; +}; + +struct rayer_pinout { + int cs_bit; + int sck_bit; + int mosi_bit; + int miso_bit; + void (*preinit)(void *); + int (*shutdown)(void *); +}; + +static struct rayer_pinout rayer_spipgm = { + .cs_bit = 5, + .sck_bit = 6, + .mosi_bit = 7, + .miso_bit = 6, +}; + +static struct rayer_pinout xilinx_dlc5 = { + .cs_bit = 2, + .sck_bit = 1, + .mosi_bit = 0, + .miso_bit = 4, +}; + +struct rayer_programmer rayer_spi_types[] = { + {"rayer", NT, "RayeR SPIPGM", &rayer_spipgm}, + {"xilinx", NT, "Xilinx Parallel Cable III (DLC 5)", &xilinx_dlc5}, + {0}, +}; + +struct rayer_pinout *pinout = NULL; static uint16_t lpt_iobase; @@ -60,22 +87,22 @@ static uint8_t lpt_outbyte; static void rayer_bitbang_set_cs(int val) { - lpt_outbyte &= ~(1 << rayer_cs_bit); - lpt_outbyte |= (val << rayer_cs_bit); + lpt_outbyte &= ~(1 << pinout->cs_bit); + lpt_outbyte |= (val << pinout->cs_bit); OUTB(lpt_outbyte, lpt_iobase); } static void rayer_bitbang_set_sck(int val) { - lpt_outbyte &= ~(1 << rayer_sck_bit); - lpt_outbyte |= (val << rayer_sck_bit); + lpt_outbyte &= ~(1 << pinout->sck_bit); + lpt_outbyte |= (val << pinout->sck_bit); OUTB(lpt_outbyte, lpt_iobase); } static void rayer_bitbang_set_mosi(int val) { - lpt_outbyte &= ~(1 << rayer_mosi_bit); - lpt_outbyte |= (val << rayer_mosi_bit); + lpt_outbyte &= ~(1 << pinout->mosi_bit); + lpt_outbyte |= (val << pinout->mosi_bit); OUTB(lpt_outbyte, lpt_iobase); } @@ -83,8 +110,8 @@ static int rayer_bitbang_get_miso(void) { uint8_t tmp; - tmp = INB(lpt_iobase + 1); - tmp = (tmp >> rayer_miso_bit) & 0x1; + tmp = INB(lpt_iobase + 1) ^ 0x80; // bit.7 inverted + tmp = (tmp >> pinout->miso_bit) & 0x1; return tmp; } @@ -99,8 +126,8 @@ static const struct bitbang_spi_master bitbang_spi_master_rayer = { int rayer_spi_init(void) { + struct rayer_programmer *prog = rayer_spi_types; char *arg = NULL; - enum rayer_type rayer_type = TYPE_RAYER; /* Non-default port requested? */ arg = extract_programmer_param("iobase"); @@ -138,36 +165,20 @@ int rayer_spi_init(void) arg = extract_programmer_param("type"); if (arg) { - if (!strcasecmp(arg, "rayer")) { - rayer_type = TYPE_RAYER; - } else if (!strcasecmp(arg, "xilinx")) { - rayer_type = TYPE_XILINX_DLC5; - } else { + for (; prog->type; ++prog) { + if (! strcasecmp (arg, prog->type)) { + break; + } + } + if(! prog->type) { msg_perr("Error: Invalid device type specified.\n"); free(arg); return 1; } + free(arg); } - free(arg); - switch (rayer_type) { - case TYPE_RAYER: - msg_pdbg("Using RayeR SPIPGM pinout.\n"); - /* Bits for master->slave direction */ - rayer_cs_bit = 5; - rayer_sck_bit = 6; - rayer_mosi_bit = 7; - /* Bits for slave->master direction */ - rayer_miso_bit = 6; - break; - case TYPE_XILINX_DLC5: - msg_pdbg("Using Xilinx Parallel Cable III (DLC 5) pinout.\n"); - /* Bits for master->slave direction */ - rayer_cs_bit = 2; - rayer_sck_bit = 1; - rayer_mosi_bit = 0; - /* Bits for slave->master direction */ - rayer_miso_bit = 4; - } + msg_pinfo("Using %s pinout.\n", prog->description); + pinout = (struct rayer_pinout *) prog->private; if (rget_io_perms()) return 1; @@ -175,6 +186,11 @@ int rayer_spi_init(void) /* Get the initial value before writing to any line. */ lpt_outbyte = INB(lpt_iobase); + if (pinout->shutdown) + register_shutdown(pinout->shutdown, (void*)pinout); + if (pinout->preinit) + pinout->preinit(pinout); + if (bitbang_spi_init(&bitbang_spi_master_rayer)) return 1; -- 1.8.1.1

4 11

Re: [flashrom] [PATCH] libpayload: By default build libflashrom.a instead of flashrom.
by Carl-Daniel Hailfinger 28 Aug '13

28 Aug '13

Am 25.08.2013 03:38 schrieb Stefan Tauner: > flashrom won't built nor run as native payload very soon (or ever). This > patch changes a special GNU make variable that allows to select the default > goal which is taken if no goal is given explicitly on the command line. Normally > this would be the first rule in Makefile, i.e. all. This won't compile if the target > OS is libpayload, hence change it to "libflashrom.a" in that case. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > refined version to make old men happy by not breaking even older build hosts. > > Makefile | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/Makefile b/Makefile > index 3b24bc4..b992790 100644 > --- a/Makefile > +++ b/Makefile > @@ -218,6 +218,16 @@ endif > endif > > ifeq ($(TARGET_OS), libpayload) > +# We want to build libflashrom.a by default here. To override the default target we need the special GNU make > +# variable DEFAULT_GOAL which is available since 3.81. To support building on ancient hosts check this first. > +min_version_needed := 3.81 > +ok := $(filter $(min_version_needed), $(firstword $(sort $(MAKE_VERSION) $(min_version_needed)))) This check is broken because the sort is alphabetic, not numeric: Sort results for make 3.81/3.80: 3.80 Sort results for make 3.81/3.81: 3.81 Sort results for make 3.81/3.82: 3.81 Sort results for make 3.81/3.100: 3.100 Writing a reliable make version check can be done in another patch. > +ifneq ($(ok),) > +ifeq ($(MAKECMDGOALS),) > +.DEFAULT_GOAL := libflashrom.a > +$(info Setting default goal to libflashrom.a) > +endif > +endif > FLASHROM_CFLAGS += -DSTANDALONE > ifeq ($(CONFIG_DUMMY), yes) > UNSUPPORTED_FEATURES += CONFIG_DUMMY=yes This patch without the Make version check is Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1726 - trunk
by repository service 28 Aug '13

28 Aug '13

Author: stefanct Date: Wed Aug 28 11:55:04 2013 New Revision: 1726 URL: http://flashrom.org/trac/flashrom/changeset/1726 Log: libpayload: By default build libflashrom.a instead of flashrom. flashrom won't build nor run as native payload very soon (or ever). This patch changes a special GNU make variable that allows to select the default goal which is taken if no goal is given explicitly on the command line. Normally this would be the first rule in Makefile, i.e. all. This won't compile if the target OS is libpayload, hence change it to "libflashrom.a" in that case. This requires two not completely ancient GNU make features: - MAKECMDGOALS - .DEFAULT_GOAL Checking for these with ancient-only GNU make features is non-trivial and hereby postponed. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Tue Aug 27 20:02:19 2013 (r1725) +++ trunk/Makefile Wed Aug 28 11:55:04 2013 (r1726) @@ -218,6 +218,10 @@ endif ifeq ($(TARGET_OS), libpayload) +ifeq ($(MAKECMDGOALS),) +.DEFAULT_GOAL := libflashrom.a +$(info Setting default goal to libflashrom.a) +endif FLASHROM_CFLAGS += -DSTANDALONE ifeq ($(CONFIG_DUMMY), yes) UNSUPPORTED_FEATURES += CONFIG_DUMMY=yes

1 0

Re: [flashrom] [PATCH] Add a write granularity of 512 bytes
by Stefan Tauner 27 Aug '13

27 Aug '13

On Thu, 28 Mar 2013 13:18:05 +0100 Mark Marshall <markmarshall14(a)gmail.com> wrote: > I think this is needed for SPI Flash that has a page size of 512. > > I have also changed the loop condition in a few places. If the > length is not a multiple of stride we need to round up the result > of the divide. (Either we need to round up the divide or we should > replace the lines "limit = min(stride, len - i * stride);" with > "limit = stride;". Rounding up the result of the divide seems > to be the correct thing to do.). > > Signed-off-by: Mark Marshall <mark.marshall(a)omicron.at> Obsolete since r1666. Thanks for your effort though :) -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH 4/4] Add support for AT45DB321C.
by Stefan Tauner 27 Aug '13

27 Aug '13

On Sun, 3 Mar 2013 23:57:13 +0100 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > It seems like this model is one-of-a-kind... it shares some properties > with the older versions of the AT45DB series as well as with new ones. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Also self-acked and committed in r1724, in addition to another patch that adds support for AT45CS1282 in r1725. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH 3/4] Add support for Atmel AT45DB* chips.
by Stefan Tauner 27 Aug '13

27 Aug '13

On Sun, 3 Mar 2013 23:57:12 +0100 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > Signed-off-by: Aidan Thornton <makosoft(a)gmail.com> > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Eventually self-acked and committed in r1723. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1725 - trunk
by repository service 27 Aug '13

27 Aug '13

Author: stefanct Date: Tue Aug 27 20:02:19 2013 New Revision: 1725 URL: http://flashrom.org/trac/flashrom/changeset/1725 Log: Add support for AT45CS1282. This one is even more strange than the AT45DB chips. Like the AT45DB321C it does not support any power-of-2 page sizes. There is only one asymmetrical eraser and that uses two opcodes. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/at45db.c trunk/chipdrivers.h trunk/flashchips.c Modified: trunk/at45db.c ============================================================================== --- trunk/at45db.c Tue Aug 27 20:02:12 2013 (r1724) +++ trunk/at45db.c Tue Aug 27 20:02:19 2013 (r1725) @@ -419,6 +419,47 @@ return at45db_erase(flash, AT45DB_CHIP_ERASE, AT45DB_CHIP_ERASE_ADDR, 500000, 200); } +/* This one is really special and works only for AT45CS1282. It uses two different opcodes depending on the + * address and has an asymmetric layout. */ +int spi_erase_at45cs_sector(struct flashctx *flash, unsigned int addr, unsigned int blocklen) +{ + const unsigned int page_size = flash->chip->page_size; + const unsigned int total_size = flash->chip->total_size * 1024; + const struct block_eraser be = flash->chip->block_erasers[0]; + const unsigned int sec_0a_top = be.eraseblocks[0].size; + const unsigned int sec_0b_top = be.eraseblocks[0].size + be.eraseblocks[1].size; + + if ((addr + blocklen) > total_size) { + msg_cerr("%s: tried to erase a sector beyond flash boundary: addr=%u, blocklen=%u, size=%u\n", + __func__, addr, blocklen, total_size); + return 1; + } + + bool partial_range = false; + uint8_t opcode = 0x7C; /* Used for all but sector 0a. */ + if (addr < sec_0a_top) { + opcode = 0x50; + /* One single sector of 8 pages at address 0. */ + if (addr != 0 || blocklen != (8 * page_size)) + partial_range = true; + } else if (addr < sec_0b_top) { + /* One single sector of 248 pages adjacent to the first. */ + if (addr != sec_0a_top || blocklen != (248 * page_size)) + partial_range = true; + } else { + /* The rest is filled by 63 aligned sectors of 256 pages. */ + if ((addr % (256 * page_size)) != 0 || (blocklen % (256 * page_size)) != 0) + partial_range = true; + } + if (partial_range) { + msg_cerr("%s: cannot erase partial sectors: addr=%u, blocklen=%u\n", __func__, addr, blocklen); + return 1; + } + + /* Needs up to 4 s for completion, so let's wait 20 seconds in 200 ms steps. */ + return at45db_erase(flash, opcode, at45db_convert_addr(addr, page_size), 200000, 100); +} + static int at45db_fill_buffer1(struct flashctx *flash, uint8_t *bytes, unsigned int off, unsigned int len) { const unsigned int page_size = flash->chip->page_size; Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Tue Aug 27 20:02:12 2013 (r1724) +++ trunk/chipdrivers.h Tue Aug 27 20:02:19 2013 (r1725) @@ -121,6 +121,7 @@ int spi_erase_at45db_block(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_erase_at45db_sector(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_erase_at45db_chip(struct flashctx *flash, unsigned int addr, unsigned int blocklen); +int spi_erase_at45cs_sector(struct flashctx *flash, unsigned int addr, unsigned int blocklen); /* 82802ab.c */ uint8_t wait_82802ab(struct flashctx *flash); Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Tue Aug 27 20:02:12 2013 (r1724) +++ trunk/flashchips.c Tue Aug 27 20:02:19 2013 (r1725) @@ -2323,11 +2323,26 @@ .total_size = 16896 /* No power of two sizes */, .page_size = 1056 /* No power of two sizes */, /* does not support EWSR nor WREN and has no writable status register bits whatsoever */ - .tested = TEST_BAD_REW, + /* OTP: 128B total, 64B pre-programmed; read 0x77 (4 dummy bytes); write 0x9A (via buffer) */ + .feature_bits = FEATURE_OTP, + .tested = TEST_UNTESTED, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, - .write = NULL /* Incompatible Page write */, - .read = NULL /* Incompatible read */, + .block_erasers = + { + { + .eraseblocks = { + {8 * 1056, 1}, /* sector 0a: opcode 50h */ + {248 * 1056, 1}, /* sector 0b: opcode 7Ch */ + {256 * 1056, 63}, /* sectors 1 - 63: opcode 7Ch */ + }, + .block_erase = spi_erase_at45cs_sector, + } + }, + .printlock = spi_prettyprint_status_register_plain, + .gran = write_gran_1056bytes, + .write = spi_write_at45db, + .read = spi_read_at45db, .voltage = {2700, 3600}, },

1 0

[commit] r1724 - trunk
by repository service 27 Aug '13

27 Aug '13

Author: stefanct Date: Tue Aug 27 20:02:12 2013 New Revision: 1724 URL: http://flashrom.org/trac/flashrom/changeset/1724 Log: Add support for AT45DB321C. It seems like this model is one-of-a-kind... it shares some properties with the older versions of the AT45DB series as well as with new ones. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/at45db.c trunk/chipdrivers.h trunk/flashchips.c Modified: trunk/at45db.c ============================================================================== --- trunk/at45db.c Tue Aug 27 20:01:53 2013 (r1723) +++ trunk/at45db.c Tue Aug 27 20:02:12 2013 (r1724) @@ -34,6 +34,7 @@ /* Opcodes */ #define AT45DB_STATUS 0xD7 /* NB: this is a block erase command on most other chips(!). */ #define AT45DB_DISABLE_PROTECT 0x3D, 0x2A, 0x7F, 0x9A +#define AT45DB_READ_ARRAY 0xE8 #define AT45DB_READ_PROTECT 0x32 #define AT45DB_READ_LOCKDOWN 0x35 #define AT45DB_PAGE_ERASE 0x81 @@ -141,6 +142,8 @@ return 1; } + /* AT45DB321C does not support lockdown or a page size of a power of 2... */ + const bool isAT45DB321C = (strcmp(flash->chip->name, "AT45DB321C") == 0); msg_cdbg("Chip status register is 0x%02x\n", status); msg_cdbg("Chip status register: Bit 7 / Ready is %sset\n", (status & AT45DB_READY) ? "" : "not "); msg_cdbg("Chip status register: Bit 6 / Compare match is %sset\n", (status & AT45DB_CMP) ? "" : "not "); @@ -151,12 +154,18 @@ const uint8_t dens = (status >> 3) & 0x7; /* Bit 2 is always 1, we use the other bits only */ msg_cdbg("Chip status register: Density is %u Mb\n", 1 << (dens - 1)); msg_cdbg("Chip status register: Bit 1 / Protection is %sset\n", (status & AT45DB_PROT) ? "" : "not "); - msg_cdbg("Chip status register: Bit 0 / \"Power of 2\" is %sset\n", - (status & AT45DB_POWEROF2) ? "" : "not "); + + if (isAT45DB321C) + spi_prettyprint_status_register_bit(status, 0); + else + msg_cdbg("Chip status register: Bit 0 / \"Power of 2\" is %sset\n", + (status & AT45DB_POWEROF2) ? "" : "not "); + if (status & AT45DB_PROT) at45db_prettyprint_protection_register(flash, AT45DB_READ_PROTECT, "protect"); - at45db_prettyprint_protection_register(flash, AT45DB_READ_LOCKDOWN, "lock"); + if (!isAT45DB321C) + at45db_prettyprint_protection_register(flash, AT45DB_READ_LOCKDOWN, "lock"); return 0; } @@ -258,6 +267,45 @@ return 0; } +/* Legacy continuous read, used where spi_read_at45db() is not available. + * The first 4 (dummy) bytes read need to be discarded. */ +int spi_read_at45db_e8(struct flashctx *flash, uint8_t *buf, unsigned int addr, unsigned int len) +{ + const unsigned int page_size = flash->chip->page_size; + const unsigned int total_size = flash->chip->total_size * 1024; + if ((addr + len) > total_size) { + msg_cerr("%s: tried to read beyond flash boundary: addr=%u, len=%u, size=%u\n", + __func__, addr, len, total_size); + return 1; + } + + /* We have to split this up into chunks to fit within the programmer's read size limit, but those + * chunks can cross page boundaries. */ + const unsigned int max_data_read = flash->pgm->spi.max_data_read; + const unsigned int max_chunk = (max_data_read > 0) ? max_data_read : page_size; + while (addr < len) { + const unsigned int addr_at45 = at45db_convert_addr(addr, page_size); + const unsigned char cmd[] = { + AT45DB_READ_ARRAY, + (addr_at45 >> 16) & 0xff, + (addr_at45 >> 8) & 0xff, + (addr_at45 >> 0) & 0xff + }; + /* We need to leave place for 4 dummy bytes and handle them explicitly. */ + unsigned int chunk = min(max_chunk, len + 4); + uint8_t tmp[chunk]; + int ret = spi_send_command(flash, sizeof(cmd), chunk, cmd, tmp); + if (ret) { + msg_cerr("%s: error sending read command!\n", __func__); + return ret; + } + /* Copy result without dummy bytes into buf and advance address counter respectively. */ + memcpy(buf + addr, tmp + 4, chunk - 4); + addr += chunk - 4; + } + return 0; +} + /* Returns 0 when ready, 1 on errors and timeouts. */ static int at45db_wait_ready (struct flashctx *flash, unsigned int us, unsigned int retries) { Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Tue Aug 27 20:01:53 2013 (r1723) +++ trunk/chipdrivers.h Tue Aug 27 20:02:12 2013 (r1724) @@ -115,6 +115,7 @@ int spi_prettyprint_status_register_at45db(struct flashctx *flash); int spi_disable_blockprotect_at45db(struct flashctx *flash); int spi_read_at45db(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int spi_read_at45db_e8(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int spi_write_at45db(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int spi_erase_at45db_page(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_erase_at45db_block(struct flashctx *flash, unsigned int addr, unsigned int blocklen); Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Tue Aug 27 20:01:53 2013 (r1723) +++ trunk/flashchips.c Tue Aug 27 20:02:12 2013 (r1724) @@ -2550,11 +2550,37 @@ .total_size = 4224 /* No power of two sizes */, .page_size = 528 /* No power of two sizes */, /* does not support EWSR nor WREN and has no writable status register bits whatsoever */ - .tested = TEST_BAD_REW, + /* OTP: 128B total, 64B pre-programmed; read 0x77 (4 dummy bytes); write 0x9A (via buffer) */ + .feature_bits = FEATURE_OTP, + .tested = TEST_UNTESTED, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, - .write = NULL, - .read = NULL /* Incompatible read */, + .block_erasers = + { + { + .eraseblocks = { {528, 8192} }, + .block_erase = spi_erase_at45db_page, + }, { + .eraseblocks = { {8 * 528, 8192/8} }, + .block_erase = spi_erase_at45db_block, + }, /* Although the datasheets describes sectors (which can be write protected) + * there seems to be no erase functions for them. + { + .eraseblocks = { + {8 * 528, 1}, + {120 * 528, 1}, + {128 * 528, 63}, + }, + .block_erase = spi_erase_at45db_sector + }, */ { + .eraseblocks = { {4224 * 1024, 1} }, + .block_erase = spi_erase_at45db_chip, + } + }, + .printlock = spi_prettyprint_status_register_at45db, /* Bit 0 is undefined, no lockdown */ + .gran = write_gran_528bytes, + .write = spi_write_at45db, + .read = spi_read_at45db_e8, /* 3 address and 4 dummy bytes */ .voltage = {2700, 3600}, },

1 0

[commit] r1723 - trunk
by repository service 27 Aug '13

27 Aug '13

Author: stefanct Date: Tue Aug 27 20:01:53 2013 New Revision: 1723 URL: http://flashrom.org/trac/flashrom/changeset/1723 Log: Add support for Atmel AT45DB* chips. Signed-off-by: Aidan Thornton <makosoft(a)gmail.com> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Added: trunk/at45db.c (contents, props changed) Modified: trunk/Makefile trunk/chipdrivers.h trunk/flashchips.c trunk/flashchips.h trunk/serprog.c trunk/spi25_statusreg.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Aug 25 15:31:43 2013 (r1722) +++ trunk/Makefile Tue Aug 27 20:01:53 2013 (r1723) @@ -317,7 +317,7 @@ CHIP_OBJS = jedec.o stm50flw0x0x.o w39.o w29ee011.o \ sst28sf040.o m29f400bt.o 82802ab.o pm49fl00x.o \ sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o spi25_statusreg.o \ - opaque.o sfdp.o en29lv640b.o + opaque.o sfdp.o en29lv640b.o at45db.o ############################################################################### # Library code. Added: trunk/at45db.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/at45db.c Tue Aug 27 20:01:53 2013 (r1723) @@ -0,0 +1,473 @@ +/* + * Support for Atmel AT45DB series DataFlash chips. + * This file is part of the flashrom project. + * + * Copyright (C) 2012 Aidan Thornton + * Copyright (C) 2013 Stefan Tauner + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 + */ + +#include <string.h> +#include "flash.h" +#include "chipdrivers.h" +#include "programmer.h" +#include "spi.h" + +/* Status register bits */ +#define AT45DB_READY (1<<7) +#define AT45DB_CMP (1<<6) +#define AT45DB_PROT (1<<1) +#define AT45DB_POWEROF2 (1<<0) + +/* Opcodes */ +#define AT45DB_STATUS 0xD7 /* NB: this is a block erase command on most other chips(!). */ +#define AT45DB_DISABLE_PROTECT 0x3D, 0x2A, 0x7F, 0x9A +#define AT45DB_READ_PROTECT 0x32 +#define AT45DB_READ_LOCKDOWN 0x35 +#define AT45DB_PAGE_ERASE 0x81 +#define AT45DB_BLOCK_ERASE 0x50 +#define AT45DB_SECTOR_ERASE 0x7C +#define AT45DB_CHIP_ERASE 0xC7 +#define AT45DB_CHIP_ERASE_ADDR 0x94809A /* Magic address. See usage. */ +#define AT45DB_BUFFER1_WRITE 0x84 +#define AT45DB_BUFFER1_PAGE_PROGRAM 0x88 +/* Buffer 2 is unused yet. +#define AT45DB_BUFFER2_WRITE 0x87 +#define AT45DB_BUFFER2_PAGE_PROGRAM 0x89 +*/ + +static uint8_t at45db_read_status_register(struct flashctx *flash, uint8_t *status) +{ + static const uint8_t cmd[] = { AT45DB_STATUS }; + + int ret = spi_send_command(flash, sizeof(cmd), 1, cmd, status); + if (ret != 0) + msg_cerr("Reading the status register failed!\n"); + else + msg_cspew("Status register: 0x%02x.\n", *status); + return ret; +} + +int spi_disable_blockprotect_at45db(struct flashctx *flash) +{ + static const uint8_t cmd[4] = { AT45DB_DISABLE_PROTECT }; /* NB: 4 bytes magic number */ + int ret = spi_send_command(flash, sizeof(cmd), 0, cmd, NULL); + if (ret != 0) { + msg_cerr("Sending disable lockdown failed!\n"); + return ret; + } + uint8_t status; + ret = at45db_read_status_register(flash, &status); + if (ret != 0 || ((status & AT45DB_PROT) != 0)) { + msg_cerr("Disabling lockdown failed!\n"); + return 1; + } + + return 0; +} + +static unsigned int at45db_get_sector_count(struct flashctx *flash) +{ + unsigned int i, j; + unsigned int cnt = 0; + for (i = 0; i < NUM_ERASEFUNCTIONS; i++) { + if (flash->chip->block_erasers[i].block_erase == &spi_erase_at45db_sector) { + for (j = 0; j < NUM_ERASEREGIONS; j++) { + cnt += flash->chip->block_erasers[i].eraseblocks[j].count; + } + } + } + msg_cspew("%s: number of sectors=%u\n", __func__, cnt); + return cnt; +} + +/* Reads and prettyprints protection/lockdown registers. + * Some elegance of the printouts had to be cut down a bit to share this code. */ +static uint8_t at45db_prettyprint_protection_register(struct flashctx *flash, uint8_t opcode, const char *regname) +{ + const uint8_t cmd[] = { opcode, 0, 0, 0 }; + /* The first two sectors share the first result byte. */ + uint8_t buf[at45db_get_sector_count(flash) - 1]; + + int ret = spi_send_command(flash, sizeof(cmd), sizeof(buf), cmd, buf); + if (ret != 0) { + msg_cerr("Reading the %s register failed!\n", regname); + return ret; + } + + unsigned int i; + for (i = 0; i < sizeof(buf); i++) { + if (buf[i] != 0x00) + break; + if (i == sizeof(buf) - 1) { + msg_cdbg("No Sector is %sed.\n", regname); + return 0; + } + } + + /* TODO: print which addresses are mapped to (un)locked sectors. */ + msg_cdbg("Sector 0a is %s%sed.\n", ((buf[0] & 0xC0) == 0x00) ? "un" : "", regname); + msg_cdbg("Sector 0b is %s%sed.\n", ((buf[0] & 0x30) == 0x00) ? "un" : "", regname); + for (i = 1; i < sizeof(buf); i++) + msg_cdbg("Sector %2u is %s%sed.\n", i, (buf[i] == 0x00) ? "un" : "", regname); + + return 0; +} + +/* bit 7: busy flag + * bit 6: memory/buffer compare result + * bit 5-2: density (encoding see below) + * bit 1: protection enabled (soft or hard) + * bit 0: "power of 2" page size indicator (e.g. 1 means 256B; 0 means 264B) + * + * 5-2 encoding: bit 2 is always 1, bits 3-5 encode the density as "2^(bits - 1)" in Mb e.g.: + * AT45DB161D 1011 16Mb */ +int spi_prettyprint_status_register_at45db(struct flashctx *flash) +{ + uint8_t status; + if (at45db_read_status_register(flash, &status) != 0) { + return 1; + } + + msg_cdbg("Chip status register is 0x%02x\n", status); + msg_cdbg("Chip status register: Bit 7 / Ready is %sset\n", (status & AT45DB_READY) ? "" : "not "); + msg_cdbg("Chip status register: Bit 6 / Compare match is %sset\n", (status & AT45DB_CMP) ? "" : "not "); + spi_prettyprint_status_register_bit(status, 5); + spi_prettyprint_status_register_bit(status, 4); + spi_prettyprint_status_register_bit(status, 3); + spi_prettyprint_status_register_bit(status, 2); + const uint8_t dens = (status >> 3) & 0x7; /* Bit 2 is always 1, we use the other bits only */ + msg_cdbg("Chip status register: Density is %u Mb\n", 1 << (dens - 1)); + msg_cdbg("Chip status register: Bit 1 / Protection is %sset\n", (status & AT45DB_PROT) ? "" : "not "); + msg_cdbg("Chip status register: Bit 0 / \"Power of 2\" is %sset\n", + (status & AT45DB_POWEROF2) ? "" : "not "); + if (status & AT45DB_PROT) + at45db_prettyprint_protection_register(flash, AT45DB_READ_PROTECT, "protect"); + + at45db_prettyprint_protection_register(flash, AT45DB_READ_LOCKDOWN, "lock"); + + return 0; +} + +/* Probe function for AT45DB* chips that support multiple page sizes. */ +int probe_spi_at45db(struct flashctx *flash) +{ + uint8_t status; + struct flashchip *chip = flash->chip; + + if (!probe_spi_rdid(flash)) + return 0; + + /* Some AT45DB* chips support two different page sizes each (e.g. 264 and 256 B). In order to tell which + * page size this chip has we need to read the status register. */ + if (at45db_read_status_register(flash, &status) != 0) + return 0; + + /* We assume sane power-of-2 page sizes and adjust the chip attributes in case this is not the case. */ + if ((status & AT45DB_POWEROF2) == 0) { + chip->total_size = (chip->total_size / 32) * 33; + chip->page_size = (chip->page_size / 32) * 33; + + unsigned int i, j; + for (i = 0; i < NUM_ERASEFUNCTIONS; i++) { + struct block_eraser *eraser = &chip->block_erasers[i]; + for (j = 0; j < NUM_ERASEREGIONS; j++) { + eraser->eraseblocks[j].size = (eraser->eraseblocks[j].size / 32) * 33; + } + } + } + + switch (chip->page_size) { + case 256: chip->gran = write_gran_256bytes; break; + case 264: chip->gran = write_gran_264bytes; break; + case 512: chip->gran = write_gran_512bytes; break; + case 528: chip->gran = write_gran_528bytes; break; + case 1024: chip->gran = write_gran_1024bytes; break; + case 1056: chip->gran = write_gran_1056bytes; break; + default: + msg_cerr("%s: unknown page size %d.\n", __func__, chip->page_size); + return 0; + } + + msg_cdbg2("%s: total size %i kB, page size %i B\n", __func__, chip->total_size * 1024, chip->page_size); + + return 1; +} + +/* Returns the minimum number of bits needed to represent the given address. + * FIXME: use mind-blowing implementation. + * FIXME: move to utility module. */ +static uint32_t address_to_bits(uint32_t addr) +{ + unsigned int lzb = 0; + while (((1 << (31 - lzb)) & ~addr) != 0) + lzb++; + return 32 - lzb; +} + +/* In case of non-power-of-two page sizes we need to convert the address flashrom uses to the address the + * DataFlash chips use. The latter uses a segmented address space where the page address is encoded in the + * more significant bits and the offset within the page is encoded in the less significant bits. The exact + * partition depends on the page size. + */ +static unsigned int at45db_convert_addr(unsigned int addr, unsigned int page_size) +{ + unsigned int page_bits = address_to_bits(page_size - 1); + unsigned int at45db_addr = ((addr / page_size) << page_bits) | (addr % page_size); + msg_cspew("%s: addr=0x%x, page_size=%u, page_bits=%u -> at45db_addr=0x%x\n", + __func__, addr, page_size, page_bits, at45db_addr); + return at45db_addr; +} + +int spi_read_at45db(struct flashctx *flash, uint8_t *buf, unsigned int addr, unsigned int len) +{ + const unsigned int page_size = flash->chip->page_size; + const unsigned int total_size = flash->chip->total_size * 1024; + if ((addr + len) > total_size) { + msg_cerr("%s: tried to read beyond flash boundary: addr=%u, len=%u, size=%u\n", + __func__, addr, len, total_size); + return 1; + } + + /* We have to split this up into chunks to fit within the programmer's read size limit, but those + * chunks can cross page boundaries. */ + const unsigned int max_data_read = flash->pgm->spi.max_data_read; + const unsigned int max_chunk = (max_data_read > 0) ? max_data_read : page_size; + while (addr < len) { + unsigned int chunk = min(max_chunk, len); + int ret = spi_nbyte_read(flash, at45db_convert_addr(addr, page_size), buf + addr, chunk); + if (ret) { + msg_cerr("%s: error sending read command!\n", __func__); + return ret; + } + addr += chunk; + } + + return 0; +} + +/* Returns 0 when ready, 1 on errors and timeouts. */ +static int at45db_wait_ready (struct flashctx *flash, unsigned int us, unsigned int retries) +{ + while (true) { + uint8_t status; + int ret = at45db_read_status_register(flash, &status); + if ((status & AT45DB_READY) == AT45DB_READY) + return 0; + if (ret != 0 || retries-- == 0) + return 1; + programmer_delay(us); + } +} + +static int at45db_erase(struct flashctx *flash, uint8_t opcode, unsigned int at45db_addr, unsigned int stepsize, unsigned int retries) +{ + const uint8_t cmd[] = { + opcode, + (at45db_addr >> 16) & 0xff, + (at45db_addr >> 8) & 0xff, + (at45db_addr >> 0) & 0xff + }; + + /* Send erase command. */ + int ret = spi_send_command(flash, sizeof(cmd), 0, cmd, NULL); + if (ret != 0) { + msg_cerr("%s: error sending erase command!\n", __func__); + return ret; + } + + /* Wait for completion. */ + ret = at45db_wait_ready(flash, stepsize, retries); + if (ret != 0) + msg_cerr("%s: chip did not became ready again after sending the erase command!\n", __func__); + + return ret; +} + +int spi_erase_at45db_page(struct flashctx *flash, unsigned int addr, unsigned int blocklen) +{ + const unsigned int page_size = flash->chip->page_size; + const unsigned int total_size = flash->chip->total_size * 1024; + + if ((addr % page_size) != 0 || (blocklen % page_size) != 0) { + msg_cerr("%s: cannot erase partial pages: addr=%u, blocklen=%u\n", __func__, addr, blocklen); + return 1; + } + + if ((addr + blocklen) > total_size) { + msg_cerr("%s: tried to erase a block beyond flash boundary: addr=%u, blocklen=%u, size=%u\n", + __func__, addr, blocklen, total_size); + return 1; + } + + /* Needs typically about 35 ms for completion, so let's wait 100 ms in 500 us steps. */ + return at45db_erase(flash, AT45DB_PAGE_ERASE, at45db_convert_addr(addr, page_size), 500, 200); +} + +int spi_erase_at45db_block(struct flashctx *flash, unsigned int addr, unsigned int blocklen) +{ + const unsigned int page_size = flash->chip->page_size; + const unsigned int total_size = flash->chip->total_size * 1024; + + if ((addr % page_size) != 0 || (blocklen % page_size) != 0) { // FIXME: should check blocks not pages + msg_cerr("%s: cannot erase partial pages: addr=%u, blocklen=%u\n", __func__, addr, blocklen); + return 1; + } + + if ((addr + blocklen) > total_size) { + msg_cerr("%s: tried to erase a block beyond flash boundary: addr=%u, blocklen=%u, size=%u\n", + __func__, addr, blocklen, total_size); + return 1; + } + + /* Needs typically between 20 and 100 ms for completion, so let's wait 300 ms in 1 ms steps. */ + return at45db_erase(flash, AT45DB_BLOCK_ERASE, at45db_convert_addr(addr, page_size), 1000, 300); +} + +int spi_erase_at45db_sector(struct flashctx *flash, unsigned int addr, unsigned int blocklen) +{ + const unsigned int page_size = flash->chip->page_size; + const unsigned int total_size = flash->chip->total_size * 1024; + + if ((addr % page_size) != 0 || (blocklen % page_size) != 0) { // FIXME: should check sectors not pages + msg_cerr("%s: cannot erase partial pages: addr=%u, blocklen=%u\n", __func__, addr, blocklen); + return 1; + } + + if ((addr + blocklen) > total_size) { + msg_cerr("%s: tried to erase a sector beyond flash boundary: addr=%u, blocklen=%u, size=%u\n", + __func__, addr, blocklen, total_size); + return 1; + } + + /* Needs typically about 5 s for completion, so let's wait 20 seconds in 200 ms steps. */ + return at45db_erase(flash, AT45DB_SECTOR_ERASE, at45db_convert_addr(addr, page_size), 200000, 100); +} + +int spi_erase_at45db_chip(struct flashctx *flash, unsigned int addr, unsigned int blocklen) +{ + const unsigned int total_size = flash->chip->total_size * 1024; + + if ((addr + blocklen) > total_size) { + msg_cerr("%s: tried to erase beyond flash boundary: addr=%u, blocklen=%u, size=%u\n", + __func__, addr, blocklen, total_size); + return 1; + } + + /* Needs typically from about 5 to over 60 s for completion, so let's wait 100 s in 500 ms steps. + * NB: the address is not a real address but a magic number. This hack allows to share code. */ + return at45db_erase(flash, AT45DB_CHIP_ERASE, AT45DB_CHIP_ERASE_ADDR, 500000, 200); +} + +static int at45db_fill_buffer1(struct flashctx *flash, uint8_t *bytes, unsigned int off, unsigned int len) +{ + const unsigned int page_size = flash->chip->page_size; + if ((off + len) > page_size) { + msg_cerr("Tried to write %u bytes at offset %u into a buffer of only %u B.\n", + len, off, page_size); + return 1; + } + + /* Create a suitable buffer to store opcode, address and data chunks for buffer1. */ + const unsigned int max_data_write = flash->pgm->spi.max_data_write; + const unsigned int max_chunk = (max_data_write > 0 && max_data_write <= page_size) ? + max_data_write : page_size; + uint8_t buf[4 + max_chunk]; + + buf[0] = AT45DB_BUFFER1_WRITE; + while (off < page_size) { + unsigned int cur_chunk = min(max_chunk, page_size - off); + buf[1] = (off >> 16) & 0xff; + buf[2] = (off >> 8) & 0xff; + buf[3] = (off >> 0) & 0xff; + memcpy(&buf[4], bytes + off, cur_chunk); + int ret = spi_send_command(flash, 4 + cur_chunk, 0, buf, NULL); + if (ret != 0) { + msg_cerr("%s: error sending buffer write!\n", __func__); + return ret; + } + off += cur_chunk; + } + return 0; +} + +static int at45db_commit_buffer1(struct flashctx *flash, unsigned int at45db_addr) +{ + const uint8_t cmd[] = { + AT45DB_BUFFER1_PAGE_PROGRAM, + (at45db_addr >> 16) & 0xff, + (at45db_addr >> 8) & 0xff, + (at45db_addr >> 0) & 0xff + }; + + /* Send buffer to device. */ + int ret = spi_send_command(flash, sizeof(cmd), 0, cmd, NULL); + if (ret != 0) { + msg_cerr("%s: error sending buffer to main memory command!\n", __func__); + return ret; + } + + /* Wait for completion (typically a few ms). */ + ret = at45db_wait_ready(flash, 250, 200); // 50 ms + if (ret != 0) { + msg_cerr("%s: chip did not became ready again!\n", __func__); + return ret; + } + + return 0; +} + +static int at45db_program_page(struct flashctx *flash, uint8_t *buf, unsigned int at45db_addr) +{ + int ret = at45db_fill_buffer1(flash, buf, 0, flash->chip->page_size); + if (ret != 0) { + msg_cerr("%s: filling the buffer failed!\n", __func__); + return ret; + } + + ret = at45db_commit_buffer1(flash, at45db_addr); + if (ret != 0) { + msg_cerr("%s: committing page failed!\n", __func__); + return ret; + } + + return 0; +} + +int spi_write_at45db(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) +{ + const unsigned int page_size = flash->chip->page_size; + const unsigned int total_size = flash->chip->total_size; + + if ((start % page_size) != 0 || (len % page_size) != 0) { + msg_cerr("%s: cannot write partial pages: start=%u, len=%u\n", __func__, start, len); + return 1; + } + + if ((start + len) > (total_size * 1024)) { + msg_cerr("%s: tried to write beyond flash boundary: start=%u, len=%u, size=%u\n", + __func__, start, len, total_size); + return 1; + } + + unsigned int i; + for (i = 0; i < len; i += page_size) { + if (at45db_program_page(flash, buf + i, at45db_convert_addr(start + i, page_size)) != 0) { + msg_cerr("Writing page %u failed!\n", i); + return 1; + } + } + return 0; +} Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Sun Aug 25 15:31:43 2013 (r1722) +++ trunk/chipdrivers.h Tue Aug 27 20:01:53 2013 (r1723) @@ -64,6 +64,7 @@ /* spi25_statusreg.c */ uint8_t spi_read_status_register(struct flashctx *flash); int spi_write_status_register(struct flashctx *flash, int status); +void spi_prettyprint_status_register_bit(uint8_t status, int bit); int spi_prettyprint_status_register_plain(struct flashctx *flash); int spi_prettyprint_status_register_default_welwip(struct flashctx *flash); int spi_prettyprint_status_register_default_bp1(struct flashctx *flash); @@ -109,6 +110,17 @@ int write_opaque(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int erase_opaque(struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen); +/* at45db.c */ +int probe_spi_at45db(struct flashctx *flash); +int spi_prettyprint_status_register_at45db(struct flashctx *flash); +int spi_disable_blockprotect_at45db(struct flashctx *flash); +int spi_read_at45db(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int spi_write_at45db(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int spi_erase_at45db_page(struct flashctx *flash, unsigned int addr, unsigned int blocklen); +int spi_erase_at45db_block(struct flashctx *flash, unsigned int addr, unsigned int blocklen); +int spi_erase_at45db_sector(struct flashctx *flash, unsigned int addr, unsigned int blocklen); +int spi_erase_at45db_chip(struct flashctx *flash, unsigned int addr, unsigned int blocklen); + /* 82802ab.c */ uint8_t wait_82802ab(struct flashctx *flash); int probe_82802ab(struct flashctx *flash); Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Sun Aug 25 15:31:43 2013 (r1722) +++ trunk/flashchips.c Tue Aug 27 20:01:53 2013 (r1723) @@ -2337,14 +2337,39 @@ .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB011D, - .total_size = 128 /* Size can only be determined from status register */, - .page_size = 256 /* Size can only be determined from status register */, + .total_size = 128 /* or 132, determined from status register */, + .page_size = 256 /* or 264, determined from status register */, /* does not support EWSR nor WREN and has no writable status register bits whatsoever */ - .tested = TEST_BAD_REW, - .probe = probe_spi_rdid, + /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ + .feature_bits = FEATURE_OTP, + .tested = TEST_UNTESTED, + .probe = probe_spi_at45db, .probe_timing = TIMING_ZERO, - .write = NULL, - .read = NULL, + .block_erasers = + { + { + .eraseblocks = { {256, 512} }, + .block_erase = spi_erase_at45db_page, + }, { + .eraseblocks = { {8 * 256, 512/8} }, + .block_erase = spi_erase_at45db_block, + }, { + .eraseblocks = { + {8 * 256, 1}, + {120 * 256, 1}, + {128 * 256, 3}, + }, + .block_erase = spi_erase_at45db_sector + }, { + .eraseblocks = { {128 * 1024, 1} }, + .block_erase = spi_erase_at45db_chip, + } + }, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ + .printlock = spi_prettyprint_status_register_at45db, + /* granularity will be set by the probing function. */ + .write = spi_write_at45db, + .read = spi_read_at45db, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -2354,14 +2379,39 @@ .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB021D, - .total_size = 256 /* Size can only be determined from status register */, - .page_size = 256 /* Size can only be determined from status register */, + .total_size = 256 /* or 264, determined from status register */, + .page_size = 256 /* or 264, determined from status register */, /* does not support EWSR nor WREN and has no writable status register bits whatsoever */ - .tested = TEST_BAD_REW, - .probe = probe_spi_rdid, + /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ + .feature_bits = FEATURE_OTP, + .tested = TEST_UNTESTED, + .probe = probe_spi_at45db, .probe_timing = TIMING_ZERO, - .write = NULL, - .read = NULL, + .block_erasers = + { + { + .eraseblocks = { {256, 1024} }, + .block_erase = spi_erase_at45db_page, + }, { + .eraseblocks = { {8 * 256, 1024/8} }, + .block_erase = spi_erase_at45db_block, + }, { + .eraseblocks = { + {8 * 256, 1}, + {120 * 256, 1}, + {128 * 256, 7}, + }, + .block_erase = spi_erase_at45db_sector + }, { + .eraseblocks = { {256 * 1024, 1} }, + .block_erase = spi_erase_at45db_chip, + } + }, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ + .printlock = spi_prettyprint_status_register_at45db, + /* granularity will be set by the probing function. */ + .write = spi_write_at45db, + .read = spi_read_at45db, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -2371,15 +2421,40 @@ .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB041D, - .total_size = 512 /* Size can only be determined from status register */, - .page_size = 256 /* Size can only be determined from status register */, + .total_size = 512 /* or 528, determined from status register */, + .page_size = 256 /* or 264, determined from status register */, /* does not support EWSR nor WREN and has no writable status register bits whatsoever */ - .tested = TEST_BAD_REW, - .probe = probe_spi_rdid, + /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ + .feature_bits = FEATURE_OTP, + .tested = TEST_OK_PREW, + .probe = probe_spi_at45db, .probe_timing = TIMING_ZERO, - .write = NULL, - .read = NULL, - .voltage = {2500, 3600}, /* 2.5-3.6V & 2.7-3.6V models available */ + .block_erasers = + { + { + .eraseblocks = { {256, 2048} }, + .block_erase = spi_erase_at45db_page, + }, { + .eraseblocks = { {8 * 256, 2048/8} }, + .block_erase = spi_erase_at45db_block, + }, { + .eraseblocks = { + {8 * 256, 1}, + {248 * 256, 1}, + {256 * 256, 7}, + }, + .block_erase = spi_erase_at45db_sector + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = spi_erase_at45db_chip, + } + }, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ + .printlock = spi_prettyprint_status_register_at45db, + /* granularity will be set by the probing function. */ + .write = spi_write_at45db, + .read = spi_read_at45db, /* Fast read (0x0B) supported */ + .voltage = {2700, 3600}, /* 2.5-3.6V & 2.7-3.6V models available */ }, { @@ -2388,14 +2463,39 @@ .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB081D, - .total_size = 1024 /* Size can only be determined from status register */, - .page_size = 256 /* Size can only be determined from status register */, + .total_size = 1024 /* or 1056, determined from status register */, + .page_size = 256 /* or 264, determined from status register */, /* does not support EWSR nor WREN and has no writable status register bits whatsoever */ - .tested = TEST_BAD_REW, - .probe = probe_spi_rdid, + /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ + .feature_bits = FEATURE_OTP, + .tested = TEST_UNTESTED, + .probe = probe_spi_at45db, .probe_timing = TIMING_ZERO, - .write = NULL, - .read = NULL, + .block_erasers = + { + { + .eraseblocks = { {256, 4096} }, + .block_erase = spi_erase_at45db_page, + }, { + .eraseblocks = { {8 * 256, 4096/8} }, + .block_erase = spi_erase_at45db_block, + }, { + .eraseblocks = { + {8 * 256, 1}, + {248 * 256, 1}, + {256 * 256, 15}, + }, + .block_erase = spi_erase_at45db_sector + }, { + .eraseblocks = { {1024 * 1024, 1} }, + .block_erase = spi_erase_at45db_chip, + } + }, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ + .printlock = spi_prettyprint_status_register_at45db, + /* granularity will be set by the probing function. */ + .write = spi_write_at45db, + .read = spi_read_at45db, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 2.5-3.6V & 2.7-3.6V models available */ }, @@ -2405,14 +2505,39 @@ .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB161D, - .total_size = 2048 /* Size can only be determined from status register */, - .page_size = 512 /* Size can only be determined from status register */, + .total_size = 2048 /* or 2112, determined from status register */, + .page_size = 512 /* or 528, determined from status register */, /* does not support EWSR nor WREN and has no writable status register bits whatsoever */ - .tested = TEST_BAD_REW, - .probe = probe_spi_rdid, + /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ + .feature_bits = FEATURE_OTP, + .tested = TEST_OK_PREW, + .probe = probe_spi_at45db, .probe_timing = TIMING_ZERO, - .write = NULL, - .read = NULL, + .block_erasers = + { + { + .eraseblocks = { {512, 4096} }, + .block_erase = spi_erase_at45db_page, + }, { + .eraseblocks = { {8 * 512, 4096/8} }, + .block_erase = spi_erase_at45db_block, + }, { + .eraseblocks = { + {8 * 512, 1}, + {248 * 512, 1}, + {256 * 512, 15}, + }, + .block_erase = spi_erase_at45db_sector + }, { + .eraseblocks = { {2048 * 1024, 1} }, + .block_erase = spi_erase_at45db_chip, + } + }, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ + .printlock = spi_prettyprint_status_register_at45db, + /* granularity will be set by the probing function. */ + .write = spi_write_at45db, + .read = spi_read_at45db, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 2.5-3.6V & 2.7-3.6V models available */ }, @@ -2439,17 +2564,82 @@ .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB321D, - .total_size = 4096 /* Size can only be determined from status register */, - .page_size = 512 /* Size can only be determined from status register */, + .total_size = 4096 /* or 4224, determined from status register */, + .page_size = 512 /* or 528, determined from status register */, + /* does not support EWSR nor WREN and has no writable status register bits whatsoever */ /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ + .feature_bits = FEATURE_OTP, + .tested = TEST_UNTESTED, + .probe = probe_spi_at45db, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {512, 8192} }, + .block_erase = spi_erase_at45db_page, + }, { + .eraseblocks = { {8 * 512, 8192/8} }, + .block_erase = spi_erase_at45db_block, + }, { + .eraseblocks = { + {8 * 512, 1}, + {120 * 512, 1}, + {128 * 512, 63}, + }, + .block_erase = spi_erase_at45db_sector + }, { + .eraseblocks = { {4096 * 1024, 1} }, + .block_erase = spi_erase_at45db_chip, + } + }, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ + .printlock = spi_prettyprint_status_register_at45db, + /* granularity will be set by the probing function. */ + .write = spi_write_at45db, + .read = spi_read_at45db, /* Fast read (0x0B) supported */ + .voltage = {2700, 3600}, /* 2.5-3.6V & 2.7-3.6V models available */ + }, + + { + .vendor = "Atmel", + .name = "AT45DB321E", + .bustype = BUS_SPI, + .manufacture_id = ATMEL_ID, + .model_id = ATMEL_AT45DB321C, + .total_size = 4096 /* or 4224, determined from status register */, + .page_size = 512 /* or 528, determined from status register */, /* does not support EWSR nor WREN and has no writable status register bits whatsoever */ + /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ .feature_bits = FEATURE_OTP, - .tested = TEST_BAD_REW, - .probe = probe_spi_rdid, + .tested = TEST_UNTESTED, + .probe = probe_spi_at45db, .probe_timing = TIMING_ZERO, - .write = NULL, - .read = NULL, - .voltage = {2700, 3600}, + .block_erasers = + { + { + .eraseblocks = { {512, 8192} }, + .block_erase = spi_erase_at45db_page, + }, { + .eraseblocks = { {8 * 512, 8192/8} }, + .block_erase = spi_erase_at45db_block, + }, { + .eraseblocks = { + {8 * 512, 1}, + {120 * 512, 1}, + {128 * 512, 63}, + }, + .block_erase = spi_erase_at45db_sector + }, { + .eraseblocks = { {4096 * 1024, 1} }, + .block_erase = spi_erase_at45db_chip, + } + }, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ + .printlock = spi_prettyprint_status_register_at45db, /* has a 2nd status register */ + /* granularity will be set by the probing function. */ + .write = spi_write_at45db, + .read = spi_read_at45db, /* Fast read (0x0B) supported */ + .voltage = {2500, 3600}, /* 2.3-3.6V & 2.5-3.6V models available */ }, { @@ -2458,14 +2648,39 @@ .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT45DB642D, - .total_size = 8192 /* Size can only be determined from status register */, - .page_size = 1024 /* Size can only be determined from status register */, + .total_size = 8192 /* or 8448, determined from status register */, + .page_size = 1024 /* or 1056, determined from status register */, /* does not support EWSR nor WREN and has no writable status register bits whatsoever */ - .tested = TEST_BAD_REW, - .probe = probe_spi_rdid, + /* OTP: 128B total, 64B pre-programmed; read 0x77; write 0x9B */ + .feature_bits = FEATURE_OTP, + .tested = TEST_UNTESTED, + .probe = probe_spi_at45db, .probe_timing = TIMING_ZERO, - .write = NULL, - .read = NULL, + .block_erasers = + { + { + .eraseblocks = { {1024, 8192} }, + .block_erase = spi_erase_at45db_page, + }, { + .eraseblocks = { {8 * 1024, 8192/8} }, + .block_erase = spi_erase_at45db_block, + }, { + .eraseblocks = { + {8 * 1024, 1}, + {248 * 1024, 1}, + {256 * 1024, 31}, + }, + .block_erase = spi_erase_at45db_sector + }, { + .eraseblocks = { {8192 * 1024, 1} }, + .block_erase = spi_erase_at45db_chip, + } + }, + .unlock = spi_disable_blockprotect_at45db, /* Impossible if locked down or #WP is low */ + .printlock = spi_prettyprint_status_register_at45db, + /* granularity will be set by the probing function. */ + .write = spi_write_at45db, + .read = spi_read_at45db, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, Modified: trunk/flashchips.h ============================================================================== --- trunk/flashchips.h Sun Aug 25 15:31:43 2013 (r1722) +++ trunk/flashchips.h Tue Aug 27 20:01:53 2013 (r1723) @@ -167,24 +167,25 @@ #define ATMEL_AT45D041A /* No ID available */ #define ATMEL_AT45D081A /* No ID available */ #define ATMEL_AT45D161 /* No ID available */ -#define ATMEL_AT45DB011 /* No ID available */ -#define ATMEL_AT45DB011B /* No ID available */ +#define ATMEL_AT45DB011 /* No ID (opcode) available for AT45DB011, AT45DB011B */ #define ATMEL_AT45DB011D 0x2200 -#define ATMEL_AT45DB021A /* No ID available */ -#define ATMEL_AT45DB021B /* No ID available */ +#define ATMEL_AT45DB021 /* No ID (opcode) available for AT45DB021, AT45DB021A, AT45DB021B */ #define ATMEL_AT45DB021D 0x2300 -#define ATMEL_AT45DB041A /* No ID available */ +#define ATMEL_AT45DB021E /* same as above but with EDI 0x0100 */ +#define ATMEL_AT45DB041 /* No ID (opcode) available for AT45DB041, AT45DB041A, AT45DB041B */ #define ATMEL_AT45DB041D 0x2400 -#define ATMEL_AT45DB081A /* No ID available */ +#define ATMEL_AT45DB041E /* same as above but with EDI 0x0100 */ +#define ATMEL_AT45DB081 /* No ID (opcode) available for AT45DB081, AT45DB081A, AT45DB081B */ #define ATMEL_AT45DB081D 0x2500 -#define ATMEL_AT45DB161 /* No ID available */ -#define ATMEL_AT45DB161B /* No ID available */ +#define ATMEL_AT45DB081E /* same as above but with EDI 0x0100 */ +#define ATMEL_AT45DB161 /* No ID (opcode) available for AT45DB161, AT45DB161B */ #define ATMEL_AT45DB161D 0x2600 -#define ATMEL_AT45DB321 /* No ID available */ -#define ATMEL_AT45DB321B /* No ID available */ +#define ATMEL_AT45DB161E /* same as above but with EDI 0x0100 */ +#define ATMEL_AT45DB321 /* No ID (opcode) available for AT45DB321, AT45DB321B */ #define ATMEL_AT45DB321C 0x2700 +#define ATMEL_AT45DB321E /* same as above but with EDI 0x0100 */ #define ATMEL_AT45DB321D 0x2701 /* Buggy data sheet */ -#define ATMEL_AT45DB642 /* No ID available */ +#define ATMEL_AT45DB642 /* No ID (opcode) available for AT45DB642 */ #define ATMEL_AT45DB642D 0x2800 #define ATMEL_AT49BV512 0x03 #define ATMEL_AT49F002N 0x07 /* for AT49F002(N) */ Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Sun Aug 25 15:31:43 2013 (r1722) +++ trunk/serprog.c Tue Aug 27 20:01:53 2013 (r1723) @@ -922,8 +922,7 @@ /* FIXME: This function is optimized so that it does not split each transaction * into chip page_size long blocks unnecessarily like spi_read_chunked. This has * the advantage that it is much faster for most chips, but breaks those with - * non-contiguous address space (like AT45DB161D). When spi_read_chunked is - * fixed this method can be removed. */ + * non-continuous reads. When spi_read_chunked is fixed this method can be removed. */ static int serprog_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { Modified: trunk/spi25_statusreg.c ============================================================================== --- trunk/spi25_statusreg.c Sun Aug 25 15:31:43 2013 (r1722) +++ trunk/spi25_statusreg.c Tue Aug 27 20:01:53 2013 (r1723) @@ -270,7 +270,7 @@ } /* Unnamed bits. */ -static void spi_prettyprint_status_register_bit(uint8_t status, int bit) +void spi_prettyprint_status_register_bit(uint8_t status, int bit) { msg_cdbg("Chip status register: Bit %i is %sset\n", bit, (status & (1 << bit)) ? "" : "not "); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom