flashrom May 2011

flashrom@flashrom.org

55 participants
236 discussions

[PATCH 1/7] improve macros for SSFS and SSFC bits
by Stefan Tauner 24 May '11

24 May '11

- introduce offset macros and use them to (re)define the existing mask macros - add comments - rename SSFS_CDS to SSFS_FDONE (abbr. used in datasheet not in SSFS but HSFS) - use those for refactoring and magic number elemination. - following patch uses them for pretty printing Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- ichspi.c | 48 ++++++++++++++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 18 deletions(-) diff --git a/ichspi.c b/ichspi.c index 6370fb6..1cfdf48 100644 --- a/ichspi.c +++ b/ichspi.c @@ -47,24 +47,36 @@ #define ICH9_REG_FDATA0 0x10 /* 64 Bytes */ #define ICH9_REG_SSFS 0x90 /* 08 Bits */ -#define SSFS_SCIP 0x00000001 -#define SSFS_CDS 0x00000004 -#define SSFS_FCERR 0x00000008 -#define SSFS_AEL 0x00000010 +#define SSFS_SCIP_OFF 0 /* SPI Cycle In Progress */ +#define SSFS_SCIP (0x1 << SSFS_SCIP_OFF) +#define SSFS_FDONE_OFF 2 /* Cycle Done Status */ +#define SSFS_FDONE (0x1 << SSFS_FDONE_OFF) +#define SSFS_FCERR_OFF 3 /* Flash Cycle Error */ +#define SSFS_FCERR (0x1 << SSFS_FCERR_OFF) +#define SSFS_AEL_OFF 4 /* Access Error Log */ +#define SSFS_AEL (0x1 << SSFS_AEL_OFF) /* The following bits are reserved in SSFS: 1,5-7. */ #define SSFS_RESERVED_MASK 0x000000e2 #define ICH9_REG_SSFC 0x91 /* 24 Bits */ -#define SSFC_SCGO 0x00000200 -#define SSFC_ACS 0x00000400 -#define SSFC_SPOP 0x00000800 -#define SSFC_COP 0x00001000 -#define SSFC_DBC 0x00010000 -#define SSFC_DS 0x00400000 -#define SSFC_SME 0x00800000 -#define SSFC_SCF 0x01000000 -#define SSFC_SCF_20MHZ 0x00000000 -#define SSFC_SCF_33MHZ 0x01000000 +#define SSFC_SCGO_OFF (1 + 8) /* 1: SPI Cycle Go */ +#define SSFC_SCGO (0x1 << SSFC_SCGO_OFF) +#define SSFC_ACS_OFF (2 + 8) /* 2: Atomic Cycle Sequence */ +#define SSFC_ACS (0x1 << SSFC_ACS_OFF) +#define SSFC_SPOP_OFF (3 + 8) /* 3: Sequence Prefix Opcode Pointer */ +#define SSFC_SPOP (0x1 << SSFC_SPOP_OFF) +#define SSFC_COP_OFF (4 + 8) /* 4-6: Cycle Opcode Pointer */ +#define SSFC_COP (0x7 << SSFC_COP_OFF) +#define SSFC_DBC_OFF (8 + 8) /* 8-13: Data Byte Count */ +#define SSFC_DBC (0x3f << SSFC_DBC_OFF) +#define SSFC_DS_OFF (14 + 8) /* 14: Data Cycle */ +#define SSFC_DS (0x1 << SSFC_DS_OFF) +#define SSFC_SME_OFF (15 + 8) /* 15: SPI SMI# Enable */ +#define SSFC_SME (0x1 << SSFC_SME_OFF) +#define SSFC_SCF_OFF (16 + 8) /* 16-18: SPI Cycle Frequency */ +#define SSFC_SCF (0x7 << SSFC_SCF_OFF) +#define SSFC_SCF_20MHZ 0x00000000 +#define SSFC_SCF_33MHZ 0x01000000 /* We combine SSFS and SSFC to one 32-bit word, * therefore SSFC bits are off by 8. * The following bits are reserved in SSFC: 23-19,7,0. */ @@ -709,8 +721,8 @@ static int ich9_run_opcode(OPCODE op, uint32_t offset, temp32 = REGREAD32(ICH9_REG_SSFS); /* Keep reserved bits only */ temp32 &= SSFS_RESERVED_MASK | SSFC_RESERVED_MASK; - /* clear error status registers */ - temp32 |= (SSFS_CDS + SSFS_FCERR); + /* Clear cycle done and cycle error status registers */ + temp32 |= (SSFS_FDONE + SSFS_FCERR); REGWRITE32(ICH9_REG_SSFS, temp32); /* Use 20 MHz */ @@ -720,7 +732,7 @@ static int ich9_run_opcode(OPCODE op, uint32_t offset, if (datalength != 0) { uint32_t datatemp; temp32 |= SSFC_DS; - datatemp = ((uint32_t) ((datalength - 1) & 0x3f)) << (8 + 8); + datatemp = (uint32_t) (((datalength - 1) << SSFC_DBC_OFF) & SSFC_DBC); temp32 |= datatemp; } @@ -767,7 +779,7 @@ static int ich9_run_opcode(OPCODE op, uint32_t offset, REGWRITE32(ICH9_REG_SSFS, temp32); /* Wait for Cycle Done Status or Flash Cycle Error. */ - while (((REGREAD32(ICH9_REG_SSFS) & (SSFS_CDS | SSFS_FCERR)) == 0) && + while (((REGREAD32(ICH9_REG_SSFS) & (SSFS_FDONE | SSFS_FCERR)) == 0) && --timeout) { programmer_delay(10); } -- 1.7.1

1 0

[PATCH 0/7] ichspi patches 3.0
by Stefan Tauner 24 May '11

24 May '11

a few corrections and 3 new patches :) Stefan Tauner (7): improve macros for SSFS and SSFC bits add pretty printing functions for SSFS+SSFC and the OPCODE struct and use them add macros and pretty printing for HSFS and HSFC use the max_data_read field of the new spi_programmer struct to simplify run_opcode. warn if SMM BIOS Write Protection is detected in BIOS_CNTL add missing ICH9 register macros and use them to eliminate magic numbers add ICH/PCH flash descriptor decoding Makefile | 2 +- chipset_enable.c | 12 +- ich_descriptors.c | 415 ++++++++++++++++++++++ ich_descriptors.h | 406 +++++++++++++++++++++ ichspi.c | 279 ++++++++++----- util/ich_descriptors_tool/Makefile | 42 +++ util/ich_descriptors_tool/TODO | 5 + util/ich_descriptors_tool/ich_descriptors_tool.c | 226 ++++++++++++ 8 files changed, 1302 insertions(+), 85 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

Gigabyte P55A-UD4 works.
by Björn Augustsson 23 May '11

23 May '11

Hello folks! Just writing in to let you know that the Gigabyte P55A-UD4 seems to work fine. I say seems, because when I re-read the image back with "-r" afterwards, it doesn't exactly match the original file I wrote. Same size, but bsdiff generates a 3297 byte binary diff file (In some format...) between them. OTOH, the system boots fine, says it'd the right version (I updated from version F11 to F15, which is the latest.) I've attached the three files your docs asks for (output, lspci, superiotool) Ideas? /August. -- Wrong on most accounts. const Foo *foo; and Foo const *foo; mean the same: foo being a pointer to const Foo. const Foo const *foo; would mean the same but is illegal (double const). You are confusing this with Foo * const foo; and const Foo * const foo; respectively. -David Kastrup, comp.os.linux.development.system

2 3

Winbond W25Q128 - in Intel ICH10
by Rheneus 22 May '11

22 May '11

Hi, I could not use flashrom 0.9.3 -r1205 to detect Winbond W25Q128 to program BIOS. Attached the read log Just by adding WINBOND_NEX_W25Q128 0x4018 in flashchips.c for W25Q128, similar to W25Q64 throws run Opcode 0x3 error for read. Could you please give some suggestions. -Antony # ./flashrom -Vr ./read.bios flashrom v0.9.3-r1205 on NetBSD 5.1_STABLE (i386), built with libpci 3.1.3, GCC 4.1.3 20080704 prerelease (NetBSD nb2 20081120), little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OS timer resolution is 1 usecs, 153M loops per second, 10 myus = 10 us, 100 myus = 102 us, 1000 myus = 1026 us, 10000 myus = 10213 us, 4 myus = 5 us, OK. Initializing internal programmer No coreboot table found. sh: dmidecode: not found dmidecode execution unsucessfull - continuing without DMI info Found chipset "Intel 3420", enabling flash write... chipset PCI ID is 8086:3b14, 0x7fffffff/0x7fffffff FWH IDSEL: 0x0 0x7fffffff/0x7fffffff FWH IDSEL: 0x0 0x7fffffff/0x7fffffff FWH IDSEL: 0x1 0x7fffffff/0x7fffffff FWH IDSEL: 0x1 0x7fffffff/0x7fffffff FWH IDSEL: 0x2 0x7fffffff/0x7fffffff FWH IDSEL: 0x2 0x7fffffff/0x7fffffff FWH IDSEL: 0x3 0x7fffffff/0x7fffffff FWH IDSEL: 0x3 0x7fffffff/0x7fffffff FWH IDSEL: 0x4 0x7fffffff/0x7fffffff FWH IDSEL: 0x5 0x7fffffff/0x7fffffff FWH IDSEL: 0x6 0x7fffffff/0x7fffffff FWH IDSEL: 0x7 0x7fffffff/0x7fffffff FWH decode enabled 0x7fffffff/0x7fffffff FWH decode enabled 0x7fffffff/0x7fffffff FWH decode enabled 0x7fffffff/0x7fffffff FWH decode enabled 0x7fffffff/0x7fffffff FWH decode enabled 0x7fffffff/0x7fffffff FWH decode enabled 0x7fffffff/0x7fffffff FWH decode enabled 0x7fffffff/0x7fffffff FWH decode enabled 0x7fffffff/0x7fffffff FWH decode disabled 0x7fffffff/0x7fffffff FWH decode disabled 0x7fffffff/0x7fffffff FWH decode disabled 0x7fffffff/0x7fffffff FWH decode disabled Maximum FWH chip size: 0x100000 bytes BIOS Lock Enable: disabled, BIOS Write Enable: disabled, BIOS_CNTL is 0x8 Root Complex Register Block address = 0xfed1c000 GCS = 0xc40: BIOS Interface Lock-Down: disabled, BOOT BIOS Straps: 0x3 (LPC) Top Swap : not enabled SPIBAR = 0xfed1c000 + 0x3800 0x04: 0x6008 (HSFS) FLOCKDN 0, FDV 1, FDOPSS 1, SCIP 0, BERASE 1, AEL 0, FCERR 0, FDONE 0 0x50: 0x0000ffff (FRAP) BMWAG 0x00, BMRAG 0x00, BRWA 0xff, BRRA 0xff 0x54: 0x00000000 (FREG0: Flash Descriptor) 0x00000000-0x00000fff is read-write 0x58: 0x07ff0400 (FREG1: BIOS) 0x00400000-0x007fffff is read-write 0x5C: 0x03ff0003 (FREG2: Management Engine) 0x00003000-0x003fffff is read-write 0x60: 0x00020001 (FREG3: Gigabit Ethernet) 0x00001000-0x00002fff is read-write 0x64: 0x00000fff (FREG4: Platform Data) 0x00fff000-0x00000fff is read-write 0x74: 0x00000000 (PR0) 0x78: 0x00000000 (PR1) 0x7C: 0x00000000 (PR2) 0x80: 0x00000000 (PR3) 0x84: 0x00000000 (PR4) 0x90: 0xf8414004 (SSFS, SSFC) 0x94: 0x5006 (PREOP) 0x96: 0x462b (OPTYPE) 0x98: 0x05ab0302 (OPMENU) 0x9C: 0xc79f0190 (OPMENU+4) 0xA0: 0x00000000 (BBAR) 0xB0: 0x00001000 (FDOC) Programming OPCODES... program_opcodes: preop=5006 optype=463b opmenu=05d80302c79f0190 done SPI Read Configuration: prefetching enabled, caching enabled, OK. This chipset supports the following protocols: FWH,SPI. 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 Am29LV040B, 512 KB: skipped. Probing for AMD Am29LV081B, 1024 KB: skipped. Probing for AMIC A25L05PT, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L05PU, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L10PT, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L10PU, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L20PT, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L20PU, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L40PT, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L40PU, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L80P, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L16PT, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L16PU, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L512, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L010, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L020, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L040, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L080, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L016, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25L032, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for AMIC A25LQ032, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 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 0xef, id2 0x4018 Probing for Atmel AT25DF041A, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT25DF081, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT25DF081A, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT25DF161, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT25DF321, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT25DF321A, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT25DF641, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT25DQ161, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT25F512B, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT25FS010, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT25FS040, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT26DF041, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT26DF081A, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT26DF161, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT26DF161A, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT26F004, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 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 0xef, id2 0x4018 Probing for Atmel AT45DB011D, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT45DB021D, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT45DB041D, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT45DB081D, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT45DB161D, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT45DB321C, 4224 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT45DB321D, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel AT45DB642D, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 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 0xef, id2 0x4018 Probing for Eon EN25B05, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B05T, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B10, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B10T, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B20, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B20T, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B40, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B40T, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B80, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B80T, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B16, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B16T, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B32, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B32T, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B64, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25B64T, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25D16, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25F05, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25F10, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25F20, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25F40, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25F80, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25F16, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon EN25F32, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 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: probe_82802ab: id1 0xea, id2 0xd0, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AC, 1024 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX25L512, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Macronix MX25L1005, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Macronix MX25L2005, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Macronix MX25L4005, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Macronix MX25L8005, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Macronix MX25L1605, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Macronix MX25L1635D, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Macronix MX25L1635E, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Macronix MX25L3205, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Macronix MX25L3235D, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Macronix MX25L6405, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Macronix MX25L12805, 16384 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 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 0xef, id2 0x4018 Probing for Numonyx M25PE20, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Numonyx M25PE40, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Numonyx M25PE80, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Numonyx M25PE16, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for PMC Pm25LV010, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for PMC Pm25LV016B, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for PMC Pm25LV020, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for PMC Pm25LV040, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for PMC Pm25LV080B, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for PMC Pm25LV512, 64 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 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: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm49FL004, 512 KB: probe_jedec_common: id1 0xea, id2 0xd0, id1 is normal flash content, id2 is normal flash content Probing for Sanyo LF25FW203A, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Sharp LHF00L04, 1024 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Spansion S25FL004A, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Spansion S25FL008A, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Spansion S25FL016A, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Spansion S25FL032A, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Spansion S25FL064A, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for SST SST25VF010.REMS, 128 KB: probe_spi_rems: id1 0xef, id2 0x17 Probing for SST SST25VF016B, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for SST SST25VF032B, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for SST SST25VF064C, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for SST SST25VF040.REMS, 512 KB: probe_spi_rems: id1 0xef, id2 0x17 Probing for SST SST25VF040B, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for SST SST25LF040A.RES, 512 KB: program_opcodes: preop=5006 optype=462b opmenu=05ab0302c79f0190 on-the-fly OPCODE (0xAB) re-programmed, op-pos=2 probe_spi_res2: id1 0x17, id2 0x17 Probing for SST SST25VF040B.REMS, 512 KB: probe_spi_rems: id1 0xef, id2 0x17 Probing for SST SST25VF080B, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 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: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF003A/B, 384 KB: probe_jedec_common: id1 0x4e, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF004A/B, 512 KB: probe_jedec_common: id1 0xea, id2 0xd0, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF004C, 512 KB: probe_82802ab: id1 0xea, id2 0xd0, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF008A, 1024 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF008C, 1024 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF016C, 2048 KB: Chip size 2048 kB is bigger than supported size 1024 kB of chipset/board/programmer for FWH interface, probe/read/erase/write may fail. probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content 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 0xef, id2 0x4018 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 0xef, id2 0x4018 Probing for ST M25P10.RES, 128 KB: Ignoring RES in favour of RDID. Probing for ST M25P20, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for ST M25P40, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for ST M25P40-old, 512 KB: Ignoring RES in favour of RDID. Probing for ST M25P80, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for ST M25P16, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for ST M25P32, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for ST M25P64, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for ST M25P128, 16384 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for ST M25PX32, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for ST M25PX64, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 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: probe_82802ab: id1 0xea, id2 0xd0, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040B, 512 KB: probe_82802ab: id1 0xea, id2 0xd0, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080A, 1024 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080B, 1024 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW002, 256 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW016, 2048 KB: Chip size 2048 kB is bigger than supported size 1024 kB of chipset/board/programmer for FWH interface, probe/read/erase/write may fail. probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW040, 512 KB: probe_82802ab: id1 0xea, id2 0xd0, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW080, 1024 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content 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 0xef, id2 0x4018 Probing for Winbond W25Q16, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Winbond W25Q32, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Winbond W25Q64, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Winbond W25x10, 128 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Winbond W25x20, 256 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Winbond W25x40, 512 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Winbond W25x80, 1024 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Winbond W25x16, 2048 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Winbond W25x32, 4096 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Winbond W25x64, 8192 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 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 W39V040A, 512 KB: skipped. Probing for Winbond W39V040B, 512 KB: skipped. Probing for Winbond W39V040C, 512 KB: skipped. Probing for Winbond W39V040FA, 512 KB: probe_jedec_common: id1 0xea, id2 0xd0, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040FB, 512 KB: probe_jedec_common: id1 0xea, id2 0xd0, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040FC, 512 KB: probe_jedec_common: id1 0xea, id2 0xd0, id1 is normal flash content, id2 is normal flash content 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: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V080FA, 1024 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V080FA (dual mode), 512 KB: probe_jedec_common: id1 0xea, id2 0xd0, id1 is normal flash content, id2 is normal flash content Probing for AMIC unknown AMIC SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Atmel unknown Atmel SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Eon unknown Eon SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Macronix unknown Macronix SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for PMC unknown PMC SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for SST unknown SST SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for ST unknown ST SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Sanyo unknown Sanyo SPI chip, 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Probing for Generic unknown SPI chip (RDID), 0 KB: probe_spi_rdid_generic: id1 0xef, id2 0x4018 Found chip "Generic unknown SPI chip (RDID)" (0 KB, SPI) at physical address 0x0. Probing for Generic unknown SPI chip (REMS), 0 KB: probe_spi_rems: id1 0xef, id2 0x17 === This flash part has status NOT WORKING for operations: PROBE READ ERASE 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! Read is not working on this chip. Aborting. Restoring PCI config space for 00:1f:0 reg 0xdc

3 7

flashrom -V
by vap vap 21 May '11

21 May '11

My chipset is not supported. Thanks.

1 0

[PATCH] add (untested) board enable for GA-K8NS Pro-939
by Stefan Tauner 20 May '11

20 May '11

this was done for a russian nick-named "general-beck" on irc. he has disappeared before testing the patch. iirc: michael dug up the right gpio; idwer and me figured the pci ids out and i put everything together in a hurry. please correct me if i am wrong :) general beck: could you test this patch? -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

3 2

Re: [flashrom] [PATCH] eliminate magic numbers indicating maximum column sizes in print_supported_chipsets and print_supported_boards_helper
by Uwe Hermann 20 May '11

20 May '11

On Thu, May 19, 2011 at 02:44:19AM +0200, Stefan Tauner wrote: > without this the magic numbers need to be kept in sync with the maximum length of the > strings printed in the corresponding column. if not an overflow and a nasty ' '-storm occurs > on executing flashrom -L. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> I only did a quick code review, but the output looks good. Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Uwe. -- http://hermann-uwe.de | http://sigrok.org http://randomprojects.org | http://unmaintained-free-software.org

1 0

Re: [flashrom] [PATCH 5/5] introduce a global variable to save the maximum number of bytes in an SPI transaction supported by this programmer and use that to simplify code
by Stefan Tauner 20 May '11

20 May '11

On Wed, 18 May 2011 00:31:52 +0200 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: parts of this are superseded by the "kill central list of SPI programmers"-patch, namely the declaration of and writes to the global value. the new max_data_read/write fields of the spi_programmer struct can be used instead to simplify the code. (which one should i use in the case that part is even wanted by you?) > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > ichspi.c | 45 +++++++++++++++++++++------------------------ > 1 files changed, 21 insertions(+), 24 deletions(-) > > diff --git a/ichspi.c b/ichspi.c > index aaf4df8..ab6af18 100644 > --- a/ichspi.c > +++ b/ichspi.c > @@ -155,6 +155,9 @@ > /* ICH SPI configuration lock-down. May be set during chipset enabling. */ > static int ichspi_lock = 0; > > +/* Indicates maximum number of data bytes for each SPI transaction. */ > +static int ichspi_maxdata = -1; > + > uint32_t ichspi_bbar = 0; > > static void *ich_spibar = NULL; > @@ -911,37 +914,28 @@ static int ich9_run_opcode(OPCODE op, uint32_t offset, > static int run_opcode(OPCODE op, uint32_t offset, > uint8_t datalength, uint8_t * data) > { > + if (spi_programmer->type == SPI_CONTROLLER_NONE) { > + msg_perr("%s: unsupported chipset\n", __func__); > + return -1; > + } > + > + if (datalength > ichspi_maxdata) { > + msg_perr("%s: Internal command size error for " > + "opcode 0x%02x, got datalength=%i, want <=%i\n", > + __func__, op.opcode, datalength, ichspi_maxdata); > + return SPI_INVALID_LENGTH; > + } > + > switch (spi_programmer->type) { > case SPI_CONTROLLER_VIA: > - if (datalength > 16) { > - msg_perr("%s: Internal command size error for " > - "opcode 0x%02x, got datalength=%i, want <=16\n", > - __func__, op.opcode, datalength); > - return SPI_INVALID_LENGTH; > - } > - return ich7_run_opcode(op, offset, datalength, data, 16); > case SPI_CONTROLLER_ICH7: > - if (datalength > 64) { > - msg_perr("%s: Internal command size error for " > - "opcode 0x%02x, got datalength=%i, want <=16\n", > - __func__, op.opcode, datalength); > - return SPI_INVALID_LENGTH; > - } > - return ich7_run_opcode(op, offset, datalength, data, 64); > + return ich7_run_opcode(op, offset, datalength, data, ichspi_maxdata); > case SPI_CONTROLLER_ICH9: > - if (datalength > 64) { > - msg_perr("%s: Internal command size error for " > - "opcode 0x%02x, got datalength=%i, want <=16\n", > - __func__, op.opcode, datalength); > - return SPI_INVALID_LENGTH; > - } > return ich9_run_opcode(op, offset, datalength, data); > default: > - msg_perr("%s: unsupported chipset\n", __func__); > + /* If we ever get here, something really weird happened */ > + return -1; > } > - > - /* If we ever get here, something really weird happened */ > - return -1; > } > > static int ich_spi_send_command(unsigned int writecnt, unsigned int readcnt, > @@ -1206,6 +1200,8 @@ int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, > break; > } > > + ichspi_maxdata = 64; > + > /* SPIBAR is at RCRB+0x3020 for ICH[78] and RCRB+0x3800 for ICH9. */ > msg_pdbg("SPIBAR = 0x%x + 0x%04x\n", base, spibar_offset); > > @@ -1356,6 +1352,7 @@ int via_init_spi(struct pci_dev *dev) > /* Not sure if it speaks all these bus protocols. */ > buses_supported = CHIP_BUSTYPE_LPC | CHIP_BUSTYPE_FWH; > register_spi_programmer(&spi_programmer_via); > + ichspi_maxdata = 16; > > msg_pdbg("0x00: 0x%04x (SPIS)\n", mmio_readw(ich_spibar + 0)); > msg_pdbg("0x02: 0x%04x (SPIC)\n", mmio_readw(ich_spibar + 2)); > -- > 1.7.1 > -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH 4/8] Add support for Atmel's AT25F series of SPI flash chips. This includes a new probing method (probe_spi_rdid_at25f), block erase method (spi_block_erase_62), spi_prettyprint_status_register_at25f and spi_disable_blockprotect_at25f.
by Carl-Daniel Hailfinger 20 May '11

20 May '11

Hi Stefan, thanks for your patch. As you found out, we do have a few architectural changes in locking ahead of us, and the best we can do until then is to print the decoded status register (.printlock) and unlock the whole chip (.unlock). The longterm goal is to abuse .printlock (probably renamed to .detectlock) to gather locking info for some flashrom internal data structure, and to abuse .unlock (probably renamed to .changelock) to lock and unlock regions of the flash chip. A generic lockprinting function will then simply display user-readable output for the data stored internally once .printlock has run. You might think that writing printlock functions is a waste of time considering the long-term design plans, but they actually make it a lot easier to write a proper detectlock and changelock routine, I'd even say that a conversion to detectlock/changelock becomes straightforward if you already have readable code for lock interpretation. Comments on the patch are inline. Am 15.03.2011 16:29 schrieb Stefan Tauner: > Signed-off-by: Stefan Tauner<stefan.tauner(a)student.tuwien.ac.at> > > diff --git a/chipdrivers.h b/chipdrivers.h > index dc46fe1..09dd751 100644 > --- a/chipdrivers.h > +++ b/chipdrivers.h > @@ -27,6 +27,7 @@ > > /* spi.c, should probably be in spi_chip.c */ > int probe_spi_rdid(struct flashchip *flash); > +int probe_spi_rdid_at25f(struct flashchip *flash); > That name is a bit unfortunate, it's not really related to the command we know as RDID. That said, the vendor datasheet IIRC mentions the name RDID, so naming is not totally obvious. A name like probe_spi_at25f might be less misleading. Then again, my original naming choice for the command definitions in spi.h has the same problem. Thoughts? > int probe_spi_rdid4(struct flashchip *flash); > int probe_spi_rems(struct flashchip *flash); > int probe_spi_res1(struct flashchip *flash); > @@ -37,6 +38,7 @@ int spi_block_erase_20(struct flashchip *flash, unsigned int addr, unsigned int > int spi_block_erase_52(struct flashchip *flash, unsigned int addr, unsigned int blocklen); > int spi_block_erase_d7(struct flashchip *flash, unsigned int addr, unsigned int blocklen); > int spi_block_erase_d8(struct flashchip *flash, unsigned int addr, unsigned int blocklen); > +int spi_block_erase_62(struct flashchip *flash, unsigned int addr, unsigned int blocklen); > int spi_block_erase_60(struct flashchip *flash, unsigned int addr, unsigned int blocklen); > int spi_block_erase_c7(struct flashchip *flash, unsigned int addr, unsigned int blocklen); > int spi_chip_write_1(struct flashchip *flash, uint8_t *buf, int start, int len); > @@ -45,12 +47,14 @@ int spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len); > uint8_t spi_read_status_register(void); > int spi_prettyprint_status_register_at25df(struct flashchip *flash); > int spi_prettyprint_status_register_at25df_sec(struct flashchip *flash); > +int spi_prettyprint_status_register_at25f(struct flashchip *flash); > AFAICS that hunk depends on an earlier patch of yours. > int spi_prettyprint_status_register_at25f512b(struct flashchip *flash); > int spi_prettyprint_status_register_at25fs010(struct flashchip *flash); > int spi_prettyprint_status_register_at25fs040(struct flashchip *flash); > int spi_disable_blockprotect(struct flashchip *flash); > int spi_disable_blockprotect_at25df(struct flashchip *flash); > int spi_disable_blockprotect_at25df_sec(struct flashchip *flash); > +int spi_disable_blockprotect_at25f(struct flashchip *flash); > int spi_disable_blockprotect_at25fs010(struct flashchip *flash); > int spi_disable_blockprotect_at25fs040(struct flashchip *flash); > int spi_byte_program(int addr, uint8_t databyte); > diff --git a/flashchips.c b/flashchips.c > index 29a4da0..7cb7d39 100644 > --- a/flashchips.c > +++ b/flashchips.c > @@ -1583,6 +1583,63 @@ struct flashchip flashchips[] = { > > { > .vendor = "Atmel", > + .name = "AT25F512", > + .bustype = CHIP_BUSTYPE_SPI, > + .manufacture_id = ATMEL_ID, > + .model_id = ATMEL_AT25F512, > + .total_size = 64, > + .page_size = 256, > This may be correct, but it looks odd... does AT25F512 really have a bigger page_size for writes than AT25F512A? > + .feature_bits = FEATURE_WRSR_WREN, > + .tested = TEST_UNTESTED, > + .probe = probe_spi_rdid_at25f, > + .probe_timing = TIMING_ZERO, > + .block_erasers = > + { > + { > + .eraseblocks = { {32 * 1024, 2} }, > + .block_erase = spi_block_erase_52, > + }, { > + .eraseblocks = { {64 * 1024, 1} }, > + .block_erase = spi_block_erase_62, > + } > + }, > + .printlock = spi_prettyprint_status_register_at25f, > + .unlock = spi_disable_blockprotect_at25f, > + .write = spi_chip_write_256, > + .read = spi_chip_read, > + }, > + > + { > + .vendor = "Atmel", > + .name = "AT25F512A", > + .bustype = CHIP_BUSTYPE_SPI, > + .manufacture_id = ATMEL_ID, > + .model_id = ATMEL_AT25F512A, > + .total_size = 64, > + .page_size = 128, > + .feature_bits = FEATURE_WRSR_WREN, > + .tested = TEST_UNTESTED, > + .probe = probe_spi_rdid_at25f, > + .probe_timing = TIMING_ZERO, > + .block_erasers = > + { > + { > + .eraseblocks = { {32 * 1024, 2} }, > + .block_erase = spi_block_erase_52, > + }, { > + .eraseblocks = { {64 * 1024, 1} }, > + .block_erase = spi_block_erase_62, > + } > + }, > + .printlock = spi_prettyprint_status_register_at25f, > + /* Not correct to use this one, because the BP1 bit is N/A. */ > + .unlock = spi_disable_blockprotect_at25f, > + .write = spi_chip_write_256, > + .read = spi_chip_read, > + }, > + > + { > + .vendor = "Atmel", > .name = "AT25F512B", > .bustype = CHIP_BUSTYPE_SPI, > .manufacture_id = ATMEL_ID, > @@ -1622,6 +1679,36 @@ struct flashchip flashchips[] = { > > { > .vendor = "Atmel", > + /* The A suffix indicates 33MHz instead of 20MHz clock rate. > + * All other properties seem to be the same.*/ > + .name = "AT25F1024(A)", > + .bustype = CHIP_BUSTYPE_SPI, > + .manufacture_id = ATMEL_ID, > + .model_id = ATMEL_AT25F1024, > + .total_size = 128, > + .page_size = 256, > + .feature_bits = FEATURE_WRSR_WREN, > + .tested = TEST_OK_PREW, > + .probe = probe_spi_rdid_at25f, > + .probe_timing = TIMING_ZERO, > + .block_erasers = > + { > + { > + .eraseblocks = { {32 * 1024, 4} }, > + .block_erase = spi_block_erase_52, > + }, { > + .eraseblocks = { {128 * 1024, 1} }, > + .block_erase = spi_block_erase_62, > + } > + }, > + .printlock = spi_prettyprint_status_register_at25f, > + .unlock = spi_disable_blockprotect_at25f, > + .write = spi_chip_write_256, > + .read = spi_chip_read, > + }, > + > + { > + .vendor = "Atmel", > .name = "AT25FS010", > .bustype = CHIP_BUSTYPE_SPI, > .manufacture_id = ATMEL_ID, > diff --git a/flashchips.h b/flashchips.h > index 3b2b94f..9b08d25 100644 > --- a/flashchips.h > +++ b/flashchips.h > @@ -134,13 +134,11 @@ > #define ATMEL_AT25DF321A 0x4701 > #define ATMEL_AT25DF641 0x4800 > #define ATMEL_AT25DQ161 0x8600 > -#define ATMEL_AT25F512 /* No device ID found in datasheet. Vendor ID > - * can be read with AT25F512A_RDID */ > -#define ATMEL_AT25F512A 0x65 /* Needs AT25F512A_RDID */ > +#define ATMEL_AT25F512 0x65 /* guessed, no device ID in datasheet. > + * Vendor ID can be read with AT25F_RDID */ > +#define ATMEL_AT25F512A 0x65 /* Needs AT25F_RDID */ > #define ATMEL_AT25F512B 0x6500 > -#define ATMEL_AT25F1024 /* No device ID found in datasheet. Vendor ID > - * can be read with AT25F512A_RDID */ > -#define ATMEL_AT25F1024A 0x60 /* Needs AT25F512A_RDID */ > +#define ATMEL_AT25F1024 0x60 /* Needs AT25F_RDID */ > That's a bit odd. You merge AT25F1024 and AT25F1024A into one definition, but you keep AT25F512 and AT25F512A separate. > #define ATMEL_AT25FS010 0x6601 > #define ATMEL_AT25FS040 0x6604 > #define ATMEL_AT26DF041 0x4400 > diff --git a/spi.h b/spi.h > index b908603..a5c3406 100644 > --- a/spi.h > +++ b/spi.h > @@ -30,10 +30,11 @@ > /* INSIZE may be 0x04 for some chips*/ > #define JEDEC_RDID_INSIZE 0x03 > > -/* AT25F512A has bit 3 as don't care bit in commands */ > -#define AT25F512A_RDID 0x15 /* 0x15 or 0x1d */ > -#define AT25F512A_RDID_OUTSIZE 0x01 > -#define AT25F512A_RDID_INSIZE 0x02 > +/* Some Atmel AT25F* models have bit 3 as don't care bit in commands */ > +/* 0x15 or 0x1d */ > +#define AT25F_RDID 0x15 > +#define AT25F_RDID_OUTSIZE 0x01 > +#define AT25F_RDID_INSIZE 0x02 > See the naming discussion near the beginning of my mail. > > /* Read Electronic Manufacturer Signature */ > #define JEDEC_REMS 0x90 > @@ -61,6 +62,11 @@ > #define JEDEC_CE_60_OUTSIZE 0x01 > #define JEDEC_CE_60_INSIZE 0x00 > > +/* Chip Erase 0x62 is supported by Atmel AT25F chips. */ > +#define JEDEC_CE_62 0x62 > +#define JEDEC_CE_62_OUTSIZE 0x01 > +#define JEDEC_CE_62_INSIZE 0x00 > + > /* Chip Erase 0xc7 is supported by SST/ST/EON/Macronix chips. */ > #define JEDEC_CE_C7 0xc7 > #define JEDEC_CE_C7_OUTSIZE 0x01 > diff --git a/spi25.c b/spi25.c > index c4cd6b2..38037f1 100644 > --- a/spi25.c > +++ b/spi25.c > @@ -141,7 +141,11 @@ static int probe_spi_rdid_generic(struct flashchip *flash, int bytes_in, unsigne > } > } else { > id1 = readarr[0]; > - id2 = (readarr[1]<< 8) | readarr[2]; > + /* Special case for AT25F chips. */ > + if (bytes_in == 2) > + id2 = readarr[1]; > + else > + id2 = (readarr[1]<< 8) | readarr[2]; > Could you make AT25F probing a totally separate function which does not reuse probe_spi_rdid_generic? And move it to at25.c white you're at it? > } > > msg_cdbg("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); > @@ -173,6 +177,11 @@ int probe_spi_rdid(struct flashchip *flash) > return probe_spi_rdid_generic(flash, JEDEC_RDID_INSIZE, JEDEC_RDID); > } > > +int probe_spi_rdid_at25f(struct flashchip *flash) > +{ > + return probe_spi_rdid_generic(flash, AT25F_RDID_INSIZE, AT25F_RDID); > See above. > +} > + > int probe_spi_rdid4(struct flashchip *flash) > { > /* Some SPI controllers do not support commands with writecnt=1 and > @@ -394,6 +403,32 @@ int spi_prettyprint_status_register_at25df_sec(struct flashchip *flash) > return spi_prettyprint_status_register_at25df(flash); > } > > +int spi_prettyprint_status_register_at25f(struct flashchip *flash) > +{ > + uint8_t status; > + > + status = spi_read_status_register(); > + msg_cdbg("Chip status register is %02x\n", status); > + > + msg_cdbg("Chip status register: Status Register Write Protect (WPEN) " > + "is %sset\n", (status& (1<< 7)) ? "" : "not "); > + /* The following 3 bits are undefined in AT25F512(A), AT25F1024(A): > + msg_cdbg("Chip status register: Bit 6 is " > + "%sset\n", (status& (1<< 6)) ? "" : "not "); > + msg_cdbg("Chip status register: Bit 5 is " > + "%sset\n", (status& (1<< 5)) ? "" : "not "); > + msg_cdbg("Chip status register: Bit 4 is " > + "%sset\n", (status& (1<< 4)) ? "" : "not "); > + */ > + /* This is undefined for AT25F512A; will be refactored soonish anyway */ > + msg_cdbg("Chip status register: Block Protect 1 (BP1) is %sset\n", > + (status& (1<< 3)) ? "" : "not "); > + msg_cdbg("Chip status register: Block Protect 0 (BP0) is %sset\n", > + (status& (1<< 2)) ? "" : "not "); > + spi_prettyprint_status_register_welwip(status); > + return 0; > +} > Status printing should already be handled just fine with the current code, could you please cross-check that? > + > int spi_prettyprint_status_register_at25f512b(struct flashchip *flash) > { > uint8_t status; > @@ -592,6 +627,46 @@ int spi_chip_erase_60(struct flashchip *flash) > return 0; > } > > +int spi_chip_erase_62(struct flashchip *flash) > +{ > + int result; > + struct spi_command cmds[] = { > + { > + .writecnt = JEDEC_WREN_OUTSIZE, > + .writearr = (const unsigned char[]){ JEDEC_WREN }, > + .readcnt = 0, > + .readarr = NULL, > + }, { > + .writecnt = JEDEC_CE_62_OUTSIZE, > + .writearr = (const unsigned char[]){ JEDEC_CE_62 }, > + .readcnt = 0, > + .readarr = NULL, > + }, { > + .writecnt = 0, > + .writearr = NULL, > + .readcnt = 0, > + .readarr = NULL, > + }}; > + > + result = spi_send_multicommand(cmds); > + if (result) { > + msg_cerr("%s failed during command execution\n", > + __func__); > + return result; > + } > + /* Wait until the Write-In-Progress bit is cleared. > + * This usually takes 2-5 s, so wait in 100 ms steps. > + */ > + /* FIXME: We assume spi_read_status_register will never fail. */ > + while (spi_read_status_register()& JEDEC_RDSR_BIT_WIP) > + programmer_delay(100 * 1000); > + if (check_erased_range(flash, 0, flash->total_size * 1024)) { > + msg_cerr("ERASE FAILED!\n"); > + return -1; > + } > + return 0; > +} > + > int spi_chip_erase_c7(struct flashchip *flash) > { > int result; > @@ -826,6 +901,16 @@ int spi_block_erase_60(struct flashchip *flash, unsigned int addr, unsigned int > return spi_chip_erase_60(flash); > } > > +int spi_block_erase_62(struct flashchip *flash, unsigned int addr, unsigned int blocklen) > +{ > + if ((addr != 0) || (blocklen != flash->total_size * 1024)) { > + msg_cerr("%s called with incorrect arguments\n", > + __func__); > + return -1; > + } > + return spi_chip_erase_62(flash); > +} > Should *_erase_62 be moved to at25.c or is it generic enogh to live in spi25.c? > + > int spi_block_erase_c7(struct flashchip *flash, unsigned int addr, unsigned int blocklen) > { > if ((addr != 0) || (blocklen != flash->total_size * 1024)) { > @@ -1076,6 +1161,57 @@ int spi_disable_blockprotect(struct flashchip *flash) > return 0; > } > > +int spi_disable_blockprotect_at25f(struct flashchip *flash) > +{ > + uint8_t status; > + int result; > + > + status = spi_read_status_register(); > + /* If block protection is disabled (BP0 and BP1 are 0), stop here. */ > + if ((status& (3<< 2)) == 0) > + return 0; > + > + msg_cdbg("Some block protection in effect, disabling\n"); > + if (status& (1<< 7)) { > + msg_cdbg("Need to disable Write Protect Enable (WPEN)\n"); > + /* The following is used in spi_disable_blockprotect_at25df > + * to check the state of the hardware lock pin. This is not > + * possible with this chip, so we have to try. > + if ((status& (1<< 4)) == 0) { > + msg_cerr("WP# pin is active, disabling " > + "write protection is impossible.\n"); > + return 1; > + } > + */ > + /* All bits except bit 7 (WPEN) are readonly. If the WP pin is > + * low, WPEN is readonly and this will fail. */ > + result = spi_write_status_register(flash, status& ~(1<< 7)); > + if (result) { > + msg_cerr("spi_write_status_register failed\n"); > + return result; > + } > + status = spi_read_status_register(); > + if (status& (1<< 7)) { > + msg_cerr("WP# pin is probably active, disabling " > + "write protection is impossible.\n"); > + return 1; > + } > + > + } > + /* Global unprotect. Make sure to mask WPEN as well. */ > + result = spi_write_status_register(flash, status& ~0x8c); > + if (result) { > + msg_cerr("spi_write_status_register failed\n"); > + return result; > + } > + status = spi_read_status_register(); > + if ((status& (3<< 2)) != 0) { > + msg_cerr("Block protection could not be disabled!\n"); > + return 1; > + } > + return 0; > +} > The function above should be in at25.c. > + > int spi_disable_blockprotect_at25df(struct flashchip *flash) > { > uint8_t status; > Feel free to only respond to my comments without posting a new patch if you think some of my comments are not applicable. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

Re: [flashrom] [PATCH 4/5] add macros and pretty printing for HSFS and HSFC
by Stefan Tauner 19 May '11

19 May '11

HSFS (0x04) and HSFC (0x06) should be placed before FADDR (0x08) and FDATA0 (0x10). -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom May 2011