by Ryan O'Leary (Code Review)
Ryan O'Leary has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/34160 )
Change subject: dediprog.c: Add id parameter to dediprog programmer
......................................................................
dediprog.c: Add id parameter to dediprog programmer
When multiple dediprog programmers are connected, the 'id' parameter
allows you to specify which one to use. The id is a string like SF012345
or DP012345. The value is printed on a sticker on the back of the dediprog.
This is an improvement over the 'device' parameter which is based on
enumeration order and changes when you plug/unplug devices or reboot the
machine.
To find the id without the sticker, run flashrom with the -V option.
This prints the ids as they are enumerated. Alternatively, with dpcmd,
you can use the --list-device-id and --fix-device commands to list and
write device ids respectively.
Note this only supports SF100 at the moment, but SF600 support is
possible with more work.
Change-Id: I4281213ab02131feb5d47bf66118a001cec0d219
Signed-off-by: Ryan O'Leary <ryanoleary(a)google.com>
---
M dediprog.c
1 file changed, 133 insertions(+), 19 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/60/34160/1
diff --git a/dediprog.c b/dediprog.c
index 8029b64..1d10b24 100644
--- a/dediprog.c
+++ b/dediprog.c
@@ -823,6 +823,46 @@
return 0;
}
+/* Read the id from the dediprog. This should return the numeric part of the
+ * serial number found on a sticker on the back of the dediprog. Note this
+ * number is stored in writable eeprom, so it could get out of sync. Also note,
+ * this function only supports SF100 at this time, but SF600 support is not too
+ * much different.
+ * @return the id on success, -1 on failure
+ */
+static int dediprog_read_id(void)
+{
+ int ret;
+ uint8_t buf[3];
+
+ ret = libusb_control_transfer(dediprog_handle, REQTYPE_OTHER_IN,
+ 0x7, /* request */
+ 0, /* value */
+ 0xEF00, /* index */
+ buf, sizeof(buf),
+ DEFAULT_TIMEOUT);
+ if (ret != sizeof(buf)) {
+ msg_perr("Failed to read dediprog id, error %d!\n", ret);
+ return -1;
+ }
+
+ return buf[0] << 16 | buf[1] << 8 | buf[2];
+}
+
+/* Return the prefix to display in front of the id. These two characters also
+ * appear on the sticker even though they can be derived from the numerical
+ * part.
+ * @id a dediprog's id
+ * @return either "DP" or "SF"
+ */
+static const char* dediprog_id_prefix(int id) {
+ /* This is so the id matches dpcmd. */
+ if (id < 600000) {
+ return "DP";
+ }
+ return "SF";
+}
+
/*
* This command presumably sets the voltage for the SF100 itself (not the
* SPI flash). Only use this command with firmware older than V6.0.0. Newer
@@ -997,9 +1037,11 @@
int dediprog_init(void)
{
- char *voltage, *device, *spispeed, *target_str;
+ char *voltage, *id_str, *device, *spispeed, *target_str;
int spispeed_idx = 1;
int millivolt = 3500;
+ int id = -1; /* -1 defaults to enumeration order */
+ int found_id;
long usedevice = 0;
long target = FLASH_TYPE_APPLICATION_FLASH_1;
int i, ret;
@@ -1029,9 +1071,37 @@
msg_pinfo("Setting voltage to %i mV\n", millivolt);
}
+ id_str = extract_programmer_param("id");
+ if (id_str) {
+ char prefix0, prefix1;
+ const char *prefix;
+ if (sscanf(id_str, "%c%c%d", &prefix0, &prefix1, &id) != 3) {
+ msg_perr("Error: Could not parse dediprog 'id'.\n");
+ msg_perr("Expected a string like SF012345 or DP012345.\n");
+ free(id_str);
+ return 1;
+ }
+ if (id < 0 || id >= 0x1000000) {
+ msg_perr("Error: id %s is out of range!\n", id_str);
+ free(id_str);
+ return 1;
+ }
+ prefix = dediprog_id_prefix(id);
+ if (strlen(prefix) != 2 || prefix[0] != prefix0 || prefix[1] != prefix1) {
+ msg_perr("Error: %s is an invalid id!\n", id_str);
+ free(id_str);
+ return 1;
+ }
+ msg_pinfo("Will search for dediprog id %s%06d.\n", dediprog_id_prefix(id), id);
+ }
+ free(id_str);
+
device = extract_programmer_param("device");
if (device) {
char *dev_suffix;
+ if (id != -1) {
+ msg_perr("Error: Cannot use 'id' and 'device'.\n");
+ }
errno = 0;
usedevice = strtol(device, &dev_suffix, 10);
if (errno != 0 || device == dev_suffix) {
@@ -1097,25 +1167,69 @@
const uint16_t vid = devs_dediprog[0].vendor_id;
const uint16_t pid = devs_dediprog[0].device_id;
- dediprog_handle = usb_dev_get_by_vid_pid_number(usb_ctx, vid, pid, (unsigned int) usedevice);
- if (!dediprog_handle) {
- msg_perr("Could not find a Dediprog programmer on USB.\n");
- libusb_exit(usb_ctx);
- return 1;
+ for (;;) {
+ /* Notice we can only call dediprog_read_id() after
+ * libusb_set_configuration() and libusb_claim_interface(). When
+ * searching by id and either configuration or claim fails
+ * (usually the device is in use by another instance of
+ * flashrom), the device is skipped and the next device is
+ * tried.
+ */
+ dediprog_handle = usb_dev_get_by_vid_pid_number(usb_ctx, vid, pid, (unsigned int) usedevice);
+ if (!dediprog_handle) {
+ msg_perr("Could not find a Dediprog programmer on USB.\n");
+ libusb_exit(usb_ctx);
+ return 1;
+ }
+ ret = libusb_set_configuration(dediprog_handle, 1);
+ if (ret != 0) {
+ msg_perr("Could not set USB device configuration: %i %s\n",
+ ret, libusb_error_name(ret));
+ libusb_close(dediprog_handle);
+ if (id != -1) {
+ usedevice++;
+ continue;
+ }
+ libusb_exit(usb_ctx);
+ return 1;
+ }
+ ret = libusb_claim_interface(dediprog_handle, 0);
+ if (ret < 0) {
+ msg_perr("Could not claim USB device interface %i: %i %s\n",
+ 0, ret, libusb_error_name(ret));
+ libusb_close(dediprog_handle);
+ if (id != -1) {
+ usedevice++;
+ continue;
+ }
+ libusb_exit(usb_ctx);
+ return 1;
+ }
+
+ /* Read the dediprog's id. The value is only used (besides
+ * logging) when searching by id.
+ */
+ found_id = dediprog_read_id();
+ if (id != -1) {
+ if (found_id < 0) {
+ msg_perr("Could not read id.\n");
+ libusb_release_interface(dediprog_handle, 0);
+ libusb_close(dediprog_handle);
+ usedevice++;
+ continue;
+ }
+ msg_pinfo("Found dediprog id %s%06d.\n", dediprog_id_prefix(found_id), found_id);
+ if (found_id != id) {
+ libusb_release_interface(dediprog_handle, 0);
+ libusb_close(dediprog_handle);
+ usedevice++;
+ continue;
+ }
+ }
+ break;
}
- ret = libusb_set_configuration(dediprog_handle, 1);
- if (ret != 0) {
- msg_perr("Could not set USB device configuration: %i %s\n", ret, libusb_error_name(ret));
- libusb_close(dediprog_handle);
- libusb_exit(usb_ctx);
- return 1;
- }
- ret = libusb_claim_interface(dediprog_handle, 0);
- if (ret < 0) {
- msg_perr("Could not claim USB device interface %i: %i %s\n", 0, ret, libusb_error_name(ret));
- libusb_close(dediprog_handle);
- libusb_exit(usb_ctx);
- return 1;
+ if (found_id >= 0) {
+ msg_pinfo("Using dediprog id %s%06d.\n", dediprog_id_prefix(found_id), found_id);
}
if (register_shutdown(dediprog_shutdown, NULL))
--
To view, visit https://review.coreboot.org/c/flashrom/+/34160
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I4281213ab02131feb5d47bf66118a001cec0d219
Gerrit-Change-Number: 34160
Gerrit-PatchSet: 1
Gerrit-Owner: Ryan O'Leary
Gerrit-MessageType: newchange
by Jacob Creedon (Code Review)
Jacob Creedon has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/34491 )
Change subject: flashchips: Add missing N25Q/MT25Q 1.8v variants
......................................................................
flashchips: Add missing N25Q/MT25Q 1.8v variants
This adds missing 1.8v variants for the 256Mb and 512Mb capacities for
N25Q and MT25Q devices. Only the MT25QU512 has been tested in hardware,
all other variants added are marked as untested.
Signed-off-by: Jacob Creedon <jcreedon(a)google.com>
Change-Id: I85630e4f6c0aa3b261f9871b7d363dad278b997e
---
M flashchips.c
1 file changed, 178 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/91/34491/1
diff --git a/flashchips.c b/flashchips.c
index d25f7a2..5424a04 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -10545,6 +10545,46 @@
{
.vendor = "Micron/Numonyx/ST",
+ .name = "N25Q256..1E", /* ..1E = 1.8V, uniform 64KB/4KB blocks/sectors */
+ .bustype = BUS_SPI,
+ .manufacture_id = ST_ID,
+ .model_id = ST_N25Q256__1E,
+ .total_size = 32768,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 64B total; read 0x4B, write 0x42 */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN,
+ .tested = TEST_UNTESTED,
+ .probe = probe_spi_rdid,
+ .probe_timing = TIMING_ZERO,
+ .block_erasers =
+ {
+ {
+ .eraseblocks = { {4 * 1024, 8192} },
+ .block_erase = spi_block_erase_21,
+ }, {
+ .eraseblocks = { {4 * 1024, 8192} },
+ .block_erase = spi_block_erase_20,
+ }, {
+ .eraseblocks = { {64 * 1024, 512} },
+ .block_erase = spi_block_erase_dc,
+ }, {
+ .eraseblocks = { {64 * 1024, 512} },
+ .block_erase = spi_block_erase_d8,
+ }, {
+ .eraseblocks = { {32768 * 1024, 1} },
+ .block_erase = spi_block_erase_c7,
+ }
+ },
+ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */
+ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */
+ .write = spi_chip_write_256, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {1700, 2000},
+ },
+
+ {
+ .vendor = "Micron/Numonyx/ST",
.name = "N25Q256..3E", /* ..3E = 3V, uniform 64KB/4KB blocks/sectors */
.bustype = BUS_SPI,
.manufacture_id = ST_ID,
@@ -10585,6 +10625,46 @@
{
.vendor = "Micron/Numonyx/ST",
+ .name = "N25Q512..1E", /* ..1E = 1.8V, uniform 64KB/4KB blocks/sectors */
+ .bustype = BUS_SPI,
+ .manufacture_id = ST_ID,
+ .model_id = ST_N25Q512__1E,
+ .total_size = 65536,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 64B total; read 0x4B, write 0x42 */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN,
+ .tested = TEST_UNTESTED,
+ .probe = probe_spi_rdid,
+ .probe_timing = TIMING_ZERO,
+ .block_erasers =
+ {
+ {
+ .eraseblocks = { {4 * 1024, 16384} },
+ .block_erase = spi_block_erase_21,
+ }, {
+ .eraseblocks = { {4 * 1024, 16384} },
+ .block_erase = spi_block_erase_20,
+ }, {
+ .eraseblocks = { {64 * 1024, 1024} },
+ .block_erase = spi_block_erase_dc,
+ }, {
+ .eraseblocks = { {64 * 1024, 1024} },
+ .block_erase = spi_block_erase_d8,
+ }, {
+ .eraseblocks = { {65536 * 1024, 1} },
+ .block_erase = spi_block_erase_c4,
+ }
+ },
+ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */
+ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */
+ .write = spi_chip_write_256, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {1700, 2000},
+ },
+
+ {
+ .vendor = "Micron/Numonyx/ST",
.name = "N25Q512..3E", /* ..3E = 3V, uniform 64KB/4KB blocks/sectors */
.bustype = BUS_SPI,
.manufacture_id = ST_ID,
@@ -10674,6 +10754,55 @@
{
.vendor = "Micron",
+ .name = "MT25QU256", /* U = 1.8V, uniform 64KB/4KB blocks/sectors */
+ .bustype = BUS_SPI,
+ .manufacture_id = ST_ID,
+ .model_id = ST_N25Q256__1E,
+ .total_size = 32768,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 64B total; read 0x4B, write 0x42 */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN,
+ .tested = TEST_UNTESTED,
+ .probe = probe_spi_rdid,
+ .probe_timing = TIMING_ZERO,
+ .block_erasers =
+ {
+ {
+ .eraseblocks = { {4 * 1024, 8192} },
+ .block_erase = spi_block_erase_21,
+ }, {
+ .eraseblocks = { {4 * 1024, 8192} },
+ .block_erase = spi_block_erase_20,
+ }, {
+ .eraseblocks = { {32 * 1024, 1024} },
+ .block_erase = spi_block_erase_5c,
+ }, {
+ .eraseblocks = { {32 * 1024, 1024} },
+ .block_erase = spi_block_erase_52,
+ }, {
+ .eraseblocks = { {64 * 1024, 512} },
+ .block_erase = spi_block_erase_dc,
+ }, {
+ .eraseblocks = { {64 * 1024, 512} },
+ .block_erase = spi_block_erase_d8,
+ }, {
+ .eraseblocks = { {32768 * 1024, 1} },
+ .block_erase = spi_block_erase_c7,
+ }, {
+ .eraseblocks = { {32768 * 1024, 1} },
+ .block_erase = spi_block_erase_60,
+ }
+ },
+ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */
+ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */
+ .write = spi_chip_write_256, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {1700, 2000},
+ },
+
+ {
+ .vendor = "Micron",
.name = "MT25QL512", /* L = 3V, uniform 64KB/4KB blocks/sectors */
.bustype = BUS_SPI,
.manufacture_id = ST_ID,
@@ -10722,6 +10851,55 @@
},
{
+ .vendor = "Micron",
+ .name = "MT25QU512", /* U = 1.8V, uniform 64KB/4KB blocks/sectors */
+ .bustype = BUS_SPI,
+ .manufacture_id = ST_ID,
+ .model_id = ST_N25Q512__1E,
+ .total_size = 65536,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 64B total; read 0x4B, write 0x42 */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN,
+ .tested = TEST_OK_PREW,
+ .probe = probe_spi_rdid,
+ .probe_timing = TIMING_ZERO,
+ .block_erasers =
+ {
+ {
+ .eraseblocks = { {4 * 1024, 16384} },
+ .block_erase = spi_block_erase_21,
+ }, {
+ .eraseblocks = { {4 * 1024, 16384} },
+ .block_erase = spi_block_erase_20,
+ }, {
+ .eraseblocks = { {32 * 1024, 2048} },
+ .block_erase = spi_block_erase_5c,
+ }, {
+ .eraseblocks = { {32 * 1024, 2048} },
+ .block_erase = spi_block_erase_52,
+ }, {
+ .eraseblocks = { {64 * 1024, 1024} },
+ .block_erase = spi_block_erase_dc,
+ }, {
+ .eraseblocks = { {64 * 1024, 1024} },
+ .block_erase = spi_block_erase_d8,
+ }, {
+ .eraseblocks = { {65536 * 1024, 1} },
+ .block_erase = spi_block_erase_c7,
+ }, {
+ .eraseblocks = { {65536 * 1024, 1} },
+ .block_erase = spi_block_erase_60,
+ }
+ },
+ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */
+ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */
+ .write = spi_chip_write_256, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {1700, 2000},
+ },
+
+ {
.vendor = "MoselVitelic",
.name = "V29C51000B",
.bustype = BUS_PARALLEL,
--
To view, visit https://review.coreboot.org/c/flashrom/+/34491
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I85630e4f6c0aa3b261f9871b7d363dad278b997e
Gerrit-Change-Number: 34491
Gerrit-PatchSet: 1
Gerrit-Owner: Jacob Creedon <jcreedon(a)google.com>
Gerrit-MessageType: newchange
by Jacob Creedon (Code Review)
Jacob Creedon has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/34521 )
Change subject: flashchips: Add N25Q00A devices
......................................................................
flashchips: Add N25Q00A devices
This adds the 1Gb N25Q00A device in both the 1.8v and 3v variants. This
is implemented from the datasheet and is marked as untested.
Signed-off-by: Jacob Creedon <jcreedon(a)google.com>
Change-Id: If36880f37746c95a97c8122a8f2fd0aecede5e8e
---
M flashchips.c
1 file changed, 80 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/21/34521/1
diff --git a/flashchips.c b/flashchips.c
index 021ae6c..5d292f1 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -10304,6 +10304,86 @@
{
.vendor = "Micron/Numonyx/ST",
+ .name = "N25Q00A..1G", /* ..1G = 1.8V, uniform 64KB/4KB blocks/sectors */
+ .bustype = BUS_SPI,
+ .manufacture_id = ST_ID,
+ .model_id = ST_N25Q00A__1G,
+ .total_size = 131072,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 64B total; read 0x4B, write 0x42 */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN,
+ .tested = TEST_UNTESTED,
+ .probe = probe_spi_rdid,
+ .probe_timing = TIMING_ZERO,
+ .block_erasers =
+ {
+ {
+ .eraseblocks = { {4 * 1024, 32768} },
+ .block_erase = spi_block_erase_21,
+ }, {
+ .eraseblocks = { {4 * 1024, 32768} },
+ .block_erase = spi_block_erase_20,
+ }, {
+ .eraseblocks = { {64 * 1024, 2048} },
+ .block_erase = spi_block_erase_dc,
+ }, {
+ .eraseblocks = { {64 * 1024, 2048} },
+ .block_erase = spi_block_erase_d8,
+ }, {
+ .eraseblocks = { {32768 * 1024, 4} },
+ .block_erase = spi_block_erase_c4,
+ }
+ },
+ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */
+ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */
+ .write = spi_chip_write_256, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {1700, 2000},
+ },
+
+ {
+ .vendor = "Micron/Numonyx/ST",
+ .name = "N25Q00A..3G", /* ..3G = 3V, uniform 64KB/4KB blocks/sectors */
+ .bustype = BUS_SPI,
+ .manufacture_id = ST_ID,
+ .model_id = ST_N25Q00A__3G,
+ .total_size = 131072,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 64B total; read 0x4B, write 0x42 */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN,
+ .tested = TEST_UNTESTED,
+ .probe = probe_spi_rdid,
+ .probe_timing = TIMING_ZERO,
+ .block_erasers =
+ {
+ {
+ .eraseblocks = { {4 * 1024, 32768} },
+ .block_erase = spi_block_erase_21,
+ }, {
+ .eraseblocks = { {4 * 1024, 32768} },
+ .block_erase = spi_block_erase_20,
+ }, {
+ .eraseblocks = { {64 * 1024, 2048} },
+ .block_erase = spi_block_erase_dc,
+ }, {
+ .eraseblocks = { {64 * 1024, 2048} },
+ .block_erase = spi_block_erase_d8,
+ }, {
+ .eraseblocks = { {32768 * 1024, 4} },
+ .block_erase = spi_block_erase_c4,
+ }
+ },
+ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */
+ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */
+ .write = spi_chip_write_256, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {2700, 3600},
+ },
+
+ {
+ .vendor = "Micron/Numonyx/ST",
.name = "N25Q016",
.bustype = BUS_SPI,
.manufacture_id = ST_ID,
--
To view, visit https://review.coreboot.org/c/flashrom/+/34521
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: If36880f37746c95a97c8122a8f2fd0aecede5e8e
Gerrit-Change-Number: 34521
Gerrit-PatchSet: 1
Gerrit-Owner: Jacob Creedon <jcreedon(a)google.com>
Gerrit-MessageType: newchange
by Jacob Creedon (Code Review)
Jacob Creedon has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/34520 )
Change subject: flashchips: Fix part names for N25Q512 and N25Q00A
......................................................................
flashchips: Fix part names for N25Q512 and N25Q00A
For the N25Q512 and N25Q00A, the 1G and 3G are used instead of 1E and 3E
to represent 1.8v and 3v respectively.
Signed-off-by: Jacob Creedon <jcreedon(a)google.com>
Change-Id: I289c33f7293f47b9449907350654cd6183c778d4
---
M flashchips.c
M flashchips.h
2 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/20/34520/1
diff --git a/flashchips.c b/flashchips.c
index 3a0da8d..021ae6c 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -10625,10 +10625,10 @@
{
.vendor = "Micron/Numonyx/ST",
- .name = "N25Q512..1E", /* ..1E = 1.8V, uniform 64KB/4KB blocks/sectors */
+ .name = "N25Q512..1G", /* ..1G = 1.8V, uniform 64KB/4KB blocks/sectors */
.bustype = BUS_SPI,
.manufacture_id = ST_ID,
- .model_id = ST_N25Q512__1E,
+ .model_id = ST_N25Q512__1G,
.total_size = 65536,
.page_size = 256,
/* supports SFDP */
@@ -10665,10 +10665,10 @@
{
.vendor = "Micron/Numonyx/ST",
- .name = "N25Q512..3E", /* ..3E = 3V, uniform 64KB/4KB blocks/sectors */
+ .name = "N25Q512..3G", /* ..3G = 3V, uniform 64KB/4KB blocks/sectors */
.bustype = BUS_SPI,
.manufacture_id = ST_ID,
- .model_id = ST_N25Q512__3E,
+ .model_id = ST_N25Q512__3G,
.total_size = 65536,
.page_size = 256,
/* supports SFDP */
@@ -10708,7 +10708,7 @@
.name = "MT25QL01G", /* L = 3V, uniform 64KB/4KB blocks/sectors */
.bustype = BUS_SPI,
.manufacture_id = ST_ID,
- .model_id = ST_N25Q00A__3E,
+ .model_id = ST_N25Q00A__3G,
.total_size = 131072,
.page_size = 256,
/* supports SFDP */
@@ -10754,7 +10754,7 @@
.name = "MT25QU01G", /* U = 1.8V, uniform 64KB/4KB blocks/sectors */
.bustype = BUS_SPI,
.manufacture_id = ST_ID,
- .model_id = ST_N25Q00A__1E,
+ .model_id = ST_N25Q00A__1G,
.total_size = 131072,
.page_size = 256,
/* supports SFDP */
@@ -11070,7 +11070,7 @@
.name = "MT25QL512", /* L = 3V, uniform 64KB/4KB blocks/sectors */
.bustype = BUS_SPI,
.manufacture_id = ST_ID,
- .model_id = ST_N25Q512__3E,
+ .model_id = ST_N25Q512__3G,
.total_size = 65536,
.page_size = 256,
/* supports SFDP */
@@ -11119,7 +11119,7 @@
.name = "MT25QU512", /* U = 1.8V, uniform 64KB/4KB blocks/sectors */
.bustype = BUS_SPI,
.manufacture_id = ST_ID,
- .model_id = ST_N25Q512__1E,
+ .model_id = ST_N25Q512__1G,
.total_size = 65536,
.page_size = 256,
/* supports SFDP */
diff --git a/flashchips.h b/flashchips.h
index e53e0df..0dcf735 100644
--- a/flashchips.h
+++ b/flashchips.h
@@ -866,10 +866,10 @@
#define ST_N25Q128__1E 0xBB18 /* N25Q128/MT25QU128, 1.8V, (uniform sectors expected) */
#define ST_N25Q256__3E 0xBA19 /* N25Q256/MT25QL256, 3.0V, (uniform sectors expected) */
#define ST_N25Q256__1E 0xBB19 /* N25Q256/MT25QU256, 1.8V, (uniform sectors expected) */
-#define ST_N25Q512__3E 0xBA20 /* N25Q512/MT25QL512, 3.0V, (uniform sectors expected) */
-#define ST_N25Q512__1E 0xBB20 /* N25Q512/MT25QU512, 1.8V, (uniform sectors expected) */
-#define ST_N25Q00A__3E 0xBA21 /* N25Q00A/MT25QL01G, 3.0V, (uniform sectors expected) */
-#define ST_N25Q00A__1E 0xBB21 /* N25Q00A/MT25QU01G, 1.8V, (uniform sectors expected) */
+#define ST_N25Q512__3G 0xBA20 /* N25Q512/MT25QL512, 3.0V, (uniform sectors expected) */
+#define ST_N25Q512__1G 0xBB20 /* N25Q512/MT25QU512, 1.8V, (uniform sectors expected) */
+#define ST_N25Q00A__3G 0xBA21 /* N25Q00A/MT25QL01G, 3.0V, (uniform sectors expected) */
+#define ST_N25Q00A__1G 0xBB21 /* N25Q00A/MT25QU01G, 1.8V, (uniform sectors expected) */
#define ST_MT25QL02G 0xBA22 /* MT25QL02G, 3.0V, (uniform sectors expected) */
#define ST_MT25QU02G 0xBB22 /* MT25QU02G, 1.8V, (uniform sectors expected) */
#define ST_NP5Q032 0xDA16 /* Phase-change memory (PCM), 3V */
--
To view, visit https://review.coreboot.org/c/flashrom/+/34520
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I289c33f7293f47b9449907350654cd6183c778d4
Gerrit-Change-Number: 34520
Gerrit-PatchSet: 1
Gerrit-Owner: Jacob Creedon <jcreedon(a)google.com>
Gerrit-MessageType: newchange
by Jacob Creedon (Code Review)
Jacob Creedon has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/34492 )
Change subject: flashchips: Add missing MT25Q capacities
......................................................................
flashchips: Add missing MT25Q capacities
This adds the 128Mb, 1Gb, and 2Gb capacities of the MT25Q devices. All
of these are implemented via the datasheet and should work but are
untested in hardware.
Signed-off-by: Jacob Creedon <jcreedon(a)google.com>
Change-Id: Ice6ea9426361afc25d4b731e2e3079edf234fdda
---
M flashchips.c
M flashchips.h
2 files changed, 274 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/92/34492/1
diff --git a/flashchips.c b/flashchips.c
index 5424a04..6b553fb 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -10705,6 +10705,270 @@
{
.vendor = "Micron",
+ .name = "MT25QL01G", /* L = 3V, uniform 64KB/4KB blocks/sectors */
+ .bustype = BUS_SPI,
+ .manufacture_id = ST_ID,
+ .model_id = ST_N25Q00A__3E,
+ .total_size = 131072,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 64B total; read 0x4B, write 0x42 */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN,
+ .tested = TEST_UNTESTED,
+ .probe = probe_spi_rdid,
+ .probe_timing = TIMING_ZERO,
+ .block_erasers =
+ {
+ {
+ .eraseblocks = { {4 * 1024, 32768} },
+ .block_erase = spi_block_erase_21,
+ }, {
+ .eraseblocks = { {4 * 1024, 32768} },
+ .block_erase = spi_block_erase_20,
+ }, {
+ .eraseblocks = { {32 * 1024, 4096} },
+ .block_erase = spi_block_erase_5c,
+ }, {
+ .eraseblocks = { {32 * 1024, 4096} },
+ .block_erase = spi_block_erase_52,
+ }, {
+ .eraseblocks = { {64 * 1024, 2048} },
+ .block_erase = spi_block_erase_dc,
+ }, {
+ .eraseblocks = { {64 * 1024, 2048} },
+ .block_erase = spi_block_erase_d8,
+ }, {
+ .eraseblocks = { {131072 * 1024, 1} },
+ .block_erase = spi_block_erase_c4,
+ }
+ },
+ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */
+ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */
+ .write = spi_chip_write_256, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {2700, 3600},
+ },
+
+ {
+ .vendor = "Micron",
+ .name = "MT25QU01G", /* U = 1.8V, uniform 64KB/4KB blocks/sectors */
+ .bustype = BUS_SPI,
+ .manufacture_id = ST_ID,
+ .model_id = ST_N25Q00A__1E,
+ .total_size = 131072,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 64B total; read 0x4B, write 0x42 */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN,
+ .tested = TEST_UNTESTED,
+ .probe = probe_spi_rdid,
+ .probe_timing = TIMING_ZERO,
+ .block_erasers =
+ {
+ {
+ .eraseblocks = { {4 * 1024, 32768} },
+ .block_erase = spi_block_erase_21,
+ }, {
+ .eraseblocks = { {4 * 1024, 32768} },
+ .block_erase = spi_block_erase_20,
+ }, {
+ .eraseblocks = { {32 * 1024, 4096} },
+ .block_erase = spi_block_erase_5c,
+ }, {
+ .eraseblocks = { {32 * 1024, 4096} },
+ .block_erase = spi_block_erase_52,
+ }, {
+ .eraseblocks = { {64 * 1024, 2048} },
+ .block_erase = spi_block_erase_dc,
+ }, {
+ .eraseblocks = { {64 * 1024, 2048} },
+ .block_erase = spi_block_erase_d8,
+ }, {
+ .eraseblocks = { {131072 * 1024, 1} },
+ .block_erase = spi_block_erase_c4,
+ }
+ },
+ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */
+ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */
+ .write = spi_chip_write_256, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {1700, 2000},
+ },
+
+ {
+ .vendor = "Micron",
+ .name = "MT25QL02G", /* L = 3V, uniform 64KB/4KB blocks/sectors */
+ .bustype = BUS_SPI,
+ .manufacture_id = ST_ID,
+ .model_id = ST_MT25QL02G,
+ .total_size = 262144,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 64B total; read 0x4B, write 0x42 */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN,
+ .tested = TEST_UNTESTED,
+ .probe = probe_spi_rdid,
+ .probe_timing = TIMING_ZERO,
+ .block_erasers =
+ {
+ {
+ .eraseblocks = { {4 * 1024, 65536} },
+ .block_erase = spi_block_erase_21,
+ }, {
+ .eraseblocks = { {4 * 1024, 65536} },
+ .block_erase = spi_block_erase_20,
+ }, {
+ .eraseblocks = { {32 * 1024, 8192} },
+ .block_erase = spi_block_erase_5c,
+ }, {
+ .eraseblocks = { {32 * 1024, 8192} },
+ .block_erase = spi_block_erase_52,
+ }, {
+ .eraseblocks = { {64 * 1024, 4096} },
+ .block_erase = spi_block_erase_dc,
+ }, {
+ .eraseblocks = { {64 * 1024, 4096} },
+ .block_erase = spi_block_erase_d8,
+ }, {
+ .eraseblocks = { {262144 * 1024, 1} },
+ .block_erase = spi_block_erase_c4,
+ }
+ },
+ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */
+ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */
+ .write = spi_chip_write_256, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {2700, 3600},
+ },
+
+ {
+ .vendor = "Micron",
+ .name = "ST_MT25QU02G", /* U = 1.8V, uniform 64KB/4KB blocks/sectors */
+ .bustype = BUS_SPI,
+ .manufacture_id = ST_ID,
+ .model_id = ST_N25Q00A__1E,
+ .total_size = 262144,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 64B total; read 0x4B, write 0x42 */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN,
+ .tested = TEST_UNTESTED,
+ .probe = probe_spi_rdid,
+ .probe_timing = TIMING_ZERO,
+ .block_erasers =
+ {
+ {
+ .eraseblocks = { {4 * 1024, 65536} },
+ .block_erase = spi_block_erase_21,
+ }, {
+ .eraseblocks = { {4 * 1024, 65536} },
+ .block_erase = spi_block_erase_20,
+ }, {
+ .eraseblocks = { {32 * 1024, 8192} },
+ .block_erase = spi_block_erase_5c,
+ }, {
+ .eraseblocks = { {32 * 1024, 8192} },
+ .block_erase = spi_block_erase_52,
+ }, {
+ .eraseblocks = { {64 * 1024, 4096} },
+ .block_erase = spi_block_erase_dc,
+ }, {
+ .eraseblocks = { {64 * 1024, 4096} },
+ .block_erase = spi_block_erase_d8,
+ }, {
+ .eraseblocks = { {262144 * 1024, 1} },
+ .block_erase = spi_block_erase_c4,
+ }
+ },
+ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */
+ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */
+ .write = spi_chip_write_256, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {1700, 2000},
+ },
+
+ {
+ .vendor = "Micron",
+ .name = "MT25QU128", /* U = 1.8V, uniform 64KB/4KB blocks/sectors */
+ .bustype = BUS_SPI,
+ .manufacture_id = ST_ID,
+ .model_id = ST_N25Q128__1E,
+ .total_size = 16384,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 64B total; read 0x4B, write 0x42 */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN,
+ .tested = TEST_UNTESTED,
+ .probe = probe_spi_rdid,
+ .probe_timing = TIMING_ZERO,
+ .block_erasers =
+ {
+ {
+ .eraseblocks = { {4 * 1024, 4096} },
+ .block_erase = spi_block_erase_20,
+ }, {
+ .eraseblocks = { {32 * 1024, 512} },
+ .block_erase = spi_block_erase_52,
+ }, {
+ .eraseblocks = { {64 * 1024, 256} },
+ .block_erase = spi_block_erase_d8,
+ }, {
+ .eraseblocks = { {16384 * 1024, 1} },
+ .block_erase = spi_block_erase_c7,
+ }, {
+ .eraseblocks = { {16384 * 1024, 1} },
+ .block_erase = spi_block_erase_60,
+ }
+ },
+ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */
+ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */
+ .write = spi_chip_write_256, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {1700, 2000},
+ },
+
+ {
+ .vendor = "Micron",
+ .name = "MT25QL128", /* L = 3V, uniform 64KB/4KB blocks/sectors */
+ .bustype = BUS_SPI,
+ .manufacture_id = ST_ID,
+ .model_id = ST_N25Q128__3E,
+ .total_size = 16384,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 64B total; read 0x4B, write 0x42 */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_WREN,
+ .tested = TEST_UNTESTED,
+ .probe = probe_spi_rdid,
+ .probe_timing = TIMING_ZERO,
+ .block_erasers =
+ {
+ {
+ .eraseblocks = { {4 * 1024, 4096} },
+ .block_erase = spi_block_erase_20,
+ }, {
+ .eraseblocks = { {32 * 1024, 512} },
+ .block_erase = spi_block_erase_52,
+ }, {
+ .eraseblocks = { {64 * 1024, 256} },
+ .block_erase = spi_block_erase_d8,
+ }, {
+ .eraseblocks = { {16384 * 1024, 1} },
+ .block_erase = spi_block_erase_c7,
+ }, {
+ .eraseblocks = { {16384 * 1024, 1} },
+ .block_erase = spi_block_erase_60,
+ }
+ },
+ .printlock = spi_prettyprint_status_register_n25q, /* TODO: config, lock, flag regs */
+ .unlock = spi_disable_blockprotect_n25q, /* TODO: per 64kB sector lock registers */
+ .write = spi_chip_write_256, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {2700, 3600},
+ },
+
+ {
+ .vendor = "Micron",
.name = "MT25QL256", /* L = 3V, uniform 64KB/4KB blocks/sectors */
.bustype = BUS_SPI,
.manufacture_id = ST_ID,
diff --git a/flashchips.h b/flashchips.h
index 006b95e..e53e0df 100644
--- a/flashchips.h
+++ b/flashchips.h
@@ -862,13 +862,16 @@
#define ST_N25Q032__1E 0xBB16 /* N25Q032, 1.8V, (uniform sectors expected) */
#define ST_N25Q064__3E 0xBA17 /* N25Q064, 3.0V, (uniform sectors expected) */
#define ST_N25Q064__1E 0xBB17 /* N25Q064, 1.8V, (uniform sectors expected) */
-#define ST_N25Q128__3E 0xBA18 /* N25Q128, 3.0V, (uniform sectors expected) */
-#define ST_N25Q128__1E 0xBB18 /* N25Q128, 1.8V, (uniform sectors expected) */
-#define ST_N25Q256__3E 0xBA19 /* N25Q256, 3.0V, (uniform sectors expected) */
-#define ST_N25Q256__1E 0xBB19 /* N25Q256, 1.8V, (uniform sectors expected) */
-#define ST_N25Q512__3E 0xBA20 /* N25Q512, 3.0V, (uniform sectors expected) */
-#define ST_N25Q512__1E 0xBB20 /* N25Q512, 1.8V, (uniform sectors expected) */
-#define ST_N25Q00A__3E 0xBA21 /* N25Q00A, 3.0V, (uniform sectors expected) */
+#define ST_N25Q128__3E 0xBA18 /* N25Q128/MT25QL128, 3.0V, (uniform sectors expected) */
+#define ST_N25Q128__1E 0xBB18 /* N25Q128/MT25QU128, 1.8V, (uniform sectors expected) */
+#define ST_N25Q256__3E 0xBA19 /* N25Q256/MT25QL256, 3.0V, (uniform sectors expected) */
+#define ST_N25Q256__1E 0xBB19 /* N25Q256/MT25QU256, 1.8V, (uniform sectors expected) */
+#define ST_N25Q512__3E 0xBA20 /* N25Q512/MT25QL512, 3.0V, (uniform sectors expected) */
+#define ST_N25Q512__1E 0xBB20 /* N25Q512/MT25QU512, 1.8V, (uniform sectors expected) */
+#define ST_N25Q00A__3E 0xBA21 /* N25Q00A/MT25QL01G, 3.0V, (uniform sectors expected) */
+#define ST_N25Q00A__1E 0xBB21 /* N25Q00A/MT25QU01G, 1.8V, (uniform sectors expected) */
+#define ST_MT25QL02G 0xBA22 /* MT25QL02G, 3.0V, (uniform sectors expected) */
+#define ST_MT25QU02G 0xBB22 /* MT25QU02G, 1.8V, (uniform sectors expected) */
#define ST_NP5Q032 0xDA16 /* Phase-change memory (PCM), 3V */
#define ST_NP5Q064 0xDA17 /* Phase-change memory (PCM), 3V */
#define ST_NP5Q128 0xDA18 /* Phase-change memory (PCM), 3V */
--
To view, visit https://review.coreboot.org/c/flashrom/+/34492
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Ice6ea9426361afc25d4b731e2e3079edf234fdda
Gerrit-Change-Number: 34492
Gerrit-PatchSet: 1
Gerrit-Owner: Jacob Creedon <jcreedon(a)google.com>
Gerrit-MessageType: newchange
by Konstantin Grudnev (Code Review)
Konstantin Grudnev has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/34496 )
Change subject: Add support for M95M02-A125
......................................................................
Add support for M95M02-A125
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(a)gmail.com>
Change-Id: Ic29cd9051c7eac4822d620c299834134f987f01b
---
M chipdrivers.h
M flashchips.c
M flashchips.h
M spi.h
M spi25.c
5 files changed, 102 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/96/34496/1
diff --git a/chipdrivers.h b/chipdrivers.h
index e380878..0b4435c 100644
--- a/chipdrivers.h
+++ b/chipdrivers.h
@@ -34,6 +34,7 @@
int probe_spi_res1(struct flashctx *flash);
int probe_spi_res2(struct flashctx *flash);
int probe_spi_res3(struct flashctx *flash);
+int probe_spi_st95(struct flashctx *flash);
int probe_spi_at25f(struct flashctx *flash);
int spi_write_enable(struct flashctx *flash);
int spi_write_disable(struct flashctx *flash);
@@ -51,6 +52,7 @@
int spi_block_erase_d8(struct flashctx *flash, unsigned int addr, unsigned int blocklen);
int spi_block_erase_db(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_emulation(struct flashctx *flash, unsigned int addr, unsigned int blocklen);
erasefunc_t *spi_get_erasefn_from_opcode(uint8_t opcode);
int spi_chip_write_1(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
int spi_nbyte_read(struct flashctx *flash, unsigned int addr, uint8_t *bytes, unsigned int len);
diff --git a/flashchips.c b/flashchips.c
index 166af6a..44875c6 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -14104,6 +14104,33 @@
},
{
+ .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,
+ .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",
.bustype = BUS_SPI,
diff --git a/flashchips.h b/flashchips.h
index 006b95e..d1eed91 100644
--- a/flashchips.h
+++ b/flashchips.h
@@ -851,6 +851,12 @@
#define ST_M58WR032KT 0x8814
#define ST_M58WR064KB 0x8811
#define ST_M58WR064KT 0x8810
+
+/* 00h ST Manufacturer code ST_ID*/
+/* 01h SPI Family code 0x00*/
+/* 02h Memory Density code ST_M95XXX */
+#define ST_M95M02 0x0012 /* ST M95XXX 2Mbit (256KiB) */
+
#define ST_MT28GU01G___1 0x88B0
#define ST_MT28GU01G___2 0x88B1
#define ST_MT28GU256___1 0x8901
diff --git a/spi.h b/spi.h
index 0073c71..9f199f3 100644
--- a/spi.h
+++ b/spi.h
@@ -28,6 +28,12 @@
/* 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_OUTSIZE 0x04 /* 8b op, 24bit addr where size >64KiB */
+#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
diff --git a/spi25.c b/spi25.c
index 2a1d492..ec35585 100644
--- a/spi25.c
+++ b/spi25.c
@@ -21,6 +21,7 @@
#include <stddef.h>
#include <string.h>
#include <stdbool.h>
+#include <stdlib.h>
#include "flash.h"
#include "flashchips.h"
#include "chipdrivers.h"
@@ -262,6 +263,32 @@
return 1;
}
+/* Only used for some stm95080 and higher chip. */
+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] = {ST_M95_RDID};
+ unsigned char readarr[ST_M95_RDID_INSIZE];
+ uint32_t id1, id2;
+
+ spi_send_command(flash, sizeof(cmd), sizeof(readarr), cmd, readarr);
+
+ id1 = readarr[0]; // manufacture id
+ id2 = readarr[2]; // model id
+
+ msg_ginfo("RDID[%s: id1 0x%02x, id2 0x%02x, "
+ "L 0x%02x, M 0x%02x, H 0x%02x]\n",
+ __func__, flash->chip->manufacture_id, flash->chip->model_id,
+ readarr[0], readarr[1], readarr[2]);
+
+ if (id1 == flash->chip->manufacture_id && id2 == flash->chip->model_id)
+ return 1;
+
+ return 0;
+}
+
/* Only used for some Atmel chips. */
int probe_spi_at25f(struct flashctx *flash)
{
@@ -440,6 +467,13 @@
return result ? result : status;
}
+static int spi_nbyte_program(struct flashctx *flash, unsigned int addr, const uint8_t *bytes, unsigned int len)
+{
+ const bool native_4ba = flash->chip->feature_bits & FEATURE_4BA_WRITE && spi_master_4ba(flash);
+ const uint8_t op = native_4ba ? JEDEC_BYTE_PROGRAM_4BA : JEDEC_BYTE_PROGRAM;
+ return spi_write_cmd(flash, op, native_4ba, addr, bytes, len, 10);
+}
+
static int spi_chip_erase_60(struct flashctx *flash)
{
/* This usually takes 1-85s, so wait in 1s steps. */
@@ -577,6 +611,33 @@
return spi_write_cmd(flash, 0xdc, true, addr, NULL, 0, 100 * 1000);
}
+/* some chips don't have erase function */
+int spi_block_erase_emulation(struct flashctx *flash, unsigned int addr, unsigned int blocklen)
+{
+ unsigned int i;
+ const unsigned int erase_len = flash->chip->page_size;
+ uint8_t *erased_contents = NULL;
+ int result = 0;
+
+ erased_contents = (uint8_t*) malloc(erase_len * sizeof(uint8_t));
+ if (!erased_contents) {
+ msg_cerr("Out of memory!\n");
+ return 1;
+ }
+
+ memset(erased_contents, ERASED_VALUE(flash), erase_len * sizeof(uint8_t));
+ msg_cinfo("\n");
+ for (i = addr; i < blocklen; i+=erase_len) {
+ if (spi_nbyte_program(flash, i, erased_contents, erase_len)) {
+ result = 1;
+ break;
+ }
+ }
+
+ free(erased_contents);
+ return result;
+}
+
erasefunc_t *spi_get_erasefn_from_opcode(uint8_t opcode)
{
switch(opcode){
@@ -619,13 +680,6 @@
}
}
-static int spi_nbyte_program(struct flashctx *flash, unsigned int addr, const uint8_t *bytes, unsigned int len)
-{
- const bool native_4ba = flash->chip->feature_bits & FEATURE_4BA_WRITE && spi_master_4ba(flash);
- const uint8_t op = native_4ba ? JEDEC_BYTE_PROGRAM_4BA : JEDEC_BYTE_PROGRAM;
- return spi_write_cmd(flash, op, native_4ba, addr, bytes, len, 10);
-}
-
int spi_nbyte_read(struct flashctx *flash, unsigned int address, uint8_t *bytes,
unsigned int len)
{
--
To view, visit https://review.coreboot.org/c/flashrom/+/34496
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Ic29cd9051c7eac4822d620c299834134f987f01b
Gerrit-Change-Number: 34496
Gerrit-PatchSet: 1
Gerrit-Owner: Konstantin Grudnev <grudnevkv(a)gmail.com>
Gerrit-MessageType: newchange
by Michał Żygowski (Code Review)
Hello ?ukasz Dmitrowski,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/flashrom/+/34363
to review the following change.
Change subject: libflashrom: add querying functions with meson integration
......................................................................
libflashrom: add querying functions with meson integration
Work based on lukasz.dmitrowski(a)gmail.com code
Change-Id: I49041b8fa5700dabe59fef0d2337339d34cd6c6f
Signed-off-by: Artur Raglis <artur.raglis(a)3mdeb.com>
Signed-off-by: Lukasz Dmitrowski <lukasz.dmitrowski(a)gmail.com>
---
M libflashrom.c
M libflashrom.h
M libflashrom.map
M meson.build
4 files changed, 187 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/63/34363/1
diff --git a/libflashrom.c b/libflashrom.c
index f90a22c..cc26835 100644
--- a/libflashrom.c
+++ b/libflashrom.c
@@ -103,7 +103,142 @@
* @{
*/
-/* TBD */
+/**
+ * @brief Returns flashrom version
+ * @return Flashrom version
+ */
+const char *flashrom_version_info(void)
+{
+ return flashrom_version;
+}
+
+/**
+ * @brief Returns list of supported programmers
+ * @return List of supported programmers
+ */
+const char **flashrom_supported_programmers(void)
+{
+ enum programmer p = 0;
+ const char **supported_programmers = NULL;
+ supported_programmers = malloc((PROGRAMMER_INVALID + 1) * sizeof(char*));
+
+ if (supported_programmers != NULL) {
+ for (; p < PROGRAMMER_INVALID; ++p) {
+ supported_programmers[p] = programmer_table[p].name;
+ }
+ } else {
+ msg_gerr("Memory allocation error!\n");
+ }
+
+ return supported_programmers;
+}
+
+/**
+ * @brief Returns list of supported flash chips
+ * @return List of supported flash chips
+ */
+flashrom_flashchip_info *flashrom_supported_flash_chips(void)
+{
+ int i = 0;
+ flashrom_flashchip_info *supported_flashchips = malloc(flashchips_size * sizeof(flashrom_flashchip_info));
+
+ if (supported_flashchips != NULL) {
+ for (; i < flashchips_size; ++i) {
+ supported_flashchips[i].vendor = flashchips[i].vendor;
+ supported_flashchips[i].name = flashchips[i].name;
+ supported_flashchips[i].tested.erase = (flashrom_test_state) flashchips[i].tested.erase;
+ supported_flashchips[i].tested.probe = (flashrom_test_state) flashchips[i].tested.probe;
+ supported_flashchips[i].tested.read = (flashrom_test_state) flashchips[i].tested.read;
+ supported_flashchips[i].tested.write = (flashrom_test_state) flashchips[i].tested.write;
+ supported_flashchips[i].total_size = flashchips[i].total_size;
+ }
+ } else {
+ msg_gerr("Memory allocation error!\n");
+ }
+
+ return supported_flashchips;
+}
+
+/**
+ * @brief Returns list of supported mainboards
+ * @return List of supported mainboards
+ */
+flashrom_board_info *flashrom_supported_boards(void)
+{
+ int boards_known_size = 0;
+ int i = 0;
+ const struct board_info *binfo = boards_known;
+
+ while ((binfo++)->vendor)
+ ++boards_known_size;
+ binfo = boards_known;
+ /* add place for {0} */
+ ++boards_known_size;
+
+ flashrom_board_info *supported_boards = malloc(boards_known_size * sizeof(flashrom_board_info));
+
+ if (supported_boards != NULL) {
+ for (; i < boards_known_size; ++i) {
+ supported_boards[i].vendor = binfo[i].vendor;
+ supported_boards[i].name = binfo[i].name;
+ supported_boards[i].working = binfo[i].working;
+ }
+ } else {
+ msg_gerr("Memory allocation error!\n");
+ }
+
+ return supported_boards;
+}
+
+/**
+ * @brief Returns list of supported chipsets
+ * @return List of supported chipsets
+ */
+flashrom_chipset_info *flashrom_supported_chipsets(void)
+{
+ int chipset_enables_size = 0;
+ int i = 0;
+ const struct penable *chipset = chipset_enables;
+
+ while ((chipset++)->vendor_name)
+ ++chipset_enables_size;
+ chipset = chipset_enables;
+ /* add place for {0}*/
+ ++chipset_enables_size;
+
+ flashrom_chipset_info *supported_chipsets = malloc(chipset_enables_size * sizeof(flashrom_chipset_info));
+
+ if (supported_chipsets != NULL) {
+ for (; i < chipset_enables_size; ++i) {
+ supported_chipsets[i].vendor = chipset[i].vendor_name;
+ supported_chipsets[i].chipset = chipset[i].device_name;
+ supported_chipsets[i].vendor_id = chipset[i].vendor_id;
+ supported_chipsets[i].chipset_id = chipset[i].device_id;
+ supported_chipsets[i].status = chipset[i].status;
+ }
+ } else {
+ msg_gerr("Memory allocation error!\n");
+ }
+
+ return supported_chipsets;
+}
+
+/**
+ * @brief Frees memory allocated by libflashrom API
+ * @param Pointer to block of memory which should be freed
+ * @return 0 on success
+ * 1 on null pointer error
+ */
+int flashrom_data_free(void *const p)
+{
+ if (!p) {
+ msg_gerr("flashrom_data_free - Null pointer!\n");
+ return 1;
+ } else {
+ free(p);
+ return 0;
+ }
+}
/** @} */ /* end flashrom-query */
diff --git a/libflashrom.h b/libflashrom.h
index 38c95d2..ebba16b 100644
--- a/libflashrom.h
+++ b/libflashrom.h
@@ -37,6 +37,50 @@
typedef int(flashrom_log_callback)(enum flashrom_log_level, const char *format, va_list);
void flashrom_set_log_callback(flashrom_log_callback *);
+/** @ingroup flashrom-query */
+typedef enum {
+ FLASHROM_TESTED_OK = 0,
+ FLASHROM_TESTED_NT = 1,
+ FLASHROM_TESTED_BAD = 2,
+ FLASHROM_TESTED_DEP = 3,
+ FLASHROM_TESTED_NA = 4,
+} flashrom_test_state;
+
+typedef struct flashrom_flashchip_info {
+ const char *vendor;
+ const char *name;
+ unsigned int total_size;
+ struct flashrom_tested {
+ flashrom_test_state probe;
+ flashrom_test_state read;
+ flashrom_test_state erase;
+ flashrom_test_state write;
+ } tested;
+} flashrom_flashchip_info;
+
+typedef struct flashrom_board_info {
+ const char *vendor;
+ const char *name;
+ flashrom_test_state working;
+} flashrom_board_info;
+
+typedef struct flashrom_chipset_info {
+ const char *vendor;
+ const char *chipset;
+ uint16_t vendor_id;
+ uint16_t chipset_id;
+ flashrom_test_state status;
+} flashrom_chipset_info;
+
+const char *flashrom_version_info(void);
+void flashrom_system_info(void);
+const char **flashrom_supported_programmers(void);
+flashrom_flashchip_info *flashrom_supported_flash_chips(void);
+flashrom_board_info *flashrom_supported_boards(void);
+flashrom_chipset_info *flashrom_supported_chipsets(void);
+int flashrom_data_free(void *const p);
+
+/** @ingroup flashrom-prog */
struct flashrom_programmer;
int flashrom_programmer_init(struct flashrom_programmer **, const char *prog_name, const char *prog_params);
int flashrom_programmer_shutdown(struct flashrom_programmer *);
diff --git a/libflashrom.map b/libflashrom.map
index 3c287ff..d6dd24d 100644
--- a/libflashrom.map
+++ b/libflashrom.map
@@ -1,7 +1,11 @@
LIBFLASHROM_1.0 {
global:
+ flashrom_board_info;
+ flashrom_chipset_info;
+ flashrom_data_free;
flashrom_flag_get;
flashrom_flag_set;
+ flashrom_flashchip_info;
flashrom_flash_erase;
flashrom_flash_getsize;
flashrom_flash_probe;
@@ -20,5 +24,8 @@
flashrom_programmer_shutdown;
flashrom_set_log_callback;
flashrom_shutdown;
+ flashrom_supported_programmers;
+ flashrom_system_info;
+ flashrom_version_info;
local: *;
};
diff --git a/meson.build b/meson.build
index 1923fdf..00f4a2f 100644
--- a/meson.build
+++ b/meson.build
@@ -68,8 +68,6 @@
srcs = []
need_libusb0 = false
-need_raw_access = false
-need_serial = false
# check for required symbols
if cc.has_function('clock_gettime')
--
To view, visit https://review.coreboot.org/c/flashrom/+/34363
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I49041b8fa5700dabe59fef0d2337339d34cd6c6f
Gerrit-Change-Number: 34363
Gerrit-PatchSet: 1
Gerrit-Owner: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-Reviewer: ?ukasz Dmitrowski <lukasz.dmitrowski(a)gmail.com>
Gerrit-MessageType: newchange
by Jacob Garber (Code Review)
Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/34577 )
Change subject: tree: Enable -Wwrite-strings
......................................................................
tree: Enable -Wwrite-strings
When compiling, this warning gives string literals the type const char[]
to help catch accidental modification (which is undefined behaviour).
There currently aren't any instances of this in flashrom, so let's
enable this warning to keep it that way. This requires adding const
qualifiers to the declarations of several variables that work with
string literals.
Change-Id: I62d9bc194938a0c9a0e4cdff7ced8ea2e14cc1bc
Signed-off-by: Jacob Garber <jgarber1(a)ualberta.ca>
---
M Makefile
M buspirate_spi.c
M cli_classic.c
M dmi.c
M pony_spi.c
M util/ich_descriptors_tool/ich_descriptors_tool.c
6 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/77/34577/1
diff --git a/Makefile b/Makefile
index 545e84a..1a20933 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@
DIFF = diff
PREFIX ?= /usr/local
MANDIR ?= $(PREFIX)/share/man
-CFLAGS ?= -Os -Wall -Wshadow -Wmissing-prototypes
+CFLAGS ?= -Os -Wall -Wshadow -Wmissing-prototypes -Wwrite-strings
EXPORTDIR ?= .
RANLIB ?= ranlib
PKG_CONFIG ?= pkg-config
diff --git a/buspirate_spi.c b/buspirate_spi.c
index fb066c2..bc6776b 100644
--- a/buspirate_spi.c
+++ b/buspirate_spi.c
@@ -112,7 +112,7 @@
return 0;
}
-static int buspirate_wait_for_string(unsigned char *buf, char *key)
+static int buspirate_wait_for_string(unsigned char *buf, const char *key)
{
unsigned int keylen = strlen(key);
int ret;
diff --git a/cli_classic.c b/cli_classic.c
index 0591bfe..428efc1 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -77,7 +77,7 @@
exit(1);
}
-static int check_filename(char *filename, char *type)
+static int check_filename(char *filename, const char *type)
{
if (!filename || (filename[0] == '\0')) {
fprintf(stderr, "Error: No %s file specified.\n", type);
diff --git a/dmi.c b/dmi.c
index ae90f7c..6132b47 100644
--- a/dmi.c
+++ b/dmi.c
@@ -69,7 +69,7 @@
static const struct {
uint8_t type;
uint8_t is_laptop;
- char *name;
+ const char *name;
} dmi_chassis_types[] = {
{0x01, 2, "Other"},
{0x02, 2, "Unknown"},
diff --git a/pony_spi.c b/pony_spi.c
index 6c03308..ed9d326 100644
--- a/pony_spi.c
+++ b/pony_spi.c
@@ -115,7 +115,7 @@
int i, data_out;
char *arg = NULL;
enum pony_type type = TYPE_SI_PROG;
- char *name;
+ const char *name;
int have_device = 0;
int have_prog = 0;
diff --git a/util/ich_descriptors_tool/ich_descriptors_tool.c b/util/ich_descriptors_tool/ich_descriptors_tool.c
index 2c7966d..768401e 100644
--- a/util/ich_descriptors_tool/ich_descriptors_tool.c
+++ b/util/ich_descriptors_tool/ich_descriptors_tool.c
@@ -111,7 +111,7 @@
printf("\n");
}
-static void usage(char *argv[], char *error)
+static void usage(char *argv[], const char *error)
{
if (error != NULL) {
fprintf(stderr, "%s\n", error);
--
To view, visit https://review.coreboot.org/c/flashrom/+/34577
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I62d9bc194938a0c9a0e4cdff7ced8ea2e14cc1bc
Gerrit-Change-Number: 34577
Gerrit-PatchSet: 1
Gerrit-Owner: Jacob Garber <jgarber1(a)ualberta.ca>
Gerrit-MessageType: newchange
by Miklós Márton (Code Review)
Miklós Márton has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/34621 )
Change subject: Removed strndup because it is not available in MingW
......................................................................
Removed strndup because it is not available in MingW
Signed-off-by: Miklós Márton <martonmiklosqdev(a)gmail.com>
Change-Id: If418080bffff1f5961cacf2a300ea9c666682458
---
M libflashrom.c
1 file changed, 10 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/21/34621/1
diff --git a/libflashrom.c b/libflashrom.c
index af62002..a1c0a9c 100644
--- a/libflashrom.c
+++ b/libflashrom.c
@@ -371,6 +371,7 @@
struct flashctx *const flashctx, const struct fmap *const fmap)
{
int i;
+ size_t len;
struct flashrom_layout *l = get_global_layout();
if (!fmap || !l)
@@ -385,8 +386,15 @@
l->entries[l->num_entries].start = fmap->areas[i].offset;
l->entries[l->num_entries].end = fmap->areas[i].offset + fmap->areas[i].size - 1;
l->entries[l->num_entries].included = false;
- l->entries[l->num_entries].name =
- strndup((const char *)fmap->areas[i].name, FMAP_STRLEN);
+ // MingW does not have strndup
+ len = strlen((const char *)fmap->areas[i].name);
+ if (len > (FMAP_STRLEN - 1))
+ len = (FMAP_STRLEN - 1);
+ l->entries[l->num_entries].name = malloc(len + 1);
+ strncpy(l->entries[l->num_entries].name,
+ (const char *)fmap->areas[i].name,
+ len);
+ l->entries[l->num_entries].name[len] = '\0';
if (!l->entries[l->num_entries].name) {
msg_gerr("Error adding layout entry: %s\n", strerror(errno));
return 1;
--
To view, visit https://review.coreboot.org/c/flashrom/+/34621
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: If418080bffff1f5961cacf2a300ea9c666682458
Gerrit-Change-Number: 34621
Gerrit-PatchSet: 1
Gerrit-Owner: Miklós Márton <martonmiklosqdev(a)gmail.com>
Gerrit-MessageType: newchange
by Alan Green (Code Review)
Alan Green has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33931
Change subject: flashchips.c: Sort file by vendor and model
......................................................................
flashchips.c: Sort file by vendor and model
For self-consistency, and to allow tools to assist with merging the
chromium fork of flashrom, sort the entries of flashchips.c. The file is
already largely sorted, though deviations have crept in over time.
This is a non-clever mostly ASCII-order sorting. It is not intended to
be permanent. Post-merge we can explore options such as breaking apart
flashchips.c into per-vendor files or directories.
Change-Id: I75a99583592526f60ba5264e92391bf8b1213b20
---
M flashchips.c
1 file changed, 5,510 insertions(+), 5,510 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/31/33931/1
--
To view, visit https://review.coreboot.org/c/flashrom/+/33931
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I75a99583592526f60ba5264e92391bf8b1213b20
Gerrit-Change-Number: 33931
Gerrit-PatchSet: 1
Gerrit-Owner: Alan Green <avg(a)google.com>
Gerrit-MessageType: newchange
