[U-Boot] [PATCH v2] MTD/SPI/FLASH: add support for Ramtron FRAMs using SPI

From: Reinhard Meyer info@emk-elektronik.de
Signed-off-by: Reinhard Meyer u-boot@emk-elektronik.de --- drivers/mtd/spi/Makefile | 1 + drivers/mtd/spi/ramtron.c | 312 ++++++++++++++++++++++++++++++++++ drivers/mtd/spi/spi_flash.c | 54 ++++++- drivers/mtd/spi/spi_flash_internal.h | 1 + 4 files changed, 363 insertions(+), 5 deletions(-) create mode 100644 drivers/mtd/spi/ramtron.c
diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile index 4f11b36..a082ca7 100644 --- a/drivers/mtd/spi/Makefile +++ b/drivers/mtd/spi/Makefile @@ -32,6 +32,7 @@ COBJS-$(CONFIG_SPI_FLASH_SPANSION) += spansion.o COBJS-$(CONFIG_SPI_FLASH_SST) += sst.o COBJS-$(CONFIG_SPI_FLASH_STMICRO) += stmicro.o COBJS-$(CONFIG_SPI_FLASH_WINBOND) += winbond.o +COBJS-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.o COBJS-$(CONFIG_SPI_M95XXX) += eeprom_m95xxx.o
COBJS := $(COBJS-y) diff --git a/drivers/mtd/spi/ramtron.c b/drivers/mtd/spi/ramtron.c new file mode 100644 index 0000000..ecdb5d2 --- /dev/null +++ b/drivers/mtd/spi/ramtron.c @@ -0,0 +1,312 @@ +/* + * (C) Copyright 2010 + * Reinhard Meyer, EMK Elektronik, reinhard.meyer@emk-elektronik.de + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +/* + * Note: RAMTRON SPI FRAMs are ferroelectric, nonvolatile RAMs + * with an interface identical to SPI flash devices. + * However since they behave like RAM there are no delays or + * busy polls required. They can sustain read or write at the + * allowed SPI bus speed, which can be 40 MHz for some devices. + * + * Unfortunately, some RAMTRON FRAMs do not have a means of + * identifying them. We use an environment variable to select + * the device we will handle. The variable "fram_device" should + * be set from VPD data. + */ + +#include <common.h> +#include <malloc.h> +#include <spi_flash.h> +#include "spi_flash_internal.h" + +/* RAMTRON commands common to all devices */ +#define CMD_RAMTRON_WREN 0x06 /* Write Enable */ +#define CMD_RAMTRON_WRDI 0x04 /* Write Disable */ +#define CMD_RAMTRON_RDSR 0x05 /* Read Status Register */ +#define CMD_RAMTRON_WRSR 0x01 /* Write Status Register */ +#define CMD_RAMTRON_READ 0x03 /* Read Data Bytes */ +#define CMD_RAMTRON_WRITE 0x02 /* Write Data Bytes */ +/* not all have those: */ +#define CMD_RAMTRON_FSTRD 0x0b /* Fast Read (for compatibility - not used here) */ +#define CMD_RAMTRON_SLEEP 0xb9 /* Enter Sleep Mode */ +#define CMD_RAMTRON_RDID 0x9f /* Read ID */ +#define CMD_RAMTRON_SNR 0xc3 /* Read Serial Number */ + +/* + * Properties of supported FRAMs + * Note: speed is currently not used because we have no method to deliver that + * value to the upper layers + */ +struct ramtron_spi_fram_params { + u32 size; /* size in bytes */ + u8 addr_len; /* number of address bytes */ + u8 merge_cmd; /* some address bits are in the command byte */ + u8 id1; /* device ID 1 (family, density) */ + u8 id2; /* device ID 2 (sub, rev, rsvd) */ + u32 speed; /* max. SPI clock in Hz */ + const char *name; /* name for display and/or matching */ +}; + +struct ramtron_spi_fram { + struct spi_flash flash; + const struct ramtron_spi_fram_params *params; +}; + +static inline struct ramtron_spi_fram *to_ramtron_spi_fram(struct spi_flash + *flash) +{ + return container_of(flash, struct ramtron_spi_fram, flash); +} + +/* + * table describing supported FRAM chips: + * chips without RDID command must have the values 0xff for id1 and id2 + */ +static const struct ramtron_spi_fram_params ramtron_spi_fram_table[] = { + { + .size = 32*1024, + .addr_len = 2, + .merge_cmd = 0, + .id1 = 0x22, + .id2 = 0x00, + .speed = 40000000, + .name = "FM25V02", + }, + { + .size = 32*1024, + .addr_len = 2, + .merge_cmd = 0, + .id1 = 0x22, + .id2 = 0x01, + .speed = 40000000, + .name = "FM25VN02", + }, + { + .size = 64*1024, + .addr_len = 2, + .merge_cmd = 0, + .id1 = 0x23, + .id2 = 0x00, + .speed = 40000000, + .name = "FM25V05", + }, + { + .size = 64*1024, + .addr_len = 2, + .merge_cmd = 0, + .id1 = 0x23, + .id2 = 0x01, + .speed = 40000000, + .name = "FM25VN05", + }, + { + .size = 128*1024, + .addr_len = 3, + .merge_cmd = 0, + .id1 = 0x24, + .id2 = 0x00, + .speed = 40000000, + .name = "FM25V10", + }, + { + .size = 128*1024, + .addr_len = 3, + .merge_cmd = 0, + .id1 = 0x24, + .id2 = 0x01, + .speed = 40000000, + .name = "FM25VN10", + }, +#ifdef CONFIG_SPI_FRAM_RAMTRON_NONSTD + { + .size = 256*1024, + .addr_len = 3, + .merge_cmd = 0, + .id1 = 0xff, + .id2 = 0xff, + .speed = 40000000, + .name = "FM25H20", + }, +#endif +}; + +static int ramtron_common(struct spi_flash *flash, + u32 offset, size_t len, void *buf, u8 command) +{ + struct ramtron_spi_fram *sn = to_ramtron_spi_fram(flash); + u8 cmd[4]; + int cmd_len; + int ret; + + if (sn->params->addr_len == 3 && sn->params->merge_cmd == 0) { + cmd[0] = command; + cmd[1] = offset >> 16; + cmd[2] = offset >> 8; + cmd[3] = offset; + cmd_len = 4; + } + else if (sn->params->addr_len == 2 && sn->params->merge_cmd == 0) { + cmd[0] = command; + cmd[1] = offset >> 8; + cmd[2] = offset; + cmd_len = 3; + } + else { + printf("SF: unsupported addr_len or merge_cmd\n"); + return -1; + } + + /* claim the bus */ + ret = spi_claim_bus(flash->spi); + if (ret) { + debug("SF: Unable to claim SPI bus\n"); + return ret; + } + + if (command == CMD_RAMTRON_WRITE) { + /* send WREN */ + ret = spi_flash_cmd(flash->spi, CMD_RAMTRON_WREN, NULL, 0); + if (ret < 0) { + debug("SF: Enabling Write failed\n"); + goto releasebus; + } + } + + /* do the transaction */ + if (command == CMD_RAMTRON_WRITE) + ret = spi_flash_cmd_write(flash->spi, cmd, cmd_len, buf, len); + else + ret = spi_flash_cmd_read(flash->spi, cmd, cmd_len, buf, len); + if (ret < 0) + debug("SF: Transaction failed\n"); + +releasebus: + /* release the bus */ + spi_release_bus(flash->spi); + return ret; +} + +static int ramtron_read(struct spi_flash *flash, + u32 offset, size_t len, void *buf) +{ + return ramtron_common(flash, offset, len, buf, + CMD_RAMTRON_READ); +} + +static int ramtron_write(struct spi_flash *flash, + u32 offset, size_t len, const void *buf) +{ + return ramtron_common(flash, offset, len, (void *)buf, + CMD_RAMTRON_WRITE); +} + +int ramtron_erase(struct spi_flash *flash, u32 offset, size_t len) +{ + debug("SF: Erase of RAMTRON FRAMs is pointless\n"); + return -1; +} + +struct spi_flash *spi_fram_probe_ramtron(struct spi_slave *spi, u8 *idcode) +{ + const struct ramtron_spi_fram_params *params; + struct ramtron_spi_fram *sn; + unsigned int i; +#ifdef CONFIG_SPI_FRAM_RAMTRON_NONSTD + int ret; + u8 sr; +#endif + + /* NOTE: the bus has been claimed before this function is called! */ + + /* + * RAMTRON chips without RDID command support will keep their Q output + * tristated. Depending on MISO termination we will read noise. + * Chips with RDID command support will answer 6*0x7f, 0xc2, id1, id2. + */ + for (i = 0; i < 7 && *idcode == 0x7f; idcode++) + ; + + switch (idcode[0]) { + case 0xc2: + /* JEDEC conformant RAMTRON id */ + for (i = 0; i < ARRAY_SIZE(ramtron_spi_fram_table); i++) { + params = &ramtron_spi_fram_table[i]; + if (idcode[1] == params->id1 && idcode[2] == params->id2) + goto found; + } + break; +#ifdef CONFIG_SPI_FRAM_RAMTRON_NONSTD + case 0xff: + /* + * probably open MISO line, pulled up. + * We COULD have a non JEDEC conformant FRAM here, + * read the status register to verify + */ + ret = spi_flash_cmd(spi, CMD_RAMTRON_RDSR, &sr, 1); + if (ret) + return NULL; + + /* Bits 5,4,0 are fixed 0 for all devices */ + if ((sr & 0x31) != 0x00) + return NULL; + /* now find the device */ + for (i = 0; i < ARRAY_SIZE(ramtron_spi_fram_table); i++) { + params = &ramtron_spi_fram_table[i]; + if (!strcmp(params->name, CONFIG_SPI_FRAM_RAMTRON_NONSTD)) + goto found; + } + debug("SF: Unsupported non-standard RAMTRON device " + CONFIG_SPI_FRAM_RAMTRON_NONSTD "\n"); + break; +#endif + default: + break; + } + + /* arriving here means no method has found a device we can handle */ + debug("SF/ramtron: unsupported device id0=%02x id1=%02x id2=%02x\n", + idcode[0], idcode[1], idcode[2]); + return NULL; + +found: + sn = malloc(sizeof(struct ramtron_spi_fram)); + if (!sn) { + debug("SF: Failed to allocate memory\n"); + return NULL; + } + + sn->params = params; + sn->flash.spi = spi; + sn->flash.name = params->name; + + sn->flash.write = ramtron_write; + sn->flash.read = ramtron_read; + sn->flash.erase = ramtron_erase; + sn->flash.size = params->size; + + printf("SF: Detected %s with size ", params->name); + print_size(sn->flash.size, "\n"); + + return &sn->flash; +} + diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index ea875dc..03e16a1 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -12,6 +12,18 @@
#include "spi_flash_internal.h"
+/* + * RAMTRONs JEDEC conformant FRAM devices have a total of 7 + * continuation bytes before their Manufacturer ID. + * Define the required ID length as 10 if RAMTRON devices + * shall be probed. + */ +#ifdef CONFIG_SPI_FRAM_RAMTRON +# define IDCODE_LEN 10 +#else +# define IDCODE_LEN 5 +#endif + int spi_flash_cmd(struct spi_slave *spi, u8 cmd, void *response, size_t len) { unsigned long flags = SPI_XFER_BEGIN; @@ -102,7 +114,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, struct spi_slave *spi; struct spi_flash *flash; int ret; - u8 idcode[5]; + u8 idcode[IDCODE_LEN];
spi = spi_setup_slave(bus, cs, max_hz, spi_mode); if (!spi) { @@ -117,12 +129,14 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, }
/* Read the ID codes */ - ret = spi_flash_cmd(spi, CMD_READ_ID, &idcode, sizeof(idcode)); + ret = spi_flash_cmd(spi, CMD_READ_ID, &idcode, IDCODE_LEN); if (ret) goto err_read_id;
- debug("SF: Got idcode %02x %02x %02x %02x %02x\n", idcode[0], - idcode[1], idcode[2], idcode[3], idcode[4]); +#ifdef DEBUG + printf("SF: Got idcode\n"); + print_buffer(0, idcode, 1, IDCODE_LEN, 0); +#endif
switch (idcode[0]) { #ifdef CONFIG_SPI_FLASH_SPANSION @@ -147,7 +161,6 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, #endif #ifdef CONFIG_SPI_FLASH_STMICRO case 0x20: - case 0xff: /* Let the stmicro func handle non-JEDEC ids */ flash = spi_flash_probe_stmicro(spi, idcode); break; #endif @@ -156,6 +169,37 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, flash = spi_flash_probe_sst(spi, idcode); break; #endif +#ifdef CONFIG_SPI_FRAM_RAMTRON + case 0x7f: + flash = spi_fram_probe_ramtron(spi, idcode); + break; +#endif + case 0xff: + /* + * non JEDEC conformant devices: + * + * Note: detecting them requires that the MISO line has a + * pullup resistor so that 0xff will be read when the + * CMD_READ_ID is issued and the device does not honor + * it. + * + * The probe functions should take reasonable measures to + * avoid false detection. + * + * We call probe functions until one returns non-NULL. + */ +#ifdef CONFIG_SPI_FRAM_RAMTRON_NONSTD + flash = spi_fram_probe_ramtron(spi, idcode); + if (flash) + break; +#endif +#ifdef CONFIG_SPI_FLASH_STMICRO + flash = spi_flash_probe_stmicro(spi, idcode); + if (flash) + break; +#endif + printf("SF: non JEDEC device suspected but could not be detected\n"); + break; default: printf("SF: Unsupported manufacturer %02X\n", idcode[0]); flash = NULL; diff --git a/drivers/mtd/spi/spi_flash_internal.h b/drivers/mtd/spi/spi_flash_internal.h index 08546fb..9bc43dd 100644 --- a/drivers/mtd/spi/spi_flash_internal.h +++ b/drivers/mtd/spi/spi_flash_internal.h @@ -50,3 +50,4 @@ struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode); struct spi_flash *spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode); struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 *idcode); struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode); +struct spi_flash *spi_fram_probe_ramtron(struct spi_slave *spi, u8 *idcode);

On Friday, August 27, 2010 07:16:37 Reinhard Meyer wrote:
From: Reinhard Meyer info@emk-elektronik.de
Signed-off-by: Reinhard Meyer u-boot@emk-elektronik.de
looks like you still need to do `git commit --amend --author 'Reinhard Meyer u-boot@emk-elektronik.de'` ...
+#ifdef CONFIG_SPI_FRAM_RAMTRON_NONSTD
i would stick with the style "NON_JEDEC" -mike

Dear Mike Frysinger,
On Friday, August 27, 2010 07:16:37 Reinhard Meyer wrote:
From: Reinhard Meyerinfo@emk-elektronik.de
Signed-off-by: Reinhard Meyeru-boot@emk-elektronik.de
looks like you still need to do `git commit --amend --author 'Reinhard Meyer u-boot@emk-elektronik.de'` ...
Both are valid e-mail addresses, who says the one who signs off and the one who sends the e-mail must be the same person? Its tedious to change that because its like 10 commits back in my branch. But I can do that again.
+#ifdef CONFIG_SPI_FRAM_RAMTRON_NONSTD
i would stick with the style "NON_JEDEC"
Doable.
Is there anything else within the patch itself that you deem need to be changed?
Reinhard

On Saturday, August 28, 2010 18:23:18 Reinhard Meyer wrote:
Dear Mike Frysinger,
On Friday, August 27, 2010 07:16:37 Reinhard Meyer wrote:
From: Reinhard Meyerinfo@emk-elektronik.de
Signed-off-by: Reinhard Meyeru-boot@emk-elektronik.de
looks like you still need to do `git commit --amend --author 'Reinhard Meyer u-boot@emk-elektronik.de'` ...
Both are valid e-mail addresses, who says the one who signs off and the one who sends the e-mail must be the same person? Its tedious to change that because its like 10 commits back in my branch. But I can do that again.
i dont think there is anything spelled out anywhere, but it's very uncommon. which is to say ive never seen anyone do it before *on purpose*, only on accident and then they wanted to fix it. being a sheeple in this scenario makes other people's lives easier because it's following the existing behavior without throwing people off. -mike

On 29.08.2010 00:28, Mike Frysinger wrote:
On Saturday, August 28, 2010 18:23:18 Reinhard Meyer wrote:
Dear Mike Frysinger,
On Friday, August 27, 2010 07:16:37 Reinhard Meyer wrote:
From: Reinhard Meyerinfo@emk-elektronik.de
Signed-off-by: Reinhard Meyeru-boot@emk-elektronik.de
looks like you still need to do `git commit --amend --author 'Reinhard Meyeru-boot@emk-elektronik.de'` ...
Both are valid e-mail addresses, who says the one who signs off and the one who sends the e-mail must be the same person? Its tedious to change that because its like 10 commits back in my branch. But I can do that again.
i dont think there is anything spelled out anywhere, but it's very uncommon. which is to say ive never seen anyone do it before *on purpose*, only on accident and then they wanted to fix it. being a sheeple in this scenario makes other people's lives easier because it's following the existing behavior without throwing people off. -mike
It is just that there are several commits (not only this one) which I have made before I introduced the new e-mail address (solely for u-boot purposes). It might be easier if I just change the sign-off addresses back to <info@> for those older patches. That's simple to do when I squash a correction anyway.
Or I let cat 00xxxxxx | sed s/info@emk/u-boot@emk/ | git send-email handle that... That will fix some older copyrights of mine that are reinhard.meyer@emk..., too.
Reinhard
participants (2)
-
Mike Frysinger
-
Reinhard Meyer