Skip to content

Commit

Permalink
Add support for M95M02-A125
Browse files Browse the repository at this point in the history
Automotive 2 Mbit (256KiB) serial SPI bus EEPROM
PREW tested successfully with use of ch341a programmer
on Linux host 5.2.0-1-MANJARO x86_64

Signed-off-by: Konstantin Grudnev <grudnevkv@gmail.com>
Change-Id: Ic29cd9051c7eac4822d620c299834134f987f01b
Reviewed-on: https://review.coreboot.org/c/flashrom/+/34496
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
  • Loading branch information
grudnevkv authored and i-c-o-n committed Oct 4, 2019
1 parent 4a84ec2 commit 3d8868c
Show file tree
Hide file tree
Showing 6 changed files with 111 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -542,7 +542,7 @@ endif
CHIP_OBJS = jedec.o stm50.o w39.o w29ee011.o \
sst28sf040.o 82802ab.o \
sst49lfxxxc.o sst_fwhub.o edi.o flashchips.o spi.o spi25.o spi25_statusreg.o \
opaque.o sfdp.o en29lv640b.o at45db.o
spi95.o opaque.o sfdp.o en29lv640b.o at45db.o

###############################################################################
# Library code.
Expand Down
4 changes: 4 additions & 0 deletions chipdrivers.h
Expand Up @@ -202,4 +202,8 @@ int edi_chip_write(struct flashctx *flash, const uint8_t *buf, unsigned int star
int edi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len);
int edi_probe_kb9012(struct flashctx *flash);

/* spi95.c */
int probe_spi_st95(struct flashctx *flash);
int spi_block_erase_emulation(struct flashctx *flash, unsigned int addr, unsigned int blocklen);

#endif /* !__CHIPDRIVERS_H__ */
27 changes: 27 additions & 0 deletions flashchips.c
Expand Up @@ -14239,6 +14239,33 @@ const struct flashchip flashchips[] = {
.voltage = {3000, 3600}, /* Also has 12V fast program & erase */
},

{
.vendor = "ST",
.name = "M95M02",
.bustype = BUS_SPI,
.manufacture_id = ST_ID,
.model_id = ST_M95M02,
.total_size = 256,
.page_size = 256,
.feature_bits = FEATURE_WRSR_WREN | FEATURE_NO_ERASE | FEATURE_ERASED_ZERO,
.tested = TEST_OK_PREW,
.probe = probe_spi_st95,
.probe_timing = TIMING_ZERO,
.block_erasers =
{
{
.eraseblocks = { {256 * 1024, 1} },
.block_erase = spi_block_erase_emulation,
}
},

.printlock = spi_prettyprint_status_register_bp1_srwd,
.unlock = spi_disable_blockprotect_bp1_srwd,
.write = spi_chip_write_256,
.read = spi_chip_read,
.voltage = {2500, 5500},
},

{
.vendor = "Sanyo",
.name = "LE25FU106B",
Expand Down
3 changes: 3 additions & 0 deletions flashchips.h
Expand Up @@ -852,6 +852,9 @@
#define ST_M58WR032KT 0x8814
#define ST_M58WR064KB 0x8811
#define ST_M58WR064KT 0x8810

#define ST_M95M02 0x0012 /* ST M95XXX 2Mbit (256KiB) */

#define ST_MT28GU01G___1 0x88B0
#define ST_MT28GU01G___2 0x88B1
#define ST_MT28GU256___1 0x8901
Expand Down
7 changes: 7 additions & 0 deletions spi.h
Expand Up @@ -28,6 +28,13 @@
/* INSIZE may be 0x04 for some chips*/
#define JEDEC_RDID_INSIZE 0x03

/* Some ST M95X model */
#define ST_M95_RDID 0x83
#define ST_M95_RDID_3BA_OUTSIZE 0x04 /* 8b op, 24bit addr where size >64KiB */
#define ST_M95_RDID_2BA_OUTSIZE 0x03 /* 8b op, 16bit addr where size <=64KiB */
#define ST_M95_RDID_OUTSIZE_MAX 0x04 /* ST_M95_RDID_3BA_OUTSIZE */
#define ST_M95_RDID_INSIZE 0x03

/* Some Atmel AT25F* models have bit 3 as don't care bit in commands */
#define AT25F_RDID 0x15 /* 0x15 or 0x1d */
#define AT25F_RDID_OUTSIZE 0x01
Expand Down
69 changes: 69 additions & 0 deletions spi95.c
@@ -0,0 +1,69 @@
/*
* This file is part of the flashrom project.
*
* Copyright (C) 2019 Konstantin Grudnev
* Copyright (C) 2019 Nikolay Nikolaev
*
* 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 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.
*/

/*
* Contains SPI chip driver functions related to ST95XXX series (SPI EEPROM)
*/
#include <string.h>
#include <stdlib.h>
#include "flashchips.h"
#include "chipdrivers.h"
#include "spi.h"

/* For ST95XXX chips which have RDID */
int probe_spi_st95(struct flashctx *flash)
{
/*
* ST_M95_RDID_OUTSIZE depends on size of the flash and
* not all ST_M95XXX have RDID.
*/
static const unsigned char cmd[ST_M95_RDID_OUTSIZE_MAX] = { ST_M95_RDID };
unsigned char readarr[ST_M95_RDID_INSIZE];
uint32_t id1, id2;

uint32_t rdid_outsize = ST_M95_RDID_2BA_OUTSIZE; // 16 bit address
if (flash->chip->total_size * KiB > 64 * KiB)
rdid_outsize = ST_M95_RDID_3BA_OUTSIZE; // 24 bit address

spi_send_command(flash, rdid_outsize, sizeof(readarr), cmd, readarr);

id1 = readarr[0]; // manufacture id
id2 = (readarr[1] << 8) | readarr[2]; // SPI family code + model id

msg_cdbg("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2);

if (id1 == flash->chip->manufacture_id && id2 == flash->chip->model_id)
return 1;

return 0;
}

/* ST95XXX chips don't have erase operation and erase is made as part of write command */
int spi_block_erase_emulation(struct flashctx *flash, unsigned int addr, unsigned int blocklen)
{
uint8_t *erased_contents = NULL;
int result = 0;

erased_contents = (uint8_t *)malloc(blocklen * sizeof(uint8_t));
if (!erased_contents) {
msg_cerr("Out of memory!\n");
return 1;
}
memset(erased_contents, ERASED_VALUE(flash), blocklen * sizeof(uint8_t));
result = spi_write_chunked(flash, erased_contents, 0, blocklen, flash->chip->page_size);
free(erased_contents);
return result;
}

0 comments on commit 3d8868c

Please sign in to comment.