flashrom September 2011

flashrom@flashrom.org

41 participants
161 discussions

Re: [flashrom] [PATCH] spi25: get rid of unneccessary line breaks (on failed probes)
by Uwe Hermann 04 Sep '11

04 Sep '11

On Mon, Aug 22, 2011 at 01:07:50PM +0200, Stefan Tauner wrote: > --- > not sure if this is correct for all execution paths, but it fixes the > output of a probe on my thinkpad. i have looked a bit around to find > examples of code that this patch would break and found none though. > > without this patch: > Probing for Spansion S25FL064A, 8192 kB: probe_spi_rdid_generic: id1 0xef, id2 0x3017 > Probing for SST SST25LF040A, 512 kB: Invalid OPCODE 0xab, will not execute. > > Probing for SST SST25LF080A, 1024 kB: Invalid OPCODE 0xab, will not execute. > > Probing for SST SST25VF010.REMS, 128 kB: Invalid OPCODE 0x90, will not execute. > > Probing for SST SST25VF016B, 2048 kB: probe_spi_rdid_generic: id1 0xef, id2 0x3017 > > with this patch: > Probing for Spansion S25FL064A, 8192 kB: probe_spi_rdid_generic: id1 0xef, id2 0x3017 > Probing for SST SST25LF040A, 512 kB: Invalid OPCODE 0xab, will not execute. > Probing for SST SST25LF080A, 1024 kB: Invalid OPCODE 0xab, will not execute. > Probing for SST SST25VF010.REMS, 128 kB: Invalid OPCODE 0x90, will not execute. > Probing for SST SST25VF016B, 2048 kB: probe_spi_rdid_generic: id1 0xef, id2 0x3017 > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Untested, but I can't see any obvious problems either. 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

2 1

Re: [flashrom] [PATCH 1/8] ichspi: add ICH/PCH flash descriptor decoding via FDOC/FDOD
by Carl-Daniel Hailfinger 04 Sep '11

04 Sep '11

Am 20.08.2011 12:39 schrieb Stefan Tauner: > based on the work of Matthias 'mazzoo' Wenzel this patch adds pretty > printing of those ICH/PCH flash descriptor sections that are > cached/mapped by the chipset (and which are therefore reachable via > FDOC/FDOD registers). > > this includes the following: > - content section: > describes the image and some generic properties (number of > sections, offset of sections, PCH/ICH and MCH/PROC strap > offsets and lengths) > - component section: > identify the different SPI flash chips and their capabilities. > - region section > similarly to a partition table this describes the different regions. > the content of FLREG* is derived from this section. > - master section > defines SPI master (host, ME, GbE) access rights of the > individual regions. the content of PR* is derived from this section. > > this is only a part of the data included in the descriptor. other > information can be retrieved from a complete binary dump of the > descriptor region 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 all supported flash chips > (together with their RDIDs) are stored in the same format in table > in a descriptor section (which is used by the ME apparently). a > later patch will use the macros outside of ichspi.c which is the > reason why the prettyprinting function and the register bit macros > are not defined in ichspi.c but ich_descriptors.h (else they would > be moved in the follow-up patch). > > because this patch relies on (compiler) implementation-specific > layouting of bit-fields, it checks for basic compiler support in the > makefile and for correct layout before taking any action on runtime. > Checking for presence of bitfield support in the compiler is the way to madness. Next we have to test for C99 capability and other fun stuff. Just assume that bitfields are supported, otherwise compilation will blow up or the runtime checks will catch a miscompilation. That compile-time check (including the #if BITFIELDS) is nacked. > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > Makefile | 25 +++++- > ich_descriptors.c | 288 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > ich_descriptors.h | 261 ++++++++++++++++++++++++++++++++++++++++++++++++ > ichspi.c | 60 +++++++++-- > 4 files changed, 622 insertions(+), 12 deletions(-) > create mode 100644 ich_descriptors.c > create mode 100644 ich_descriptors.h > > diff --git a/Makefile b/Makefile > index 26f978f..247a60c 100644 > --- a/Makefile > +++ b/Makefile > @@ -340,9 +340,11 @@ endif > > ifeq ($(CONFIG_INTERNAL), yes) > FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' > +FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "BITFIELDS := yes" .features && printf "%s" "-D'BITFIELDS=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 > @@ -635,6 +637,19 @@ int main(int argc, char **argv) > endef > export UTSNAME_TEST > > +define BITFIELDS_TEST > +#include "ich_descriptors.h" > +int main(int argc, char **argv) > +{ > + struct ich_descriptors desc; > + (void) argc; > + (void) argv; > + desc.region.FLREGs[4] = 0x5aa5a55a; > + return desc.region.reg4_base; > +} > +endef > +export BITFIELDS_TEST > + > features: compiler > @echo "FEATURES := yes" > .features.tmp > ifeq ($(CONFIG_FT2232_SPI), yes) > @@ -649,6 +664,14 @@ endif > @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) >/dev/null 2>&1 && \ > ( echo "found."; echo "UTSNAME := yes" >> .features.tmp ) || \ > ( echo "not found."; echo "UTSNAME := no" >> .features.tmp ) > +# ugly hack to get a logical AND *sigh* > +ifeq ($(CONFIG_INTERNAL)$(ARCH), yes"x86") > + @printf "Checking if bit-fields support is sufficient... " > + @echo "$$BITFIELDS_TEST" > .featuretest.c > + @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -D BITFIELDS .featuretest.c -o .featuretest$(EXEC_SUFFIX) >/dev/null 2>&1 && \ > + ( echo "yes."; echo "BITFIELDS := yes" >> .features.tmp ) || \ > + ( echo "no."; echo "BITFIELDS := no" >> .features.tmp ) > +endif > @$(DIFF) -q .features.tmp .features >/dev/null 2>&1 && rm .features.tmp || mv .features.tmp .features > @rm -f .featuretest.c .featuretest$(EXEC_SUFFIX) > > That Makefile change needs to be dropped except for the PROGRAMMER_OBJS addition. > diff --git a/ich_descriptors.c b/ich_descriptors.c > new file mode 100644 > index 0000000..ce40d9f > --- /dev/null > +++ b/ich_descriptors.c > @@ -0,0 +1,288 @@ > [...] > +int read_ich_descriptors_via_fdo(void *spibar, struct ich_descriptors *desc) > +{ > + uint8_t i; > + uint8_t nr; > + struct ich_desc_region *r = &desc->region; > + > The snippet below needs to be in its own function named selfcheck_bitfields(), and that function should live in flashrom.c (or any other reasonably central place) and be called in the initial selfcheck() function. We want to know where this explodes, even if the functionality would not be necessary. > + /* Test if bit-fields are working as expected */ > + for (i = 0; i < 4; i++) > + desc->region.FLREGs[i] = 0x5A << (i * 8); > + if (r->reg0_base != 0x005A || r->reg0_limit != 0x0000 || > + r->reg1_base != 0x1A00 || r->reg1_limit != 0x0000 || > + r->reg2_base != 0x0000 || r->reg2_limit != 0x005A || > + r->reg3_base != 0x0000 || r->reg3_limit != 0x1A00) { > + msg_pdbg("The combination of compiler and CPU architecture used" > + "does not lay out bit-fields as expected, sorry.\n"); > + msg_pspew("r->reg0_base = 0x%04X (0x005A)\n", r->reg0_base); > + msg_pspew("r->reg0_limit = 0x%04X (0x0000)\n", r->reg0_limit); > + msg_pspew("r->reg1_base = 0x%04X (0x1A00)\n", r->reg1_base); > + msg_pspew("r->reg1_limit = 0x%04X (0x0000)\n", r->reg1_limit); > + msg_pspew("r->reg2_base = 0x%04X (0x0000)\n", r->reg2_base); > + msg_pspew("r->reg2_limit = 0x%04X (0x005A)\n", r->reg2_limit); > + msg_pspew("r->reg3_base = 0x%04X (0x0000)\n", r->reg3_base); > + msg_pspew("r->reg3_limit = 0x%04X (0x1A00)\n", r->reg3_limit); > + return RET_ERR; > + } > Snippet ends here. If you want, I can send my own bitfield checker code to the list so you can compare both implementations. > diff --git a/ich_descriptors.h b/ich_descriptors.h > new file mode 100644 > index 0000000..b1da914 > --- /dev/null > +++ b/ich_descriptors.h > @@ -0,0 +1,261 @@ > +/* > + * 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> > + > +#define RET_OK 0 > +#define RET_ERR -1 > +#define RET_WARN -2 > +#define RET_PARAM -3 > +#define RET_OOB -4 > Too generic names. > + > +#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 ICH_FREG_BASE(flreg) (((flreg) << 12) & 0x01fff000) > +#define ICH_FREG_LIMIT(flreg) (((flreg) >> 4) & 0x01fff000) > + > +/* Used to select the right descriptor printing function. > + * Currently only ICH8 and Ibex Peak are supported. > + */ > +enum ich_chipset { > + CHIPSET_ICH_UNKNOWN, > + CHIPSET_ICH7 = 7, > + CHIPSET_ICH8, > + CHIPSET_ICH9, > + CHIPSET_ICH10, > + CHIPSET_5_SERIES_IBEX_PEAK, > + CHIPSET_6_SERIES_COUGAR_POINT, > + CHIPSET_7_SERIES_PANTHER_POINT > +}; > + > +void prettyprint_ich_reg_vscc(uint32_t reg_val, int verbosity); > + > +#if BITFIELDS == 1 > +struct ich_desc_content { > + uint32_t FLVALSIG; /* 0x00 */ > + union { /* 0x04 */ > + uint32_t FLMAP0; > + struct { > + uint32_t FCBA :8, /* Flash Component Base Address */ > + NC :2, /* Number Of Components */ > + :6, > + FRBA :8, /* Flash Region Base Address */ > + NR :3, /* Number Of Regions */ > + :5; > + }; > + }; > + union { /* 0x08 */ > + uint32_t FLMAP1; > + struct { > + uint32_t FMBA :8, /* Flash Master Base Address */ > + NM :3, /* Number Of Masters */ > + :5, > + FISBA :8, /* Flash ICH Strap Base Address */ > + ISL :8; /* ICH Strap Length */ > + }; > + }; > + union { /* 0x0c */ > + uint32_t FLMAP2; > + struct { > + uint32_t FMSBA :8, /* Flash (G)MCH Strap Base Addr. */ > + MSL :8, /* MCH Strap Length */ > + :16; > + }; > + }; > +}; > + > +struct ich_desc_component { > + union { /* 0x00 */ > + uint32_t FLCOMP; /* Flash Components Register */ > + struct { > + uint32_t comp1_density :3, > + comp2_density :3, > + :11, > + freq_read :3, > + fastread :1, > + freq_fastread :3, > + freq_write :3, > + freq_read_id :3, > + :2; > + }; > + }; > + union { /* 0x04 */ > + uint32_t FLILL; /* Flash Invalid Instructions Register */ > + struct { > + uint32_t invalid_instr0 :8, > + invalid_instr1 :8, > + invalid_instr2 :8, > + invalid_instr3 :8; > + }; > + }; > + union { /* 0x08 */ > + uint32_t FLPB; /* Flash Partition Boundary Register */ > + struct { > + uint32_t FPBA :13, /* Flash Partition Boundary Addr */ > + :19; > + }; > + }; > +}; > + > +struct ich_desc_region { > + union { > + uint32_t FLREGs[5]; > + struct { > + struct { /* FLREG0 Flash Descriptor */ > + uint32_t reg0_base :13, > + :3, > + reg0_limit :13, > + :3; > + }; > + struct { /* FLREG1 BIOS */ > + uint32_t reg1_base :13, > + :3, > + reg1_limit :13, > + :3; > + }; > + struct { /* FLREG2 ME */ > + uint32_t reg2_base :13, > + :3, > + reg2_limit :13, > + :3; > + }; > + struct { /* FLREG3 GbE */ > + uint32_t reg3_base :13, > + :3, > + reg3_limit :13, > + :3; > + }; > + struct { /* FLREG4 Platform */ > + uint32_t reg4_base :13, > + :3, > + reg4_limit :13, > + :3; > + }; > + }; > + }; > +}; > + > +struct ich_desc_master { > + union { > + uint32_t FLMSTR1; > + struct { > + uint32_t BIOS_req_ID :16, > + BIOS_descr_r :1, > + BIOS_BIOS_r :1, > + BIOS_ME_r :1, > + BIOS_GbE_r :1, > + BIOS_plat_r :1, > + :3, > + BIOS_descr_w :1, > + BIOS_BIOS_w :1, > + BIOS_ME_w :1, > + BIOS_GbE_w :1, > + BIOS_plat_w :1, > + :3; > + }; > + }; > + union { > + uint32_t FLMSTR2; > + struct { > + uint32_t ME_req_ID :16, > + ME_descr_r :1, > + ME_BIOS_r :1, > + ME_ME_r :1, > + ME_GbE_r :1, > + ME_plat_r :1, > + :3, > + ME_descr_w :1, > + ME_BIOS_w :1, > + ME_ME_w :1, > + ME_GbE_w :1, > + ME_plat_w :1, > + :3; > + }; > + }; > + union { > + uint32_t FLMSTR3; > + struct { > + uint32_t GbE_req_ID :16, > + GbE_descr_r :1, > + GbE_BIOS_r :1, > + GbE_ME_r :1, > + GbE_GbE_r :1, > + GbE_plat_r :1, > + :3, > + GbE_descr_w :1, > + GbE_BIOS_w :1, > + GbE_ME_w :1, > + GbE_GbE_w :1, > + GbE_plat_w :1, > + :3; > + }; > + }; > +}; > + > +struct ich_descriptors { > + struct ich_desc_content content; > + struct ich_desc_component component; > + struct ich_desc_region region; > + struct ich_desc_master master; > +}; > + > +void prettyprint_ich_descriptors(enum ich_chipset, const struct ich_descriptors *desc); > + > +void prettyprint_ich_descriptor_content(const struct ich_desc_content *content); > +void prettyprint_ich_descriptor_component(const struct ich_descriptors *desc); > +void prettyprint_ich_descriptor_region(const struct ich_descriptors *desc); > +void prettyprint_ich_descriptor_master(const struct ich_desc_master *master); > + > +int read_ich_descriptors_via_fdo(void *spibar, struct ich_descriptors *desc); > + > +#endif /* BITFIELDS == 1 */ > +#endif /* __ICH_DESCRIPTORS_H__ */ > +#endif /* defined(__i386__) || defined(__x86_64__) */ > diff --git a/ichspi.c b/ichspi.c > index 8b4210e..09af2b3 100644 > --- a/ichspi.c > +++ b/ichspi.c > @@ -1190,6 +1197,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: > @@ -1261,6 +1269,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; > How does FDOVR (or whatever the correct acronym for Flash Descriptor Override is) relate to this? > > tmp2 = mmio_readw(ich_spibar + ICH9_REG_HSFC); > msg_pdbg("0x06: 0x%04x (HSFC)\n", tmp2); > @@ -1308,12 +1318,40 @@ int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, > mmio_readl(ich_spibar + ICH9_REG_OPMENU)); > msg_pdbg("0x9C: 0x%08x (OPMENU+4)\n", > mmio_readl(ich_spibar + ICH9_REG_OPMENU + 4)); > - 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_FPB); > - msg_pdbg("0xD0: 0x%08x (FPB)\n", tmp); > + if (ich_generation == 8) { > + tmp = mmio_readl(ich_spibar + ICH8_REG_VSCC); > + msg_pdbg("0xC1: 0x%08x (VSCC)\n", tmp); > + msg_pdbg("VSCC: "); > + prettyprint_ich_reg_vscc(tmp, MSG_DEBUG); > + } else { > + 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_ich_reg_vscc(tmp, MSG_DEBUG); > + > + tmp = mmio_readl(ich_spibar + ICH9_REG_UVSCC); > + msg_pdbg("0xC8: 0x%08x (UVSCC)\n", tmp); > + msg_pdbg("UVSCC: "); > + prettyprint_ich_reg_vscc(tmp, MSG_DEBUG); > + > + tmp = mmio_readl(ich_spibar + ICH9_REG_FPB); > + msg_pdbg("0xD0: 0x%08x (FPB)\n", tmp); > + } > > + msg_pdbg("\n"); > +#if BITFIELDS == 1 > + if (ichspi_desc) { > + struct ich_descriptors desc = {{ 0 }}; > + if (read_ich_descriptors_via_fdo(ich_spibar, &desc) == > + RET_OK) > + prettyprint_ich_descriptors(CHIPSET_ICH_UNKNOWN, > + &desc); > + } > +#endif /* BITFIELDS == 1 */ > ich_init_opcodes(); > break; > default: > Regards, Carl-Daniel -- http://www.hailfinger.org/

2 5

[PATCH] Kill exit() calls in cli_classic
by Tadas Slotkus 04 Sep '11

04 Sep '11

exit() calls are very bad. GUI's and payload don't like it, so remove it for easier flashrom usage across projects. P.S. currently return values are the same as vere to exit calls, so if you have a clue what these should be please tell it now. Signed-off-by: Tadas Slotkus <devtadas(a)gmail.com> --- cli_classic.c | 55 ++++++++++++++++++++++++++----------------------------- 1 files changed, 26 insertions(+), 29 deletions(-) diff --git a/cli_classic.c b/cli_classic.c index c6fb379..43b435f 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -93,7 +93,6 @@ static void cli_classic_usage(const char *name) static void cli_classic_abort_usage(void) { printf("Please run \"flashrom --help\" for usage info.\n"); - exit(1); } int main(int argc, char *argv[]) @@ -142,7 +141,7 @@ int main(int argc, char *argv[]) print_banner(); if (selfcheck()) - exit(1); + return 1; setbuf(stdout, NULL); /* FIXME: Delay all operation_specified checks until after command @@ -155,7 +154,7 @@ int main(int argc, char *argv[]) if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; } filename = strdup(optarg); read_it = 1; @@ -164,7 +163,7 @@ int main(int argc, char *argv[]) if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; } filename = strdup(optarg); write_it = 1; @@ -174,12 +173,12 @@ int main(int argc, char *argv[]) if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; } if (dont_verify_it) { fprintf(stderr, "--verify and --noverify are" "mutually exclusive. Aborting.\n"); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; } filename = strdup(optarg); verify_it = 1; @@ -188,7 +187,7 @@ int main(int argc, char *argv[]) if (verify_it) { fprintf(stderr, "--verify and --noverify are" "mutually exclusive. Aborting.\n"); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; } dont_verify_it = 1; break; @@ -202,7 +201,7 @@ int main(int argc, char *argv[]) if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; } erase_it = 1; break; @@ -214,7 +213,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "Error: Internal programmer support " "was not compiled in and --mainboard only\n" "applies to the internal programmer. Aborting.\n"); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; #endif break; case 'f': @@ -222,8 +221,9 @@ int main(int argc, char *argv[]) break; case 'l': tempstr = strdup(optarg); - if (read_romlayout(tempstr)) - cli_classic_abort_usage(); + if (read_romlayout(tempstr)) { + cli_classic_abort_usage(); return 1; + } break; case 'i': /* FIXME: -l has to be specified before -i. */ @@ -232,14 +232,14 @@ int main(int argc, char *argv[]) fprintf(stderr, "Error: image %s not found in " "layout file or -i specified before " "-l\n", tempstr); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; } break; case 'L': if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; } list_supported = 1; break; @@ -248,13 +248,13 @@ int main(int argc, char *argv[]) if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; } list_supported_wiki = 1; #else fprintf(stderr, "Error: Wiki output was not compiled " "in. Aborting.\n"); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; #endif break; case 'p': @@ -286,7 +286,7 @@ int main(int argc, char *argv[]) if (programmer == PROGRAMMER_INVALID) { fprintf(stderr, "Error: Unknown programmer " "%s.\n", optarg); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; } break; case 'R': @@ -294,41 +294,38 @@ int main(int argc, char *argv[]) if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; } - exit(0); - break; + return 0; case 'h': if (++operation_specified > 1) { fprintf(stderr, "More than one operation " "specified. Aborting.\n"); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; } cli_classic_usage(argv[0]); - exit(0); - break; + return 0; default: - cli_classic_abort_usage(); - break; + cli_classic_abort_usage(); return 1; } } if (optind < argc) { fprintf(stderr, "Error: Extra parameter found.\n"); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; } /* FIXME: Print the actions flashrom will take. */ if (list_supported) { print_supported(); - exit(0); + return 0; } #if CONFIG_PRINT_WIKI == 1 if (list_supported_wiki) { print_supported_wiki(); - exit(0); + return 0; } #endif @@ -336,7 +333,7 @@ int main(int argc, char *argv[]) if ((programmer != PROGRAMMER_INTERNAL) && (lb_part || lb_vendor)) { fprintf(stderr, "Error: --mainboard requires the internal " "programmer. Aborting.\n"); - cli_classic_abort_usage(); + cli_classic_abort_usage(); return 1; } #endif @@ -349,7 +346,7 @@ int main(int argc, char *argv[]) chip_to_probe); printf("Run flashrom -L to view the hardware supported " "in this flashrom version.\n"); - exit(1); + return 1; } /* Clean up after the check. */ flash = NULL; -- 1.7.6

2 2

Re: [flashrom] [PATCH] Make the laptop warning less scary if unsure
by Stefan Tauner 04 Sep '11

04 Sep '11

On Thu, 25 Aug 2011 14:56:56 +0200 Idwer Vollering <vidwer(a)gmail.com> wrote: > 2011/8/20 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at>: > > Telling the user to use "force_I_want_a_brick" if it is not even a > > laptop, is a bit over-the-top. Introduce a new laptop parameter > > "this_is_not_a_laptop" that allows to force operation, but only if > > the detection is not sure. > > > > --- > > > > complicates the whole thing a bit. could do without the extra > > variable and new part of the if condition, if we allow the > > this_is_not_a_laptop parameter to always work, not only if the > > laptop detection is uncertain. it will be undocumented and only > > visible to the user together with the warning anyway... > > I was curious whether the currently present overriding parameter works > in combination with the parameter in this patch, and it does: $ sudo > ./flashrom -V -p internal:laptop=force_I_want_a_brick -p > internal:laptop=this_is_not_a_laptop > flashrom v0.9.4-r1418 on FreeBSD 9.0-BETA1 (i386), built with libpci > 3.1.7, GCC 4.2.2 20070831 prerelease [FreeBSD], little endian > (etcetera) > > Do you think this behaviour is desired? > the force_I_want_a_brick will override the other one (which is then neither used nor checked). i think that is ok... this is already way too sophisticated imho. :) but thanks for pointing it out, i have not thought about it yet. do you think this is a problem? -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 4

ASUS P4XP-X
by Patrick Welche 03 Sep '11

03 Sep '11

Is there a newbies list? I thought I would attempt to upgrade the firmware of a SiI3124 SATALink PCI card plugged into a P4XP-X motherboard. Stage one seems to be to run flashrom -V (attached). It seems that P4XP-X isn't listed in flashrom -L, so maybe I could "test" somehow? How can I probe for the sata card? On another computer with an intel board, the intel supplied bios executable contains EV0482C.BIO and EV0482C.ITK. .BIO seems promising as "BIOS", but the .ITK looks as though it contains all the strings - presumably both files are necessary for an upgrade? Pointers to a FM welcome... Cheers, Patrick

3 2

Re: [flashrom] SuperMicro X8DTU-6TF+: flashrom -Vr failed
by Stefan Tauner 03 Sep '11

03 Sep '11

On Fri, 2 Sep 2011 08:15:45 -0500 Scott Silverman <ssilverman(a)simplexinvestments.com> wrote: > I can confirm that this particular board is the > X8DTU-6TF+<http://www.supermicro.com/products/motherboard/QPI/5500/X8DTU_.cfm?TYP=SAS&…>(with > the Intel 82599 based 10GbE interfaces onboard). oki, thanks! > I do not have any X8DTU-6F+, but I do have other X8DTx boards to test with, > including X8DTU-F, X8DTU-LN4F+, X8DTi-LN4F and X8DTH-iF. If you need data > from any of these boards, let me know. no, that is not necessary. i just wanted to be sure to have valid data in our database :) if you ever use flashrom on a yet untested board, we would be glad to get a log of course.. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1427 - trunk
by repository service 03 Sep '11

03 Sep '11

Author: uwe Date: Sat Sep 3 20:37:52 2011 New Revision: 1427 URL: http://flashrom.org/trac/flashrom/changeset/1427 Log: Add support for the Linux SPI subsystem (spidev). See http://www.kernel.org/doc/Documentation/spi/spidev for an introduction. Usage is as follows: flashrom -p linux_spi:dev=/dev/spidevX.Y where X is the bus number, and Y device. It accepts an optional parameter 'speed' which allows to set the SPI clock speed in kHz. Tested on an Atmel AVR32AP7000 board (NGW100 Network Gateway Kit), see below, which was used to program a ThinkPad X60, but it should work on every other Linux system, too. http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4102) Signed-off-by: Sven Schnelle <svens(a)stackframe.org> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Added: trunk/linux_spi.c Modified: trunk/Makefile trunk/flashrom.c trunk/programmer.h Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Sep 3 19:15:00 2011 (r1426) +++ trunk/Makefile Sat Sep 3 20:37:52 2011 (r1427) @@ -313,6 +313,10 @@ # Always enable Bus Pirate SPI for now. CONFIG_BUSPIRATE_SPI ?= yes +# Disable Linux spidev interface support for now, until we check for a Linux +# device (not host, as DOS binaries for example are built on a Linux host). +CONFIG_LINUX_SPI ?= no + # Disable Dediprog SF100 until support is complete and tested. CONFIG_DEDIPROG ?= no @@ -449,6 +453,11 @@ NEED_SERIAL := yes endif +ifeq ($(CONFIG_LINUX_SPI), yes) +FEATURE_CFLAGS += -D'CONFIG_LINUX_SPI=1' +PROGRAMMER_OBJS += linux_spi.o +endif + ifeq ($(CONFIG_DEDIPROG), yes) FEATURE_CFLAGS += -D'CONFIG_DEDIPROG=1' FEATURE_LIBS += -lusb Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sat Sep 3 19:15:00 2011 (r1426) +++ trunk/flashrom.c Sat Sep 3 20:37:52 2011 (r1427) @@ -104,6 +104,9 @@ #if CONFIG_SATAMV == 1 PROGRAMMER_SATAMV #endif +#if CONFIG_LINUX_SPI == 1 + PROGRAMMER_LINUX_SPI +#endif ; #endif @@ -447,6 +450,24 @@ .chip_writew = fallback_chip_writew, .chip_writel = fallback_chip_writel, .chip_writen = fallback_chip_writen, + .delay = internal_delay, + }, +#endif + +#if CONFIG_LINUX_SPI == 1 + { + .name = "linux_spi", + .init = linux_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .chip_readb = noop_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = noop_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, .delay = internal_delay, }, #endif Added: trunk/linux_spi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/linux_spi.c Sat Sep 3 20:37:52 2011 (r1427) @@ -0,0 +1,139 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2011 Sven Schnelle <svens(a)stackframe.org> + * + * 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; version 2 of the License. + * + * 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 + */ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <sys/fcntl.h> +#include <errno.h> +#include <ctype.h> +#include <unistd.h> +#include <linux/spi/spidev.h> +#include <sys/ioctl.h> +#include "flash.h" +#include "chipdrivers.h" +#include "programmer.h" +#include "spi.h" + +static int fd = -1; + +static int linux_spi_shutdown(void *data); +static int linux_spi_send_command(unsigned int writecnt, unsigned int readcnt, + const unsigned char *txbuf, unsigned char *rxbuf); +static int linux_spi_read(struct flashchip *flash, uint8_t *buf, int start, + int len); +static int linux_spi_write_256(struct flashchip *flash, uint8_t *buf, + int start, int len); + +static const struct spi_programmer spi_programmer_linux = { + .type = SPI_CONTROLLER_LINUX, + .max_data_read = MAX_DATA_UNSPECIFIED, /* TODO? */ + .max_data_write = MAX_DATA_UNSPECIFIED, /* TODO? */ + .command = linux_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = linux_spi_read, + .write_256 = linux_spi_write_256, +}; + +int linux_spi_init(void) +{ + char *p, *endp, *dev; + int speed = 0; + + dev = extract_programmer_param("dev"); + if (!dev || !strlen(dev)) { + msg_perr("No SPI device given. Use flashrom -p " + "linux_spi:dev=/dev/spidevX.Y\n"); + return 1; + } + + p = extract_programmer_param("speed"); + if (p && strlen(p)) { + speed = strtoul(p, &endp, 10) * 1024; + if (p == endp) { + msg_perr("%s: invalid clock: %s kHz\n", __func__, p); + return 1; + } + } + + if ((fd = open(dev, O_RDWR)) == -1) { + msg_perr("%s: failed to open %s: %s\n", __func__, + dev, strerror(errno)); + return 1; + } + + if (speed > 0 && ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed) == -1) { + msg_perr("%s: failed to set speed %dHz: %s\n", + __func__, speed, strerror(errno)); + close(fd); + return 1; + } + + if (register_shutdown(linux_spi_shutdown, NULL)) + return 1; + + register_spi_programmer(&spi_programmer_linux); + + return 0; +} + +static int linux_spi_shutdown(void *data) +{ + if (fd != -1) { + close(fd); + fd = -1; + } + return 0; +} + +static int linux_spi_send_command(unsigned int writecnt, unsigned int readcnt, + const unsigned char *txbuf, unsigned char *rxbuf) +{ + struct spi_ioc_transfer msg[2] = { + { + .tx_buf = (uint64_t)txbuf, + .len = writecnt, + }, + { + .rx_buf = (uint64_t)rxbuf, + .len = readcnt, + }, + }; + + if (fd == -1) + return -1; + + if (ioctl(fd, SPI_IOC_MESSAGE(2), msg) == -1) { + msg_cerr("%s: ioctl: %s\n", __func__, strerror(errno)); + return -1; + } + return 0; +} + +static int linux_spi_read(struct flashchip *flash, uint8_t *buf, int start, + int len) +{ + return spi_read_chunked(flash, buf, start, len, getpagesize()); +} + +static int linux_spi_write_256(struct flashchip *flash, uint8_t *buf, + int start, int len) +{ + return spi_write_chunked(flash, buf, start, len, getpagesize() - 4); +} Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Sat Sep 3 19:15:00 2011 (r1426) +++ trunk/programmer.h Sat Sep 3 20:37:52 2011 (r1427) @@ -79,6 +79,9 @@ #if CONFIG_SATAMV == 1 PROGRAMMER_SATAMV, #endif +#if CONFIG_LINUX_SPI == 1 + PROGRAMMER_LINUX_SPI, +#endif PROGRAMMER_INVALID /* This must always be the last entry. */ }; @@ -485,6 +488,11 @@ int buspirate_spi_init(void); #endif +/* linux_spi.c */ +#if CONFIG_LINUX_SPI == 1 +int linux_spi_init(void); +#endif + /* dediprog.c */ #if CONFIG_DEDIPROG == 1 int dediprog_init(void); @@ -536,6 +544,9 @@ #if CONFIG_OGP_SPI == 1 || CONFIG_NICINTEL_SPI == 1 || CONFIG_RAYER_SPI == 1 || (CONFIG_INTERNAL == 1 && (defined(__i386__) || defined(__x86_64__))) SPI_CONTROLLER_BITBANG, #endif +#if CONFIG_LINUX_SPI == 1 + SPI_CONTROLLER_LINUX, +#endif }; extern const int spi_programmer_count;

1 0

[commit] r1426 - trunk
by repository service 03 Sep '11

03 Sep '11

Author: uwe Date: Sat Sep 3 19:15:00 2011 New Revision: 1426 URL: http://flashrom.org/trac/flashrom/changeset/1426 Log: Introduce ERROR_FATAL, abort upon failed chipset enables. Signed-off-by: Tadas Slotkus <devtadas(a)gmail.com> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/chipset_enable.c trunk/flash.h trunk/internal.c Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Sat Sep 3 13:22:27 2011 (r1425) +++ trunk/chipset_enable.c Sat Sep 3 19:15:00 2011 (r1426) @@ -1325,6 +1325,10 @@ msg_pinfo("OK.\n"); else if (ret == ERROR_NONFATAL) msg_pinfo("PROBLEMS, continuing anyway\n"); + if (ret == ERROR_FATAL) { + msg_perr("FATAL ERROR!\n"); + return ret; + } } s = flashbuses_to_text(buses_supported); Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sat Sep 3 13:22:27 2011 (r1425) +++ trunk/flash.h Sat Sep 3 19:15:00 2011 (r1426) @@ -224,9 +224,12 @@ #define OK 0 #define NT 1 /* Not tested */ -/* Something happened that shouldn't happen, but we can go on */ +/* Something happened that shouldn't happen, but we can go on. */ #define ERROR_NONFATAL 0x100 +/* Something happened that shouldn't happen, we'll abort. */ +#define ERROR_FATAL -0xee + /* cli_output.c */ /* Let gcc and clang check for correct printf-style format strings. */ int print(int type, const char *fmt, ...) __attribute__((format(printf, 2, 3))); Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Sat Sep 3 13:22:27 2011 (r1425) +++ trunk/internal.c Sat Sep 3 19:15:00 2011 (r1426) @@ -268,7 +268,8 @@ if (ret == -2) { msg_perr("WARNING: No chipset found. Flash detection " "will most likely fail.\n"); - } + } else if (ret == ERROR_FATAL) + return ret; #if defined(__i386__) || defined(__x86_64__) /* Probe unconditionally for IT87* LPC->SPI translation and for

1 0

Flashrom & Intel DH67CF
by Matthijs van Aalten 03 Sep '11

03 Sep '11

Hi, Can you tell me if it is (mostly) safe to use Flashrom 0.9.4 on my Intel DH67CF main board? The log doesn't make it clear how risky it is to flash. I've attached the 'flashrom -V' log file. What makes me afraid to try: Warning messages in the log file: "WARNING: BIOS region SMM protection is enabled!" "tried to set 0xdc to 0x23 on H67 failed (WARNING ONLY)" "WARNING: SPI Configuration Lockdown activated." ... is all a bit too technical but not very positive. I've downloaded the latest BIOS for this mainboard and flashed it from the BIOS utility itself (file used: BL0128P.BIO). Then I did a verify job with Flashrom - ideally it should read the flash memory and report it equal to the downloaded file: > flashrom -v BL0128P.BIO flashrom v0.9.4-r1395 on Linux 3.0.0 (x86_64), built with libpci 3.1.7, GCC 4.4.5, little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found chipset "Intel H67". This chipset is marked as untested. If you are using an up-to-date version of flashrom please email a report to flashrom(a)flashrom.org including a verbose (-V) log. Thank you! Enabling flash write... WARNING: BIOS region SMM protection is enabled! tried to set 0xdc to 0x23 on H67 failed (WARNING ONLY) WARNING: SPI Configuration Lockdown activated. FAILED! This chipset supports the following protocols: FWH, SPI. Found Macronix flash chip "MX25L3205" (4096 kB, SPI) at physical address 0xffc00000. Error: Image size doesn't match But: the Macronix flash chip as well as the Intel chipset (H67) are supported by Flashrom 0.9.4. All in all I'm reluctant to try it - especially since it already has a problem reading and verifying the BIOS. Any advice? Thanks, Matthijs

2 2

Re: [flashrom] ASRock P4V88
by Stefan Tauner 03 Sep '11

03 Sep '11

On Fri, 2 Sep 2011 20:05:13 +0200 Raúl Sigüenza <raulsiguenza89(a)gmail.com> wrote: > Board: http://www.asrock.com/mb/overview.asp?Model=p4v88 > > root@desktop:/home/raul# flashrom -Vr bios.bin > flashrom v0.9.3-r1323 on Linux 2.6.38-11-generic (i686), built with libpci > 3.1.7, GCC 4.6.1, little endian > flashrom is free software, get the source code at http://www.flashrom.org > > Calibrating delay loop... OS timer resolution is 1 usecs, 1981M loops per > second, 10 myus = 11 us, 100 myus = 100 us, 1000 myus = 1030 us, 10000 myus > = 11307 us, 4 myus = 5 us, OK. > Initializing internal programmer > No coreboot table found. > DMI string system-manufacturer: " " > DMI string system-product-name: "P4V88" > DMI string system-version: "1.00" > DMI string baseboard-manufacturer: " " > DMI string baseboard-product-name: "P4V88" > DMI string baseboard-version: "1.0" > DMI string chassis-type: "" > Found chipset "VIA VT8237", enabling flash write... chipset PCI ID is > 1106:3227, OK. > This chipset supports the following protocols: Non-SP. > […] > Probing for SST SST39SF020A, 256 kB: probe_jedec_common: id1 0xbf, id2 0xb6 > Found chip "SST SST39SF020A" (256 kB, Parallel) at physical address > 0xfffc0000. > […] > === > 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! > Reading flash... done. > Restoring PCI config space for 00:11:0 reg 0x59 > Restoring PCI config space for 00:11:0 reg 0x40 > Restoring PCI config space for 00:11:0 reg 0x41 hi what is the purpose of your mail exactly? :) have you tried writing the flash chip? because that's the only thing that would be helpful to us... if you are not sure if your board is supported... we don't know! you have to try it please :) -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom September 2011