by Nico Huber (Code Review)
Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/31012
Change subject: cli_classic: Report the gathered layout entries at level dbg
......................................................................
cli_classic: Report the gathered layout entries at level dbg
Change-Id: I7678ba5138f0d722ee44747fe123f192abdd0ffd
Signed-off-by: Nico Huber <nico.h(a)gmx.de>
---
M cli_classic.c
M layout.c
M layout.h
3 files changed, 18 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/12/31012/1
diff --git a/cli_classic.c b/cli_classic.c
index ced08c6..536ef24 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -645,6 +645,8 @@
goto out_shutdown;
}
+ report_layout(layout);
+
flashrom_layout_set(fill_flash, layout);
flashrom_flag_set(fill_flash, FLASHROM_FLAG_FORCE, !!force);
#if CONFIG_INTERNAL == 1
diff --git a/layout.c b/layout.c
index fa66238..c589d17 100644
--- a/layout.c
+++ b/layout.c
@@ -229,3 +229,17 @@
return ret;
}
+
+void report_layout(const struct flashrom_layout *const l)
+{
+ unsigned int i;
+
+ if (!l)
+ return;
+
+ msg_gdbg("Gathered %zu layout entries:\n", l->num_entries);
+ for (i = 0; i < l->num_entries; ++i) {
+ msg_gdbg("%08"PRIx32":%08"PRIx32" %s\n",
+ l->entries[i].start, l->entries[i].end, l->entries[i].name);
+ }
+}
diff --git a/layout.h b/layout.h
index eb54a4f..61311bc 100644
--- a/layout.h
+++ b/layout.h
@@ -59,4 +59,6 @@
int process_include_args(struct flashrom_layout *);
+void report_layout(const struct flashrom_layout *);
+
#endif /* !__LAYOUT_H__ */
--
To view, visit https://review.coreboot.org/c/flashrom/+/31012
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I7678ba5138f0d722ee44747fe123f192abdd0ffd
Gerrit-Change-Number: 31012
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>
Gerrit-MessageType: newchange
by Joel Stanley (Code Review)
Joel Stanley has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/34595 )
Change subject: flashchips: add W25M512JV
......................................................................
flashchips: add W25M512JV
https://www.winbond.com/resource-files/w25m512jv%20revd%2009052017.pdf
Change-Id: I8d16f0918785795cc49500435a03641b87d706e9
Signed-off-by: Joel Stanley <joel(a)jms.id.au>
---
M flashchips.c
M flashchips.h
2 files changed, 20 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/95/34595/1
diff --git a/flashchips.c b/flashchips.c
index 166af6a..304ebe7 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -15902,6 +15902,25 @@
{
.vendor = "Winbond",
+ .name = "W25Q512JV",
+ .bustype = BUS_SPI,
+ .manufacture_id = WINBOND_NEX_ID,
+ .model_id = WINBOND_NEX_W25Q512JV,
+ .total_size = 64 * 1024,
+ .page_size = 1024,
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA,
+ .tested = TEST_OK_PREW,
+ .probe = probe_spi_rdid,
+ .probe_timing = TIMING_ZERO,
+ .printlock = spi_prettyprint_status_register_plain,
+ .unlock = spi_disable_blockprotect,
+ .write = spi_chip_write_256,
+ .read = spi_chip_read,
+ .voltage = {2700, 3600},
+ },
+
+ {
+ .vendor = "Winbond",
.name = "W25Q256JV_M",
.bustype = BUS_SPI,
.manufacture_id = WINBOND_NEX_ID,
diff --git a/flashchips.h b/flashchips.h
index 006b95e..c606161 100644
--- a/flashchips.h
+++ b/flashchips.h
@@ -921,6 +921,7 @@
#define WINBOND_NEX_W25Q64_V 0x4017 /* W25Q64BV, W25Q64CV; W25Q64FV in SPI mode (default) */
#define WINBOND_NEX_W25Q128_V 0x4018 /* W25Q128BV; W25Q128FV in SPI mode (default) */
#define WINBOND_NEX_W25Q256_V 0x4019 /* W25Q256FV or W25Q256JV_Q (QE=1) */
+#define WINBOND_NEX_W25Q512JV 0x4020 /* W25Q512JV */
#define WINBOND_NEX_W25Q20_W 0x5012 /* W25Q20BW */
#define WINBOND_NEX_W25Q40BW 0x5013 /* W25Q40BW */
#define WINBOND_NEX_W25Q80BW 0x5014 /* W25Q80BW */
--
To view, visit https://review.coreboot.org/c/flashrom/+/34595
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I8d16f0918785795cc49500435a03641b87d706e9
Gerrit-Change-Number: 34595
Gerrit-PatchSet: 1
Gerrit-Owner: Joel Stanley
Gerrit-MessageType: newchange
by mikeb mikeb (Code Review)
Hello Mike Banon,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/flashrom/+/31830
to review the following change.
Change subject: Add "--dangerous-bruteforce" mode for the unreliable ISP environments
......................................................................
Add "--dangerous-bruteforce" mode for the unreliable ISP environments
Some in-system-programming environments are very unreliable, e.g.
when you connect a SOIC8 test clip to the flash chip of WR841ND v9
wireless router: because the low power SOC of this router becomes
powered and is constantly trying to boot, the router's flash chip
is correctly detected only 30% of times, and when it is detected
just 30% of the read operations are successful - the rest result in
zeroes or garbage data being read from a flash chip.
While in this new "--dangerous-bruteforce" mode, flashrom will be
constantly probing for a flash chip until it is correctly detected -
and then, depending on the operation selected by a user, at the
moments of chip availability it will be reading or writing by the
small chunks of 256 bytes maximum size, verifying each small chunk
and retrying the operation until the success or timeout (~ 60 sec).
Constant probing between the small chunk operations is also being
done - to avoid a possible situation where we have got two identical
blocks of zeroes while reading a chunk and erroneously accepted it.
Currently this mode is active only for those SPI25 chips which are
".write = spi_chip_write_256" and ".read = spi_chip_read", but later
could be expanded to more functions to become useful for more chips.
NOTE: this mode is experimental! Also, some targets like WR841ND v9
could block the ISP chip access completely if there is no bootable
firmware inside (e.g. after you've tried to erase the chip contents).
In such a situation it could be hard to recover the firmware without
desoldering a flash chip and flashing it separately. Please do not
erase or write to a flash chip using this mode if you are not sure.
Signed-off-by: Mike Banon <mikebdp2(a)gmail.com>
Change-Id: If47476793721a0061fd65bc6d1f98d48b03dc6c1
---
M cli_classic.c
M flash.h
M flashrom.c
M libflashrom.c
M libflashrom.h
M spi25.c
6 files changed, 148 insertions(+), 15 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/30/31830/1
diff --git a/cli_classic.c b/cli_classic.c
index ced08c6..454df2b 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -51,6 +51,7 @@
" -V | --verbose more verbose output\n"
" -c | --chip <chipname> probe only for specified flash chip\n"
" -f | --force force specific operations (see man page)\n"
+ " --dangerous-bruteforce verify each small chunk and probe constantly\n"
" -n | --noverify don't auto-verify\n"
" -N | --noverify-all verify included regions only (cf. -i)\n"
" -l | --layout <layoutfile> read ROM layout from <layoutfile>\n"
@@ -104,7 +105,7 @@
#if CONFIG_PRINT_WIKI == 1
int list_supported_wiki = 0;
#endif
- int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0;
+ int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0, bruteforce = 0, timeout = 30000;
int dont_verify_it = 0, dont_verify_all = 0, list_supported = 0, operation_specified = 0;
struct flashrom_layout *layout = NULL;
enum programmer prog = PROGRAMMER_INVALID;
@@ -113,6 +114,7 @@
OPTION_FMAP,
OPTION_FMAP_FILE,
OPTION_FLASH_CONTENTS,
+ OPTION_BRUTEFORCE,
};
int ret = 0;
@@ -127,6 +129,7 @@
{"chip", 1, NULL, 'c'},
{"verbose", 0, NULL, 'V'},
{"force", 0, NULL, 'f'},
+ {"dangerous-bruteforce", 0, NULL, OPTION_BRUTEFORCE},
{"layout", 1, NULL, 'l'},
{"ifd", 0, NULL, OPTION_IFD},
{"fmap", 0, NULL, OPTION_FMAP},
@@ -228,6 +231,9 @@
case 'f':
force = 1;
break;
+ case OPTION_BRUTEFORCE:
+ bruteforce = 1;
+ break;
case 'l':
if (layoutfile) {
fprintf(stderr, "Error: --layout specified "
@@ -503,16 +509,27 @@
msg_pdbg("The following protocols are supported: %s.\n", tempstr);
free(tempstr);
- for (j = 0; j < registered_master_count; j++) {
- startchip = 0;
- while (chipcount < ARRAY_SIZE(flashes)) {
- startchip = probe_flash(®istered_masters[j], startchip, &flashes[chipcount], 0);
- if (startchip == -1)
- break;
- chipcount++;
- startchip++;
+ do {
+ chipcount = 0;
+ for (j = 0; j < registered_master_count; j++) {
+ startchip = 0;
+ while (chipcount < ARRAY_SIZE(flashes)) {
+ startchip = probe_flash(®istered_masters[j], startchip, &flashes[chipcount], 0);
+ if (startchip == -1)
+ break;
+ chipcount++;
+ startchip++;
+ }
}
- }
+ timeout--;
+ if (!timeout) {
+ msg_cerr("Error: Timed out trying to detect a chip.\n");
+ ret = 1;
+ goto out_shutdown;
+ }
+ } while (bruteforce && ( !chipcount || // wait for the correct chip detection
+ ((flashes[0].chip->manufacture_id == GENERIC_MANUF_ID) ||
+ (flashes[0].chip->model_id == GENERIC_DEVICE_ID)) ) );
if (chipcount > 1) {
msg_cinfo("Multiple flash chip definitions match the detected chip(s): \"%s\"",
@@ -650,6 +667,7 @@
#if CONFIG_INTERNAL == 1
flashrom_flag_set(fill_flash, FLASHROM_FLAG_FORCE_BOARDMISMATCH, !!force_boardmismatch);
#endif
+ flashrom_flag_set(fill_flash, FLASHROM_FLAG_BRUTEFORCE, !!bruteforce);
flashrom_flag_set(fill_flash, FLASHROM_FLAG_VERIFY_AFTER_WRITE, !dont_verify_it);
flashrom_flag_set(fill_flash, FLASHROM_FLAG_VERIFY_WHOLE_CHIP, !dont_verify_all);
diff --git a/flash.h b/flash.h
index 911214c..6ba116e 100644
--- a/flash.h
+++ b/flash.h
@@ -256,6 +256,7 @@
struct {
bool force;
bool force_boardmismatch;
+ bool bruteforce;
bool verify_after_write;
bool verify_whole_chip;
} flags;
diff --git a/flashrom.c b/flashrom.c
index e82c32e..8f2c859 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -1641,6 +1641,8 @@
size_t i, j;
bool first = true;
struct block_eraser *const eraser = &flashctx->chip->block_erasers[erasefunction];
+ unsigned int bruteforce = flashrom_flag_get(flashctx, FLASHROM_FLAG_BRUTEFORCE);
+ int timeout;
info->erase_start = 0;
for (i = 0; i < NUM_ERASEREGIONS; ++i) {
@@ -1662,9 +1664,34 @@
msg_cdbg(", ");
msg_cdbg("0x%06x-0x%06x:", info->erase_start, info->erase_end);
- ret = per_blockfn(flashctx, info, eraser->block_erase);
- if (ret)
- return ret;
+ if (!bruteforce) {
+ ret = per_blockfn(flashctx, info, eraser->block_erase);
+ if (ret)
+ return ret;
+ } else {
+ timeout = 30000;
+ while(1) {
+ timeout--;
+ if (!timeout) {
+ msg_cerr("%s timeout during command execution\n", __func__);
+ return 2;
+ }
+
+ /* First probe. */
+ if (flashctx->chip->probe(flashctx) != 1)
+ continue;
+
+ ret = per_blockfn(flashctx, info, eraser->block_erase);
+ if (ret)
+ continue;
+
+ /* Second probe. */
+ if (flashctx->chip->probe(flashctx) != 1)
+ continue;
+
+ break;
+ }
+ }
}
if (info->region_end < info->erase_start)
break;
diff --git a/libflashrom.c b/libflashrom.c
index f90a22c..6dd0167 100644
--- a/libflashrom.c
+++ b/libflashrom.c
@@ -250,6 +250,7 @@
switch (flag) {
case FLASHROM_FLAG_FORCE: flashctx->flags.force = value; break;
case FLASHROM_FLAG_FORCE_BOARDMISMATCH: flashctx->flags.force_boardmismatch = value; break;
+ case FLASHROM_FLAG_BRUTEFORCE: flashctx->flags.bruteforce = value; break;
case FLASHROM_FLAG_VERIFY_AFTER_WRITE: flashctx->flags.verify_after_write = value; break;
case FLASHROM_FLAG_VERIFY_WHOLE_CHIP: flashctx->flags.verify_whole_chip = value; break;
}
@@ -267,6 +268,7 @@
switch (flag) {
case FLASHROM_FLAG_FORCE: return flashctx->flags.force;
case FLASHROM_FLAG_FORCE_BOARDMISMATCH: return flashctx->flags.force_boardmismatch;
+ case FLASHROM_FLAG_BRUTEFORCE: return flashctx->flags.bruteforce;
case FLASHROM_FLAG_VERIFY_AFTER_WRITE: return flashctx->flags.verify_after_write;
case FLASHROM_FLAG_VERIFY_WHOLE_CHIP: return flashctx->flags.verify_whole_chip;
default: return false;
diff --git a/libflashrom.h b/libflashrom.h
index 38c95d2..0f2ead8 100644
--- a/libflashrom.h
+++ b/libflashrom.h
@@ -51,6 +51,7 @@
enum flashrom_flag {
FLASHROM_FLAG_FORCE,
FLASHROM_FLAG_FORCE_BOARDMISMATCH,
+ FLASHROM_FLAG_BRUTEFORCE,
FLASHROM_FLAG_VERIFY_AFTER_WRITE,
FLASHROM_FLAG_VERIFY_WHOLE_CHIP,
};
diff --git a/spi25.c b/spi25.c
index 8b6c462..832c836 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"
@@ -655,6 +656,48 @@
return spi_send_command(flash, 1 + addr_len, len, cmd, bytes);
}
+static int spi_rw_bruteforce(struct flashctx *flash, uint8_t *buf1, uint8_t *buf2,
+ unsigned int startrw_here, unsigned int torw_len, bool rw_flag) {
+ int rc = 0;
+ int timeout = 30000;
+ while (1) {
+ timeout--;
+ if (!timeout) {
+ msg_cerr("%s timeout during command execution\n", __func__);
+ return -1;
+ }
+
+ /* First probe. */
+ if (flash->chip->probe(flash) != 1)
+ continue;
+
+ /* First operation. */
+ if (rw_flag == 0)
+ rc = spi_nbyte_read(flash, startrw_here, buf1, torw_len);
+ else
+ rc = spi_nbyte_program(flash, startrw_here, buf1, torw_len);
+
+ if (rc != 0)
+ break;
+
+ /* Second probe. */
+ if (flash->chip->probe(flash) != 1)
+ continue;
+
+ /* Second operation. */
+ rc = spi_nbyte_read(flash, startrw_here, buf2, torw_len);
+ if (rc != 0)
+ break;
+
+ /* Compare two buffers. */
+ if (memcmp(buf1, buf2, torw_len))
+ continue;
+
+ break;
+ }
+ return rc;
+}
+
/*
* Read a part of the flash chip.
* FIXME: Use the chunk code from Michael Karcher instead.
@@ -668,6 +711,19 @@
/* Limit for multi-die 4-byte-addressing chips. */
unsigned int area_size = min(flash->chip->total_size * 1024, 16 * 1024 * 1024);
+ unsigned int bruteforce = flashrom_flag_get(flash, FLASHROM_FLAG_BRUTEFORCE);
+ uint8_t *const buf1 = bruteforce ? malloc(chunksize) : NULL;
+ uint8_t *const buf2 = bruteforce ? malloc(chunksize) : NULL;
+
+ if (bruteforce) {
+ if (!buf1 || !buf2) {
+ msg_gerr("Out of memory!\n");
+ goto _free_ret;
+ }
+ msg_cdbg("spi_read_chunked: chunksize %i ---> %i\n", chunksize, min(chunksize, 256));
+ chunksize = min(chunksize, 256);
+ }
+
/* Warning: This loop has a very unusual condition and body.
* The loop needs to go through each area with at least one affected
* byte. The lowest area number is (start / area_size) since that
@@ -685,7 +741,11 @@
lenhere = min(start + len, (i + 1) * area_size) - starthere;
for (j = 0; j < lenhere; j += chunksize) {
toread = min(chunksize, lenhere - j);
- rc = spi_nbyte_read(flash, starthere + j, buf + starthere - start + j, toread);
+ if (bruteforce) {
+ rc = spi_rw_bruteforce(flash, buf1, buf2, starthere + j, toread, 0 /* read */);
+ memcpy(buf + starthere - start + j, buf1, toread);
+ } else
+ rc = spi_nbyte_read(flash, starthere + j, buf + starthere - start + j, toread);
if (rc)
break;
}
@@ -693,6 +753,9 @@
break;
}
+_free_ret:
+ free(buf1);
+ free(buf2);
return rc;
}
@@ -712,6 +775,19 @@
*/
unsigned int page_size = flash->chip->page_size;
+ unsigned int bruteforce = flashrom_flag_get(flash, FLASHROM_FLAG_BRUTEFORCE);
+ uint8_t *const buf1 = bruteforce ? malloc(chunksize) : NULL;
+ uint8_t *const buf2 = bruteforce ? malloc(chunksize) : NULL;
+
+ if (bruteforce) {
+ if (!buf1 || !buf2) {
+ msg_gerr("Out of memory!\n");
+ goto _free_ret;
+ }
+ msg_cdbg("spi_write_chunked: chunksize %i ---> %i\n", chunksize, min(chunksize, 256));
+ chunksize = min(chunksize, 256);
+ }
+
/* Warning: This loop has a very unusual condition and body.
* The loop needs to go through each page with at least one affected
* byte. The lowest page number is (start / page_size) since that
@@ -731,12 +807,20 @@
int rc;
towrite = min(chunksize, lenhere - j);
- rc = spi_nbyte_program(flash, starthere + j, buf + starthere - start + j, towrite);
+ if (bruteforce) {
+ memcpy(buf1, buf + starthere - start + j, towrite);
+ rc = spi_rw_bruteforce(flash, buf1, buf2, starthere + j, towrite, 1 /* write */);
+ } else
+ rc = spi_nbyte_program(flash, starthere + j, buf + starthere - start + j, towrite);
+
if (rc)
return rc;
}
}
+_free_ret:
+ free(buf1);
+ free(buf2);
return 0;
}
--
To view, visit https://review.coreboot.org/c/flashrom/+/31830
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: If47476793721a0061fd65bc6d1f98d48b03dc6c1
Gerrit-Change-Number: 31830
Gerrit-PatchSet: 1
Gerrit-Owner: mikeb mikeb <mikebdp2(a)gmail.com>
Gerrit-Reviewer: Mike Banon <mikebdp2(a)gmail.com>
Gerrit-MessageType: newchange
by Nico Huber (Code Review)
Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33637
Change subject: nicintel_eeprom: Reduce usage of is_i210()
......................................................................
nicintel_eeprom: Reduce usage of is_i210()
Don't entagle the code paths for the two NIC classes if it's not necessary.
Only compile tested.
Change-Id: I59164ccf54afbbd64a0598282d13e80ff7fd6fa4
Signed-off-by: Nico Huber <nico.h(a)gmx.de>
---
M nicintel_eeprom.c
1 file changed, 52 insertions(+), 46 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/37/33637/1
diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c
index 4e01fcb..4d45f79 100644
--- a/nicintel_eeprom.c
+++ b/nicintel_eeprom.c
@@ -145,14 +145,6 @@
return 1;
}
-static int nicintel_ee_probe(struct flashctx *flash)
-{
- if (is_i210(nicintel_pci->device_id))
- return nicintel_ee_probe_i210(flash);
-
- return nicintel_ee_probe_82580(flash);
-}
-
#define MAX_ATTEMPTS 10000000
static int nicintel_ee_read_word(unsigned int addr, uint16_t *data)
{
@@ -281,6 +273,11 @@
return 0;
}
+static int nicintel_ee_erase_i210(struct flashctx *flash, unsigned int addr, unsigned int len)
+{
+ return nicintel_ee_write_i210(flash, NULL, addr, len);
+}
+
static int nicintel_ee_bitset(int reg, int bit, bool val)
{
uint32_t tmp;
@@ -392,24 +389,24 @@
nicintel_ee_bitset(EEC, EE_REQ, 0); /* Give up direct access. */
return ret;
}
-static int nicintel_ee_write(struct flashctx *flash, const uint8_t *buf, unsigned int addr, unsigned int len)
-{
- if (is_i210(nicintel_pci->device_id))
- return nicintel_ee_write_i210(flash, buf, addr, len);
- return nicintel_ee_write_82580(flash, buf, addr, len);
+static int nicintel_ee_erase_82580(struct flashctx *flash, unsigned int addr, unsigned int len)
+{
+ return nicintel_ee_write_82580(flash, NULL, addr, len);
}
-static int nicintel_ee_erase(struct flashctx *flash, unsigned int addr, unsigned int len)
-{
- return nicintel_ee_write(flash, NULL, addr, len);
-}
-
-static const struct opaque_master opaque_master_nicintel_ee = {
- .probe = nicintel_ee_probe,
+static const struct opaque_master opaque_master_nicintel_ee_82580 = {
+ .probe = nicintel_ee_probe_82580,
.read = nicintel_ee_read,
- .write = nicintel_ee_write,
- .erase = nicintel_ee_erase,
+ .write = nicintel_ee_write_82580,
+ .erase = nicintel_ee_erase_82580,
+};
+
+static const struct opaque_master opaque_master_nicintel_ee_i210 = {
+ .probe = nicintel_ee_probe_i210,
+ .read = nicintel_ee_read,
+ .write = nicintel_ee_write_i210,
+ .erase = nicintel_ee_erase_i210,
};
static int nicintel_ee_shutdown_i210(void *arg)
@@ -432,7 +429,7 @@
return -1;
}
-static int nicintel_ee_shutdown(void *eecp)
+static int nicintel_ee_shutdown_82580(void *eecp)
{
uint32_t old_eec = *(uint32_t *)eecp;
/* Request bitbanging and unselect the chip first to be safe. */
@@ -463,35 +460,44 @@
if (!io_base_addr)
return 1;
- nicintel_eebar = rphysmap("Intel Gigabit NIC w/ SPI EEPROM",
- io_base_addr + (is_i210(dev->device_id) ? 0x12000 : 0), MEMMAP_SIZE);
- if (!nicintel_eebar)
- return 1;
-
- nicintel_pci = dev;
- if ((dev->device_id != UNPROG_DEVICE) && ! is_i210(dev->device_id))
- {
- uint32_t eec = pci_mmio_readl(nicintel_eebar + EEC);
-
- /* C.f. 3.3.1.5 for the detection mechanism (maybe? contradicting the EE_PRES definition),
- * and 3.3.1.7 for possible recovery. */
- if (!(eec & BIT(EE_PRES))) {
- msg_perr("Controller reports no EEPROM is present.\n");
+ if (!is_i210(dev->device_id)) {
+ nicintel_eebar = rphysmap("Intel Gigabit NIC w/ SPI EEPROM", io_base_addr, MEMMAP_SIZE);
+ if (!nicintel_eebar)
return 1;
+
+ nicintel_pci = dev;
+ if ((dev->device_id != UNPROG_DEVICE)) {
+ uint32_t eec = pci_mmio_readl(nicintel_eebar + EEC);
+
+ /* C.f. 3.3.1.5 for the detection mechanism (maybe? contradicting
+ the EE_PRES definition),
+ and 3.3.1.7 for possible recovery. */
+ if (!(eec & BIT(EE_PRES))) {
+ msg_perr("Controller reports no EEPROM is present.\n");
+ return 1;
+ }
+
+ uint32_t *eecp = malloc(sizeof(uint32_t));
+ if (eecp == NULL)
+ return 1;
+ *eecp = eec;
+
+ if (register_shutdown(nicintel_ee_shutdown_82580, eecp))
+ return 1;
}
- uint32_t *eecp = malloc(sizeof(uint32_t));
- if (eecp == NULL)
+ return register_opaque_master(&opaque_master_nicintel_ee_82580);
+ } else {
+ nicintel_eebar = rphysmap("Intel i210 NIC w/ emulated EEPROM",
+ io_base_addr + 0x12000, MEMMAP_SIZE);
+ if (!nicintel_eebar)
return 1;
- *eecp = eec;
- if (register_shutdown(nicintel_ee_shutdown, eecp))
- return 1;
- }
-
- if (is_i210(dev->device_id))
if (register_shutdown(nicintel_ee_shutdown_i210, NULL))
return 1;
- return register_opaque_master(&opaque_master_nicintel_ee);
+ return register_opaque_master(&opaque_master_nicintel_ee_i210);
+ }
+
+ return 1;
}
--
To view, visit https://review.coreboot.org/c/flashrom/+/33637
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I59164ccf54afbbd64a0598282d13e80ff7fd6fa4
Gerrit-Change-Number: 33637
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>
Gerrit-MessageType: newchange
by Nico Huber (Code Review)
Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33337
Change subject: manibuilder: Enable CONFIG_EVERYTHING=yes
......................................................................
manibuilder: Enable CONFIG_EVERYTHING=yes
Change-Id: I4651b55744d730956aa8fda8fdfccbbd68cdda19
Signed-off-by: Nico Huber <nico.h(a)gmx.de>
---
M util/manibuilder/Makefile
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/37/33337/1
diff --git a/util/manibuilder/Makefile b/util/manibuilder/Makefile
index b1e161c..9b87f45 100644
--- a/util/manibuilder/Makefile
+++ b/util/manibuilder/Makefile
@@ -4,6 +4,7 @@
CC := ccache cc
MAKECMD := make
+MAKEARGS := CONFIG_EVERYTHING=yes
spc :=
spc +=
@@ -50,7 +51,7 @@
djgpp\:6.1.0: CC=ccache i586-pc-msdosdjgpp-gcc
djgpp\:6.1.0: STRIP=i586-pc-msdosdjgpp-strip
djgpp\:6.1.0: LIBS_BASE=../
-djgpp\:6.1.0: TARGET=strip
+djgpp\:6.1.0: MAKEARGS+=strip
$(ANITA_TAGS): MAKECMD=gmake
$(ALL_TAGS): export QUIET_SETUP=$(QUIET_TEST)
$(ALL_TAGS): %: %-check-build
@@ -65,7 +66,7 @@
$(MAKECMD) clean && $(MAKECMD) -j$${CPUS:-1} CC='$(CC)' \
$(if $(STRIP),STRIP='$(STRIP)') \
$(if $(LIBS_BASE),LIBS_BASE='$(LIBS_BASE)') \
- $(TARGET)" \
+ $(MAKEARGS)" \
$(if $(QUIET_TEST),>/dev/null 2>&1) || echo $*: $$?
$(addsuffix -shell,$(ALL_TAGS)): %-shell: %-check-build
--
To view, visit https://review.coreboot.org/c/flashrom/+/33337
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I4651b55744d730956aa8fda8fdfccbbd68cdda19
Gerrit-Change-Number: 33337
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>
Gerrit-MessageType: newchange
by Nico Huber (Code Review)
Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/31018
Change subject: Implement IFWI layout reading
......................................................................
Implement IFWI layout reading
Alas, yet another conflicting command-line option before we overhaul the
internal layout handling.
Change-Id: I1f1ef4c5d109b81dec7a11bca04ba89204fa84eb
Signed-off-by: Nico Huber <nico.h(a)gmx.de>
---
M Makefile
M cli_classic.c
A ifwi.c
M libflashrom.c
M libflashrom.h
5 files changed, 463 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/18/31018/1
diff --git a/Makefile b/Makefile
index 1e7db3e..4a1094d 100644
--- a/Makefile
+++ b/Makefile
@@ -536,7 +536,7 @@
###############################################################################
# Library code.
-LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich_descriptors.o fmap.o
+LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich_descriptors.o fmap.o ifwi.o
###############################################################################
# Frontend related stuff.
diff --git a/cli_classic.c b/cli_classic.c
index 536ef24..f764a6d 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -57,6 +57,7 @@
" --fmap read ROM layout from fmap embedded in ROM\n"
" --fmap-file <fmapfile> read ROM layout from fmap in <fmapfile>\n"
" --ifd read layout from an Intel Firmware Descriptor\n"
+ " --ifwi read layout from an Integrated Firmware Image\n"
" -i | --image <name> only flash image <name> from flash layout\n"
" -o | --output <logfile> log output to <logfile>\n"
" --flash-contents <ref-file> assume flash contents to be <ref-file>\n"
@@ -100,7 +101,7 @@
struct flashctx *fill_flash;
const char *name;
int namelen, opt, i, j;
- int startchip = -1, chipcount = 0, option_index = 0, force = 0, ifd = 0, fmap = 0;
+ int startchip = -1, chipcount = 0, option_index = 0, force = 0, ifd = 0, ifwi = 0, fmap = 0;
#if CONFIG_PRINT_WIKI == 1
int list_supported_wiki = 0;
#endif
@@ -110,6 +111,7 @@
enum programmer prog = PROGRAMMER_INVALID;
enum {
OPTION_IFD = 0x0100,
+ OPTION_IFWI,
OPTION_FMAP,
OPTION_FMAP_FILE,
OPTION_FLASH_CONTENTS,
@@ -129,6 +131,7 @@
{"force", 0, NULL, 'f'},
{"layout", 1, NULL, 'l'},
{"ifd", 0, NULL, OPTION_IFD},
+ {"ifwi", 0, NULL, OPTION_IFWI},
{"fmap", 0, NULL, OPTION_FMAP},
{"fmap-file", 1, NULL, OPTION_FMAP_FILE},
{"image", 1, NULL, 'i'},
@@ -238,6 +241,10 @@
fprintf(stderr, "Error: --layout and --ifd both specified. Aborting.\n");
cli_classic_abort_usage();
}
+ if (ifwi) {
+ fprintf(stderr, "Error: --layout and --ifwi both specified. Aborting.\n");
+ cli_classic_abort_usage();
+ }
if (fmap) {
fprintf(stderr, "Error: --layout and --fmap-file both specified. Aborting.\n");
cli_classic_abort_usage();
@@ -249,12 +256,31 @@
fprintf(stderr, "Error: --layout and --ifd both specified. Aborting.\n");
cli_classic_abort_usage();
}
+ if (ifwi) {
+ fprintf(stderr, "Error: --ifwi and --ifd both specified. Aborting.\n");
+ cli_classic_abort_usage();
+ }
if (fmap) {
fprintf(stderr, "Error: --fmap-file and --ifd both specified. Aborting.\n");
cli_classic_abort_usage();
}
ifd = 1;
break;
+ case OPTION_IFWI:
+ if (layoutfile) {
+ fprintf(stderr, "Error: --layout and --ifwi both specified. Aborting.\n");
+ cli_classic_abort_usage();
+ }
+ if (ifd) {
+ fprintf(stderr, "Error: --ifd and --ifwi both specified. Aborting.\n");
+ cli_classic_abort_usage();
+ }
+ if (fmap) {
+ fprintf(stderr, "Error: --fmap-file and --ifwi both specified. Aborting.\n");
+ cli_classic_abort_usage();
+ }
+ ifwi = 1;
+ break;
case OPTION_FMAP_FILE:
if (fmap) {
fprintf(stderr, "Error: --fmap or --fmap-file specified "
@@ -265,6 +291,10 @@
fprintf(stderr, "Error: --fmap-file and --ifd both specified. Aborting.\n");
cli_classic_abort_usage();
}
+ if (ifwi) {
+ fprintf(stderr, "Error: --fmap-file and --ifwi both specified. Aborting.\n");
+ cli_classic_abort_usage();
+ }
if (layoutfile) {
fprintf(stderr, "Error: --fmap-file and --layout both specified. Aborting.\n");
cli_classic_abort_usage();
@@ -282,6 +312,10 @@
fprintf(stderr, "Error: --fmap and --ifd both specified. Aborting.\n");
cli_classic_abort_usage();
}
+ if (ifwi) {
+ fprintf(stderr, "Error: --fmap and --ifwi both specified. Aborting.\n");
+ cli_classic_abort_usage();
+ }
if (layoutfile) {
fprintf(stderr, "Error: --layout and --fmap both specified. Aborting.\n");
cli_classic_abort_usage();
@@ -452,7 +486,7 @@
goto out;
}
- if (!ifd && !fmap && process_include_args(get_global_layout())) {
+ if (!ifd && !ifwi && !fmap && process_include_args(get_global_layout())) {
ret = 1;
goto out;
}
@@ -611,6 +645,10 @@
process_include_args(layout))) {
ret = 1;
goto out_shutdown;
+ } else if (ifwi && (flashrom_layout_read_from_ifwi(&layout, fill_flash) ||
+ process_include_args(layout))) {
+ ret = 1;
+ goto out_shutdown;
} else if (fmap && fmapfile) {
struct stat s;
if (stat(fmapfile, &s) != 0) {
diff --git a/ifwi.c b/ifwi.c
new file mode 100644
index 0000000..320335a
--- /dev/null
+++ b/ifwi.c
@@ -0,0 +1,359 @@
+/*
+ * This file is part of the flashrom project.
+ *
+ * Copyright (C) 2019 secunet Security Networks AG
+ *
+ * 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.
+ */
+
+#include <stdio.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "hwaccess.h"
+#include "layout.h"
+#include "flash.h"
+#include "ifwi.h"
+
+static size_t bpdt_size(const struct bpdt *const header)
+{
+ return BPDT_HEADER_LENGTH + header->desc_count * BPDT_ENTRY_LENGTH;
+}
+
+static int deserialize_bpdt_header(struct bpdt *const header, const uint8_t *const from)
+{
+ header->signature = read_le32(from + 0);
+ header->desc_count = read_le16(from + 4);
+ header->version = read_le16(from + 6);
+ header->xorsum = read_le32(from + 8);
+ header->ifwi_version = read_le32(from + 12);
+
+ if (header->signature != BPDT_SIGNATURE) {
+ msg_gerr("IFWI: BPDT signature mismatch. Found 0x%08"PRIx32", expected 0x%08x.\n",
+ header->signature, BPDT_SIGNATURE);
+ return -4;
+ }
+ if (header->version != 1) {
+ msg_gerr("IFWI: Unknown BPDT version: %"PRIu32".\n", header->version);
+ return -3;
+ }
+ return 0;
+}
+
+static int deserialize_bpdt_entries(struct bpdt *const bpdt, const uint8_t *const from, const size_t limit)
+{
+ unsigned int i;
+ size_t offset;
+
+ for (i = 0, offset = 0; i < bpdt->desc_count; ++i, offset += BPDT_ENTRY_LENGTH) {
+ bpdt->entries[i].type = read_le16(from + offset + 0);
+ bpdt->entries[i].flags = read_le16(from + offset + 2);
+ bpdt->entries[i].offset = read_le32(from + offset + 4);
+ bpdt->entries[i].size = read_le32(from + offset + 8);
+ msg_gdbg("IFWI: BPDT entry #%u (0x%04"PRIx16", 0x%04"PRIx16", 0x%08"PRIx32", 0x%08"PRIx32")\n",
+ i, bpdt->entries[i].type, bpdt->entries[i].flags,
+ bpdt->entries[i].offset, bpdt->entries[i].size);
+
+ const uint32_t end = bpdt->entries[i].offset + bpdt->entries[i].size;
+ if (end < bpdt->entries[i].offset) {
+ msg_gerr("IFWI: BPDT entry overflows 32-bit space; "
+ "offset 0x%08"PRIx32" size 0x%08"PRIx32"\n",
+ bpdt->entries[i].offset, bpdt->entries[i].size);
+ return -4;
+ }
+ if (end > limit) {
+ msg_gerr("IFWI: BPDT entry points outside of the partition: %08"PRIx32":%08"PRIx32"\n",
+ bpdt->entries[i].offset, end - 1);
+ return -4;
+ }
+ }
+ return (int)i;
+}
+
+static int read_bpdt(struct bpdt **bpdt,
+ const size_t flash_offset, const size_t partition_limit,
+ int (*const read)(void *args, uint8_t *buf, unsigned int start, unsigned int len),
+ void *const read_args)
+{
+ uint8_t *buf;
+ int ret;
+
+ buf = malloc(BPDT_HEADER_LENGTH);
+ *bpdt = malloc(sizeof(**bpdt));
+ if (!buf || !*bpdt) {
+ msg_gerr("Out of memory!\n");
+ ret = -1;
+ goto _free_bpdt_ret;
+ }
+
+ if (read(read_args, buf, flash_offset, BPDT_HEADER_LENGTH)) {
+ ret = -2;
+ goto _free_bpdt_ret;
+ }
+ ret = deserialize_bpdt_header(*bpdt, buf);
+ if (ret < 0)
+ goto _free_bpdt_ret;
+
+ buf = realloc_or_free(buf, bpdt_size(*bpdt));
+ *bpdt = realloc_or_free(*bpdt, offsetof(struct bpdt, entries) +
+ (*bpdt)->desc_count * sizeof((*bpdt)->entries[0]));
+ if (!buf || !*bpdt) {
+ ret = -1;
+ goto _free_bpdt_ret;
+ }
+
+ if (read(read_args, buf + BPDT_HEADER_LENGTH,
+ flash_offset + BPDT_HEADER_LENGTH, bpdt_size(*bpdt) - BPDT_HEADER_LENGTH)) {
+ ret = -2;
+ goto _free_bpdt_ret;
+ }
+ ret = deserialize_bpdt_entries(*bpdt, (uint8_t *)buf + BPDT_HEADER_LENGTH, partition_limit);
+ if (ret < 0)
+ goto _free_bpdt_ret;
+
+ ret = 0;
+ goto _free_buf_ret;
+
+_free_bpdt_ret:
+ free(*bpdt);
+_free_buf_ret:
+ free(buf);
+ return ret;
+}
+
+static size_t spd_size(const struct spd *const header)
+{
+ return header->header_length + header->num_entries * SPD_ENTRY_LENGTH;
+}
+
+static int deserialize_spd_header(struct spd *const header, const uint8_t *const from)
+{
+ header->marker = read_le32(from + 0);
+ header->num_entries = read_le32(from + 4);
+ header->header_version = read_le8 (from + 8);
+ header->entry_version = read_le8 (from + 9);
+ header->header_length = read_le8 (from + 10);
+ header->checksum = read_le8 (from + 11);
+ memcpy(header->name, from + 12, sizeof(header->name) - 1);
+ header->name[sizeof(header->name) - 1] = '\0';
+
+ if (header->marker != SPD_MARKER) {
+ msg_gerr("IFWI: SPD marker mismatch. Found 0x%08"PRIx32", expected 0x%08x.\n",
+ header->marker, SPD_MARKER);
+ return -4;
+ }
+ if (header->header_version != 1) {
+ msg_gerr("IFWI: Unknown SPD header version: %"PRIu8".\n", header->header_version);
+ return -3;
+ }
+ if (header->entry_version != 1) {
+ msg_gerr("IFWI: Unknown SPD entry version: %"PRIu8".\n", header->entry_version);
+ return -3;
+ }
+ return 0;
+}
+
+static int deserialize_spd_entries(struct spd *const spd, const uint8_t *const from, const size_t limit)
+{
+ unsigned int i;
+ size_t offset;
+
+ for (i = 0, offset = 0; i < spd->num_entries; ++i, offset += SPD_ENTRY_LENGTH) {
+ memcpy(spd->entries[i].name, from + offset, sizeof(spd->entries[i].name) - 1);
+ spd->entries[i].name[sizeof(spd->entries[i].name) - 1] = '\0';
+ spd->entries[i].offset = read_le32(from + offset + 12);
+ spd->entries[i].length = read_le32(from + offset + 16);
+ msg_gdbg("IFWI: SPD entry #%u (%s, 0x%08"PRIx32", 0x%08"PRIx32")\n",
+ i, spd->entries[i].name, spd->entries[i].offset, spd->entries[i].length);
+
+ const uint32_t end = spd->entries[i].offset + spd->entries[i].length;
+ if (end < spd->entries[i].offset) {
+ msg_gerr("IFWI: SPD entry overflows 32-bit space; "
+ "offset 0x%08"PRIx32" size 0x%08"PRIx32"\n",
+ spd->entries[i].offset, spd->entries[i].length);
+ return -4;
+ }
+ if (end > limit) {
+ msg_gerr("IFWI: SPD entry points outside of the partition: %08"PRIx32":%08"PRIx32"\n",
+ spd->entries[i].offset, end - 1);
+ return -4;
+ }
+ }
+ return (int)i;
+}
+
+static int read_spd(struct spd **spd,
+ const size_t flash_offset, const size_t partition_limit,
+ int (*const read)(void *args, uint8_t *buf, unsigned int start, unsigned int len),
+ void *const read_args)
+{
+ uint8_t *buf;
+ int ret;
+
+ buf = malloc(SPD_MIN_HEADER_LENGTH);
+ *spd = malloc(sizeof(**spd));
+ if (!buf || !*spd) {
+ msg_gerr("Out of memory!\n");
+ ret = -1;
+ goto _free_spd_ret;
+ }
+
+ if (read(read_args, buf, flash_offset, SPD_MIN_HEADER_LENGTH)) {
+ ret = -2;
+ goto _free_spd_ret;
+ }
+ ret = deserialize_spd_header(*spd, (uint8_t *)buf);
+ if (ret < 0)
+ goto _free_spd_ret;
+
+ buf = realloc_or_free(buf, spd_size(*spd));
+ *spd = realloc_or_free(*spd, offsetof(struct spd, entries) +
+ (*spd)->num_entries * sizeof((*spd)->entries[0]));
+ if (!buf || !*spd) {
+ ret = -1;
+ goto _free_spd_ret;
+ }
+
+ if (read(read_args, buf + (*spd)->header_length,
+ flash_offset + (*spd)->header_length, spd_size(*spd) - (*spd)->header_length)) {
+ ret = -2;
+ goto _free_spd_ret;
+ }
+ ret = deserialize_spd_entries(*spd, (uint8_t *)buf + (*spd)->header_length, partition_limit);
+ if (ret < 0)
+ goto _free_spd_ret;
+
+ ret = 0;
+ goto _free_buf_ret;
+
+_free_spd_ret:
+ free(*spd);
+_free_buf_ret:
+ free(buf);
+ return ret;
+}
+
+static int layout_from_ifwi(struct flashrom_layout **const layout,
+ const size_t primary_offset, const size_t secondary_offset,
+ const size_t partition_limit,
+ int (*const read)(void *args, uint8_t *buf, unsigned int start, unsigned int len),
+ void *const read_args)
+{
+ struct bpdt *bpdt;
+ struct spd *spd;
+ size_t bpdt_offset, offset;
+ unsigned int i, j;
+ int ret = -1;
+
+ if (!secondary_offset)
+ bpdt_offset = primary_offset;
+ else
+ bpdt_offset = secondary_offset;
+
+ ret = read_bpdt(&bpdt, bpdt_offset, partition_limit - primary_offset, read, read_args);
+ if (ret < 0)
+ return ret;
+
+ if (!secondary_offset && !(*layout = new_layout(32))) {
+ ret = -1;
+ goto _free_bpdt_ret;
+ }
+
+ ret = add_layout_entry(layout, secondary_offset ? "S-BPDT" : "BPDT",
+ bpdt_offset, bpdt_offset + bpdt_size(bpdt) - 1);
+ if (ret < 0)
+ goto _free_layout_ret;
+
+ for (i = 0; i < bpdt->desc_count; ++i) {
+ offset = primary_offset + bpdt->entries[i].offset;
+
+ if (!bpdt->entries[i].offset || !bpdt->entries[i].size) {
+ msg_gdbg("IFWI: Skipping empty BPDT entry #%u of type %"PRIu16".\n",
+ i, bpdt->entries[i].type);
+ continue;
+ }
+
+ switch (bpdt->entries[i].type) {
+ case 5:
+ /* recurse into secondary BPDT */
+ ret = layout_from_ifwi(layout, primary_offset, offset,
+ partition_limit, read, read_args);
+ if (ret)
+ goto _free_layout_ret;
+ continue;
+ case 0: /* Fall through.*/
+ case 1: /* Fall through.*/
+ case 2: /* Fall through.*/
+ case 3: /* Fall through.*/
+ case 4: /* Fall through.*/
+ case 6: /* Fall through.*/
+ case 7: /* Fall through.*/
+ case 8: /* Fall through.*/
+ case 9: /* Fall through.*/
+ case 14: /* Fall through.*/
+ case 15:
+ break;
+ default:
+ continue;
+ }
+
+ ret = read_spd(&spd, offset, partition_limit - offset, read, read_args);
+ switch (ret) {
+ case 0:
+ break;
+ case -1: /* Fall through. */
+ case -2:
+ goto _free_layout_ret;
+ default:
+ continue;
+ }
+
+ ret = add_layout_entry(layout, spd->name, offset, offset + bpdt->entries[i].size - 1);
+ if (ret < 0) {
+ free(spd);
+ goto _free_layout_ret;
+ }
+ for (j = 0; j < spd->num_entries; ++j) {
+ offset = primary_offset + bpdt->entries[i].offset +
+ (spd->entries[j].offset & SPD_ENTRY_OFFSET_MASK);
+ ret = add_layout_entry(
+ layout, spd->entries[j].name,
+ offset, offset + spd->entries[j].length - 1);
+ if (ret < 0) {
+ free(spd);
+ goto _free_layout_ret;
+ }
+ }
+ free(spd);
+ }
+
+ ret = 0;
+ goto _free_bpdt_ret;
+
+_free_layout_ret:
+ free(*layout);
+_free_bpdt_ret:
+ free(bpdt);
+ return ret;
+}
+
+int layout_from_ifwi_rom(struct flashrom_layout **const layout,
+ struct flashrom_flashctx *const flashctx,
+ const size_t flash_offset)
+{
+ return layout_from_ifwi(layout, flash_offset, 0, flashctx->chip->total_size * 1024,
+ (int (*)(void *, uint8_t *, unsigned int, unsigned int))flashctx->chip->read,
+ flashctx);
+}
diff --git a/libflashrom.c b/libflashrom.c
index f90a22c..96e34cc 100644
--- a/libflashrom.c
+++ b/libflashrom.c
@@ -30,6 +30,7 @@
#include "layout.h"
#include "hwaccess.h"
#include "ich_descriptors.h"
+#include "ifwi.h"
#include "libflashrom.h"
/**
@@ -383,6 +384,67 @@
#endif
}
+/**
+ * @brief Read a layout from the Intel IFWI in the flash.
+ *
+ * @param[out] layout Points to a struct flashrom_layout pointer that
+ * gets set if the descriptor is read and parsed
+ * successfully.
+ * @param[in] flashctx Flash context to read the descriptor from flash.
+ *
+ * @return 0 on success,
+ * 6 if descriptor parsing isn't implemented for the host,
+ * 3 if the data on flash couldn't be parsed,
+ * 2 if the data on flash couldn't be read,
+ * 1 on any other error.
+ */
+int flashrom_layout_read_from_ifwi(struct flashrom_layout **const layout,
+ struct flashrom_flashctx *const flashctx)
+{
+ struct flashrom_layout *ifd_layout;
+ unsigned int i;
+ int ret;
+
+ ret = flashrom_layout_read_from_ifd(&ifd_layout, flashctx, NULL, 0);
+ if (ret)
+ return ret;
+
+ for (i = 0; i < ifd_layout->num_entries; ++i) {
+ if (strcmp(ifd_layout->entries[i].name, "bios") == 0)
+ break;
+ }
+ if (i >= ifd_layout->num_entries) {
+ msg_gerr("Cannot find BIOS region in Intel Firmware Descriptor (IFD).\n");
+ ret = 3;
+ goto _free_ifd_ret;
+ }
+
+ msg_cinfo("Reading IFWI layout... ");
+ ret = layout_from_ifwi_rom(layout, flashctx, ifd_layout->entries[i].start);
+ switch (ret) {
+ case -4: /* Fall through. */
+ case -3:
+ ret = 3;
+ break;
+ case -2:
+ ret = 2;
+ break;
+ case 0:
+ break;
+ default:
+ ret = 1;
+ break;
+ }
+ if (ret)
+ msg_cinfo("FAILED.\n");
+ else
+ msg_cinfo("done.\n");
+
+_free_ifd_ret:
+ free(ifd_layout);
+ return ret;
+}
+
static int flashrom_layout_parse_fmap(struct flashrom_layout **layout,
struct flashctx *const flashctx, const struct fmap *const fmap)
{
diff --git a/libflashrom.h b/libflashrom.h
index 38c95d2..9ca7ea0 100644
--- a/libflashrom.h
+++ b/libflashrom.h
@@ -63,6 +63,7 @@
struct flashrom_layout;
int flashrom_layout_read_from_ifd(struct flashrom_layout **, struct flashrom_flashctx *, const void *dump, size_t len);
+int flashrom_layout_read_from_ifwi(struct flashrom_layout **, struct flashrom_flashctx *);
int flashrom_layout_read_fmap_from_rom(struct flashrom_layout **,
struct flashrom_flashctx *, off_t offset, size_t length);
int flashrom_layout_read_fmap_from_buffer(struct flashrom_layout **layout,
--
To view, visit https://review.coreboot.org/c/flashrom/+/31018
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I1f1ef4c5d109b81dec7a11bca04ba89204fa84eb
Gerrit-Change-Number: 31018
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>
Gerrit-MessageType: newchange
by Nico Huber (Code Review)
Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/31017
Change subject: ifwi: Add definitions for the Integrated Firmware Image format
......................................................................
ifwi: Add definitions for the Integrated Firmware Image format
The Integrated Firmware Image (IFWI) is used as a partitioning format
on some Intel SoCs (e.g. Apollo Lake). It is not tied to NOR flashes,
rather to have a common format between different types of boot media.
Change-Id: I4bdf47637bfb68560e6d4269f89710572c1bb82a
Signed-off-by: Nico Huber <nico.h(a)gmx.de>
---
A ifwi.h
1 file changed, 80 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/17/31017/1
diff --git a/ifwi.h b/ifwi.h
new file mode 100644
index 0000000..622fccf
--- /dev/null
+++ b/ifwi.h
@@ -0,0 +1,80 @@
+/*
+ * This file is part of the flashrom 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.
+ */
+
+/*
+ * The Integrated Firmware Image (IFWI) is used as a partitioning
+ * format on some Intel SoCs (e.g. Apollo Lake). It is not tied to
+ * NOR flashes, rather to have a common format between different
+ * types of boot media.
+ */
+
+#ifndef __IFWI_H__
+#define __IFWI_H__ 1
+
+#include <stdint.h>
+
+#include "layout.h"
+
+int layout_from_ifwi_rom(struct flashrom_layout **, struct flashrom_flashctx *, const size_t flash_offset);
+
+/*********** Boot Partition Descriptor Table (BPDT) ***********/
+
+#define BPDT_ENTRY_LENGTH 12
+
+struct bpdt_entry { /* points to a Sub-Partition */
+ uint16_t type;
+ uint16_t flags;
+ uint32_t offset; /* from start of Logical Boot Partition */
+ uint32_t size;
+};
+
+#define BPDT_SIGNATURE 0x000055aa
+#define BPDT_HEADER_LENGTH 24
+
+struct bpdt {
+ uint32_t signature;
+ uint16_t desc_count;
+ uint16_t version;
+ uint32_t xorsum; /* covers BPDT to S-BPDT (inclusive), iff there is
+ a redundant Logical Boot Partition, otherwise 0 */
+ uint32_t ifwi_version; /* revision of this IFWI build */
+ struct bpdt_entry entries[];
+};
+
+/**************** Sub-Partition Directory (SPD) ***************/
+
+#define SPD_ENTRY_OFFSET_MASK 0x01ffffff
+#define SPD_ENTRY_LENGTH 24
+
+struct spd_entry {
+ char name[12 + 1]; /* serialized as 12 chars w/o terminator */
+ uint32_t offset; /* from start of the SPD header */
+ uint32_t length;
+};
+
+#define SPD_MARKER 0x44504324 /* $CPD */
+#define SPD_MIN_HEADER_LENGTH 16
+
+struct spd {
+ uint32_t marker;
+ uint32_t num_entries;
+ uint8_t header_version;
+ uint8_t entry_version;
+ uint8_t header_length;
+ uint8_t checksum; /* xor-sum covering header + entries */
+ char name[4 + 1]; /* serialized as 4 chars w/o terminator */
+ struct spd_entry entries[];
+};
+
+#endif /* __IFWI_H__ */
--
To view, visit https://review.coreboot.org/c/flashrom/+/31017
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I4bdf47637bfb68560e6d4269f89710572c1bb82a
Gerrit-Change-Number: 31017
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>
Gerrit-MessageType: newchange
by Nico Huber (Code Review)
Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/31016
Change subject: hwaccess: Add endianness converting deserialization functions
......................................................................
hwaccess: Add endianness converting deserialization functions
Add functions like
uint32_t read_le32(const void *);
Change-Id: Idde177acf8bc5f94cd046b6539dc31532c98e452
Signed-off-by: Nico Huber <nico.h(a)gmx.de>
---
M hwaccess.h
1 file changed, 14 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/16/31016/1
diff --git a/hwaccess.h b/hwaccess.h
index af7054b..5df4fc3 100644
--- a/hwaccess.h
+++ b/hwaccess.h
@@ -20,6 +20,7 @@
#ifndef __HWACCESS_H__
#define __HWACCESS_H__ 1
+#include <stdint.h>
#include "platform.h"
#if NEED_PCI == 1
@@ -109,6 +110,19 @@
#define le_to_cpu32 cpu_to_le32
#define le_to_cpu64 cpu_to_le64
+#define read_from(endianness, bits) \
+static inline uint##bits##_t read_##endianness##bits(const void *from) \
+{ \
+ return le_to_cpu##bits(*(uint##bits##_t *)from); \
+}
+
+read_from(be, 8)
+read_from(be, 16)
+read_from(be, 32)
+read_from(le, 8)
+read_from(le, 16)
+read_from(le, 32)
+
#if NEED_RAW_ACCESS == 1
#if IS_X86
--
To view, visit https://review.coreboot.org/c/flashrom/+/31016
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Idde177acf8bc5f94cd046b6539dc31532c98e452
Gerrit-Change-Number: 31016
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>
Gerrit-MessageType: newchange
by Nico Huber (Code Review)
Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/31014
Change subject: layout: Add interface to create a dynamically growing layout
......................................................................
layout: Add interface to create a dynamically growing layout
Another interim solution until we have a better internal layout
structure (i.e. linked lists).
Change-Id: I0093de58bc7eadc5cd52355937df23c4a6e934ed
Signed-off-by: Nico Huber <nico.h(a)gmx.de>
---
M layout.c
M layout.h
2 files changed, 60 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/14/31014/1
diff --git a/layout.c b/layout.c
index c589d17..420a3d9 100644
--- a/layout.c
+++ b/layout.c
@@ -243,3 +243,54 @@
l->entries[i].start, l->entries[i].end, l->entries[i].name);
}
}
+
+static size_t dynlayout_size(unsigned int num_entries)
+{
+ return sizeof(struct dynamic_layout) + num_entries * sizeof(struct romentry);
+}
+
+struct flashrom_layout *new_layout(unsigned int num_entries)
+{
+ struct dynamic_layout *const dyn = malloc(dynlayout_size(num_entries));
+ if (!dyn) {
+ msg_gerr("Out of memory!\n");
+ return NULL;
+ }
+
+ memset(dyn, 0x00, sizeof(*dyn));
+ dyn->base.entries = (void *)((uint8_t *)dyn + sizeof(*dyn));
+ dyn->allocated = num_entries;
+
+ return &dyn->base;
+}
+
+int add_layout_entry(struct flashrom_layout **const l, const char *const name,
+ const size_t start, const size_t end)
+{
+ struct dynamic_layout *dyn;
+
+ if (!*l)
+ *l = new_layout(8);
+ if (!*l)
+ return -1;
+
+ dyn = (void *)*l;
+
+ if (dyn->base.num_entries >= dyn->allocated) {
+ const unsigned int allocate = (dyn->allocated ? : 1) * 2;
+ dyn = realloc(dyn, dynlayout_size(allocate));
+ if (!dyn)
+ return -1;
+ dyn->base.entries = (void *)((uint8_t *)dyn + sizeof(*dyn));
+ dyn->allocated = allocate;
+ *l = (void *)dyn;
+ }
+
+ const unsigned int i = dyn->base.num_entries++;
+ memset(&dyn->base.entries[i], 0x00, sizeof(dyn->base.entries[i]));
+ dyn->base.entries[i].start = start;
+ dyn->base.entries[i].end = end;
+ snprintf(dyn->base.entries[i].name, sizeof(dyn->base.entries[i].name), "%s", name);
+
+ return 0;
+}
diff --git a/layout.h b/layout.h
index a10cbb4..4227e92 100644
--- a/layout.h
+++ b/layout.h
@@ -54,6 +54,12 @@
struct romentry entry;
};
+struct dynamic_layout {
+ struct flashrom_layout base;
+ /* number of (pre)allocated entries */
+ unsigned int allocated;
+};
+
struct flashrom_layout *get_global_layout(void);
struct flashrom_flashctx;
const struct flashrom_layout *get_layout(const struct flashrom_flashctx *const flashctx);
@@ -62,4 +68,7 @@
void report_layout(const struct flashrom_layout *);
+struct flashrom_layout *new_layout(unsigned int num_entries);
+int add_layout_entry(struct flashrom_layout **, const char *name, size_t start, size_t end);
+
#endif /* !__LAYOUT_H__ */
--
To view, visit https://review.coreboot.org/c/flashrom/+/31014
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I0093de58bc7eadc5cd52355937df23c4a6e934ed
Gerrit-Change-Number: 31014
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>
Gerrit-MessageType: newchange
by Nico Huber (Code Review)
Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33340
Change subject: manibuilder: Add list of tags used for the 1.1.x branch
......................................................................
manibuilder: Add list of tags used for the 1.1.x branch
Change-Id: I243aa11f4a017a4209efcc227cec56eb12020e28
Signed-off-by: Nico Huber <nico.h(a)gmx.de>
---
M util/manibuilder/Makefile.targets
1 file changed, 48 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/40/33340/1
diff --git a/util/manibuilder/Makefile.targets b/util/manibuilder/Makefile.targets
index 044b0a4..079c181 100644
--- a/util/manibuilder/Makefile.targets
+++ b/util/manibuilder/Makefile.targets
@@ -112,6 +112,46 @@
# can only run what is still maintained
10X_TAGS := $(filter $(10X_TAGS),$(ALL_TAGS))
+# original 1.1.x tags
+11X_TAGS := \
+ anita\:amd64 \
+ djgpp\:6.1.0 \
+ fedora\:25-x86_64 \
+ fedora\:25-ppc64le \
+ fedora\:25-aarch64 \
+ fedora\:24-x86_64 \
+ centos\:7.3-aarch64-clean \
+ centos\:7.3-amd64-clean \
+ centos\:7.2-amd64-clean \
+ debian-debootstrap\:ppc64el-stretch \
+ debian-debootstrap\:armhf-stretch \
+ debian-debootstrap\:mips-stretch \
+ debian-debootstrap\:mipsel-stretch \
+ debian-debootstrap\:amd64-stretch \
+ debian-debootstrap\:i386-stretch \
+ debian-debootstrap\:amd64-sid \
+ ubuntu-debootstrap\:arm64-xenial \
+ ubuntu-debootstrap\:amd64-xenial \
+ ubuntu-debootstrap\:powerpc-xenial \
+ ubuntu-debootstrap\:amd64-bionic \
+ alpine\:amd64-v3.7 \
+ alpine\:amd64-v3.8 \
+ alpine\:amd64-v3.6 \
+ alpine\:armhf-v3.8 \
+ alpine\:i386-v3.6 \
+ alpine\:i386-v3.7 \
+ alpine\:i386-v3.8 \
+ debian-debootstrap\:amd64-buster \
+ debian-debootstrap\:i386-buster \
+ debian-debootstrap\:i386-sid \
+ ubuntu-debootstrap\:armhf-xenial \
+ ubuntu-debootstrap\:i386-bionic \
+ ubuntu-debootstrap\:i386-xenial \
+ ubuntu-debootstrap\:ppc64el-xenial \
+
+# can only run what is still maintained
+11X_TAGS := $(filter $(11X_TAGS),$(ALL_TAGS))
+
default: $(DEFAULT_TAGS)
native: $(NATIVE_TAGS)
@@ -121,6 +161,9 @@
1.0.x: export TEST_REVISION=refs/heads/1.0.x
1.0.x: $(10X_TAGS)
+1.1.x: export TEST_REVISION=refs/heads/1.1.x
+1.1.x: $(11X_TAGS)
+
show-default:
@printf "%s\n" $(DEFAULT_TAGS)
@@ -133,6 +176,9 @@
show-1.0.x:
@printf "%s\n" $(10X_TAGS)
-.PHONY: default native all 1.0.x
-.PHONY: show-default show-native show-all show-1.0.x
+show-1.1.x:
+ @printf "%s\n" $(11X_TAGS)
+
+.PHONY: default native all 1.0.x 1.1.x
+.PHONY: show-default show-native show-all show-1.0.x show-1.1.x
.PHONY: $(ALL_TAGS)
--
To view, visit https://review.coreboot.org/c/flashrom/+/33340
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I243aa11f4a017a4209efcc227cec56eb12020e28
Gerrit-Change-Number: 33340
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>
Gerrit-MessageType: newchange
