- flashrom - mail.coreboot.org

Re: [flashrom] [PATCH] Fix and clean up cli_classic.c
by Carl-Daniel Hailfinger 15 Jul '11

15 Jul '11

Am 16.07.2011 01:43 schrieb David Hendricks: > Acked-by: David Hendricks <dhendrix(a)google.com> Thanks, committed in r1373. Regards, Carl-Daniel -- http://www.hailfinger.org/

1 0

[commit] r1373 - trunk
by repository service 15 Jul '11

15 Jul '11

Author: hailfinger Date: Sat Jul 16 01:47:45 2011 New Revision: 1373 URL: http://flashrom.org/trac/flashrom/changeset/1373 Log: Fix and clean up cli_classic.c Don't ignore -i if it is specified before -l Check if image mentioned by -i is present in layout file Consolidate duplicated programmer_shutdown calls Kill outdated comments Finish parameter checking before -L/-z is executed Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: David Hendricks <dhendrix(a)google.com> Modified: trunk/cli_classic.c Modified: trunk/cli_classic.c ============================================================================== --- trunk/cli_classic.c Wed Jul 13 22:48:54 2011 (r1372) +++ trunk/cli_classic.c Sat Jul 16 01:47:45 2011 (r1373) @@ -117,6 +117,7 @@ #endif int operation_specified = 0; int i; + int ret = 0; static const char optstring[] = "r:Rw:v:nVEfc:m:l:i:p:Lzh"; static const struct option long_options[] = { @@ -232,8 +233,14 @@ cli_classic_abort_usage(); break; case 'i': + /* FIXME: -l has to be specified before -i. */ tempstr = strdup(optarg); - find_romentry(tempstr); + if (find_romentry(tempstr)) { + fprintf(stderr, "Error: image %s not found in " + "layout file or -i specified before " + "-l\n", tempstr); + cli_classic_abort_usage(); + } break; case 'L': if (++operation_specified > 1) { @@ -313,6 +320,11 @@ } } + if (optind < argc) { + fprintf(stderr, "Error: Extra parameter found.\n"); + cli_classic_abort_usage(); + } + /* FIXME: Print the actions flashrom will take. */ if (list_supported) { @@ -327,11 +339,6 @@ } #endif - if (optind < argc) { - fprintf(stderr, "Error: Extra parameter found.\n"); - cli_classic_abort_usage(); - } - #if CONFIG_INTERNAL == 1 if ((programmer != PROGRAMMER_INTERNAL) && (lb_part || lb_vendor)) { fprintf(stderr, "Error: --mainboard requires the internal " @@ -360,8 +367,8 @@ if (programmer_init(pparam)) { fprintf(stderr, "Error: Programmer initialization failed.\n"); - programmer_shutdown(); - exit(1); + ret = 1; + goto out_shutdown; } for (i = 0; i < ARRAY_SIZE(flashes); i++) { @@ -377,8 +384,8 @@ for (i = 0; i < chipcount; i++) printf(" %s", flashes[i].name); printf("\nPlease specify which chip to use with the -c <chipname> option.\n"); - programmer_shutdown(); - exit(1); + ret = 1; + goto out_shutdown; } else if (!chipcount) { printf("No EEPROM/flash device found.\n"); if (!force || !chip_to_probe) { @@ -389,15 +396,14 @@ startchip = probe_flash(0, &flashes[0], 1); if (startchip == -1) { printf("Probing for flash chip '%s' failed.\n", chip_to_probe); - programmer_shutdown(); - exit(1); + ret = 1; + goto out_shutdown; } printf("Please note that forced reads most likely contain garbage.\n"); return read_flash_to_file(&flashes[0], filename); } - // FIXME: flash writes stay enabled! - programmer_shutdown(); - exit(1); + ret = 1; + goto out_shutdown; } fill_flash = &flashes[0]; @@ -409,22 +415,19 @@ (!force)) { fprintf(stderr, "Chip is too big for this programmer " "(-V gives details). Use --force to override.\n"); - programmer_shutdown(); - return 1; + ret = 1; + goto out_shutdown; } if (!(read_it | write_it | verify_it | erase_it)) { printf("No operations were specified.\n"); - // FIXME: flash writes stay enabled! - programmer_shutdown(); - exit(0); + goto out_shutdown; } if (!filename && !erase_it) { printf("Error: No filename specified.\n"); - // FIXME: flash writes stay enabled! - programmer_shutdown(); - exit(1); + ret = 1; + goto out_shutdown; } /* Always verify write operations unless -n is used. */ @@ -437,4 +440,8 @@ */ programmer_delay(100000); return doit(fill_flash, force, filename, read_it, write_it, erase_it, verify_it); + +out_shutdown: + programmer_shutdown(); + return ret; }

1 0

Re: [flashrom] Atmel AT49LH002 support missing
by Stefan Tauner 15 Jul '11

15 Jul '11

On Fri, 15 Jul 2011 11:41:12 -0300 Marcos Felipe Rasia de Mello <marcosfrm(a)gmail.com> wrote: > Hi, > > I got another PCCHIPS M863G V5.1A, but this time the board came with > an Atmel AT49LH002 flash, which flashrom v0.9.3-r1362 doesn't detect. jup, this one is not supported yet. the datasheet can for example be found here: http://www.datasheetcatalog.org/datasheet/atmel/doc3377.pdf it supports LPC and FWH so it may share some characteristics with the Pm49FL002. patches are welcome ;) -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

Atmel AT49LH002 support missing
by Marcos Felipe Rasia de Mello 15 Jul '11

15 Jul '11

Hi, I got another PCCHIPS M863G V5.1A, but this time the board came with an Atmel AT49LH002 flash, which flashrom v0.9.3-r1362 doesn't detect. Regards, Marcos

1 0

Re: [flashrom] [PATCH 1/4] ichspi.c: refactor filling and reading the fdata/spid registers
by Carl-Daniel Hailfinger 14 Jul '11

14 Jul '11

Am 15.07.2011 02:39 schrieb Stefan Tauner: > - add ich_fill_data to fill the chipset registers from an array > - add ich_read_data to copy the data from the chipset register into an array > - replace the existing code with calls to those functions > - minor cosmetic changes > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> > Excellent, please commit. Regards, Carl-Daniel -- http://www.hailfinger.org/

1 0

[PATCH 4/4] ichspi.c: add support for Intel Hardware Sequencing
by Stefan Tauner 14 Jul '11

14 Jul '11

todo: - revise hwseq activation: when should hwseq be used, when swseq? when should swseq be forbidden? etc. - commit message (is a link to my blog post a good idea (additionally)?) - revise (levels of) prints - revise timeout values (for optimal performance) - build upon the upcoming opaque interface framework instead Tested-by: David Hendricks <dhendrix(a)google.com> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- chipdrivers.h | 6 + flashchips.c | 23 ++++- flashchips.h | 2 + ich_descriptors.c | 35 ++++++ ich_descriptors.h | 1 + ichspi.c | 331 +++++++++++++++++++++++++++++++++++++++++++++++++++-- programmer.h | 1 + 7 files changed, 387 insertions(+), 12 deletions(-) diff --git a/chipdrivers.h b/chipdrivers.h index 92ddbea..f97e2ad 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -84,6 +84,12 @@ void print_status_82802ab(uint8_t status); int unlock_82802ab(struct flashchip *flash); int unlock_28f004s5(struct flashchip *flash); +/* ichspi.c */ +int ich_hwseq_probe(struct flashchip *flash); +int ich_hwseq_read(struct flashchip *flash, uint8_t *buf, int start, int len); +int ich_hwseq_block_erase(struct flashchip *flash, unsigned int addr, unsigned int blocklen); +int ich_hwseq_write_256(struct flashchip *flash, uint8_t *buf, int start, int len); + /* jedec.c */ uint8_t oddparity(uint8_t val); void toggle_ready_jedec(chipaddr dst); diff --git a/flashchips.c b/flashchips.c index 1b5c88a..1fbdcfe 100644 --- a/flashchips.c +++ b/flashchips.c @@ -8507,7 +8507,27 @@ const struct flashchip flashchips[] = { .write = write_jedec_1, .read = read_memmapped, }, - +#if defined(CONFIG_INTERNAL) && (defined(__i386__) || defined(__x86_64__)) + { + .vendor = "Intel", + .name = "Hardware Sequencing", + .bustype = CHIP_BUSTYPE_SPI, + .manufacture_id = INTEL_ID, + .model_id = INTEL_HWSEQ, + .total_size = 0, + .page_size = 256, + .tested = TEST_OK_PREW, + .probe = ich_hwseq_probe, + .block_erasers = + { + { /* erase blocks will be set by the probing function */ + .block_erase = ich_hwseq_block_erase, + } + }, + .write = ich_hwseq_write_256, + .read = ich_hwseq_read, + }, +#endif // defined(CONFIG_INTERNAL) && (defined(__i386__) || defined(__x86_64__)) { .vendor = "AMIC", .name = "unknown AMIC SPI chip", @@ -8640,6 +8660,7 @@ const struct flashchip flashchips[] = { .probe = probe_spi_rdid, .write = NULL, }, + { .vendor = "Generic", .name = "unknown SPI chip (REMS)", diff --git a/flashchips.h b/flashchips.h index 3b2b94f..6b8d574 100644 --- a/flashchips.h +++ b/flashchips.h @@ -340,6 +340,8 @@ #define SHARP_LH28F008SA 0xA2 /* Sharp chip, Intel Vendor ID */ #define SHARP_LH28F008SC 0xA6 /* Sharp chip, Intel Vendor ID */ +#define INTEL_HWSEQ 0xFFFE /* dummy ID for hardware sequencing */ + #define ISSI_ID 0xD5 /* ISSI Integrated Silicon Solutions */ /* diff --git a/ich_descriptors.c b/ich_descriptors.c index 0281488..c54e710 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -393,6 +393,41 @@ int read_ich_descriptors_from_dump(const uint32_t *dump, enum chipset cs, struct } #else // ICH_DESCRIPTORS_FROM_MMAP_DUMP +/** Returns the integer representation of the component density with index +idx in bytes or 0 if a correct size can not be determined. */ +int getFCBA_component_density(uint8_t idx, const struct flash_descriptors *desc) +{ + uint8_t size_enc; + const int dec_mem[6] = { + 512 * 1024, + 1 * 1024 * 1024, + 2 * 1024 * 1024, + 4 * 1024 * 1024, + 8 * 1024 * 1024, + 16 * 1024 * 1024, + }; + + switch(idx) { + case 0: + size_enc = desc->component.comp1_density; + break; + case 1: + if (desc->content.NC == 0) + return 0; + size_enc = desc->component.comp2_density; + break; + default: + msg_perr("Only component index 0 or 1 are supported yet.\n"); + return 0; + } + if (size_enc > 5) { + msg_perr("Density of component with index %d is invalid. " + "Encoded density is 0x%x.\n", idx, size_enc); + return 0; + } + return dec_mem[size_enc]; +} + static uint32_t read_descriptor_reg(uint8_t section, uint16_t offset, void *spibar) { uint32_t control = 0; diff --git a/ich_descriptors.h b/ich_descriptors.h index 1129805..fd56b26 100644 --- a/ich_descriptors.h +++ b/ich_descriptors.h @@ -452,6 +452,7 @@ int read_ich_descriptors_from_dump(const uint32_t *dump, enum chipset cs, struct #else // ICH_DESCRIPTORS_FROM_MMAP_DUMP void read_ich_descriptors_via_fdo(void *spibar, struct flash_descriptors *desc); +int getFCBA_component_density(uint8_t idx, const struct flash_descriptors *desc); #endif // ICH_DESCRIPTORS_FROM_MMAP_DUMP #endif // __ICH_DESCRIPTORS_H__ diff --git a/ichspi.c b/ichspi.c index edca654..9597c05 100644 --- a/ichspi.c +++ b/ichspi.c @@ -23,10 +23,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined(__i386__) || defined(__x86_64__) +#if defined(CONFIG_INTERNAL) && (defined(__i386__) || defined(__x86_64__)) #include <string.h> #include "flash.h" +#include "flashchips.h" #include "chipdrivers.h" #include "programmer.h" #include "spi.h" @@ -1073,6 +1074,298 @@ static int ich_spi_send_command(unsigned int writecnt, unsigned int readcnt, return result; } +static struct hwseq { + uint32_t size_comp0; + uint32_t size_comp1; +} hwseq; + +static void ich_hwseq_set_addr(uint32_t addr) +{ + uint32_t addr_old = REGREAD32(ICH9_REG_FADDR) & ~0x01FFFFFF; + REGWRITE32(ICH9_REG_FADDR, (addr & 0x01FFFFFF) | addr_old); +} + +/* Sets FADDR.FLA to 'addr' and returns the erase block size in bytes + * of the block containing this address. */ +static uint32_t ich_hwseq_get_erase_block_size(unsigned int addr) +{ + uint8_t enc_berase; + const uint32_t dec_berase[4] = { + 256, + 4 * 1024, + 8 * 1024, + 64 * 1024 + }; + + ich_hwseq_set_addr(addr); + enc_berase = (REGREAD16(ICH9_REG_HSFS) & HSFS_BERASE) >> + HSFS_BERASE_OFF; + return dec_berase[enc_berase]; +} + +/* Polls for Cycle Done Status, Flash Cycle Error or timeout in 10 us intervals. + Resets all error flags in HSFS. + Returns 0 if the cycle completes successfully without errors within + timeout us, 1 on errors. */ +static int ich_hwseq_wait_for_cycle_complete(unsigned int timeout, + unsigned int len) +{ + uint16_t hsfs; + uint32_t addr; + + while ((((hsfs = REGREAD16(ICH9_REG_HSFS)) & + (HSFS_FDONE | HSFS_FCERR)) == 0) && + --timeout) { + programmer_delay(10); + } + REGWRITE16(ICH9_REG_HSFS, REGREAD16(ICH9_REG_HSFS)); + if (!timeout) { + addr = REGREAD32(ICH9_REG_FADDR) & 0x01FFFFFF; + msg_perr("Timeout error between offset 0x%08x and " + "0x%08x + %d (=0x%08x)!\n", + addr, addr, len - 1, addr + len - 1); + prettyprint_ich9_reg_hsfs(hsfs); + prettyprint_ich9_reg_hsfc(REGREAD16(ICH9_REG_HSFC)); + return 1; + } + + if (hsfs & HSFS_FCERR) { + addr = REGREAD32(ICH9_REG_FADDR) & 0x01FFFFFF; + msg_perr("Transaction error between offset 0x%08x and " + "0x%08x + %d (=0x%08x)!\n", + addr, addr, len - 1, addr + len - 1); + prettyprint_ich9_reg_hsfs(hsfs); + prettyprint_ich9_reg_hsfc(REGREAD16(ICH9_REG_HSFC)); + return 1; + } + return 0; +} + +int ich_hwseq_probe(struct flashchip *flash) +{ + uint32_t total_size, boundary; + uint32_t erase_size_low, size_low, erase_size_high, size_high; + struct block_eraser *eraser; + + if (flash->manufacture_id != INTEL_ID || + flash->model_id != INTEL_HWSEQ) { + msg_cerr("This chip (%s) is not supported in hardware" + "sequencing mode and should never have been probed.\n", + flash->name); + msg_cerr("%s: Please report a bug at flashrom(a)flashrom.org\n", + __func__); + return 0; + } + + msg_cdbg("Prerequisites for Intel Hardware Sequencing are "); + if (spi_programmer->type != SPI_CONTROLLER_ICH_HWSEQ) { + msg_cdbg("not met.\n"); + return 0; + } + msg_cdbg("met.\n"); + + total_size = hwseq.size_comp0 + hwseq.size_comp1; + msg_cdbg("Found %d attached SPI flash chip", + (hwseq.size_comp1 != 0) ? 2 : 1); + if (hwseq.size_comp1 != 0) + msg_cdbg("s with a combined"); + else + msg_cdbg(" with a"); + msg_cdbg(" density of %d kB.\n", total_size / 1024); + flash->total_size = total_size / 1024; + + eraser = &(flash->block_erasers[0]); + boundary = (REGREAD32(ICH9_REG_FPB) & FPB_FPBA) << 12; + size_high = total_size - boundary; + erase_size_high = ich_hwseq_get_erase_block_size(boundary); + + if (boundary == 0) { + msg_cdbg("There is only one partition containing the whole " + "address space (0x%06x - 0x%06x).\n", 0, size_high-1); + eraser->eraseblocks[0].size = erase_size_high; + eraser->eraseblocks[0].count = size_high / erase_size_high; + msg_cdbg("There are %d erase blocks with %d B each.\n", + size_high / erase_size_high, erase_size_high); + } else { + msg_cdbg("The flash address space (0x%06x - 0x%06x) is divided " + "at address 0x%06x in two partitions.\n", + 0, size_high-1, boundary); + size_low = total_size - size_high; + erase_size_low = ich_hwseq_get_erase_block_size(0); + + eraser->eraseblocks[0].size = erase_size_low; + eraser->eraseblocks[0].count = size_low / erase_size_low; + msg_cdbg("The first partition ranges from 0x%06x to 0x%06x.\n", + 0, size_low-1); + msg_cdbg("In that range are %d erase blocks with %d B each.\n", + size_low / erase_size_low, erase_size_low); + + eraser->eraseblocks[1].size = erase_size_high; + eraser->eraseblocks[1].count = size_high / erase_size_high; + msg_cdbg("The second partition ranges from 0x%06x to 0x%06x.\n", + boundary, size_high-1); + msg_cdbg("In that range are %d erase blocks with %d B each.\n", + size_high / erase_size_high, erase_size_high); + } + return 1; +} + +static int ich_hwseq_send_command(unsigned int writecnt, + unsigned int readcnt, + const unsigned char *writearr, + unsigned char *readarr) +{ + msg_pdbg("skipped. Intel Hardware Sequencing does not support sending " + "arbitrary commands."); + return -1; +} + +int ich_hwseq_block_erase(struct flashchip *flash, + unsigned int addr, + unsigned int len) +{ + uint32_t erase_block; + uint16_t hsfc; + uint32_t timeout = 5000 * 1000; /* 5 s for max 64 kB */ + + if (flash->manufacture_id != INTEL_ID || + flash->model_id != INTEL_HWSEQ) { + msg_perr("This chip (%s) is not supported in hardware" + "sequencing mode\n", flash->name); + return -1; + } + + erase_block = ich_hwseq_get_erase_block_size(addr); + if (len != erase_block) { + msg_cerr("Erase block size for address 0x%06x is %d B, " + "but requested erase block size is %d B. " + "Not erasing anything.\n", addr, erase_block, len); + return -1; + } + + /* Although the hardware supports this (it would erase the whole block + * containing the address) we play safe here. */ + if (addr % erase_block != 0) { + msg_cerr("Erase address 0x%06x is not aligned to the erase " + "block boundary (any multiple of %d). " + "Not erasing anything.\n", addr, erase_block); + return -1; + } + + if (addr + len > flash->total_size * 1024) { + msg_perr("Request to erase some inaccessible memory address(es)" + " (addr=0x%x, len=%d). " + "Not erasing anything.\n", addr, len); + return -1; + } + + msg_pdbg("Erasing %d bytes starting at 0x%06x.\n", len, addr); + + /* make sure FDONE, FCERR, AEL are cleared by writing 1 to them */ + REGWRITE16(ICH9_REG_HSFS, REGREAD16(ICH9_REG_HSFS)); + + hsfc = REGREAD16(ICH9_REG_HSFC); + hsfc &= ~HSFC_FCYCLE; /* clear operation */ + hsfc |= (0x3 << HSFC_FCYCLE_OFF); /* set erase operation */ + hsfc |= HSFC_FGO; /* start */ + msg_pdbg("HSFC used for block erasing: "); + prettyprint_ich9_reg_hsfc(hsfc); + REGWRITE16(ICH9_REG_HSFC, hsfc); + + if (ich_hwseq_wait_for_cycle_complete(timeout, len)) + return -1; + return 0; +} + +int ich_hwseq_read(struct flashchip *flash, uint8_t *buf, int addr, int len) +{ + uint16_t hsfc; + uint16_t timeout = 100 * 60; + uint8_t block_len; + + if (flash->manufacture_id != INTEL_ID || + flash->model_id != INTEL_HWSEQ) { + msg_perr("This chip (%s) is not supported in hardware" + "sequencing mode.\n", flash->name); + return -1; + } + + if (addr < 0 || addr + len > flash->total_size * 1024) { + msg_perr("Request to read from an inaccessible memory address " + "(addr=0x%x, len=%d).\n", addr, len); + return -1; + } + + msg_pdbg("Reading %d bytes starting at 0x%06x.\n", len, addr); + /* clear FDONE, FCERR, AEL by writing 1 to them (if they are set) */ + REGWRITE16(ICH9_REG_HSFS, REGREAD16(ICH9_REG_HSFS)); + + while (len > 0) { + block_len = min(len, spi_programmer->max_data_read); + ich_hwseq_set_addr(addr); + hsfc = REGREAD16(ICH9_REG_HSFC); + hsfc &= ~HSFC_FCYCLE; /* set read operation */ + hsfc &= ~HSFC_FDBC; /* clear byte count */ + /* set byte count */ + hsfc |= (((block_len - 1) << HSFC_FDBC_OFF) & HSFC_FDBC); + hsfc |= HSFC_FGO; /* start */ + REGWRITE16(ICH9_REG_HSFC, hsfc); + + if (ich_hwseq_wait_for_cycle_complete(timeout, block_len)) + return 1; + ich_read_data(buf, block_len, ICH9_REG_FDATA0); + addr += block_len; + buf += block_len; + len -= block_len; + } + return 0; +} + +int ich_hwseq_write_256(struct flashchip *flash, uint8_t *buf, int addr, int len) +{ + uint16_t hsfc; + uint16_t timeout = 100 * 60; + uint8_t block_len; + + if (flash->manufacture_id != INTEL_ID || + flash->model_id != INTEL_HWSEQ) { + msg_perr("This chip (%s) is not supported in hardware" + "sequencing mode\n", flash->name); + return -1; + } + + if (addr < 0 || addr + len > flash->total_size * 1024) { + msg_perr("Request to write to an inaccessible memory address " + "(addr=0x%x, len=%d).\n", addr, len); + return -1; + } + + msg_pdbg("Writing %d bytes starting at 0x%06x.\n", len, addr); + /* clear FDONE, FCERR, AEL by writing 1 to them (if they are set) */ + REGWRITE16(ICH9_REG_HSFS, REGREAD16(ICH9_REG_HSFS)); + + while (len > 0) { + ich_hwseq_set_addr(addr); + block_len = min(len, spi_programmer->max_data_write); + ich_fill_data(buf, block_len, ICH9_REG_FDATA0); + hsfc = REGREAD16(ICH9_REG_HSFC); + hsfc &= ~HSFC_FCYCLE; /* clear operation */ + hsfc |= (0x2 << HSFC_FCYCLE_OFF); /* set write operation */ + hsfc &= ~HSFC_FDBC; /* clear byte count */ + /* set byte count */ + hsfc |= (((block_len - 1) << HSFC_FDBC_OFF) & HSFC_FDBC); + hsfc |= HSFC_FGO; /* start */ + REGWRITE16(ICH9_REG_HSFC, hsfc); + + if (ich_hwseq_wait_for_cycle_complete(timeout, block_len)) + return -1; + addr += block_len; + buf += block_len; + len -= block_len; + } + return 0; +} + static int ich_spi_send_multicommand(struct spi_command *cmds) { int ret = 0; @@ -1191,6 +1484,16 @@ static const struct spi_programmer spi_programmer_ich9 = { .write_256 = default_spi_write_256, }; +static const struct spi_programmer spi_programmer_ich_hwseq = { + .type = SPI_CONTROLLER_ICH_HWSEQ, + .max_data_read = 64, + .max_data_write = 64, + .command = ich_hwseq_send_command, + .multicommand = default_spi_send_multicommand, + .read = ich_hwseq_read, + .write_256 = ich_hwseq_write_256, +}; + int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, int ich_generation) { @@ -1199,20 +1502,18 @@ int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, uint16_t spibar_offset, tmp2; uint32_t tmp; int ichspi_desc = 0; + struct flash_descriptors desc = {{ 0 }}; switch (ich_generation) { case 7: - register_spi_programmer(&spi_programmer_ich7); spibar_offset = 0x3020; break; case 8: - register_spi_programmer(&spi_programmer_ich9); spibar_offset = 0x3020; break; case 9: case 10: default: /* Future version might behave the same */ - register_spi_programmer(&spi_programmer_ich9); spibar_offset = 0x3800; break; } @@ -1223,8 +1524,8 @@ int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, /* Assign Virtual Address */ ich_spibar = rcrb + spibar_offset; - switch (spi_programmer->type) { - case SPI_CONTROLLER_ICH7: + switch (ich_generation) { + case 7: msg_pdbg("0x00: 0x%04x (SPIS)\n", mmio_readw(ich_spibar + 0)); msg_pdbg("0x02: 0x%04x (SPIC)\n", @@ -1260,9 +1561,13 @@ int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, msg_pinfo("WARNING: SPI Configuration Lockdown activated.\n"); ichspi_lock = 1; } + register_spi_programmer(&spi_programmer_ich7); ich_init_opcodes(); break; - case SPI_CONTROLLER_ICH9: + case 8: + case 9: + case 10: + default: /* Future version might behave the same */ tmp2 = mmio_readw(ich_spibar + ICH9_REG_HSFS); msg_pdbg("0x04: 0x%04x (HSFS)\n", tmp2); prettyprint_ich9_reg_hsfs(tmp2); @@ -1338,15 +1643,19 @@ int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, msg_pdbg("\n"); if (ichspi_desc) { - struct flash_descriptors desc = {{ 0 }}; read_ich_descriptors_via_fdo(ich_spibar, &desc); prettyprint_ich_descriptors(CHIPSET_UNKNOWN, &desc); + if (ichspi_lock || desc.content.NC != 0) { + hwseq.size_comp0 = getFCBA_component_density(0, &desc); + hwseq.size_comp1 = getFCBA_component_density(1, &desc); + register_spi_programmer(&spi_programmer_ich_hwseq); + break; + } } + + register_spi_programmer(&spi_programmer_ich9); ich_init_opcodes(); break; - default: - /* Nothing */ - break; } old = pci_read_byte(dev, 0xdc); diff --git a/programmer.h b/programmer.h index 6a28dbe..6e316d1 100644 --- a/programmer.h +++ b/programmer.h @@ -517,6 +517,7 @@ enum spi_controller { #if defined(__i386__) || defined(__x86_64__) SPI_CONTROLLER_ICH7, SPI_CONTROLLER_ICH9, + SPI_CONTROLLER_ICH_HWSEQ, SPI_CONTROLLER_IT85XX, SPI_CONTROLLER_IT87XX, SPI_CONTROLLER_SB600, -- 1.7.1

1 0

[PATCH 3/4] add ich_descriptor_tool to decode all flash descriptors stored in a flash dump file
by Stefan Tauner 14 Jul '11

14 Jul '11

additionally to what is available via FDOC/FDOD...<TODO> TODO: - fix msg_perr - decode all ibex straps Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- ich_descriptors.c | 186 ++++++++++++++++++++ ich_descriptors.h | 200 ++++++++++++++++++++++ util/ich_descriptors_tool/Makefile | 42 +++++ util/ich_descriptors_tool/TODO | 5 + util/ich_descriptors_tool/ich_descriptors_tool.c | 197 +++++++++++++++++++++ 5 files changed, 630 insertions(+), 0 deletions(-) create mode 100644 util/ich_descriptors_tool/Makefile create mode 100644 util/ich_descriptors_tool/TODO create mode 100644 util/ich_descriptors_tool/ich_descriptors_tool.c diff --git a/ich_descriptors.c b/ich_descriptors.c index 43b2c52..0281488 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -22,8 +22,21 @@ #if defined(__i386__) || defined(__x86_64__) #include "ich_descriptors.h" + +#ifdef ICH_DESCRIPTORS_FROM_MMAP_DUMP + +#define DESCRIPTOR_MODE_MAGIC 0x0ff0a55a +#define msg_pdbg printf +#define msg_pspew printf +#define msg_perr printf +#include <stdio.h> + +#else + #include "flash.h" /* for msg_* */ +#endif // ICH_DESCRIPTORS_FROM_MMAP_DUMP + uint32_t getFCBA(const struct flash_content *cont) { return (cont->FLMAP0 << 4) & 0x00000ff0; @@ -59,12 +72,26 @@ uint32_t getFISBA(const struct flash_content *cont) return (cont->FLMAP1 >> 12) & 0x00000ff0; } +#ifdef ICH_DESCRIPTORS_FROM_MMAP_DUMP +uint32_t getVTBA(const struct flash_upper_map *flumap) +{ /* The bits in FLUMAP1 describe bits 4-11 out of 24 in total; + * others are 0. */ + return (flumap->FLUMAP1 << 4) & 0x0ff0; +} +#endif + void prettyprint_ich_descriptors(enum chipset cs, const struct flash_descriptors *desc) { prettyprint_ich_descriptor_content(&desc->content); prettyprint_ich_descriptor_component(desc); prettyprint_ich_descriptor_region(&desc->region); prettyprint_ich_descriptor_master(&desc->master); +#ifdef ICH_DESCRIPTORS_FROM_MMAP_DUMP + if (cs >= CHIPSET_ICH8) { + prettyprint_ich_descriptor_upper_map(&desc->upper); + prettyprint_ich_descriptor_straps(cs, &desc->straps); + } +#endif // ICH_DESCRIPTORS_FROM_MMAP_DUMP } void prettyprint_ich_descriptor_content(const struct flash_content *cont) @@ -208,6 +235,164 @@ void prettyprint_ich9_reg_vscc(uint32_t reg_val) pprint_reg(VSCC, VCL, reg_val, "\n"); } +#ifdef ICH_DESCRIPTORS_FROM_MMAP_DUMP +void prettyprint_ich_descriptor_straps_ich8(const struct flash_strap *straps) +{ + const char * const str_GPIO12[4] = { + "GPIO12", + "LAN PHY Power Control Function (Native Output)", + "GLAN_DOCK# (Native Input)", + "invalid configuration", + }; + + msg_pdbg1("=== FISBA ===\n"); + msg_pdbg1("STRP0 0x%8.8x\n", straps->ich8.STRPs[0]); + msg_pdbg1("\n"); + + msg_pdbg2("--- FISBA details ---\n"); + msg_pdbg2("ME SMBus addr2 0x%2.2x\n", straps->ich8.ASD2); + msg_pdbg2("ME SMBus addr1 0x%2.2x\n", straps->ich8.ASD); + msg_pdbg2("ME SMBus Controller is connected to %s\n", straps->ich8.MESM2SEL ? "SMLink pins" : "SMBus pins"); + msg_pdbg2("SPI CS1 is used for %s\n", straps->ich8.SPICS1_LANPHYPC_SEL ? "LAN PHY Power Control Function" : "SPI Chip Select"); + msg_pdbg2("GPIO12_SEL is used as %s\n", str_GPIO12[straps->ich8.GPIO12_SEL]); + msg_pdbg2("PCIe Port 6 is used for %s\n", straps->ich8.GLAN_PCIE_SEL ? "integrated GLAN" : "PCI Express"); + msg_pdbg2("Intel AMT SMBus Controller 1 is connected to %s\n", straps->ich8.BMCMODE ? "SMLink" : "SMBus"); + msg_pdbg2("TCO slave is on %s. Intel AMT SMBus Controller 1 is %sabled\n", + straps->ich8.TCOMODE ? "SMBus" : "SMLink", straps->ich8.TCOMODE ? "en" : "dis"); + msg_pdbg2("ME A is %sabled\n", straps->ich8.ME_DISABLE ? "dis" : "en"); + + msg_pdbg2("\n"); + msg_pdbg2("=== FMSBA ===\n"); + msg_pdbg2("STRP1 0x%8.8x\n", straps->ich8.STRPs[1]); + + msg_pdbg2("\n"); + msg_pdbg2("--- FMSBA details ---\n"); + msg_pdbg2("ME B is %sabled\n", straps->ich8.ME_disable_B ? "dis" : "en"); + msg_pdbg2("\n"); +} + +void prettyprint_ich_descriptor_straps_ibex(const struct flash_strap *straps) +{ + int i; + msg_pdbg2("=== FPSBA ===\n"); + /* TODO: decode properly */ + for(i = 0; i <= 15; i++) + msg_pdbg2("STRP%-2d = 0x%8.8x\n", i, straps->ibex.STRPs[i]); + msg_pdbg2("\n"); +} + +void prettyprint_ich_descriptor_straps(enum chipset cs, const struct flash_strap *straps) +{ + switch (cs) { + case CHIPSET_ICH8: + prettyprint_ich_descriptor_straps_ich8(straps); + break; + case CHIPSET_SERIES_5_IBEX_PEAK: + /* PCH straps only. PROCSTRPs are unknown. */ + prettyprint_ich_descriptor_straps_ibex(straps); + break; + case CHIPSET_UNKNOWN: + break; + default: + msg_pdbg2("The meaning of the descriptor straps are unknown yet.\n"); + msg_pdbg2("\n"); + break; + } +} + +void prettyprint_rdid(uint32_t reg_val) +{ + uint8_t mid = reg_val & 0xFF; + uint16_t did = ((reg_val >> 16) & 0xFF) | (reg_val & 0xFF00); + msg_pdbg2("Manufacturer ID 0x%02x, Device ID 0x%04x\n", mid, did); +} + +void prettyprint_ich_descriptor_upper_map(const struct flash_upper_map *umap) +{ + int i; + msg_pdbg1("=== FLUMAP ===\n"); + msg_pdbg1("FLUMAP1 0x%8.8x\n", umap->FLUMAP1); + msg_pdbg1("\n"); + + msg_pdbg2("--- FLUMAP details ---\n"); + msg_pdbg2("VTL (length) = %d\n", umap->VTL); + msg_pdbg2("VTBA (base address) = 0x%6.6x\n", getVTBA(umap)); + msg_pdbg2("\n"); + + msg_pdbg2("VSCC Table:\n"); + for (i=0; i < umap->VTL/2; i++) + { + uint32_t jid = umap->vscc_table[i].JID; + uint32_t vscc = umap->vscc_table[i].VSCC; + msg_pdbg2(" JID%d = 0x%8.8x\n", i, jid); + msg_pdbg2(" VSCC%d = 0x%8.8x\n", i, vscc); + msg_pdbg2(" "); /* indention */ + prettyprint_rdid(jid); + msg_pdbg2(" "); /* indention */ + prettyprint_ich9_reg_vscc(vscc); + } + msg_pdbg2("\n"); +} + +int read_ich_descriptors_from_dump(const uint32_t *dump, enum chipset cs, struct flash_descriptors *desc) +{ + int i; + uint8_t pch_bug_offset = 0; + if (dump[0] != DESCRIPTOR_MODE_MAGIC) { + if (dump[4] == DESCRIPTOR_MODE_MAGIC) + pch_bug_offset = 4; + else + return -1; + } + + /* map */ + desc->content.FLVALSIG = dump[0 + pch_bug_offset]; + desc->content.FLMAP0 = dump[1 + pch_bug_offset]; + desc->content.FLMAP1 = dump[2 + pch_bug_offset]; + desc->content.FLMAP2 = dump[3 + pch_bug_offset]; + + /* component */ + desc->component.FLCOMP = dump[(getFCBA(&desc->content) >> 2) + 0]; + desc->component.FLILL = dump[(getFCBA(&desc->content) >> 2) + 1]; + desc->component.FLPB = dump[(getFCBA(&desc->content) >> 2) + 2]; + + /* region */ + desc->region.FLREG0 = dump[(getFRBA(&desc->content) >> 2) + 0]; + desc->region.FLREG1 = dump[(getFRBA(&desc->content) >> 2) + 1]; + desc->region.FLREG2 = dump[(getFRBA(&desc->content) >> 2) + 2]; + desc->region.FLREG3 = dump[(getFRBA(&desc->content) >> 2) + 3]; + + /* master */ + desc->master.FLMSTR1 = dump[(getFMBA(&desc->content) >> 2) + 0]; + desc->master.FLMSTR2 = dump[(getFMBA(&desc->content) >> 2) + 1]; + desc->master.FLMSTR3 = dump[(getFMBA(&desc->content) >> 2) + 2]; + + /* upper map */ + desc->upper.FLUMAP1 = dump[(0x0efc >> 2) + 0]; + + for (i=0; i < desc->upper.VTL; i++) + { + desc->upper.vscc_table[i].JID = dump[(getVTBA(&desc->upper) >> 2) + i * 2 + 0]; + desc->upper.vscc_table[i].VSCC = dump[(getVTBA(&desc->upper) >> 2) + i * 2 + 1]; + } + /* straps */ + switch (cs) { + case CHIPSET_ICH8: + desc->straps.ich8.STRPs[0] = dump[(getFISBA(&desc->content) >> 2) + 0]; + desc->straps.ich8.STRPs[1] = dump[(getFMSBA(&desc->content) >> 2) + 0]; + break; + case CHIPSET_SERIES_5_IBEX_PEAK: + for(i = 0; i <= 15; i++) + desc->straps.ibex.STRPs[i] = dump[(getFISBA(&desc->content) >> 2) + i]; + break; + default: + break; + } + + return 0; +} +#else // ICH_DESCRIPTORS_FROM_MMAP_DUMP + static uint32_t read_descriptor_reg(uint8_t section, uint16_t offset, void *spibar) { uint32_t control = 0; @@ -247,4 +432,5 @@ void read_ich_descriptors_via_fdo(void *spibar, struct flash_descriptors *desc) msg_pdbg1(" done\n"); } +#endif // ICH_DESCRIPTORS_FROM_MMAP_DUMP #endif // defined(__i386__) || defined(__x86_64__) diff --git a/ich_descriptors.h b/ich_descriptors.h index 9954149..1129805 100644 --- a/ich_descriptors.h +++ b/ich_descriptors.h @@ -238,11 +238,202 @@ struct flash_master { }; }; +#ifdef ICH_DESCRIPTORS_FROM_MMAP_DUMP +struct flash_strap { + union { + union { + uint32_t STRPs[2]; + struct { + struct { + uint32_t ME_DISABLE :1; + uint32_t :6; + uint32_t TCOMODE :1; + uint32_t ASD :7; + uint32_t BMCMODE :1; + uint32_t :3; + uint32_t GLAN_PCIE_SEL :1; + uint32_t GPIO12_SEL :2; + uint32_t SPICS1_LANPHYPC_SEL :1; + uint32_t MESM2SEL :1; + uint32_t :1; + uint32_t ASD2 :7; + }; + struct { + uint32_t ME_disable_B :1; + uint32_t :31; + }; + }; + }ich8; + union { + uint32_t STRPs[15]; + struct { + struct { + uint32_t :1; + uint32_t cs_ss2 :1; + uint32_t :5; + uint32_t SMB_EN :1; + uint32_t SML0_EN :1; + uint32_t SML1_EN :1; + uint32_t SML1FRQ :2; + uint32_t SMB0FRQ :2; + uint32_t SML0FRQ :2; + uint32_t :4; + uint32_t LANPHYPC_GP12_SEL :1; + uint32_t cs_ss1 :1; + uint32_t :2; + uint32_t DMI_REQID_DIS :1; + uint32_t :4; + uint32_t BBBS :2; + uint32_t :1; + }; + struct { + uint32_t cs_ss3 :4; + uint32_t :28; + }; + struct { + uint32_t :8; + uint32_t MESMASDEN :1; + uint32_t MESMASDA :7; + uint32_t :8; + uint32_t MESMI2CEN :1; + uint32_t MESMI2CA :7; + }; + struct { + uint32_t :32; + }; + struct { + uint32_t PHYCON :2; + uint32_t :6; + uint32_t GBEMAC_SMBUS_ADDR_EN :1; + uint32_t GBEMAC_SMBUS_ADDR :7; + uint32_t :1; + uint32_t GBEPHY_SMBUS_ADDR :7; + uint32_t :8; + }; + struct { + uint32_t :32; + }; + struct { + uint32_t :32; + }; + struct { + uint32_t MESMA2UDID_DEVICE :16; + uint32_t MESMA2UDID_VENDOR :16; + }; + struct { + uint32_t :32; + }; + struct { + uint32_t PCIEPCS1 :2; + uint32_t PCIEPCS2 :2; + uint32_t PCIELR1 :1; + uint32_t PCIELR2 :1; + uint32_t DMILR :1; + uint32_t :1; + uint32_t PHY_PCIEPORTSEL :3; + uint32_t PHY_PCIE_EN :1; + uint32_t :20; + }; + struct { + uint32_t :1; + uint32_t ME_BOOT_FLASH :1; + uint32_t cs_ss5 :1; + uint32_t VE_EN :1; + uint32_t :4; + uint32_t MMDDE :1; + uint32_t MMADDR :7; + uint32_t cs_ss7 :1; + uint32_t :1; + uint32_t ICC_SEL :3; + uint32_t MER_CL1 :1; + uint32_t :10; + }; + struct { + uint32_t SML1GPAEN :1; + uint32_t SML1GPA :7; + uint32_t :10; + uint32_t SML1I2CAEN :1; + uint32_t SML1I2CA :7; + }; + struct { + uint32_t :32; + }; + struct { + uint32_t :32; + }; + struct { + uint32_t :8; + uint32_t VE_EN2 :1; + uint32_t :5; + uint32_t VE_BOOT_FLASH :1; + uint32_t :1; + uint32_t BW_SSD :1; + uint32_t NVMHCI_EN :1; + uint32_t :14; + }; + struct { + uint32_t :3; + uint32_t cs_ss6 :2; + uint32_t :1; + uint32_t IWL_EN :1; + uint32_t :1; + uint32_t t209min :2; + uint32_t :22; + }; + }; + }ibex; + }; +}; + +struct flash_upper_map { + union { + uint32_t FLUMAP1; + struct { + uint32_t VTBA :8; + uint32_t VTL :8; + uint32_t :16; + }; + }; + struct { + union { + uint32_t JID; + struct { + uint8_t vid :8; + uint8_t cid0 :8; + uint8_t cid1 :8; + uint32_t :8; + }; + }; + union { + uint32_t VSCC; + struct { + uint32_t ubes :2; + uint32_t uwg :1; + uint32_t uwsr :1; + uint32_t uwews :1; + uint32_t :3; + uint32_t ueo :8; + uint32_t lbes :2; + uint32_t lwg :1; + uint32_t lwsr :1; + uint32_t lwews :1; + uint32_t :3; + uint32_t leo :16; + }; + }; + }vscc_table[128]; +}; +#endif // ICH_DESCRIPTORS_FROM_MMAP_DUMP + struct flash_descriptors { struct flash_content content; struct flash_component component; struct flash_region region; struct flash_master master; +#ifdef ICH_DESCRIPTORS_FROM_MMAP_DUMP + struct flash_strap straps; + struct flash_upper_map upper; +#endif // ICH_DESCRIPTORS_FROM_MMAP_DUMP }; void prettyprint_ich_descriptors(enum chipset, const struct flash_descriptors *desc); @@ -252,7 +443,16 @@ void prettyprint_ich_descriptor_component(const struct flash_descriptors *desc); void prettyprint_ich_descriptor_region(const struct flash_region *region); void prettyprint_ich_descriptor_master(const struct flash_master *master); +#ifdef ICH_DESCRIPTORS_FROM_MMAP_DUMP + +void prettyprint_ich_descriptor_upper_map(const struct flash_upper_map *umap); +void prettyprint_ich_descriptor_straps(enum chipset cs, const struct flash_strap *straps); +int read_ich_descriptors_from_dump(const uint32_t *dump, enum chipset cs, struct flash_descriptors *desc); + +#else // ICH_DESCRIPTORS_FROM_MMAP_DUMP + void read_ich_descriptors_via_fdo(void *spibar, struct flash_descriptors *desc); +#endif // ICH_DESCRIPTORS_FROM_MMAP_DUMP #endif // __ICH_DESCRIPTORS_H__ #endif // defined(__i386__) || defined(__x86_64__) diff --git a/util/ich_descriptors_tool/Makefile b/util/ich_descriptors_tool/Makefile new file mode 100644 index 0000000..1d7f056 --- /dev/null +++ b/util/ich_descriptors_tool/Makefile @@ -0,0 +1,42 @@ +CC ?= gcc + +PROGRAM=ich_descriptors_tool +EXTRAINCDIRS = ../../ . +DEPPATH = .dep +OBJATH = .obj +SHAREDSRC = ich_descriptors.c +SHAREDSRCDIR = ../.. + +SRC = $(wildcard *.c) + +CFLAGS=-Wall +CFLAGS += -MMD -MP -MF $(DEPPATH)/$((a)F).d +# enables functions that populate the descriptor structs from plain binary dumps +CFLAGS += -D ICH_DESCRIPTORS_FROM_MMAP_DUMP +CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) + +OBJ = $(OBJATH)/$(SRC:%.c=%.o) + +SHAREDOBJ = $(OBJATH)/$(notdir $(SHAREDSRC:%.c=%.o)) + +all:$(PROGRAM) + +$(OBJ): $(OBJATH)/%.o : %.c + $(CC) $(CFLAGS) -o $@ -c $< + +# this enables us to share source files without simultaneously sharing .o files +# with flashrom, which would lead to unexpected results (w/o running make clean) +$(SHAREDOBJ): $(OBJATH)/%.o : $(SHAREDSRCDIR)/%.c + $(CC) $(CFLAGS) -o $@ -c $< + +$(PROGRAM): $(OBJ) $(SHAREDOBJ) + $(CC) -o $(PROGRAM) $(OBJ) $(SHAREDOBJ) + +clean: + rm -f $(PROGRAM) + rm -rf $(DEPPATH) $(OBJATH) + +# Include the dependency files. +-include $(shell mkdir -p $(DEPPATH) $(OBJATH) 2>/dev/null) $(wildcard $(DEPPATH)/*) + +.PHONY: all clean diff --git a/util/ich_descriptors_tool/TODO b/util/ich_descriptors_tool/TODO new file mode 100644 index 0000000..e3933ee --- /dev/null +++ b/util/ich_descriptors_tool/TODO @@ -0,0 +1,5 @@ +- reverse the path, as in assemble a descriptormode image from various + blobs (BIOS, GbE, ME, OEM) and a description (xml? custom config? + sane defaults and cmd-line switches?) +- dump 256 OEM bytes +- handle descriptors of various chipsets correctly \ No newline at end of file diff --git a/util/ich_descriptors_tool/ich_descriptors_tool.c b/util/ich_descriptors_tool/ich_descriptors_tool.c new file mode 100644 index 0000000..f6fd77a --- /dev/null +++ b/util/ich_descriptors_tool/ich_descriptors_tool.c @@ -0,0 +1,197 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2010 Matthias Wenzel <bios at mazzoo dot de> + * Copyright (C) 2011 Stefan Tauner + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* + * dump information and binaries from BIOS images that are in descriptor mode + */ +#include <stdio.h> +#include <stdint.h> +#include <stdlib.h> +#include <sys/mman.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> +#include <string.h> +#include <errno.h> +#include "ich_descriptors.h" + +static void dump_file(const char *filename, const char *suf, uint32_t offset, uint32_t length, const uint32_t *dump) +{ + int ret; + char *n = malloc(strlen(filename) + strlen(suf) + 1); + + if (!n) { + fprintf(stderr, "Out of memory!\n"); + exit(1); + } + snprintf(n, strlen(filename) + strlen(suf) + 1, "%s%s", filename, suf); + printf("\n"); + printf("+++ dumping %s... ", n); + int fh = open(n, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); + free(n); + if (fh < 0) { + fprintf(stderr, + "ERROR: couldn't open(%s): %s\n", n, strerror(errno)); + exit(1); + } + + ret = write(fh, &dump[offset >> 2], length); + if (ret != length) { + fprintf(stderr, "FAILED.\n"); + exit(1); + } + + printf("done.\n"); + close(fh); +} + +void dump_files(const char *n, const uint32_t *fm, struct flash_region *freg) +{ + printf("=== dumping section files ===\n"); + if (freg->reg0_limit) + dump_file(n, ".descr.bin", freg->reg0_base, freg->reg0_limit, fm); + if (freg->reg1_limit) + dump_file(n, ".BIOS.bin", freg->reg1_base, freg->reg1_limit, fm); + if (freg->reg2_limit) + dump_file(n, ".ME.bin", freg->reg2_base, freg->reg2_limit, fm); + if (freg->reg3_limit) { + uint8_t *pMAC = (uint8_t *) &fm[freg->reg3_base >> 2]; + dump_file(n, ".GbE.bin", freg->reg2_base, freg->reg2_limit, fm); + printf("the MAC-address might be: %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", + pMAC[0], + pMAC[1], + pMAC[2], + pMAC[3], + pMAC[4], + pMAC[5] + ); + } +} + +static void usage(char *argv[], char *error) +{ + if (error != NULL) { + fprintf(stderr, "%s\n", error); + } + printf("usage: '%s -f <image file name> [-c <chipset name>] [-d]'\n\n" +"where <image file name> points to an image of the contents of the SPI flash.\n" +"In case that image is really in descriptor mode %s\n" +"will pretty print some of the contained information.\n" +"To also print the data stored in the descriptor strap you have to indicate\n" +"the chipset series with the '-c' parameter and one of the possible arguments:\n" +"\t- \"ich8\",\n" +"\t- \"ich9\",\n" +"\t- \"ich10\",\n" +"\t- \"5\" or \"ibex\" for Intel's 5 series chipsets,\n" +"\t- \"6\" or \"cougar\" for Intel's 6 series chipsets,\n" +"\t- \"7\" or \"panther\" for Intel's 7 series chipsets.\n" +"If '-d' is specified some sections such as the BIOS image as seen by the CPU or\n" +"the GbE blob that is required to initialize the GbE are also dumped to files.\n", + argv[0], argv[0]); + exit(1); +} + +int main(int argc, char *argv[]) +{ + int f; /* file descriptor to flash file */ + unsigned int fs; /* file size */ + uint32_t *fm; /* mmap'd file */ + + int opt; + int dump = 0; + const char *fn = NULL; + const char *csn = NULL; + enum chipset cs = CHIPSET_UNKNOWN; + struct flash_descriptors desc = {{ 0 }}; + + while ((opt = getopt(argc, argv, "df:c:")) != -1) { + switch (opt) { + case 'd': + dump = 1; + break; + case 'f': + fn = optarg; + break; + case 'c': + csn = optarg; + break; + default: /* '?' */ + usage(argv, NULL); + } + } + if (fn == NULL) + usage(argv, + "Need a file name of a descriptor image to read from."); + + f = open(fn, O_RDONLY); + if (f < 0) + usage(argv, "No such file"); + fs = lseek(f, 0, SEEK_END); + if (fs < 0) + usage(argv, "Seeking to the end of the file failed"); + + fm = mmap(NULL, fs, PROT_READ, MAP_PRIVATE, f, 0); + if (fm == (void *) -1) { + /* fallback for stupid OSes like cygwin */ + int ret; + fm = malloc(fs); + if (!fm) + usage(argv, "Could not allocate memory"); + lseek(f, 0, SEEK_SET); + ret = read(f, fm, fs); + if (ret != fs) + usage(argv, "Seeking to the end of the file failed"); + } + printf("flash image has a size of %d [0x%x] bytes.\n", fs, fs); + close(f); + + if (csn != NULL) { + if (strcmp(csn, "ich8") == 0) + cs = CHIPSET_ICH8; + else if (strcmp(csn, "ich9") == 0) + cs = CHIPSET_ICH9; + else if (strcmp(csn, "ich10") == 0) + cs = CHIPSET_ICH10; + else if ((strcmp(csn, "5") == 0) || + (strcmp(csn, "ibex") == 0)) + cs = CHIPSET_SERIES_5_IBEX_PEAK; + else if ((strcmp(csn, "6") == 0) || + (strcmp(csn, "cougar") == 0)) + cs = CHIPSET_SERIES_6_COUGAR_POINT; + else if ((strcmp(csn, "7") == 0) || + (strcmp(csn, "panther") == 0)) + cs = CHIPSET_SERIES_7_PANTHER_POINT; + } + + if(read_ich_descriptors_from_dump(fm, cs, &desc)){ + printf("not in descriptor mode\n"); + exit(1); + } + + prettyprint_ich_descriptors(cs, &desc); + + if (dump == 1) + dump_files(fn, fm, &desc.region); + + return 0; +} + -- 1.7.1

1 0

[PATCH 2/4] add ICH/PCH flash descriptor decoding via FDOC/FDOD
by Stefan Tauner 14 Jul '11

14 Jul '11

based on the work of Matthias 'mazzoo' Wenzel this patch adds pretty printing of those ICH/PCH flash descriptors that are cached/mapped by the chipset (and which are therefore reachable via FDOC/FDOD registers). this includes the following: - content descriptor: describes the image and some generic properties (number of regions, offset of regions, PCH/ICH and MCH/PROC strap offsets and lengths) - component descriptor: identify the different SPI Flash Components and their capabilities. - region descriptor similarly to a partition table this describes the different regions - master descriptor defines access rights of the individual regions this is only a part of the data included in the descriptor. other information can be retreived from a complete binary dump of the descriptor image only. this patch also adds macros and pretty printing for "Vendor Specific Component Capabilities" registers: there are two of them: lower and upper. they describe the properties of the address space divided by FPBA (which allows to use multiple flash chips or partitions with different properties). the properties of flash chips supported by the ME are stored in the same format in a descriptor table. a later patch will uses them outside of ichspi.c which is also the reason why the prettyprinting function and the register bit macros are not defined in ichspi.c but ich_descriptors.h. TODO: - is endianess important? and other questions related to the struct/union pattern used. - file naming and partitioning was not discussed. we may want a ichspi.h. and/or rename ichspi.c to ich_spi.c or similar... - checking derived offsets for OOB errors Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- Makefile | 3 +- ich_descriptors.c | 250 +++++++++++++++++++++++++++++++++++++++++++++++++++ ich_descriptors.h | 258 +++++++++++++++++++++++++++++++++++++++++++++++++++++ ichspi.c | 31 ++++++- 4 files changed, 539 insertions(+), 3 deletions(-) create mode 100644 ich_descriptors.c create mode 100644 ich_descriptors.h diff --git a/Makefile b/Makefile index a35df06..7f73452 100644 --- a/Makefile +++ b/Makefile @@ -308,7 +308,8 @@ ifeq ($(CONFIG_INTERNAL), yes) FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o dmi.o internal.o ifeq ($(ARCH),"x86") -PROGRAMMER_OBJS += it87spi.o it85spi.o ichspi.o sb600spi.o wbsio_spi.o mcp6x_spi.o +PROGRAMMER_OBJS += it87spi.o it85spi.o sb600spi.o wbsio_spi.o mcp6x_spi.o +PROGRAMMER_OBJS += ichspi.o ich_descriptors.o else endif NEED_PCI := yes diff --git a/ich_descriptors.c b/ich_descriptors.c new file mode 100644 index 0000000..43b2c52 --- /dev/null +++ b/ich_descriptors.c @@ -0,0 +1,250 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (c) 2010 Matthias Wenzel <bios at mazzoo dot de> + * Copyright (c) 2011 Stefan Tauner + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#if defined(__i386__) || defined(__x86_64__) + +#include "ich_descriptors.h" +#include "flash.h" /* for msg_* */ + +uint32_t getFCBA(const struct flash_content *cont) +{ + return (cont->FLMAP0 << 4) & 0x00000ff0; +} + +uint32_t getFRBA(const struct flash_content *cont) +{ + return (cont->FLMAP0 >> 12) & 0x00000ff0; +} + +uint32_t getFMBA(const struct flash_content *cont) +{ + return (cont->FLMAP1 << 4) & 0x00000ff0; +} + +uint32_t getFMSBA(const struct flash_content *cont) +{ + return (cont->FLMAP2 << 4) & 0x00000ff0; +} + +uint32_t getFLREG_limit(uint32_t flreg) +{ + return (flreg >> 4) & 0x01fff000; +} + +uint32_t getFLREG_base(uint32_t flreg) +{ + return (flreg << 12) & 0x01fff000; +} + +uint32_t getFISBA(const struct flash_content *cont) +{ + return (cont->FLMAP1 >> 12) & 0x00000ff0; +} + +void prettyprint_ich_descriptors(enum chipset cs, const struct flash_descriptors *desc) +{ + prettyprint_ich_descriptor_content(&desc->content); + prettyprint_ich_descriptor_component(desc); + prettyprint_ich_descriptor_region(&desc->region); + prettyprint_ich_descriptor_master(&desc->master); +} + +void prettyprint_ich_descriptor_content(const struct flash_content *cont) +{ + msg_pdbg1("=== Content Section ===\n"); + msg_pdbg1("FLVALSIG 0x%8.8x\n", cont->FLVALSIG); + msg_pdbg1("FLMAP0 0x%8.8x\n", cont->FLMAP0 ); + msg_pdbg1("FLMAP1 0x%8.8x\n", cont->FLMAP1 ); + msg_pdbg1("FLMAP2 0x%8.8x\n", cont->FLMAP2 ); + msg_pdbg1("\n"); + + msg_pdbg2("--- Details ---\n"); + msg_pdbg2("0x%02x NR Number of Regions (%d)\n", cont->NR, cont->NR + 1); + msg_pdbg2("0x%06x FRBA Flash Region Base Address\n", getFRBA(cont)); + msg_pdbg2("0x%02x NC Number of Components (%d)\n", cont->NC, cont->NC + 1); + msg_pdbg2("0x%06x FCBA Flash Component Base Address\n", getFCBA(cont)); + msg_pdbg2("\n"); + msg_pdbg2("0x%02x ISL ICH Strap Length (%d)\n", cont->ISL, cont->ISL); + msg_pdbg2("0x%06x FISBA Flash ICH Strap Base Address\n", getFISBA(cont)); + msg_pdbg2("0x%02x NM Number of Masters (%d)\n", cont->NM, cont->NM + 1); + msg_pdbg2("0x%06x FMBA Flash Master Base Address\n", getFMBA(cont)); + msg_pdbg2("\n"); + msg_pdbg2("0x%02x MSL MCH Strap Length (%d)\n", cont->MSL, cont->MSL); + msg_pdbg2("0x%06x FMSBA Flash MCH Strap Base Address\n", getFMSBA(cont)); + msg_pdbg2("\n"); +} + +void prettyprint_ich_descriptor_component(const struct flash_descriptors *desc) +{ + const char * const str_freq[8] = { + "20 MHz", /* 000 */ + "33 MHz", /* 001 */ + "reserved", /* 010 */ + "reserved", /* 011 */ + "50 MHz", /* 100 */ + "reserved", /* 101 */ + "reserved", /* 110 */ + "reserved" /* 111 */ + }; + const char * const str_mem[8] = { + "512kB", + "1 MB", + "2 MB", + "4 MB", + "8 MB", + "16 MB", + "reserved", + "reserved" + }; + + msg_pdbg1("=== Component Section ===\n"); + msg_pdbg1("FLCOMP 0x%8.8x\n", desc->component.FLCOMP); + msg_pdbg1("FLILL 0x%8.8x\n", desc->component.FLILL ); + msg_pdbg1("\n"); + + msg_pdbg2("--- Details ---\n"); + msg_pdbg2("0x%2.2x freq_read_id %s\n", + desc->component.freq_read_id , str_freq[desc->component.freq_read_id ]); + msg_pdbg2("0x%2.2x freq_write %s\n", + desc->component.freq_write , str_freq[desc->component.freq_write ]); + msg_pdbg2("0x%2.2x freq_fastread %s\n", + desc->component.freq_fastread, str_freq[desc->component.freq_fastread]); + msg_pdbg2("0x%2.2x fastread %ssupported\n", + desc->component.fastread, desc->component.fastread ? "" : "not "); + msg_pdbg2("0x%2.2x freq_read %s\n", + desc->component.freq_read, str_freq[desc->component.freq_read ]); + msg_pdbg2("0x%2.2x comp 1 density %s\n", + desc->component.comp1_density, str_mem[desc->component.comp1_density]); + if (desc->content.NC) + msg_pdbg2("0x%2.2x comp 2 density %s\n", + desc->component.comp2_density, str_mem[desc->component.comp2_density]); + else + msg_pdbg2("0x%2.2x comp 2 is not used (FLMAP0.NC=0)\n", + desc->component.comp2_density); + msg_pdbg2("\n"); + msg_pdbg2("0x%2.2x invalid instr 0\n", desc->component.invalid_instr0); + msg_pdbg2("0x%2.2x invalid instr 1\n", desc->component.invalid_instr1); + msg_pdbg2("0x%2.2x invalid instr 2\n", desc->component.invalid_instr2); + msg_pdbg2("0x%2.2x invalid instr 3\n", desc->component.invalid_instr3); + msg_pdbg2("\n"); +} + +void prettyprint_ich_descriptor_region(const struct flash_region *reg) +{ + msg_pdbg1("=== Region Section ===\n"); + msg_pdbg1("FLREG0 0x%8.8x\n", reg->FLREG0); + msg_pdbg1("FLREG1 0x%8.8x\n", reg->FLREG1); + msg_pdbg1("FLREG2 0x%8.8x\n", reg->FLREG2); + msg_pdbg1("FLREG3 0x%8.8x\n", reg->FLREG3); + msg_pdbg1("\n"); + + msg_pdbg2("--- Details ---\n"); + msg_pdbg2("0x%8.8x region 0 limit (descr)\n", getFLREG_limit(reg->FLREG0)); + msg_pdbg2("0x%8.8x region 0 base (descr)\n", getFLREG_base(reg->FLREG0)); + msg_pdbg2("0x%8.8x region 1 limit ( BIOS)\n", getFLREG_limit(reg->FLREG1)); + msg_pdbg2("0x%8.8x region 1 base ( BIOS)\n", getFLREG_base(reg->FLREG1)); + msg_pdbg2("0x%8.8x region 2 limit ( ME )\n", getFLREG_limit(reg->FLREG2)); + msg_pdbg2("0x%8.8x region 2 base ( ME )\n", getFLREG_base(reg->FLREG2)); + msg_pdbg2("0x%8.8x region 3 limit ( GbE )\n", getFLREG_limit(reg->FLREG3)); + msg_pdbg2("0x%8.8x region 3 base ( GbE )\n", getFLREG_base(reg->FLREG3)); + msg_pdbg2("\n"); +} + +void prettyprint_ich_descriptor_master(const struct flash_master *mstr) +{ + msg_pdbg1("=== Master Section ===\n"); + msg_pdbg1("FLMSTR1 0x%8.8x\n", mstr->FLMSTR1); + msg_pdbg1("FLMSTR2 0x%8.8x\n", mstr->FLMSTR2); + msg_pdbg1("FLMSTR3 0x%8.8x\n", mstr->FLMSTR3); + msg_pdbg1("\n"); + + #define R(r) (r)?'r':' ' + #define W(w) (w)?'w':' ' + msg_pdbg2("--- Details ---\n"); + msg_pdbg2(" Descr. BIOS ME GbE\n"); + msg_pdbg2("BIOS %c%c %c%c %c%c %c%c\n", + R(mstr->BIOS_descr_read), W(mstr->BIOS_descr_write), + R(mstr->BIOS_BIOS_read), W(mstr->BIOS_BIOS_write), + R(mstr->BIOS_ME_read), W(mstr->BIOS_ME_write), + R(mstr->BIOS_GbE_read), W(mstr->BIOS_GbE_write)); + msg_pdbg2("ME %c%c %c%c %c%c %c%c\n", + R(mstr->ME_descr_read), W(mstr->ME_descr_write), + R(mstr->ME_BIOS_read), W(mstr->ME_BIOS_write), + R(mstr->ME_ME_read), W(mstr->ME_ME_write), + R(mstr->ME_GbE_read), W(mstr->ME_GbE_write)); + msg_pdbg2("GbE %c%c %c%c %c%c %c%c\n", + R(mstr->GbE_descr_read), W(mstr->GbE_descr_write), + R(mstr->GbE_BIOS_read), W(mstr->GbE_BIOS_write), + R(mstr->GbE_ME_read), W(mstr->GbE_ME_write), + R(mstr->GbE_GbE_read), W(mstr->GbE_GbE_write)); + msg_pdbg2("\n"); +} + +void prettyprint_ich9_reg_vscc(uint32_t reg_val) +{ + pprint_reg_hex(VSCC, BES, reg_val, ", "); + pprint_reg(VSCC, WG, reg_val, ", "); + pprint_reg(VSCC, WSR, reg_val, ", "); + pprint_reg(VSCC, WEWS, reg_val, ", "); + pprint_reg_hex(VSCC, EO, reg_val, ", "); + pprint_reg(VSCC, VCL, reg_val, "\n"); +} + +static uint32_t read_descriptor_reg(uint8_t section, uint16_t offset, void *spibar) +{ + uint32_t control = 0; + control |= (section << FDOC_FDSS_OFF) & FDOC_FDSS; + control |= (offset << FDOC_FDSI_OFF) & FDOC_FDSI; + *(volatile uint32_t *) (spibar + ICH9_REG_FDOC) = control; + return *(volatile uint32_t *)(spibar + ICH9_REG_FDOD); +} + +void read_ich_descriptors_via_fdo(void *spibar, struct flash_descriptors *desc) +{ + msg_pdbg1("Reading flash descriptors " + "mapped by the chipset via FDOC/FDOD..."); + /* content section */ + desc->content.FLVALSIG = read_descriptor_reg(0, 0, spibar); + desc->content.FLMAP0 = read_descriptor_reg(0, 1, spibar); + desc->content.FLMAP1 = read_descriptor_reg(0, 2, spibar); + desc->content.FLMAP2 = read_descriptor_reg(0, 3, spibar); + + /* component section */ + desc->component.FLCOMP = read_descriptor_reg(1, 0, spibar); + desc->component.FLILL = read_descriptor_reg(1, 1, spibar); + desc->component.FLPB = read_descriptor_reg(1, 2, spibar); + + /* region section */ + desc->region.FLREG0 = read_descriptor_reg(2, 0, spibar); + desc->region.FLREG1 = read_descriptor_reg(2, 1, spibar); + desc->region.FLREG2 = read_descriptor_reg(2, 2, spibar); + desc->region.FLREG3 = read_descriptor_reg(2, 3, spibar); + + /* master section */ + desc->master.FLMSTR1 = read_descriptor_reg(3, 0, spibar); + desc->master.FLMSTR2 = read_descriptor_reg(3, 1, spibar); + desc->master.FLMSTR3 = read_descriptor_reg(3, 2, spibar); + + /* accessing strap section and upper map is impossible via FDOC/D(?) */ + msg_pdbg1(" done\n"); +} + +#endif // defined(__i386__) || defined(__x86_64__) diff --git a/ich_descriptors.h b/ich_descriptors.h new file mode 100644 index 0000000..9954149 --- /dev/null +++ b/ich_descriptors.h @@ -0,0 +1,258 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (c) 2010 Matthias Wenzel <bios at mazzoo dot de> + * Copyright (c) 2011 Stefan Tauner + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#if defined(__i386__) || defined(__x86_64__) +#ifndef __ICH_DESCRIPTORS_H__ +#define __ICH_DESCRIPTORS_H__ 1 + +#include <stdint.h> + +/* most of the following should probably be in a new file named ichspi.h */ +#define msg_pdbg1 msg_pdbg +#define msg_pdbg2 msg_pspew + +#define ICH9_REG_FDOC 0xB0 /* 32 Bits Flash Descriptor Observability Control */ + /* 0-1: reserved */ +#define FDOC_FDSI_OFF 2 /* 2-11: Flash Descriptor Section Index */ +#define FDOC_FDSI (0x3f << FDOC_FDSI_OFF) +#define FDOC_FDSS_OFF 12 /* 12-14: Flash Descriptor Section Select */ +#define FDOC_FDSS (0x3 << FDOC_FDSS_OFF) + /* 15-31: reserved */ + +#define ICH9_REG_FDOD 0xB4 /* 32 Bits Flash Descriptor Observability Data */ + +/* Field locations and semantics for LVSCC, UVSCC and related words in the flash + * descriptor are equal therefore they all share the same macros below. */ +#define VSCC_BES_OFF 0 /* 0-1: Block/Sector Erase Size */ +#define VSCC_BES (0x3 << VSCC_BES_OFF) +#define VSCC_WG_OFF 2 /* 2: Write Granularity */ +#define VSCC_WG (0x1 << VSCC_WG_OFF) +#define VSCC_WSR_OFF 3 /* 3: Write Status Required */ +#define VSCC_WSR (0x1 << VSCC_WSR_OFF) +#define VSCC_WEWS_OFF 4 /* 4: Write Enable on Write Status */ +#define VSCC_WEWS (0x1 << VSCC_WEWS_OFF) + /* 5-7: reserved */ +#define VSCC_EO_OFF 8 /* 8-15: Erase Opcode */ +#define VSCC_EO (0xff << VSCC_EO_OFF) + /* 16-22: reserved */ +#define VSCC_VCL_OFF 23 /* 23: Vendor Component Lock */ +#define VSCC_VCL (0x1 << VSCC_VCL_OFF) + /* 24-31: reserved */ + +#define pprint_reg(reg, bit, val, sep) msg_pdbg("%s=%d" sep, #bit, (val & reg##_##bit)>>reg##_##bit##_OFF) +#define pprint_reg_hex(reg, bit, val, sep) msg_pdbg("%s=0x%x" sep, #bit, (val & reg##_##bit)>>reg##_##bit##_OFF) +void prettyprint_ich9_reg_vscc(uint32_t reg_val); + +enum chipset { + CHIPSET_UNKNOWN, + CHIPSET_ICH7 = 7, + CHIPSET_ICH8, + CHIPSET_ICH9, + CHIPSET_ICH10, + CHIPSET_SERIES_5_IBEX_PEAK, + CHIPSET_SERIES_6_COUGAR_POINT, + CHIPSET_SERIES_7_PANTHER_POINT +}; + +struct flash_content { + uint32_t FLVALSIG; /* 0x00 */ + union { /* 0x04 */ + uint32_t FLMAP0; + struct { + uint32_t FCBA :8; + uint32_t NC :2; + uint32_t :6; + uint32_t FRBA :8; + uint32_t NR :3; + uint32_t :5; + }; + }; + union { /* 0x08 */ + uint32_t FLMAP1; + struct { + uint32_t FMBA :8; + uint32_t NM :3; + uint32_t :5; + union { + uint32_t FISBA :8; + uint32_t FPSBA :8; + }; + uint32_t ISL :8; + }; + }; + union { /* 0x0c */ + uint32_t FLMAP2; + struct { + uint32_t FMSBA :8; + uint32_t MSL :8; + uint32_t :16; + }; + }; +}; + +struct flash_component { + union { /* 0x00 */ + uint32_t FLCOMP; + struct { + uint32_t comp1_density :3; + uint32_t comp2_density :3; + uint32_t :11; + uint32_t freq_read :3; + uint32_t fastread :1; + uint32_t freq_fastread :3; + uint32_t freq_write :3; + uint32_t freq_read_id :3; + uint32_t :2; + }; + }; + union { /* 0x04 */ + uint32_t FLILL; + struct { + uint32_t invalid_instr0; + uint32_t invalid_instr1; + uint32_t invalid_instr2; + uint32_t invalid_instr3; + }; + }; + union { /* 0x08 */ + uint32_t FLPB; + struct { + uint32_t FPBA :13; + uint32_t :19; + }; + }; +}; + +struct flash_region { + + union { + uint32_t FLREG0; /* Flash Descriptor */ + struct { + uint32_t reg0_base :13; + uint32_t :3; + uint32_t reg0_limit :13; + uint32_t :3; + }; + }; + union { + uint32_t FLREG1; /* BIOS */ + struct { + uint32_t reg1_base :13; + uint32_t :3; + uint32_t reg1_limit :13; + uint32_t :3; + }; + }; + union { + uint32_t FLREG2; /* ME */ + struct { + uint32_t reg2_base :13; + uint32_t :3; + uint32_t reg2_limit :13; + uint32_t :3; + }; + }; + union { + uint32_t FLREG3; /* GbE */ + struct { + uint32_t reg3_base :13; + uint32_t :3; + uint32_t reg3_limit :13; + uint32_t :3; + }; + }; +}; + +struct flash_master { + union { + uint32_t FLMSTR1; + struct { + uint32_t BIOS_req_ID :16; + uint32_t BIOS_descr_read :1; + uint32_t BIOS_BIOS_read :1; + uint32_t BIOS_ME_read :1; + uint32_t BIOS_GbE_read :1; + uint32_t BIOS_plat_read :1; + uint32_t :3; + uint32_t BIOS_descr_write :1; + uint32_t BIOS_BIOS_write :1; + uint32_t BIOS_ME_write :1; + uint32_t BIOS_GbE_write :1; + uint32_t BIOS_plat_write :1; + uint32_t :3; + }; + }; + union { + uint32_t FLMSTR2; + struct { + uint32_t ME_req_ID :16; + uint32_t ME_descr_read :1; + uint32_t ME_BIOS_read :1; + uint32_t ME_ME_read :1; + uint32_t ME_GbE_read :1; + uint32_t ME_plat_read :1; + uint32_t :3; + uint32_t ME_descr_write :1; + uint32_t ME_BIOS_write :1; + uint32_t ME_ME_write :1; + uint32_t ME_GbE_write :1; + uint32_t ME_plat_write :1; + uint32_t :3; + }; + }; + union { + uint32_t FLMSTR3; + struct { + uint32_t GbE_req_ID :16; + uint32_t GbE_descr_read :1; + uint32_t GbE_BIOS_read :1; + uint32_t GbE_ME_read :1; + uint32_t GbE_GbE_read :1; + uint32_t GbE_plat_read :1; + uint32_t :3; + uint32_t GbE_descr_write :1; + uint32_t GbE_BIOS_write :1; + uint32_t GbE_ME_write :1; + uint32_t GbE_GbE_write :1; + uint32_t GbE_plat_write :1; + uint32_t :3; + }; + }; +}; + +struct flash_descriptors { + struct flash_content content; + struct flash_component component; + struct flash_region region; + struct flash_master master; +}; + +void prettyprint_ich_descriptors(enum chipset, const struct flash_descriptors *desc); + +void prettyprint_ich_descriptor_content(const struct flash_content *content); +void prettyprint_ich_descriptor_component(const struct flash_descriptors *desc); +void prettyprint_ich_descriptor_region(const struct flash_region *region); +void prettyprint_ich_descriptor_master(const struct flash_master *master); + +void read_ich_descriptors_via_fdo(void *spibar, struct flash_descriptors *desc); + +#endif // __ICH_DESCRIPTORS_H__ +#endif // defined(__i386__) || defined(__x86_64__) diff --git a/ichspi.c b/ichspi.c index 2480fa5..edca654 100644 --- a/ichspi.c +++ b/ichspi.c @@ -30,6 +30,7 @@ #include "chipdrivers.h" #include "programmer.h" #include "spi.h" +#include "ich_descriptors.h" /* ICH9 controller register definition */ #define ICH9_REG_HSFS 0x04 /* 16 Bits Hardware Sequencing Flash Status */ @@ -120,6 +121,14 @@ #define ICH9_REG_BBAR 0xA0 /* 32 Bits BIOS Base Address Configuration */ #define BBAR_MASK 0x00ffff00 /* 8-23: Bottom of System Flash */ +#define ICH9_REG_LVSCC 0xC4 /* 32 Bits Host Lower Vendor Specific Component Capabilities */ +#define ICH9_REG_UVSCC 0xC8 /* 32 Bits Host Upper Vendor Specific Component Capabilities */ +/* The individual fields of the VSCC registers are defined in the file + * ich_descriptors.h. The reason is that the same fields are also used in the + * flash descriptors to define the properties of the different flash chips + * supported by the BIOS image. These descriptors are also the source for the + * registers above. */ + #define ICH9_REG_FPB 0xD0 /* 32 Bits Flash Partition Boundary */ #define FPB_FPBA_OFF 0 /* 0-12: Block/Sector Erase Size */ #define FPB_FPBA (0x1FFF << FPB_FPBA_OFF) @@ -302,8 +311,6 @@ static void prettyprint_opcodes(OPCODES *ops) } } -#define pprint_reg(reg, bit, val, sep) msg_pdbg("%s=%d" sep, #bit, (val & reg##_##bit)>>reg##_##bit##_OFF) - static void prettyprint_ich9_reg_hsfs(uint16_t reg_val) { msg_pdbg("HSFS: "); @@ -1191,6 +1198,7 @@ int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, uint8_t old, new; uint16_t spibar_offset, tmp2; uint32_t tmp; + int ichspi_desc = 0; switch (ich_generation) { case 7: @@ -1262,6 +1270,8 @@ int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, msg_pinfo("WARNING: SPI Configuration Lockdown activated.\n"); ichspi_lock = 1; } + if (tmp2 & HSFS_FDV) + ichspi_desc = 1; tmp2 = mmio_readw(ich_spibar + ICH9_REG_HSFC); msg_pdbg("0x06: 0x%04x (HSFC)\n", tmp2); @@ -1312,9 +1322,26 @@ int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, ichspi_bbar = mmio_readl(ich_spibar + ICH9_REG_BBAR); msg_pdbg("0xA0: 0x%08x (BBAR)\n", ichspi_bbar); + + tmp = mmio_readl(ich_spibar + ICH9_REG_LVSCC); + msg_pdbg("0xC4: 0x%08x (LVSCC)\n", tmp); + msg_pdbg("LVSCC: "); + prettyprint_ich9_reg_vscc(tmp); + + tmp = mmio_readl(ich_spibar + ICH9_REG_UVSCC); + msg_pdbg("0xC8: 0x%08x (UVSCC)\n", tmp); + msg_pdbg("UVSCC: "); + prettyprint_ich9_reg_vscc(tmp); + tmp = mmio_readl(ich_spibar + ICH9_REG_FPB); msg_pdbg("0xD0: 0x%08x (FPB)\n", tmp); + msg_pdbg("\n"); + if (ichspi_desc) { + struct flash_descriptors desc = {{ 0 }}; + read_ich_descriptors_via_fdo(ich_spibar, &desc); + prettyprint_ich_descriptors(CHIPSET_UNKNOWN, &desc); + } ich_init_opcodes(); break; default: -- 1.7.1

1 0

[PATCH 1/4] ichspi.c: refactor filling and reading the fdata/spid registers
by Stefan Tauner 14 Jul '11

14 Jul '11

- add ich_fill_data to fill the chipset registers from an array - add ich_read_data to copy the data from the chipset register into an array - replace the existing code with calls to those functions - minor cosmetic changes Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> --- ichspi.c | 135 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 57 insertions(+), 78 deletions(-) diff --git a/ichspi.c b/ichspi.c index 99c4613..2480fa5 100644 --- a/ichspi.c +++ b/ichspi.c @@ -6,6 +6,7 @@ * Copyright (C) 2008 Dominik Geyer <dominik.geyer(a)kontron.com> * Copyright (C) 2008 coresystems GmbH <info(a)coresystems.de> * Copyright (C) 2009, 2010 Carl-Daniel Hailfinger + * Copyright (C) 2011 Stefan Tauner * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,18 +23,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/* - * This module is designed for supporting the devices - * ST M25P40 - * ST M25P80 - * ST M25P16 - * ST M25P32 already tested - * ST M25P64 - * AT 25DF321 already tested - * ... and many more SPI flash devices - * - */ - #if defined(__i386__) || defined(__x86_64__) #include <string.h> @@ -293,7 +282,7 @@ static OPCODE POSSIBLE_OPCODES[] = { static OPCODES O_EXISTING = {}; /* pretty printing functions */ -static void pretty_print_opcodes(OPCODES *ops) +static void prettyprint_opcodes(OPCODES *ops) { if(ops == NULL) return; @@ -592,6 +581,51 @@ static void ich_set_bbar(uint32_t min_addr) msg_perr("Setting BBAR failed!\n"); } +/* Read len bytes from the fdata/spid register into the data array. + * + * Note that using len > spi_programmer->max_data_read will return garbage or + * may even crash. + */ + static void ich_read_data(uint8_t *data, int len, int reg0_off) + { + int i; + uint32_t temp32 = 0; + + for (i = 0; i < len; i++) { + if ((i % 4) == 0) + temp32 = REGREAD32(reg0_off + i); + + data[i] = (temp32 >> ((i % 4) * 8)) & 0xff; + } +} + +/* Fill len bytes from the data array into the fdata/spid registers. + * + * Note that using len > spi_programmer->max_data_write will trash the registers + * following the data registers. + */ +static void ich_fill_data(const uint8_t *data, int len, int reg0_off) +{ + uint32_t temp32 = 0; + int i; + + if (len <= 0) + return; + + for (i = 0; i < len; i++) { + if ((i % 4) == 0) + temp32 = 0; + + temp32 |= ((uint32_t) data[i]) << ((i % 4) * 8); + + if ((i % 4) == 3) /* 32 bits are full, write them to regs. */ + REGWRITE32(reg0_off + (i - (i % 4)), temp32); + } + i--; + if ((i % 4) != 3) /* Write remaining data to regs. */ + REGWRITE32(reg0_off + (i - (i % 4)), temp32); +} + /* This function generates OPCODES from or programs OPCODES to ICH according to * the chipset's SPI configuration lock. * @@ -627,7 +661,7 @@ static int ich_init_opcodes(void) } else { curopcodes = curopcodes_done; msg_pdbg("done\n"); - pretty_print_opcodes(curopcodes); + prettyprint_opcodes(curopcodes); msg_pdbg("\n"); return 0; } @@ -638,9 +672,8 @@ static int ich7_run_opcode(OPCODE op, uint32_t offset, { int write_cmd = 0; int timeout; - uint32_t temp32 = 0; + uint32_t temp32; uint16_t temp16; - uint32_t a; uint64_t opmenu; int opcode_index; @@ -664,26 +697,8 @@ static int ich7_run_opcode(OPCODE op, uint32_t offset, REGWRITE32(ICH7_REG_SPIA, (offset & 0x00FFFFFF) | temp32); /* Program data into SPID0 to N */ - if (write_cmd && (datalength != 0)) { - temp32 = 0; - for (a = 0; a < datalength; a++) { - if ((a % 4) == 0) { - temp32 = 0; - } - - temp32 |= ((uint32_t) data[a]) << ((a % 4) * 8); - - if ((a % 4) == 3) { - REGWRITE32(ICH7_REG_SPID0 + (a - (a % 4)), - temp32); - } - } - if (((a - 1) % 4) != 3) { - REGWRITE32(ICH7_REG_SPID0 + - ((a - 1) - ((a - 1) % 4)), temp32); - } - - } + if (write_cmd && (datalength != 0)) + ich_fill_data(data, datalength, ICH7_REG_SPID0); /* Assemble SPIS */ temp16 = REGREAD16(ICH7_REG_SPIS); @@ -764,17 +779,8 @@ static int ich7_run_opcode(OPCODE op, uint32_t offset, return 1; } - if ((!write_cmd) && (datalength != 0)) { - for (a = 0; a < datalength; a++) { - if ((a % 4) == 0) { - temp32 = REGREAD32(ICH7_REG_SPID0 + (a)); - } - - data[a] = - (temp32 & (((uint32_t) 0xff) << ((a % 4) * 8))) - >> ((a % 4) * 8); - } - } + if ((!write_cmd) && (datalength != 0)) + ich_read_data(data, datalength, ICH7_REG_SPID0); return 0; } @@ -785,7 +791,6 @@ static int ich9_run_opcode(OPCODE op, uint32_t offset, int write_cmd = 0; int timeout; uint32_t temp32; - uint32_t a; uint64_t opmenu; int opcode_index; @@ -810,25 +815,8 @@ static int ich9_run_opcode(OPCODE op, uint32_t offset, REGWRITE32(ICH9_REG_FADDR, (offset & 0x00FFFFFF) | temp32); /* Program data into FDATA0 to N */ - if (write_cmd && (datalength != 0)) { - temp32 = 0; - for (a = 0; a < datalength; a++) { - if ((a % 4) == 0) { - temp32 = 0; - } - - temp32 |= ((uint32_t) data[a]) << ((a % 4) * 8); - - if ((a % 4) == 3) { - REGWRITE32(ICH9_REG_FDATA0 + (a - (a % 4)), - temp32); - } - } - if (((a - 1) % 4) != 3) { - REGWRITE32(ICH9_REG_FDATA0 + - ((a - 1) - ((a - 1) % 4)), temp32); - } - } + if (write_cmd && (datalength != 0)) + ich_fill_data(data, datalength, ICH9_REG_FDATA0); /* Assemble SSFS + SSFC */ temp32 = REGREAD32(ICH9_REG_SSFS); @@ -916,17 +904,8 @@ static int ich9_run_opcode(OPCODE op, uint32_t offset, return 1; } - if ((!write_cmd) && (datalength != 0)) { - for (a = 0; a < datalength; a++) { - if ((a % 4) == 0) { - temp32 = REGREAD32(ICH9_REG_FDATA0 + (a)); - } - - data[a] = - (temp32 & (((uint32_t) 0xff) << ((a % 4) * 8))) - >> ((a % 4) * 8); - } - } + if ((!write_cmd) && (datalength != 0)) + ich_read_data(data, datalength, ICH9_REG_FDATA0); return 0; } -- 1.7.1

1 0

[PATCH 0/4] ichspi 7.0
by Stefan Tauner 14 Jul '11

14 Jul '11

the first one is already acked, but not committed yet, because i want it to be tested first (again :). i have worked a lot on the descriptor patch: - i have split the main part which integrates into flashrom directly (2/4) from the stand-alone utility (3/4). - the global variables are all gone. references to the memory holding the descriptors have to be passed as arguments instead. this is a problem for the hwseq patch, because ich_hwseq_probe no longer has access to the descriptors and can't know number of flashes or their densities without this. a workaround has been added while we are working on the generic opaque programmer framwork. - the structs for the ibex peak straps are now complete, but the big chunk of work - the decoding into human readable output - is not even started. - lots of cleanup done, lots of cleanup to come :) Stefan Tauner (4): ichspi.c: refactor filling and reading the fdata/spid registers add ICH/PCH flash descriptor decoding via FDOC/FDOD add ich_descriptor_tool to decode all flash descriptors stored in a flash dump file ichspi.c: add support for Intel Hardware Sequencing Makefile | 3 +- chipdrivers.h | 6 + flashchips.c | 23 +- flashchips.h | 2 + ich_descriptors.c | 471 ++++++++++++++++++++ ich_descriptors.h | 459 ++++++++++++++++++++ ichspi.c | 495 ++++++++++++++++++---- programmer.h | 1 + util/ich_descriptors_tool/Makefile | 42 ++ util/ich_descriptors_tool/TODO | 5 + util/ich_descriptors_tool/ich_descriptors_tool.c | 197 +++++++++ 11 files changed, 1612 insertions(+), 92 deletions(-) create mode 100644 ich_descriptors.c create mode 100644 ich_descriptors.h create mode 100644 util/ich_descriptors_tool/Makefile create mode 100644 util/ich_descriptors_tool/TODO create mode 100644 util/ich_descriptors_tool/ich_descriptors_tool.c

1 0

[PATCH] add known board MSI-7369 (K9N Neo V2) ... unsupported
by Melchior FRANZ 14 Jul '11

14 Jul '11

In case this board isn't missing for a particular reason, you may want to add it as unsupported. The problem is its usage of NVIDIA MCP65. I reported the output a while ago, but here again the short form: $ sudo ./flashrom flashrom v0.9.3-r1370 on Linux 2.6.39.3 (x86_64), built with libpci 3.1.7, \ GCC 4.5.1 20101208 [gcc-4_5-branch revision 167585], little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found chipset "NVIDIA MCP65", enabling flash write... \ This chipset is not really supported yet. Guesswork... SPI on this chipset is WIP. Write is unsupported! Mapping NVIDIA MCP6x SPI at 0xfec80000, unaligned size 0x544. Please send the output of "flashrom -V" to flashrom(a)flashrom.org with your board name: flashrom -V as the subject to help us finish support for your chipset. Thanks. OK. This chipset supports the following protocols: SPI. Found chip "Winbond W25X80" (1024 kB, SPI) at physical address 0xfff00000. No operations were specified. m.

3 5

MS-7369 (MSI K9N Neo V2): flashrom -V
by Melchior FRANZ 13 Jul '11

13 Jul '11

flashrom v0.9.3-r1370 on Linux 2.6.39.3 (x86_64) works: reading verifying untested: erasing writing m.

2 3

Re: [flashrom] [PATCH 1/3] ichspi.c: refactor filling and reading the fdata/spid registers
by Carl-Daniel Hailfinger 13 Jul '11

13 Jul '11

Am 01.07.2011 05:38 schrieb Stefan Tauner: > - add ich_fill_data to fill the chipset registers from an array > - add ich_read_data to copy the data from the chipset register into an array > - replace the existing code with calls to those functions > > NB: this changes the semantic of the *run_opcode functions a bit: > previously they could trash the chipset registers following the data registers because there > was no (explicit) length check (it was and is checked by the dispatching run_opcode method). > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > I know you're just moving code, but this is a chance to clean up the code and improve readability. > diff --git a/ichspi.c b/ichspi.c > index 19e52d2..905ed70 100644 > --- a/ichspi.c > +++ b/ichspi.c > @@ -592,6 +592,57 @@ static void ich_set_bbar(uint32_t min_addr) > msg_perr("Setting BBAR failed!\n"); > } > > +/* Reads up to len byte from the fdata/spid register into the data array. > + * The amount actually read is limited by the maximum read size of the > + * chipset. */ > Can you put the terminating */ on its own line like the multiline comments in other files? > + static void ich_read_data(uint8_t *data, int len, int reg0_off) > + { > + int a; > int i would be a nicer name... although you just moved that code, so it's not your fault. > + uint32_t temp32 = 0; > + > + if (len > spi_programmer->max_data_read) > + len = spi_programmer->max_data_read; > Can this really happen? If yes, does it depend on bugs elsewhere in the code? This needs at least a msg_perr("bug in blabla, please report to flashrom@"), we might even want to have the function return int to handle errors. > + > + for (a = 0; a < len; a++) { > + if ((a % 4) == 0) > + temp32 = REGREAD32(reg0_off + (a)); > Are the extra parentheses around a really needed? > + > + data[a] = (temp32 & (((uint32_t) 0xff) << ((a % 4) * 8))) > + >> ((a % 4) * 8); > I think David had a suggestion on how to simplify this formula a bit. > + } > +} > + > +/* Fills up to len bytes from the data array into the fdata/spid registers. > + * The amount actually written is limited by the maximum write size of the > + * chipset and is returned by the function. */ > The result is discarded anyway, and we probably shouldn't call this function with a too big len in the first place, so a return type of void may be the best choice. That said, if you decide to care about the result of this function, please make sure that ich_fill_data and ich_read_data have identical return types and check that the comments above the functions match the prototypes. > +static uint8_t ich_fill_data(const uint8_t *data, int len, int reg0_off) > +{ > + uint32_t temp32 = 0; > + int a; > See ich_read_data. > + > + if (len > spi_programmer->max_data_write) > + len = spi_programmer->max_data_write; > See ich_read_data. > + > + if (len <= 0) > + return 0; > Superfluous check? len<0 should not happen, and len==0 won't execute the for loop below. > + > + for (a = 0; a < len; a++) { > + if ((a % 4) == 0) { > + temp32 = 0; > + } > Please kill superfluous {}. > + > + temp32 |= ((uint32_t) data[a]) << ((a % 4) * 8); > + > + if ((a % 4) == 3) { > + REGWRITE32(reg0_off + (a - (a % 4)), temp32); > + } > Please kill superfluous {}. > + } > + if (((a - 1) % 4) != 3) { > Yeargh! AFAIK modulo for negative integers is implementation-defined. So your len<=0 check a few lines above may have been a good idea. That said, it is a good idea to add a comment so others won't fall into that trap. And all this (a-1) stuff in the line above and below would be a lot more readable if you inserted a--; before the if. > + REGWRITE32(reg0_off + ((a - 1) - ((a - 1) % 4)), temp32); > + } > Please kill superfluous {}. > + return len; > +} > + > /* This function generates OPCODES from or programs OPCODES to ICH according to > * the chipset's SPI configuration lock. > * > @@ -638,9 +689,8 @@ static int ich7_run_opcode(OPCODE op, uint32_t offset, > { > int write_cmd = 0; > int timeout; > - uint32_t temp32 = 0; > + uint32_t temp32; > uint16_t temp16; > - uint32_t a; > uint64_t opmenu; > int opcode_index; > > @@ -664,26 +714,8 @@ static int ich7_run_opcode(OPCODE op, uint32_t offset, > REGWRITE32(ICH7_REG_SPIA, (offset & 0x00FFFFFF) | temp32); > > /* Program data into SPID0 to N */ > - if (write_cmd && (datalength != 0)) { > - temp32 = 0; > - for (a = 0; a < datalength; a++) { > - if ((a % 4) == 0) { > - temp32 = 0; > - } > - > - temp32 |= ((uint32_t) data[a]) << ((a % 4) * 8); > - > - if ((a % 4) == 3) { > - REGWRITE32(ICH7_REG_SPID0 + (a - (a % 4)), > - temp32); > - } > - } > - if (((a - 1) % 4) != 3) { > - REGWRITE32(ICH7_REG_SPID0 + > - ((a - 1) - ((a - 1) % 4)), temp32); > - } > - > - } > + if (write_cmd && (datalength != 0)) > + ich_fill_data(data, datalength, ICH7_REG_SPID0); > Nice! Killed superfluous {}. > > /* Assemble SPIS */ > temp16 = REGREAD16(ICH7_REG_SPIS); > @@ -765,15 +797,7 @@ static int ich7_run_opcode(OPCODE op, uint32_t offset, > } > > if ((!write_cmd) && (datalength != 0)) { > - for (a = 0; a < datalength; a++) { > - if ((a % 4) == 0) { > - temp32 = REGREAD32(ICH7_REG_SPID0 + (a)); > - } > - > - data[a] = > - (temp32 & (((uint32_t) 0xff) << ((a % 4) * 8))) > - >> ((a % 4) * 8); > - } > + ich_read_data(data, datalength, ICH7_REG_SPID0); > Can you kill {} here as well? > } > > return 0; > @@ -785,7 +809,6 @@ static int ich9_run_opcode(OPCODE op, uint32_t offset, > int write_cmd = 0; > int timeout; > uint32_t temp32; > - uint32_t a; > uint64_t opmenu; > int opcode_index; > > @@ -810,25 +833,8 @@ static int ich9_run_opcode(OPCODE op, uint32_t offset, > REGWRITE32(ICH9_REG_FADDR, (offset & 0x00FFFFFF) | temp32); > > /* Program data into FDATA0 to N */ > - if (write_cmd && (datalength != 0)) { > - temp32 = 0; > - for (a = 0; a < datalength; a++) { > - if ((a % 4) == 0) { > - temp32 = 0; > - } > - > - temp32 |= ((uint32_t) data[a]) << ((a % 4) * 8); > - > - if ((a % 4) == 3) { > - REGWRITE32(ICH9_REG_FDATA0 + (a - (a % 4)), > - temp32); > - } > - } > - if (((a - 1) % 4) != 3) { > - REGWRITE32(ICH9_REG_FDATA0 + > - ((a - 1) - ((a - 1) % 4)), temp32); > - } > - } > + if (write_cmd && (datalength != 0)) > + ich_fill_data(data, datalength, ICH9_REG_FDATA0); > > /* Assemble SSFS + SSFC */ > temp32 = REGREAD32(ICH9_REG_SSFS); > @@ -917,15 +923,7 @@ static int ich9_run_opcode(OPCODE op, uint32_t offset, > } > > if ((!write_cmd) && (datalength != 0)) { > - for (a = 0; a < datalength; a++) { > - if ((a % 4) == 0) { > - temp32 = REGREAD32(ICH9_REG_FDATA0 + (a)); > - } > - > - data[a] = > - (temp32 & (((uint32_t) 0xff) << ((a % 4) * 8))) > - >> ((a % 4) * 8); > - } > + ich_read_data(data, datalength, ICH9_REG_FDATA0); > Kill superfluous {} > } > > return 0; > Regards, Carl-Daniel -- http://www.hailfinger.org/

2 3

Desktop Summit 2011 in Berlin
by Paul Menzel 13 Jul '11

13 Jul '11

Dear coreboot folks, the Desktop Summit 2011 [1] will take place in Berlin from August 6th– 12th. The first three days will consist of keynotes and talks [2]. There seem to be some open slots on Monday and maybe on the weekend evening too. I am CCing Lennart Poettering as one of the organizers(?). Knowing that some coreboot or flashrom developers live in Berlin it would be awesome if one of them could present coreboot or flashrom. For coreboot a short introduction and demonstration of for example the ThinkPad X60/T60 and ASRock E350M1 would be a good idea. I know this is on short notice and the Desktop Summit is normally associated with GNOME and KDE and therefore coreboot seems out of place. But in my opinion – if accepted – coreboot could reach *developers* who might be interested in the possibilities of coreboot and do not know about this. flashrom could be interesting for the desktop developers to know that there are tools to upgrade the BIOS from the desktop and maybe someone is motivated to code up a GUI (graphical user interface) for flashrom. That is just a thought and I do not know how easy that would be and if flashrom provides these kinds of means to be hooked up to a GUI. I would do it, but I am only able to be there on Saturday and not being that knowledgeable with the internals I would rather not do it. Thanks, Paul [1] https://desktopsummit.org/ [2] https://desktopsummit.org/program

2 1

[commit] r1372 - trunk
by repository service 13 Jul '11

13 Jul '11

Author: stefanct Date: Wed Jul 13 22:48:54 2011 New Revision: 1372 URL: http://flashrom.org/trac/flashrom/changeset/1372 Log: enable writing on mcp6x_7x this was deliberately disabled until now, but seems to work well enough. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/chipset_enable.c Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Wed Jul 13 13:22:03 2011 (r1371) +++ trunk/chipset_enable.c Wed Jul 13 22:48:54 2011 (r1372) @@ -912,8 +912,9 @@ */ buses_supported = CHIP_BUSTYPE_NONE; msg_pdbg("Flash bus type is SPI\n"); - msg_perr("SPI on this chipset is WIP. Write is unsupported!\n"); - programmer_may_write = 0; + msg_pinfo("SPI on this chipset is WIP. Please report any " + "success or failure by mailing us the verbose " + "output to flashrom(a)flashrom.org, thanks!\n"); break; default: /* Should not happen. */

1 0

[commit] r1371 - trunk
by repository service 13 Jul '11

13 Jul '11

Author: uwe Date: Wed Jul 13 13:22:03 2011 New Revision: 1371 URL: http://flashrom.org/trac/flashrom/changeset/1371 Log: Change "class" parameter name to "devclass" to avoid C++ issues. In C++ "class" is a reserved keyword, and as we'll want to use libflashrom from C++ code at some point, let's make sure it doesn't cause issues. Other places in the code already used "devclass" anyway, so it also increases consistency and readability a bit. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/internal.c trunk/programmer.h Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Wed Jul 13 00:35:21 2011 (r1370) +++ trunk/internal.c Wed Jul 13 13:22:03 2011 (r1371) @@ -35,7 +35,7 @@ return NULL; } -struct pci_dev *pci_dev_find_vendorclass(uint16_t vendor, uint16_t class) +struct pci_dev *pci_dev_find_vendorclass(uint16_t vendor, uint16_t devclass) { struct pci_dev *temp; struct pci_filter filter; @@ -48,7 +48,7 @@ if (pci_filter_match(&filter, temp)) { /* Read PCI class */ tmp2 = pci_read_word(temp, 0x0a); - if (tmp2 == class) + if (tmp2 == devclass) return temp; } Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Wed Jul 13 00:35:21 2011 (r1370) +++ trunk/programmer.h Wed Jul 13 13:22:03 2011 (r1371) @@ -289,7 +289,7 @@ #endif #if NEED_PCI == 1 struct pci_dev *pci_dev_find_filter(struct pci_filter filter); -struct pci_dev *pci_dev_find_vendorclass(uint16_t vendor, uint16_t class); +struct pci_dev *pci_dev_find_vendorclass(uint16_t vendor, uint16_t devclass); struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device); struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, uint16_t card_vendor, uint16_t card_device);

1 0

Re: [flashrom] [PATCH] fix unchecked malloc calls
by Uwe Hermann 12 Jul '11

12 Jul '11

On Fri, Jul 01, 2011 at 06:05:07AM +0200, Stefan Tauner wrote: > compile tested only. > btw... why dont we wrap malloc to automatically include these checks? > there is probably a patch somewhere that adds totally awesome shutdown code in OOM cases, > but afaics we just print a warning and exit right now... it is just stupid to do the checks in the real > code then. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> It's definately better than what we have now (no error checking at all), so: Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> A few notes for later though: - We should call any shutdown function which may need to be called in the respective places (and any free()s which may be needed). - Later we should not exit(1) upon the error, but rather return an error code instead (e.g. FL_ERR_MALLOC or similar), at least in all public "API" functions which are meant to be in the upcoming libflashrom. - A small xmalloc() wrapper (or use another name) would indeed be nice, too, but once we really return error codes etc. it's not really useful anymore I think. Uwe. -- http://hermann-uwe.de | http://sigrok.org http://randomprojects.org | http://unmaintained-free-software.org

2 1

[commit] r1370 - trunk
by repository service 12 Jul '11

12 Jul '11

Author: stefanct Date: Wed Jul 13 00:35:21 2011 New Revision: 1370 URL: http://flashrom.org/trac/flashrom/changeset/1370 Log: fix unchecked malloc calls and casts of malloc return values in the long term the exit calls should be replaced by returns. until then this is the correct way to handle failures. the casts are not needed (in C) and we don't cast malloc return values anywhere else. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/flashrom.c trunk/hwaccess.c trunk/pcidev.c trunk/serial.c Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Wed Jul 13 00:01:44 2011 (r1369) +++ trunk/flashrom.c Wed Jul 13 00:35:21 2011 (r1370) @@ -1513,7 +1513,11 @@ unsigned int usable_erasefunctions = count_usable_erasers(flash); msg_cinfo("Erasing and writing flash chip... "); - curcontents = (uint8_t *) malloc(size); + curcontents = malloc(size); + if (!curcontents) { + msg_gerr("Out of memory!\n"); + exit(1); + } /* Copy oldcontents to curcontents to avoid clobbering oldcontents. */ memcpy(curcontents, oldcontents, size); @@ -1880,10 +1884,18 @@ goto out_nofree; } - oldcontents = (uint8_t *) malloc(size); + oldcontents = malloc(size); + if (!oldcontents) { + msg_gerr("Out of memory!\n"); + exit(1); + } /* Assume worst case: All bits are 0. */ memset(oldcontents, 0x00, size); - newcontents = (uint8_t *) malloc(size); + newcontents = malloc(size); + if (!newcontents) { + msg_gerr("Out of memory!\n"); + exit(1); + } /* Assume best case: All bits should be 1. */ memset(newcontents, 0xff, size); /* Side effect of the assumptions above: Default write action is erase Modified: trunk/hwaccess.c ============================================================================== --- trunk/hwaccess.c Wed Jul 13 00:01:44 2011 (r1369) +++ trunk/hwaccess.c Wed Jul 13 00:35:21 2011 (r1370) @@ -226,6 +226,10 @@ { \ struct undo_mmio_write_data *undo_mmio_write_data; \ undo_mmio_write_data = malloc(sizeof(struct undo_mmio_write_data)); \ + if (!undo_mmio_write_data) { \ + msg_gerr("Out of memory!\n"); \ + exit(1); \ + } \ undo_mmio_write_data->addr = a; \ undo_mmio_write_data->type = mmio_write_type_##c; \ undo_mmio_write_data->c##data = mmio_read##c(a); \ Modified: trunk/pcidev.c ============================================================================== --- trunk/pcidev.c Wed Jul 13 00:01:44 2011 (r1369) +++ trunk/pcidev.c Wed Jul 13 00:35:21 2011 (r1370) @@ -295,6 +295,10 @@ { \ struct undo_pci_write_data *undo_pci_write_data; \ undo_pci_write_data = malloc(sizeof(struct undo_pci_write_data)); \ + if (!undo_pci_write_data) { \ + msg_gerr("Out of memory!\n"); \ + exit(1); \ + } \ undo_pci_write_data->dev = *a; \ undo_pci_write_data->reg = b; \ undo_pci_write_data->type = pci_write_type_##c; \ Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Wed Jul 13 00:01:44 2011 (r1369) +++ trunk/serial.c Wed Jul 13 00:35:21 2011 (r1370) @@ -110,6 +110,8 @@ (tolower((unsigned char)dev[1]) == 'o') && (tolower((unsigned char)dev[2]) == 'm')) { dev2 = malloc(strlen(dev) + 5); + if (!dev2) + sp_die("Error: Out of memory"); strcpy(dev2, "\\\\.\\"); strcpy(dev2 + 4, dev); }

1 0

MSI K9A2 Platinum OK
by Sylvain BERTRAND 12 Jul '11

12 Jul '11

Hi, Successfully flashed BIOS v1.9 on this motherboard. Cheers, Sylvain BERTRAND

2 2

MSI "K8MM-V" (MS-7142) successful BIOS update
by Benjamin Bellec 11 Jul '11

11 Jul '11

Hello, I successfully flash this motherboard with a "Winbond W39V040A" (512 kB, LPC) chip which is currently tagged as UNTESTED for ERASE and WRITE. Flash from BIOS version 1.0 to 1.A (the last one). http://eu.msi.com/product/mb/K8MM-V.html Here are the logs. Benjamin

2 1

Re: [flashrom] Report scan flashrom v0.9.3-r1299 for Asus M2N-MX SE Plus
by Paul Menzel 11 Jul '11

11 Jul '11

Dear Alexabder, Am Montag, den 11.07.2011, 20:46 +0300 schrieb Senior College Krikoon Hilton Enterprise: > I Alexabder > I very hope and trust you > How many time you need do this? I am sorry I do not understand your question. What do we need to do? > [root@localhost flashrom]# flashrom -V > flashrom v0.9.3-r1299 on Linux 2.6.38.8-32.fc15.i686 (i686), built with > libpci 3.1.7, GCC 4.6.0 20110428 (Red Hat 4.6.0-6), little endian > flashrom is free software, get the source code at http://www.flashrom.org […] If you want to upgrade you BIOS you should try a newer version [1][2] and make sure you can recover from a failed flashing operation if your motherboard is not marked as supported. Thanks, Paul [1] http://flashrom.org/Flashrom [2] http://flashrom.org/Downloads

1 0

Report scan flashrom v0.9.3-r1299
by Senior College Krikoon Hilton Enterprise 11 Jul '11

11 Jul '11

I Alexabder I very hope and trust you How many time you need do this? [root@localhost flashrom]# flashrom -V flashrom v0.9.3-r1299 on Linux 2.6.38.8-32.fc15.i686 (i686), built with libpci 3.1.7, GCC 4.6.0 20110428 (Red Hat 4.6.0-6), little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OS timer resolution is 3 usecs, 1029M loops per second, 10 myus = 10 us, 100 myus = 95 us, 1000 myus = 1033 us, 10000 myus = 9413 us, 12 myus = 12 us, OK. Initializing internal programmer No coreboot table found. DMI string system-manufacturer: "System manufacturer" DMI string system-product-name: "System Product Name" DMI string system-version: "System Version" DMI string baseboard-manufacturer: "ASUSTeK Computer INC." DMI string baseboard-product-name: "M2N-MX SE Plus" DMI string baseboard-version: "Rev x.xx" DMI string chassis-type: "Desktop" Found ITE Super I/O, ID 0x8712 on port 0x2e Found chipset "NVIDIA MCP61", enabling flash write... chipset PCI ID is 10de:03e0, This chipset is not really supported yet. Guesswork... ISA/LPC bridge reg 0x8a contents: 0x40, bit 6 is 1, bit 5 is 0 Flash bus type is SPI SPI on this chipset is WIP. Write is unsupported! Found SMBus device 10de:03eb at 00:01:1 MCP SPI BAR is at 0xfec80000 Mapping NVIDIA MCP6x SPI at 0xfec80000, unaligned size 0x544. SPI control is 0x0002, req=0, gnt=0 Please send the output of "flashrom -V" to flashrom(a)flashrom.org with your board name: flashrom -V as the subject to help us finish support for your chipset. Thanks. OK. This chipset supports the following protocols: SPI. Super I/O ID 0x8712 is not on the list of flash capable controllers. Probing for AMD Am29F010A/B, 128 KB: skipped. Probing for AMD Am29F002(N)BB, 256 KB: skipped. Probing for AMD Am29F002(N)BT, 256 KB: skipped. Probing for AMD Am29F016D, 2048 KB: skipped. Probing for AMD Am29F040B, 512 KB: skipped. Probing for AMD Am29F080B, 1024 KB: skipped. Probing for AMD Am29LV001BB, 128 KB: skipped. Probing for AMD Am29LV001BT, 128 KB: skipped. Probing for AMD Am29LV002BB, 256 KB: skipped. Probing for AMD Am29LV002BT, 256 KB: skipped. Probing for AMD Am29LV004BB, 512 KB: skipped. Probing for AMD Am29LV004BT, 512 KB: skipped. Probing for AMD Am29LV008BB, 1024 KB: skipped. Probing for AMD Am29LV008BT, 1024 KB: skipped. Probing for AMD Am29LV040B, 512 KB: skipped. Probing for AMD Am29LV081B, 1024 KB: skipped. Probing for AMIC A25L05PT, 64 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L05PU, 64 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L10PT, 128 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L10PU, 128 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L20PT, 256 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L20PU, 256 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L40PT, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L40PU, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L80P, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L16PT, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L16PU, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L512, 64 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L010, 128 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L020, 256 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L040, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L080, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L016, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L032, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25LQ032, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A29002B, 256 KB: skipped. Probing for AMIC A29002T, 256 KB: skipped. Probing for AMIC A29040B, 512 KB: skipped. Probing for AMIC A49LF040A, 512 KB: skipped. Probing for Atmel AT25DF021, 256 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25DF041A, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25DF081, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25DF081A, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25DF161, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25DF321, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25DF321A, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25DF641, 8192 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25DQ161, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25F512B, 64 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25FS010, 128 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25FS040, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT26DF041, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT26DF081A, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT26DF161, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT26DF161A, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT26F004, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT29C512, 64 KB: skipped. Probing for Atmel AT29C010A, 128 KB: skipped. Probing for Atmel AT29C020, 256 KB: skipped. Probing for Atmel AT29C040A, 512 KB: skipped. Probing for Atmel AT45CS1282, 16896 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB011D, 128 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB021D, 256 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB041D, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB081D, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB161D, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB321C, 4224 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB321D, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB642D, 8192 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT49BV512, 64 KB: skipped. Probing for Atmel AT49F020, 256 KB: skipped. Probing for Atmel AT49F002(N), 256 KB: skipped. Probing for Atmel AT49F002(N)T, 256 KB: skipped. Probing for Bright BM29F040, 512 KB: skipped. Probing for EMST F49B002UA, 256 KB: skipped. Probing for EMST F25L008A, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B05, 64 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B05T, 64 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B10, 128 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B10T, 128 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B20, 256 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B20T, 256 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B40, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B40T, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B80, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B80T, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B16, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B16T, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B32, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B32T, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B64, 8192 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B64T, 8192 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25D16, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25F05, 64 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25F10, 128 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25F20, 256 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25F40, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25F80, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25F16, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25F32, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN29F010, 128 KB: skipped. Probing for Eon EN29F002(A)(N)B, 256 KB: skipped. Probing for Eon EN29F002(A)(N)T, 256 KB: skipped. Probing for Fujitsu MBM29F004BC, 512 KB: skipped. Probing for Fujitsu MBM29F004TC, 512 KB: skipped. Probing for Fujitsu MBM29F400BC, 512 KB: skipped. Probing for Fujitsu MBM29F400TC, 512 KB: skipped. Probing for Hyundai HY29F002T, 256 KB: skipped. Probing for Hyundai HY29F002B, 256 KB: skipped. Probing for Hyundai HY29F040A, 512 KB: skipped. Probing for Intel 28F001BN/BX-B, 128 KB: skipped. Probing for Intel 28F001BN/BX-T, 128 KB: skipped. Probing for Intel 28F002BC/BL/BV/BX-T, 256 KB: skipped. Probing for Intel 28F008S3/S5/SC, 512 KB: skipped. Probing for Intel 28F004B5/BE/BV/BX-B, 512 KB: skipped. Probing for Intel 28F004B5/BE/BV/BX-T, 512 KB: skipped. Probing for Intel 28F400BV/BX/CE/CV-B, 512 KB: skipped. Probing for Intel 28F400BV/BX/CE/CV-T, 512 KB: skipped. Probing for Intel 82802AB, 512 KB: skipped. Probing for Intel 82802AC, 1024 KB: skipped. Probing for Macronix MX25L512, 64 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L1005, 128 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L2005, 256 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L4005, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L8005, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Chip status register is 00 Chip status register: Status Register Write Disable (SRWD) is not set Chip status register: Bit 6 is not set Chip status register: Bit 5 / Block Protect 3 (BP3) is not set Chip status register: Bit 4 / Block Protect 2 (BP2) is not set Chip status register: Bit 3 / Block Protect 1 (BP1) is not set Chip status register: Bit 2 / Block Protect 0 (BP0) is not set Chip status register: Write Enable Latch (WEL) is not set Chip status register: Write In Progress (WIP/BUSY) is not set Found chip "Macronix MX25L8005" (1024 KB, SPI) at physical address 0xfff00000. Probing for Macronix MX25L1605, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L1635D, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L1635E, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L3205, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L3235D, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L6405, 8192 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L12805, 16384 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX29F001B, 128 KB: skipped. Probing for Macronix MX29F001T, 128 KB: skipped. Probing for Macronix MX29F002B, 256 KB: skipped. Probing for Macronix MX29F002T, 256 KB: skipped. Probing for Macronix MX29F040, 512 KB: skipped. Probing for Macronix MX29LV040, 512 KB: skipped. Probing for MoselVitelic V29C51000B, 64 KB: skipped. Probing for MoselVitelic V29C51000T, 64 KB: skipped. Probing for MoselVitelic V29C51400B, 512 KB: skipped. Probing for MoselVitelic V29C51400T, 512 KB: skipped. Probing for MoselVitelic V29LC51000, 64 KB: skipped. Probing for MoselVitelic V29LC51001, 128 KB: skipped. Probing for MoselVitelic V29LC51002, 256 KB: skipped. Probing for Numonyx M25PE10, 128 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Numonyx M25PE20, 256 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Numonyx M25PE40, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Numonyx M25PE80, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Numonyx M25PE16, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC Pm25LV010, 128 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC Pm25LV016B, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC Pm25LV020, 256 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC Pm25LV040, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC Pm25LV080B, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC Pm25LV512, 64 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC Pm29F002T, 256 KB: skipped. Probing for PMC Pm29F002B, 256 KB: skipped. Probing for PMC Pm39LV010, 128 KB: skipped. Probing for PMC Pm39LV020, 256 KB: skipped. Probing for PMC Pm39LV040, 512 KB: skipped. Probing for PMC Pm49FL002, 256 KB: skipped. Probing for PMC Pm49FL004, 512 KB: skipped. Probing for Sanyo LF25FW203A, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Sharp LHF00L04, 1024 KB: skipped. Probing for Spansion S25FL004A, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Spansion S25FL008A, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Spansion S25FL016A, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Spansion S25FL032A, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Spansion S25FL064A, 8192 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for SST SST25VF010.REMS, 128 KB: probe_spi_rems: id1 0xc2, id2 0x13 Probing for SST SST25VF016B, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for SST SST25VF032B, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for SST SST25VF064C, 8192 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for SST SST25VF040.REMS, 512 KB: probe_spi_rems: id1 0xc2, id2 0x13 Probing for SST SST25VF040B, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for SST SST25LF040A.RES, 512 KB: probe_spi_res2: id1 0x13, id2 0x13 Probing for SST SST25VF040B.REMS, 512 KB: probe_spi_rems: id1 0xc2, id2 0x13 Probing for SST SST25VF080B, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for SST SST28SF040A, 512 KB: skipped. Probing for SST SST29EE010, 128 KB: skipped. Probing for SST SST29LE010, 128 KB: skipped. Probing for SST SST29EE020A, 256 KB: skipped. Probing for SST SST29LE020, 256 KB: skipped. Probing for SST SST39SF512, 64 KB: skipped. Probing for SST SST39SF010A, 128 KB: skipped. Probing for SST SST39SF020A, 256 KB: skipped. Probing for SST SST39SF040, 512 KB: skipped. Probing for SST SST39VF512, 64 KB: skipped. Probing for SST SST39VF010, 128 KB: skipped. Probing for SST SST39VF020, 256 KB: skipped. Probing for SST SST39VF040, 512 KB: skipped. Probing for SST SST39VF080, 1024 KB: skipped. Probing for SST SST49LF002A/B, 256 KB: skipped. Probing for SST SST49LF003A/B, 384 KB: skipped. Probing for SST SST49LF004A/B, 512 KB: skipped. Probing for SST SST49LF004C, 512 KB: skipped. Probing for SST SST49LF008A, 1024 KB: skipped. Probing for SST SST49LF008C, 1024 KB: skipped. Probing for SST SST49LF016C, 2048 KB: skipped. Probing for SST SST49LF020, 256 KB: skipped. Probing for SST SST49LF020A, 256 KB: skipped. Probing for SST SST49LF040, 512 KB: skipped. Probing for SST SST49LF040B, 512 KB: skipped. Probing for SST SST49LF080A, 1024 KB: skipped. Probing for SST SST49LF160C, 2048 KB: skipped. Probing for ST M25P05-A, 64 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P05.RES, 64 KB: Ignoring RES in favour of RDID. Probing for ST M25P10-A, 128 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P10.RES, 128 KB: Ignoring RES in favour of RDID. Probing for ST M25P20, 256 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P40, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P40-old, 512 KB: Ignoring RES in favour of RDID. Probing for ST M25P80, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P16, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P32, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P64, 8192 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P128, 16384 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25PX16, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25PX32, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25PX64, 8192 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M29F002B, 256 KB: skipped. Probing for ST M29F002T/NT, 256 KB: skipped. Probing for ST M29F040B, 512 KB: skipped. Probing for ST M29F400BB, 512 KB: skipped. Probing for ST M29F400BT, 512 KB: skipped. Probing for ST M29W010B, 128 KB: skipped. Probing for ST M29W040B, 512 KB: skipped. Probing for ST M29W512B, 64 KB: skipped. Probing for ST M50FLW040A, 512 KB: skipped. Probing for ST M50FLW040B, 512 KB: skipped. Probing for ST M50FLW080A, 1024 KB: skipped. Probing for ST M50FLW080B, 1024 KB: skipped. Probing for ST M50FW002, 256 KB: skipped. Probing for ST M50FW016, 2048 KB: skipped. Probing for ST M50FW040, 512 KB: skipped. Probing for ST M50FW080, 1024 KB: skipped. Probing for ST M50LPW116, 2048 KB: skipped. Probing for SyncMOS/MoselVitelic {F,S,V}29C51001B, 128 KB: skipped. Probing for SyncMOS/MoselVitelic {F,S,V}29C51001T, 128 KB: skipped. Probing for SyncMOS/MoselVitelic {F,S,V}29C51002B, 256 KB: skipped. Probing for SyncMOS/MoselVitelic {F,S,V}29C51002T, 256 KB: skipped. Probing for SyncMOS/MoselVitelic {F,S,V}29C51004B, 512 KB: skipped. Probing for SyncMOS/MoselVitelic {F,S,V}29C51004T, 512 KB: skipped. Probing for SyncMOS/MoselVitelic {S,V}29C31004B, 512 KB: skipped. Probing for SyncMOS/MoselVitelic {S,V}29C31004T, 512 KB: skipped. Probing for TI TMS29F002RB, 256 KB: skipped. Probing for TI TMS29F002RT, 256 KB: skipped. Probing for Winbond W25Q80, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25Q16, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25Q32, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25Q64, 8192 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25x10, 128 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25x20, 256 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25x40, 512 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25x80, 1024 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25x16, 2048 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25x32, 4096 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25x64, 8192 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W29C010(M)/W29C011A/W29EE011/W29EE012, 128 KB: skipped. Probing for Winbond W29C020(C)/W29C022, 256 KB: skipped. Probing for Winbond W29C040/P, 512 KB: skipped. Probing for Winbond W29C010(M)/W29C011A/W29EE011/W29EE012, 128 KB: skipped. Probing for Winbond W39L040, 512 KB: skipped. Probing for Winbond W39V040A, 512 KB: skipped. Probing for Winbond W39V040B, 512 KB: skipped. Probing for Winbond W39V040C, 512 KB: skipped. Probing for Winbond W39V040FA, 512 KB: skipped. Probing for Winbond W39V040FB, 512 KB: skipped. Probing for Winbond W39V040FC, 512 KB: skipped. Probing for Winbond W39V080A, 1024 KB: skipped. Probing for Winbond W49F002U/N, 256 KB: skipped. Probing for Winbond W49F020, 256 KB: skipped. Probing for Winbond W49V002A, 256 KB: skipped. Probing for Winbond W49V002FA, 256 KB: skipped. Probing for Winbond W39V080FA, 1024 KB: skipped. Probing for Winbond W39V080FA (dual mode), 512 KB: skipped. Probing for AMIC unknown AMIC SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel unknown Atmel SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon unknown Eon SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix unknown Macronix SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC unknown PMC SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for SST unknown SST SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST unknown ST SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Sanyo unknown Sanyo SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Generic unknown SPI chip (RDID), 0 KB: probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Generic unknown SPI chip (REMS), 0 KB: probe_spi_rems: id1 0xc2, id2 0x13 === This flash part has status UNTESTED for operations: WRITE The test status of this chip may have been updated in the latest development version of flashrom. If you are running the latest development version, please email a report to flashrom(a)flashrom.org if any of the above operations work correctly for you with this flash part. Please include the flashrom output with the additional -V option for all operations you tested (-V, -Vr, -Vw, -VE), and mention which mainboard or programmer you tested. Please mention your board in the subject line. Thanks for your help! No operations were specified. [root@localhost flashrom]# A non-text attachment has been stripped: flash-rom-read It is available at http://paste.flashrom.org/view.php?id=691

1 0

Re: [flashrom] Additional voltages
by Stefan Tauner 10 Jul '11

10 Jul '11

On Sun, 10 Jul 2011 16:07:33 -0400 Steven Zakulec <spzakulec(a)gmail.com> wrote: > Index: flashchips.c > =================================================================== > --- flashchips.c (revision 1368) > +++ flashchips.c (working copy) > @@ -143,10 +143,11 @@ > .block_erase = erase_chip_block_jedec, > }, > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {4750, 5250}, /* -55 speed is +-5%, all others +-10% */ > }, > > { > .vendor = "AMD", > .name = "Am29F016D", > @@ -254,10 +255,11 @@ > .block_erase = erase_chip_block_jedec, > }, > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600}, /* -45R speed is 3.0-3.6V, others 2.7-3.6V */ > }, > > { > .vendor = "AMD", > .name = "Am29LV001BT", > @@ -284,10 +286,11 @@ > .block_erase = erase_chip_block_jedec, > }, > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600}, /* -45R speed is 3.0-3.6V, others 2.7-3.6V */ > }, > > { > .vendor = "AMD", > .name = "Am29LV002BB", > @@ -315,10 +318,11 @@ > .block_erase = erase_chip_block_jedec, > }, > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600}, /* -55 speed is 3.0-3.6V, others 2.7-3.6V */ > }, > > { > .vendor = "AMD", > .name = "Am29LV002BT", > @@ -346,10 +350,11 @@ > .block_erase = erase_chip_block_jedec, > }, > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600}, /* -55 speed is 3.0-3.6V, others 2.7-3.6V */ > }, > > { > .vendor = "AMD", > .name = "Am29LV004BB", > @@ -377,10 +382,11 @@ > .block_erase = erase_chip_block_jedec, > }, > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {2700, 3600}, > }, > > { > .vendor = "AMD", > .name = "Am29LV004BT", > @@ -408,10 +414,11 @@ > .block_erase = erase_chip_block_jedec, > }, > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {2700, 3600}, > }, > > { > .vendor = "AMD", > .name = "Am29LV008BB", > @@ -439,10 +446,11 @@ > .block_erase = erase_chip_block_jedec, > }, > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600} /* 3.0-3.6V (-70R), 2.7-3.6V for others */ > }, > > { > .vendor = "AMD", > .name = "Am29LV008BT", > @@ -470,10 +478,11 @@ > .block_erase = erase_chip_block_jedec, > }, > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600} /* 3.0-3.6V (-70R), 2.7-3.6V for others */ > }, > > { > .vendor = "AMD", > .name = "Am29LV040B", > @@ -496,11 +505,11 @@ > .block_erase = erase_chip_block_jedec, > }, > }, > .write = write_jedec_1, > .read = read_memmapped, > - .voltage = {2700, 3600}, > + .voltage = {3000, 3600}, /* 3.0-3.6V (-60R), 2.7-3.6V for others */ > }, > > { > .vendor = "AMD", > .name = "Am29LV081B", > @@ -523,11 +532,11 @@ > .block_erase = erase_chip_block_jedec, > }, > }, > .write = write_jedec_1, > .read = read_memmapped, > - .voltage = {2700, 3600}, > + .voltage = {3000, 3600}, /* regulated voltage range- full range is 2.7-3.6V */ probably a speed grade distinction again? > }, > > { > .vendor = "AMIC", > .name = "A25L05PT", > @@ -589,10 +598,11 @@ > }, > .printlock = spi_prettyprint_status_register_amic_a25l05p, > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > .vendor = "AMIC", > .name = "A25L10PT", > @@ -1330,11 +1340,11 @@ > }, > .printlock = spi_prettyprint_status_register_at25df, > .unlock = spi_disable_blockprotect_at25df, > .write = spi_chip_write_256, > .read = spi_chip_read, > - .voltage = {2300, 3600}, /* Datasheet says 2.3-3.6V or 2.7-3.6V */ > + .voltage = {2700, 3600}, /* Datasheet says there's a 2.3-3.6V & 2.7-3.6V model */ > }, > > { > .vendor = "Atmel", > .name = "AT25DF041A", > @@ -1368,11 +1378,11 @@ > }, > .printlock = spi_prettyprint_status_register_at25df, > .unlock = spi_disable_blockprotect_at25df, > .write = spi_chip_write_256, > .read = spi_chip_read, > - .voltage = {2300, 3600}, /* Datasheet says 2.3-3.6V or 2.7-3.6V */ > + .voltage = {2700, 3600}, /* Datasheet says there's a 2.3-3.6V & 2.7-3.6V model */ > }, > > { > .vendor = "Atmel", > .name = "AT25DF081", > @@ -1444,10 +1454,11 @@ > }, > .printlock = spi_prettyprint_status_register_at25df_sec, > .unlock = spi_disable_blockprotect_at25df_sec, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > .vendor = "Atmel", > .name = "AT25DF161", > @@ -1771,11 +1782,11 @@ > .block_erase = spi_block_erase_20, > } > }, > .write = NULL /* Incompatible Page write */, > .read = spi_chip_read, > - .voltage = {2700, 3600}, /* Datasheet says 3.0-3.6 V or 2.7-3.6 V */ > + .voltage = {2700, 3600}, /* Datasheet says 3.0-3.6 V or 2.7-3.6 V- either range is fine */ that comment is a bit vague... i like the one of the AT25DF041A above better. > }, > > { > .vendor = "Atmel", > .name = "AT26DF081A", > @@ -2112,11 +2123,11 @@ > .tested = TEST_BAD_READ, > .probe = probe_spi_rdid, > .probe_timing = TIMING_ZERO, > .write = NULL, > .read = NULL, > - .voltage = {2500, 3600}, /* Datasheet says 2.5-3.6 V or 2.7-3.6 V */ > + .voltage = {2700, 3600}, /* Datasheet says 2.5-3.6 V or 2.7-3.6 V */ > }, > > { > .vendor = "Atmel", > .name = "AT45DB161D", > @@ -2128,11 +2139,11 @@ > .tested = TEST_BAD_READ, > .probe = probe_spi_rdid, > .probe_timing = TIMING_ZERO, > .write = NULL, > .read = NULL, > - .voltage = {2500, 3600}, /* Datasheet says 2.5-3.6 V or 2.7-3.6 V */ > + .voltage = {2700, 3600}, /* Datasheet says 2.5-3.6 V or 2.7-3.6 V */ > }, > > { > .vendor = "Atmel", > .name = "AT45DB321C", > @@ -2315,10 +2326,11 @@ > .block_erase = erase_chip_block_jedec, > }, > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {4500, 5500}, > }, > > { > .vendor = "EMST", > .name = "F49B002UA", > @@ -3499,10 +3511,11 @@ > .block_erase = erase_chip_block_jedec, > }, > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {4500, 5500}, > }, > > { > .vendor = "Intel", > .name = "28F001BN/BX-B", > @@ -4050,10 +4063,11 @@ > } > }, > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > .vendor = "Macronix", > .name = "MX25L3205", > @@ -4342,10 +4356,11 @@ > .block_erase = erase_chip_block_jedec, > }, > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {4500, 5500}, > }, > > { > .vendor = "Macronix", > .name = "MX29LV040", > @@ -4773,10 +4788,11 @@ > } > }, > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > .vendor = "PMC", > .name = "Pm25LV020", > @@ -4898,10 +4914,11 @@ > } > }, > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > .vendor = "PMC", > .name = "Pm29F002T", > @@ -5199,10 +5216,11 @@ > } > }, > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > .vendor = "Spansion", > .name = "S25FL008A", > @@ -5279,10 +5297,11 @@ > } > }, > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > .vendor = "Spansion", > .name = "S25FL064A", > @@ -5305,10 +5324,11 @@ > } > }, > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > .vendor = "SST", > .name = "SST25VF010.REMS", > @@ -5334,10 +5354,11 @@ > }, > }, > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_1, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > .vendor = "SST", > .name = "SST25VF016B", > @@ -5471,10 +5492,11 @@ > }, > }, > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_1, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > .vendor = "SST", > .name = "SST25VF040B", > @@ -5536,10 +5558,11 @@ > }, > }, > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_1, > .read = spi_chip_read, > + .voltage = {3000, 3600}, > }, > > { > .vendor = "SST", > .name = "SST25VF040B.REMS", > @@ -5571,10 +5594,11 @@ > }, > }, > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_1, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > .vendor = "SST", > .name = "SST25VF080B", > @@ -5769,11 +5793,11 @@ > .manufacture_id = SST_ID, > .model_id = SST_SST39SF010, > .total_size = 128, > .page_size = 4096, > .feature_bits = FEATURE_EITHER_RESET, > - .tested = TEST_OK_PREW, > + .tested = TEST_OK_PR, why? > .probe = probe_jedec, > .probe_timing = 1, /* 150 ns */ > .block_erasers = > { > { > @@ -6703,11 +6727,11 @@ > .bustype = CHIP_BUSTYPE_SPI, > .manufacture_id = ST_ID, > .model_id = ST_M25P128, > .total_size = 16384, > .page_size = 256, > - .tested = TEST_OK_PREW, > + .tested = TEST_UNTESTED, why? > .probe = probe_spi_rdid, > .probe_timing = TIMING_ZERO, > .block_erasers = > { > { > @@ -6778,10 +6802,11 @@ > } > }, > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > .vendor = "ST", > .name = "M25PX64", > @@ -7774,11 +7799,11 @@ > .read = spi_chip_read, > }, > > { > .vendor = "Winbond", > - .name = "W25X10", > + .name = "W25x10", ah i think i see the pattern... you are reverting my last changes. you need to rebase your changes on top of mine/the ones in svn instead. > .bustype = CHIP_BUSTYPE_SPI, > .manufacture_id = WINBOND_NEX_ID, > .model_id = WINBOND_NEX_W25X10, > .total_size = 128, > .page_size = 256, > @@ -7805,11 +7830,11 @@ > .voltage = {2700, 3600}, > }, > > { > .vendor = "Winbond", > - .name = "W25X20", > + .name = "W25x20", > .bustype = CHIP_BUSTYPE_SPI, > .manufacture_id = WINBOND_NEX_ID, > .model_id = WINBOND_NEX_W25X20, > .total_size = 256, > .page_size = 256, > @@ -7836,11 +7861,11 @@ > .voltage = {2700, 3600}, > }, > > { > .vendor = "Winbond", > - .name = "W25X40", > + .name = "W25x40", > .bustype = CHIP_BUSTYPE_SPI, > .manufacture_id = WINBOND_NEX_ID, > .model_id = WINBOND_NEX_W25X40, > .total_size = 512, > .page_size = 256, > @@ -7867,11 +7892,11 @@ > .voltage = {2700, 3600}, > }, > > { > .vendor = "Winbond", > - .name = "W25X80", > + .name = "W25x80", > .bustype = CHIP_BUSTYPE_SPI, > .manufacture_id = WINBOND_NEX_ID, > .model_id = WINBOND_NEX_W25X80, > .total_size = 1024, > .page_size = 256, > @@ -7898,11 +7923,11 @@ > .voltage = {2700, 3600}, > }, > > { > .vendor = "Winbond", > - .name = "W25X16", > + .name = "W25x16", > .bustype = CHIP_BUSTYPE_SPI, > .manufacture_id = WINBOND_NEX_ID, > .model_id = WINBOND_NEX_W25X16, > .total_size = 2048, > .page_size = 256, > @@ -7935,11 +7960,11 @@ > .voltage = {2700, 3600}, > }, > > { > .vendor = "Winbond", > - .name = "W25X32", > + .name = "W25x32", > .bustype = CHIP_BUSTYPE_SPI, > .manufacture_id = WINBOND_NEX_ID, > .model_id = WINBOND_NEX_W25X32, > .total_size = 4096, > .page_size = 256, > @@ -7972,11 +7997,11 @@ > .voltage = {2700, 3600}, > }, > > { > .vendor = "Winbond", > - .name = "W25X64", > + .name = "W25x64", > .bustype = CHIP_BUSTYPE_SPI, > .manufacture_id = WINBOND_NEX_ID, > .model_id = WINBOND_NEX_W25X64, > .total_size = 8192, > .page_size = 256, > @@ -8039,13 +8064,13 @@ > .manufacture_id = WINBOND_ID, > .model_id = WINBOND_W29C020, > .total_size = 256, > .page_size = 128, > .feature_bits = FEATURE_LONG_RESET, > - .tested = TEST_OK_PREW, > + .tested = TEST_OK_PRE, > .probe = probe_jedec, > - .probe_timing = 10, > + .probe_timing = 10, > .block_erasers = > { > { > .eraseblocks = { {256 * 1024, 1} }, > .block_erase = erase_chip_block_jedec, > @@ -8129,10 +8154,11 @@ > } > }, > .printlock = printlock_w39l040, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600}, > }, > > { > .vendor = "Winbond", > .name = "W39V040A", > @@ -8273,10 +8299,11 @@ > }, > .printlock = printlock_w39v040fb, > .unlock = unlock_w39v040fb, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600}, /*Also offers a 12V fast program */ space after /* please > }, > > { > .vendor = "Winbond", > .name = "W39V040FC", > @@ -8300,10 +8327,11 @@ > } > }, > .printlock = printlock_w39v040fc, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600}, /*Also offers a 12V fast program */ again > }, > > { > .vendor = "Winbond", > .name = "W39V080A", > @@ -8395,13 +8423,13 @@ > .manufacture_id = WINBOND_ID, > .model_id = WINBOND_W49V002A, > .total_size = 256, > .page_size = 128, > .feature_bits = FEATURE_EITHER_RESET, > - .tested = TEST_OK_PREW, > + .tested = TEST_OK_PRE, > .probe = probe_jedec, > - .probe_timing = 10, > + .probe_timing = 10, > .block_erasers = > { > { > .eraseblocks = { > {64 * 1024, 3}, > @@ -8504,10 +8532,11 @@ > } > }, > .printlock = printlock_w39v080fa_dual, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600}, /* 12 V fast program mode */ > }, > > { > .vendor = "AMIC", > .name = "unknown AMIC SPI chip", i just skimmed through it, so i may have missed a few things. thanks for trying to provide more context in the patch. it is not enough though... the number of 5 i told you was just an example. this adds 5 lines above and 5 lines below every change in a patch. what i wanted to accomplish is that the model name of every chip that is changed is mentioned in the patch. so depending on the number of erasers in the affected chips a number as high as 20 or so is needed (another example number). > I believe I've addressed all of your issues. > What's the correct datasheet for M25PX16 ? There seem to be several of them > , by different companies. st created a joint venture with others forming numonyx. numonyx was acquired by micron later... http://www.micron.com/get-document/?documentId=5983 -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

Re: [flashrom] ECS GeForce 8000 series, NVIDIA MCP78S: flashrom -V (v0.9.2-r1141)
by Paul Menzel 10 Jul '11

10 Jul '11

Dear Philipp, please always reply to the list too and use interleaved style [3]. Am Sonntag, den 10.07.2011, 22:08 +0200 schrieb Philipp Shah: > actually I wrote that message because it was written on the console by > your program. Understood. > So I just wanted to support the project and didn't check whether a new > version exist and could cover my "case" of bios; I just used the ubuntu > package and wasn't thinking of a newer version. Thank you for the follow up. It is good to know that there is no problem on your end. Thanks again for supporting flashrom, Paul [3] http://en.opensuse.org/openSUSE:Mailing_list_netiquette

1 0

Re: [flashrom] Additional voltages
by Stefan Tauner 10 Jul '11

10 Jul '11

On Mon, 4 Jul 2011 22:27:59 -0400 Steven Zakulec <spzakulec(a)gmail.com> wrote: > Hello, I've attached some additional voltages for a number of the remaining > chips in flashchips.c. thanks for your continuous contributions :) > I have some questions about some of the remaining > chips: > > Should the voltage range always be the most restrictive one offered, with > others mentioned in the comments? that's most probably what we want for now, yes. i dont know what we are gonna do with the values, but a possible use case could be to tell an external programmer what voltage it should supply. we would have to choose a safe value from a number of choices that the programmer supports. since we are not able to differentiate between different speed grades (or whatever the distinction of chips with different voltage ranges are), we have to choose one of the most conservative range in our database. later this could be extended to allow the user to set a voltage outside of the safe range, but inside the extended ranges. > Where can I find the datasheet for the Sanyo LF25FW203A? good question, i cant find one either. the guy who has added this (Sean Nelson <audiohacked(a)gmail.com>) is currently unavailable afaik. > Can I ignore the .REMS/etc text after a chip name when looking for the > datasheet? Is it something I need to be aware of? yes. the suffix corresponds with the opcode used to identify the chip. some chips do support multiple such opcodes and are added multiple times (for now) in flashchips.c supply voltage is independent and so should be equal for such variations. > Is there a difference for M25P40 and P40-old? similar to above the old version seems to use a different probing method. i have not looked at the datasheet(s) so i can't say if the supply voltages are different. http://www.coreboot.org/pipermail/coreboot/2008-May/034640.html and the preceding discussion may shed some light on this. if i were you i would just leave it out for now. > For the W25Q64, it seems to be on the same datasheet as the Q80, Q16, and > Q32, but it's only referenced once in the sheet, and makes me wonder if this > is the correct sheet then. there are multiple versions of the W25Q64 (and maybe also of the other chips in the 25Q series, i have not looked into it). http://www.winbond.com/hq/enu/ProductAndSales/ProductSearch/?partno=w25q64 V: 3V (no datasheet, probably predecessor of BV. BV: 3V (deprecated) CV: 3V (successor of BV) DW: 1.8V (not supported by flashrom yet, has a different id (0x6017) the difference between BV and CV regarding the supply voltage is, that the BV specs a supply voltage of at least 3.0V for "Octal Word Read Quad I/O (E3h)" when used with a clock of 50MHz. this can be ignored for now, just use 2.7-3.3 imho. > Index: flashchips.c > =================================================================== > --- flashchips.c (revision 1364) > +++ flashchips.c (working copy) i have not looked into it in detail yet, just a few comments... > @@ -145,6 +145,7 @@ > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {4750, 5250}, /* -55 speed is +-5%, all others +-10% */ > }, > > { > @@ -256,6 +257,7 @@ > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600}, /* -45R speed is 3.0-3.6V regulated, others 2.7-3.6V */ > }, i think you can drop "regulated" in those entries. its use in the datasheet is already a bit odd imho, but in the comments it is even less clear without the context of the datasheet. > { > @@ -286,6 +288,7 @@ > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600}, /* -45R speed is 3.0-3.6V regulated, others 2.7-3.6V */ > }, > > { > @@ -317,6 +320,7 @@ > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600}, /* -55 speed is 3.0-3.6V regulated, others 2.7-3.6V */ > }, > > { > @@ -348,6 +352,7 @@ > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600}, /* -55 speed is 3.0-3.6V regulated, others 2.7-3.6V */ > }, > > { > @@ -379,6 +384,7 @@ > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {2700, 3600}, > }, > > { > @@ -410,6 +416,7 @@ > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {2700, 3600}, > }, > > { > @@ -441,6 +448,7 @@ > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600} /* 3.0-3.6V regulated(-70R), 2.7-3.6V for others */ > }, > > { > @@ -472,6 +480,7 @@ > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {3000, 3600} /* 3.0-3.6V regulated(-70R), 2.7-3.6V for others */ > }, > > { > @@ -498,7 +507,7 @@ > }, > .write = write_jedec_1, > .read = read_memmapped, > - .voltage = {2700, 3600}, > + .voltage = {3000, 3600}, /* regulated voltage range- full range is 2.7-3.6V */ > }, NB: that's the diff for Am29LV040B >3.0V for the -60R speedgrade only, so essentially the line should be similar to the ones above. when reading that datasheet i noticed the following paragraph: "The device requires only a single power supply (2.7 V–3.6V) for both read and write functions. Internally generated and regulated voltages are provided for the program and erase operations." this indicates to me that at least for these "regulated" means that they have an internal voltage regulator to guarantee stable supply for write/erase operations. such regulators need a minimum difference between input (vcc) and output (some internal voltage rail), hence the 0.3V higher vcc requirement. i am not sure if the other chips we have encountered also have internal regulators, but they may have. these are implementation-specific details which are not necessarily interesting to flashrom or its users. i think just naming the speed grades for the noted ranges is the best way to deal with such chips for now. > { > @@ -525,7 +534,7 @@ > }, > .write = write_jedec_1, > .read = read_memmapped, > - .voltage = {2700, 3600}, > + .voltage = {3000, 3600}, /* regulated voltage range- full range is 2.7-3.6V */ > }, > > { > @@ -591,6 +600,7 @@ > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > @@ -1446,6 +1456,7 @@ > .unlock = spi_disable_blockprotect_at25df_sec, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > @@ -2317,6 +2328,7 @@ > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {4500, 5500}, > }, > > { > @@ -3501,6 +3513,7 @@ > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {4500, 5500}, > }, > > { > @@ -4052,6 +4065,7 @@ > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > @@ -4344,6 +4358,7 @@ > }, > .write = write_jedec_1, > .read = read_memmapped, > + .voltage = {4500, 5500}, > }, > > { > @@ -4775,6 +4790,7 @@ > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > @@ -4900,6 +4916,7 @@ > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > @@ -5201,6 +5218,7 @@ > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > @@ -5281,6 +5299,7 @@ > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > @@ -5307,6 +5326,7 @@ > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { > @@ -6780,6 +6800,7 @@ > .unlock = spi_disable_blockprotect, > .write = spi_chip_write_256, > .read = spi_chip_read, > + .voltage = {2700, 3600}, > }, > > { to ease review you could post diffs with more context so that the chip models are included in each hunk. i cant remember the correct svn diff parameters right now for this though. i personally don't need it, but if you can figure it out quickly it may be nice to have. :) -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom