flashrom

flashrom@flashrom.org

3 participants
9189 discussions

[commit] r1460 - trunk
by repository service 07 Nov '11

07 Nov '11

Author: stefanct Date: Mon Nov 7 00:51:09 2011 New Revision: 1460 URL: http://flashrom.org/trac/flashrom/changeset/1460 Log: ichspi: use a variable to distinguish ich generations instead of spi_programmer->type The type member is enough most of the time to derive the wanted information, but - not always (e.g. ich_set_bbar), - only available after registration, which we want to delay till the end of init, and - we really want to distinguish between chipset version-grained attributes which are not reflected by the registered programmer. Hence this patch introduces a new static variable which is set up early by the init functions and allows us to get rid of all "switch (spi_programmer->type)" in ichspi.c. We reuse the enum introduced for descriptor mode for the type of the new variable. Previously magic numbers were passed by chipset_enable wrappers. Now they use the enumeration items too. To get this working the enum definition had to be moved to programmer.h. Another noteworthy detail: previously we have checked for a valid programmer/ich generation all over the place. I have removed those checks and added one single check in the init method. Calling any function of a programmer without executing the init method first, is undefined behavior. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/chipset_enable.c trunk/ich_descriptors.h trunk/ichspi.c trunk/programmer.h Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Fri Nov 4 22:35:26 2011 (r1459) +++ trunk/chipset_enable.c Mon Nov 7 00:51:09 2011 (r1460) @@ -489,7 +489,7 @@ } static int enable_flash_ich_dc_spi(struct pci_dev *dev, const char *name, - int ich_generation) + enum ich_chipset ich_generation) { int ret; uint8_t bbs, buc; @@ -504,7 +504,7 @@ static const char *const straps_names_unknown[] = { "unknown", "unknown", "unknown", "unknown" }; switch (ich_generation) { - case 7: + case CHIPSET_ICH7: /* EP80579 may need further changes, but this is the least * intrusive way to get correct BOOT Strap printing without * changing the rest of its code path). */ @@ -513,13 +513,13 @@ else straps_names = straps_names_ich7_nm10; break; - case 8: - case 9: - case 10: + case CHIPSET_ICH8: + case CHIPSET_ICH9: + case CHIPSET_ICH10: straps_names = straps_names_ich8910; break; - case 11: - case 12: + case CHIPSET_5_SERIES_IBEX_PEAK: + case CHIPSET_6_SERIES_COUGAR_POINT: straps_names = straps_names_pch56; break; default: @@ -557,7 +557,7 @@ * on ICH7 when the southbridge is strapped to LPC */ buses_supported = BUS_FWH; - if (ich_generation == 7) { + if (ich_generation == CHIPSET_ICH7) { if (bbs == 0x03) { /* If strapped to LPC, no further SPI initialization is * required. */ @@ -579,34 +579,34 @@ static int enable_flash_ich7(struct pci_dev *dev, const char *name) { - return enable_flash_ich_dc_spi(dev, name, 7); + return enable_flash_ich_dc_spi(dev, name, CHIPSET_ICH7); } static int enable_flash_ich8(struct pci_dev *dev, const char *name) { - return enable_flash_ich_dc_spi(dev, name, 8); + return enable_flash_ich_dc_spi(dev, name, CHIPSET_ICH8); } static int enable_flash_ich9(struct pci_dev *dev, const char *name) { - return enable_flash_ich_dc_spi(dev, name, 9); + return enable_flash_ich_dc_spi(dev, name, CHIPSET_ICH9); } static int enable_flash_ich10(struct pci_dev *dev, const char *name) { - return enable_flash_ich_dc_spi(dev, name, 10); + return enable_flash_ich_dc_spi(dev, name, CHIPSET_ICH10); } /* Ibex Peak aka. 5 series & 3400 series */ static int enable_flash_pch5(struct pci_dev *dev, const char *name) { - return enable_flash_ich_dc_spi(dev, name, 11); + return enable_flash_ich_dc_spi(dev, name, CHIPSET_5_SERIES_IBEX_PEAK); } /* Cougar Point aka. 6 series & c200 series */ static int enable_flash_pch6(struct pci_dev *dev, const char *name) { - return enable_flash_ich_dc_spi(dev, name, 12); + return enable_flash_ich_dc_spi(dev, name, CHIPSET_6_SERIES_COUGAR_POINT); } static int via_no_byte_merge(struct pci_dev *dev, const char *name) Modified: trunk/ich_descriptors.h ============================================================================== --- trunk/ich_descriptors.h Fri Nov 4 22:35:26 2011 (r1459) +++ trunk/ich_descriptors.h Mon Nov 7 00:51:09 2011 (r1460) @@ -24,6 +24,7 @@ #define __ICH_DESCRIPTORS_H__ 1 #include <stdint.h> +#include "programmer.h" /* for enum ich_chipset */ /* FIXME: Replace with generic return codes */ #define ICH_RET_OK 0 @@ -63,20 +64,6 @@ #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); struct ich_desc_content { Modified: trunk/ichspi.c ============================================================================== --- trunk/ichspi.c Fri Nov 4 22:35:26 2011 (r1459) +++ trunk/ichspi.c Mon Nov 7 00:51:09 2011 (r1460) @@ -172,6 +172,7 @@ /* ICH SPI configuration lock-down. May be set during chipset enabling. */ static int ichspi_lock = 0; +static enum ich_chipset ich_generation = CHIPSET_ICH_UNKNOWN; uint32_t ichspi_bbar = 0; static void *ich_spibar = NULL; @@ -454,23 +455,20 @@ return -1; } - switch (spi_programmer->type) { - case SPI_CONTROLLER_ICH7: - case SPI_CONTROLLER_VIA: + switch (ich_generation) { + case CHIPSET_ICH7: preop = REGREAD16(ICH7_REG_PREOP); optype = REGREAD16(ICH7_REG_OPTYPE); opmenu[0] = REGREAD32(ICH7_REG_OPMENU); opmenu[1] = REGREAD32(ICH7_REG_OPMENU + 4); break; - case SPI_CONTROLLER_ICH9: + case CHIPSET_ICH8: + default: /* Future version might behave the same */ preop = REGREAD16(ICH9_REG_PREOP); optype = REGREAD16(ICH9_REG_OPTYPE); opmenu[0] = REGREAD32(ICH9_REG_OPMENU); opmenu[1] = REGREAD32(ICH9_REG_OPMENU + 4); break; - default: - msg_perr("%s: unsupported chipset\n", __func__); - return -1; } op->preop[0] = (uint8_t) preop; @@ -529,9 +527,8 @@ } msg_pdbg("\n%s: preop=%04x optype=%04x opmenu=%08x%08x\n", __func__, preop, optype, opmenu[0], opmenu[1]); - switch (spi_programmer->type) { - case SPI_CONTROLLER_ICH7: - case SPI_CONTROLLER_VIA: + switch (ich_generation) { + case CHIPSET_ICH7: /* Register undo only for enable_undo=1, i.e. first call. */ if (enable_undo) { rmmio_valw(ich_spibar + ICH7_REG_PREOP); @@ -544,7 +541,8 @@ mmio_writel(opmenu[0], ich_spibar + ICH7_REG_OPMENU); mmio_writel(opmenu[1], ich_spibar + ICH7_REG_OPMENU + 4); break; - case SPI_CONTROLLER_ICH9: + case CHIPSET_ICH8: + default: /* Future version might behave the same */ /* Register undo only for enable_undo=1, i.e. first call. */ if (enable_undo) { rmmio_valw(ich_spibar + ICH9_REG_PREOP); @@ -557,9 +555,6 @@ mmio_writel(opmenu[0], ich_spibar + ICH9_REG_OPMENU); mmio_writel(opmenu[1], ich_spibar + ICH9_REG_OPMENU + 4); break; - default: - msg_perr("%s: unsupported chipset\n", __func__); - return -1; } return 0; @@ -569,16 +564,17 @@ * Try to set BBAR (BIOS Base Address Register), but read back the value in case * it didn't stick. */ -static void ich_set_bbar(int ich_generation, uint32_t min_addr) +static void ich_set_bbar(uint32_t min_addr) { int bbar_off; switch (ich_generation) { - case 7: + case CHIPSET_ICH7: bbar_off = 0x50; break; - case 8: + case CHIPSET_ICH8: msg_perr("BBAR offset is unknown on ICH8!\n"); return; + case CHIPSET_ICH9: default: /* Future version might behave the same */ bbar_off = ICH9_REG_BBAR; break; @@ -943,15 +939,12 @@ return SPI_INVALID_LENGTH; } - switch (spi_programmer->type) { - case SPI_CONTROLLER_VIA: - case SPI_CONTROLLER_ICH7: + switch (ich_generation) { + case CHIPSET_ICH7: return ich7_run_opcode(op, offset, datalength, data, maxlength); - case SPI_CONTROLLER_ICH9: + case CHIPSET_ICH8: + default: /* Future version might behave the same */ return ich9_run_opcode(op, offset, datalength, data); - default: - /* If we ever get here, something really weird happened */ - return -1; } } @@ -1022,19 +1015,11 @@ opcode->spi_type == SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS) { addr = (writearr[1] << 16) | (writearr[2] << 8) | (writearr[3] << 0); - switch (spi_programmer->type) { - case SPI_CONTROLLER_ICH7: - case SPI_CONTROLLER_VIA: - case SPI_CONTROLLER_ICH9: - if (addr < ichspi_bbar) { - msg_perr("%s: Address 0x%06x below allowed " - "range 0x%06x-0xffffff\n", __func__, - addr, ichspi_bbar); - return SPI_INVALID_ADDRESS; - } - break; - default: - break; + if (addr < ichspi_bbar) { + msg_perr("%s: Address 0x%06x below allowed " + "range 0x%06x-0xffffff\n", __func__, + addr, ichspi_bbar); + return SPI_INVALID_ADDRESS; } } @@ -1316,7 +1301,7 @@ }; int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, - int ich_generation) + enum ich_chipset ich_gen) { int i; uint8_t old, new; @@ -1324,15 +1309,16 @@ uint32_t tmp; int desc_valid = 0; + ich_generation = ich_gen; + switch (ich_generation) { - case 7: - spibar_offset = 0x3020; - break; - case 8: + case CHIPSET_ICH_UNKNOWN: + return -1; + case CHIPSET_ICH7: + case CHIPSET_ICH8: spibar_offset = 0x3020; break; - case 9: - case 10: + case CHIPSET_ICH9: default: /* Future version might behave the same */ spibar_offset = 0x3800; break; @@ -1345,7 +1331,7 @@ ich_spibar = rcrb + spibar_offset; switch (ich_generation) { - case 7: + case CHIPSET_ICH7: msg_pdbg("0x00: 0x%04x (SPIS)\n", mmio_readw(ich_spibar + 0)); msg_pdbg("0x02: 0x%04x (SPIC)\n", @@ -1381,13 +1367,11 @@ msg_pinfo("WARNING: SPI Configuration Lockdown activated.\n"); ichspi_lock = 1; } - ich_set_bbar(ich_generation, 0); + ich_set_bbar(0); register_spi_programmer(&spi_programmer_ich7); ich_init_opcodes(); break; - case 8: - case 9: - case 10: + case CHIPSET_ICH8: default: /* Future version might behave the same */ tmp2 = mmio_readw(ich_spibar + ICH9_REG_HSFS); msg_pdbg("0x04: 0x%04x (HSFS)\n", tmp2); @@ -1447,7 +1431,7 @@ mmio_readl(ich_spibar + ICH9_REG_OPMENU)); msg_pdbg("0x9C: 0x%08x (OPMENU+4)\n", mmio_readl(ich_spibar + ICH9_REG_OPMENU + 4)); - if (ich_generation == 8) { + if (ich_generation == CHIPSET_ICH8) { tmp = mmio_readl(ich_spibar + ICH8_REG_VSCC); msg_pdbg("0xC1: 0x%08x (VSCC)\n", tmp); msg_pdbg("VSCC: "); @@ -1469,7 +1453,7 @@ tmp = mmio_readl(ich_spibar + ICH9_REG_FPB); msg_pdbg("0xD0: 0x%08x (FPB)\n", tmp); - ich_set_bbar(ich_generation, 0); + ich_set_bbar(0); } msg_pdbg("\n"); @@ -1524,6 +1508,7 @@ /* Not sure if it speaks all these bus protocols. */ buses_supported = BUS_LPC | BUS_FWH; + ich_generation = CHIPSET_ICH7; register_spi_programmer(&spi_programmer_via); msg_pdbg("0x00: 0x%04x (SPIS)\n", mmio_readw(ich_spibar + 0)); @@ -1556,7 +1541,7 @@ ichspi_lock = 1; } - ich_set_bbar(7, 0); + ich_set_bbar(0); ich_init_opcodes(); return 0; Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Fri Nov 4 22:35:26 2011 (r1459) +++ trunk/programmer.h Mon Nov 7 00:51:09 2011 (r1460) @@ -579,9 +579,20 @@ /* ichspi.c */ #if CONFIG_INTERNAL == 1 +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 +}; + extern uint32_t ichspi_bbar; int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, - int ich_generation); + enum ich_chipset ich_generation); int via_init_spi(struct pci_dev *dev); /* it85spi.c */

1 0

(no subject)
by yarpr＠pochta.ru 05 Nov '11

05 Nov '11

 _ Pr.om_ot.ions on weeke_nds 

2 1

Re: [flashrom] [PATCH 1/5] Add opaque programmer registration infrastructure.
by Michael Karcher 04 Nov '11

04 Nov '11

Am Freitag, den 21.10.2011, 00:39 +0200 schrieb Stefan Tauner: > diff --git a/flash.h b/flash.h > index 535c1b8..8ad2845 100644 > --- a/flash.h > +++ b/flash.h > @@ -62,8 +62,9 @@ enum chipbustype { > BUS_LPC = 1 << 1, > BUS_FWH = 1 << 2, > BUS_SPI = 1 << 3, > + BUS_PROG = 1 << 4, > BUS_NONSPI = BUS_PARALLEL | BUS_LPC | BUS_FWH, > - BUS_UNKNOWN = BUS_PARALLEL | BUS_LPC | BUS_FWH | BUS_SPI, > + BUS_UNKNOWN = BUS_PARALLEL | BUS_LPC | BUS_FWH | BUS_SPI | BUS_PROG, We don't need BUS_UNKNOWN. It is referenced only in flashbuses_to_text. Having a programmer being both opaque and non-opaque seems to be as useless as defining that a chip "might also be accessed through an opaque interface". In the case of opaque interfaces, we don't care about the chip type - so I don't see any use case for BUS_UNKNOWN, even more after adding BUS_PROG. > }; > +#if defined(CONFIG_INTERNAL) && (defined(__i386__) || defined(__x86_64__)) > + { > + .vendor = "Programmer", > + .name = "Opaque flash chip", > + .bustype = BUS_PROG, > + .manufacture_id = PROGMANUF_ID, > + .model_id = PROGDEV_ID, > + .total_size = 0, > + .page_size = 256, > + /* probe is assumed to work, rest will be filled in by probe */ > + .tested = TEST_OK_PROBE, > + .probe = probe_opaque, > + /* eraseblock sizes will be set by the probing function */ > + .block_erasers = > + { > + { > + .block_erase = erase_opaque, > + } > + }, > + .write = write_opaque, > + .read = read_opaque, > + }, > +#endif // defined(CONFIG_INTERNAL) && (defined(__i386__) || defined(__x86_64__)) Why do we need any prerequisite for the opaque programmer? It should work outside of x86(-64), too, depending on which opaque backend is used. I guess this #if is there because at the moment, the only opaque programmer is the ICH9 stuff, but wouldn't a define NEED_OPAQUE that is set in the include file as soon as any programmer based on the opaque programmer is selected be more sensible? > @@ -9005,6 +9027,7 @@ const struct flashchip flashchips[] = { > .probe = probe_spi_rdid, > .write = NULL, > }, > + > { > .vendor = "Generic", > .name = "unknown SPI chip (REMS)", Unrelated change - you might have it in accidentally. > +/* > + * Contains the opaque programmer framework. > + * An opaque programmer is a programmer which does not provide direct access > + * to the flash chip and which abstracts all flash chip properties into a > + * programmer specific interface. > + */ > + > +#include <strings.h> > +#include <string.h> > +#include "flash.h" > +#include "flashchips.h" > +#include "chipdrivers.h" > +#include "programmer.h" > + > +const struct opaque_programmer opaque_programmer_none = { > + .max_data_read = MAX_DATA_UNSPECIFIED, > + .max_data_write = MAX_DATA_UNSPECIFIED, > + .probe = NULL, > + .read = NULL, You are missing ".erase = NULL" here. > + .write = NULL, > +}; > + > +const struct opaque_programmer *opaque_programmer = &opaque_programmer_none; > + > +int probe_opaque(struct flashchip *flash) > +{ > + if (!opaque_programmer->probe) { > + msg_perr("%s called, but this is not an opaque programmer. " > + "Please report a bug at flashrom(a)flashrom.org\n", > + __func__); I don't really like the error message, I would prefer "%s called without register_opaque" or something like that. > +void register_opaque_programmer(const struct opaque_programmer *pgm) > +{ > + opaque_programmer = pgm; > + buses_supported |= BUS_PROG; > +} You might want to check that the function pointers in pgm are not NULL, to make the suggested error message "without register_opaque" more apt. Otherwise, the patch looks good to me. This is Acked-By: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> If you feel confident you didn't mess up anything, feel free to re-use the ack after minor edits. Regards, Michael Karcher

3 4

[commit] r1459 - trunk
by repository service 04 Nov '11

04 Nov '11

Author: hailfinger Date: Fri Nov 4 22:35:26 2011 New Revision: 1459 URL: http://flashrom.org/trac/flashrom/changeset/1459 Log: Add opaque programmer registration infrastructure An opaque programmer does not allow direct flash access and only offers abstract probe/read/erase/write methods. Due to that, opaque programmers need their own infrastructure and registration framework. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Added: trunk/opaque.c Modified: trunk/Makefile trunk/chipdrivers.h trunk/flash.h trunk/flashchips.c trunk/flashchips.h trunk/print.c trunk/programmer.h Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed Nov 2 15:31:18 2011 (r1458) +++ trunk/Makefile Fri Nov 4 22:35:26 2011 (r1459) @@ -242,7 +242,7 @@ CHIP_OBJS = jedec.o stm50flw0x0x.o w39.o w29ee011.o \ sst28sf040.o m29f400bt.o 82802ab.o pm49fl00x.o \ sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o sharplhf00l04.o \ - a25.o at25.o + a25.o at25.o opaque.o LIB_OBJS = layout.o Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Wed Nov 2 15:31:18 2011 (r1458) +++ trunk/chipdrivers.h Fri Nov 4 22:35:26 2011 (r1459) @@ -58,6 +58,12 @@ int spi_write_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize); int spi_aai_write(struct flashchip *flash, uint8_t *buf, int start, int len); +/* opaque.c */ +int probe_opaque(struct flashchip *flash); +int read_opaque(struct flashchip *flash, uint8_t *buf, int start, int len); +int write_opaque(struct flashchip *flash, uint8_t *buf, int start, int len); +int erase_opaque(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen); + /* a25.c */ int spi_prettyprint_status_register_amic_a25l05p(struct flashchip *flash); int spi_prettyprint_status_register_amic_a25l40p(struct flashchip *flash); Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Wed Nov 2 15:31:18 2011 (r1458) +++ trunk/flash.h Fri Nov 4 22:35:26 2011 (r1459) @@ -62,8 +62,8 @@ BUS_LPC = 1 << 1, BUS_FWH = 1 << 2, BUS_SPI = 1 << 3, + BUS_PROG = 1 << 4, BUS_NONSPI = BUS_PARALLEL | BUS_LPC | BUS_FWH, - BUS_UNKNOWN = BUS_PARALLEL | BUS_LPC | BUS_FWH | BUS_SPI, }; /* Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Wed Nov 2 15:31:18 2011 (r1458) +++ trunk/flashchips.c Fri Nov 4 22:35:26 2011 (r1459) @@ -8874,6 +8874,28 @@ }, { + .vendor = "Programmer", + .name = "Opaque flash chip", + .bustype = BUS_PROG, + .manufacture_id = PROGMANUF_ID, + .model_id = PROGDEV_ID, + .total_size = 0, + .page_size = 256, + /* probe is assumed to work, rest will be filled in by probe */ + .tested = TEST_OK_PROBE, + .probe = probe_opaque, + /* eraseblock sizes will be set by the probing function */ + .block_erasers = + { + { + .block_erase = erase_opaque, + } + }, + .write = write_opaque, + .read = read_opaque, + }, + + { .vendor = "AMIC", .name = "unknown AMIC SPI chip", .bustype = BUS_SPI, Modified: trunk/flashchips.h ============================================================================== --- trunk/flashchips.h Wed Nov 2 15:31:18 2011 (r1458) +++ trunk/flashchips.h Fri Nov 4 22:35:26 2011 (r1459) @@ -646,4 +646,7 @@ #define WINBOND_W49V002A 0xB0 #define WINBOND_W49V002FA 0x32 +#define PROGMANUF_ID 0xFFFE /* dummy ID for opaque chips behind a programmer */ +#define PROGDEV_ID 0x01 /* dummy ID for opaque chips behind a programmer */ + #endif /* !FLASHCHIPS_H */ Added: trunk/opaque.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/opaque.c Fri Nov 4 22:35:26 2011 (r1459) @@ -0,0 +1,99 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2011 Carl-Daniel Hailfinger + * + * 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 + */ + +/* + * Contains the opaque programmer framework. + * An opaque programmer is a programmer which does not provide direct access + * to the flash chip and which abstracts all flash chip properties into a + * programmer specific interface. + */ + +#include <stdint.h> +#include "flash.h" +#include "flashchips.h" +#include "chipdrivers.h" +#include "programmer.h" + +const struct opaque_programmer opaque_programmer_none = { + .max_data_read = MAX_DATA_UNSPECIFIED, + .max_data_write = MAX_DATA_UNSPECIFIED, + .probe = NULL, + .read = NULL, + .write = NULL, + .erase = NULL, +}; + +const struct opaque_programmer *opaque_programmer = &opaque_programmer_none; + +int probe_opaque(struct flashchip *flash) +{ + if (!opaque_programmer->probe) { + msg_perr("%s called before register_opaque_programmer. " + "Please report a bug at flashrom(a)flashrom.org\n", + __func__); + return 0; + } + + return opaque_programmer->probe(flash); +} + +int read_opaque(struct flashchip *flash, uint8_t *buf, int start, int len) +{ + if (!opaque_programmer->read) { + msg_perr("%s called before register_opaque_programmer. " + "Please report a bug at flashrom(a)flashrom.org\n", + __func__); + return 1; + } + return opaque_programmer->read(flash, buf, start, len); +} + +int write_opaque(struct flashchip *flash, uint8_t *buf, int start, int len) +{ + if (!opaque_programmer->write) { + msg_perr("%s called before register_opaque_programmer. " + "Please report a bug at flashrom(a)flashrom.org\n", + __func__); + return 1; + } + return opaque_programmer->write(flash, buf, start, len); +} + +int erase_opaque(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen) +{ + if (!opaque_programmer->erase) { + msg_perr("%s called before register_opaque_programmer. " + "Please report a bug at flashrom(a)flashrom.org\n", + __func__); + return 1; + } + return opaque_programmer->erase(flash, blockaddr, blocklen); +} + +void register_opaque_programmer(const struct opaque_programmer *pgm) +{ + if (!pgm->probe || !pgm->read || !pgm->write || !pgm->erase) { + msg_perr("%s called with one of probe/read/write/erase being " + "NULL. Please report a bug at flashrom(a)flashrom.org\n", + __func__); + return; + } + opaque_programmer = pgm; + buses_supported |= BUS_PROG; +} Modified: trunk/print.c ============================================================================== --- trunk/print.c Wed Nov 2 15:31:18 2011 (r1458) +++ trunk/print.c Fri Nov 4 22:35:26 2011 (r1459) @@ -32,13 +32,11 @@ char *flashbuses_to_text(enum chipbustype bustype) { char *ret = calloc(1, 1); - if (bustype == BUS_UNKNOWN) { - ret = strcat_realloc(ret, "Unknown, "); /* * FIXME: Once all chipsets and flash chips have been updated, NONSPI * will cease to exist and should be eliminated here as well. */ - } else if (bustype == BUS_NONSPI) { + if (bustype == BUS_NONSPI) { ret = strcat_realloc(ret, "Non-SPI, "); } else { if (bustype & BUS_PARALLEL) @@ -49,6 +47,8 @@ ret = strcat_realloc(ret, "FWH, "); if (bustype & BUS_SPI) ret = strcat_realloc(ret, "SPI, "); + if (bustype & BUS_PROG) + ret = strcat_realloc(ret, "Programmer-specific, "); if (bustype == BUS_NONE) ret = strcat_realloc(ret, "None, "); } Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Wed Nov 2 15:31:18 2011 (r1458) +++ trunk/programmer.h Fri Nov 4 22:35:26 2011 (r1459) @@ -24,6 +24,8 @@ #ifndef __PROGRAMMER_H__ #define __PROGRAMMER_H__ 1 +#include "flash.h" /* for chipaddr and flashchip */ + enum programmer { #if CONFIG_INTERNAL == 1 PROGRAMMER_INTERNAL, @@ -601,6 +603,19 @@ int wbsio_check_for_spi(void); #endif +/* opaque.c */ +struct opaque_programmer { + int max_data_read; + int max_data_write; + /* Specific functions for this programmer */ + int (*probe) (struct flashchip *flash); + int (*read) (struct flashchip *flash, uint8_t *buf, int start, int len); + int (*write) (struct flashchip *flash, uint8_t *buf, int start, int len); + int (*erase) (struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen); +}; +extern const struct opaque_programmer *opaque_programmer; +void register_opaque_programmer(const struct opaque_programmer *pgm); + /* serprog.c */ #if CONFIG_SERPROG == 1 int serprog_init(void);

1 0

Re: [flashrom] Flashing FM28V100 through satasii
by Rudolf Marek 03 Nov '11

03 Nov '11

The message is some test from the chip which is telling if some chip is connected or not. Try to override that or check the datasheet to see what it really does. Thanks Rudolf

1 0

SST49LF080A - ERASE FAILED at 0x000a3d28!
by Rudolf Marek 03 Nov '11

03 Nov '11

Hi all, It worked with this chip some time ago (a year). Erasing with -E also fails but the next one will succeed. If I write back content again and do it all again I can reproduce this. It seems like a timing issue. Log attached. Changing probe_timing to 10000 is not helping. Tried with latest flashrom, older ended with SIGSEGV. Any clue? Thanks Rudolf

2 1

Re: [flashrom] [PATCH 1/2] ichspi: remove dependency on spi_programmer from generate_opcodes and program_opcodes
by Carl-Daniel Hailfinger 03 Nov '11

03 Nov '11

Am 26.10.2011 15:35 schrieb Stefan Tauner: > This allows them to be called before programmer registration. > --- > i think it might be a good idea to get rid of the whole > switch(spi_programmer->type) > pattern and create a file-scope static ich_generation variable instead > of using the type member and the ich_generation parameters everywhere. Absolutely agreed. The only possible generic problem with that approach would be the registration of multiple ICH-style SPI programmers, but unless we see boards with two active ICH-style southbridges I think we can assume the static variable handles it well. (Note that boards with multiple MCP55 southbridges exist, but only one southbridge has an attached flash chip.) There might be an issue for those who want to use flashrom as a standalone tool (e.g. on top of libpayload) where heap allocations for static variables are unwanted, but that's a huge can of worms and I'd rather ignore that issue until either static variables work well in that environment or until someone hacks a way around static variables being a problem there. > the type member is enough most of the time to derive the wanted > information, but > - not always (e.g. ich_set_bbar) > - only available after registration, which we want to delay till the end > of init. > - we really want to distinguish between chipset version-grained > attributes which are not reflected by the registered programmer. Indeed. So if you could rework the patch to use your static variable suggestion, it would reduce patch size and make the code more readable. Regards, Carl-Daniel > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > ichspi.c | 44 +++++++++++++++++++++++++++----------------- > 1 files changed, 27 insertions(+), 17 deletions(-) > > diff --git a/ichspi.c b/ichspi.c > index afa420b..bc03554 100644 > --- a/ichspi.c > +++ b/ichspi.c > @@ -225,8 +225,8 @@ static uint16_t REGREAD8(int X) > /* Common SPI functions */ > static int find_opcode(OPCODES *op, uint8_t opcode); > static int find_preop(OPCODES *op, uint8_t preop); > -static int generate_opcodes(OPCODES * op); > -static int program_opcodes(OPCODES *op, int enable_undo); > +static int generate_opcodes(int ich_generation, OPCODES * op); > +static int program_opcodes(int ich_generation, OPCODES *op, int enable_undo); > static int run_opcode(OPCODE op, uint32_t offset, > uint8_t datalength, uint8_t * data); > > @@ -410,7 +410,18 @@ static int reprogram_opcode_on_the_fly(uint8_t opcode, unsigned int writecnt, un > int oppos=2; // use original JEDEC_BE_D8 offset > curopcodes->opcode[oppos].opcode = opcode; > curopcodes->opcode[oppos].spi_type = spi_type; > - program_opcodes(curopcodes, 0); > + switch (spi_programmer->type) { > + case SPI_CONTROLLER_ICH7: > + case SPI_CONTROLLER_VIA: > + program_opcodes(7, curopcodes, 0); > + break; > + case SPI_CONTROLLER_ICH9: > + program_opcodes(9, curopcodes, 0); > + break; > + default: > + msg_perr("%s: unsupported chipset\n", __func__); > + return -1; > + } > oppos = find_opcode(curopcodes, opcode); > msg_pdbg ("on-the-fly OPCODE (0x%02X) re-programmed, op-pos=%d\n", opcode, oppos); > return oppos; > @@ -443,7 +454,7 @@ static int find_preop(OPCODES *op, uint8_t preop) > } > > /* Create a struct OPCODES based on what we find in the locked down chipset. */ > -static int generate_opcodes(OPCODES * op) > +static int generate_opcodes(int ich_generation, OPCODES * op) > { > int a; > uint16_t preop, optype; > @@ -498,7 +509,7 @@ static int generate_opcodes(OPCODES * op) > return 0; > } > > -static int program_opcodes(OPCODES *op, int enable_undo) > +static int program_opcodes(int ich_generation, OPCODES *op, int enable_undo) > { > uint8_t a; > uint16_t preop, optype; > @@ -529,9 +540,8 @@ static int program_opcodes(OPCODES *op, int enable_undo) > } > > msg_pdbg("\n%s: preop=%04x optype=%04x opmenu=%08x%08x\n", __func__, preop, optype, opmenu[0], opmenu[1]); > - switch (spi_programmer->type) { > - case SPI_CONTROLLER_ICH7: > - case SPI_CONTROLLER_VIA: > + switch (ich_generation) { > + case 7: > /* Register undo only for enable_undo=1, i.e. first call. */ > if (enable_undo) { > rmmio_valw(ich_spibar + ICH7_REG_PREOP); > @@ -544,7 +554,10 @@ static int program_opcodes(OPCODES *op, int enable_undo) > mmio_writel(opmenu[0], ich_spibar + ICH7_REG_OPMENU); > mmio_writel(opmenu[1], ich_spibar + ICH7_REG_OPMENU + 4); > break; > - case SPI_CONTROLLER_ICH9: > + case 8: > + case 9: > + case 10: > + default: /* Future version might behave the same */ > /* Register undo only for enable_undo=1, i.e. first call. */ > if (enable_undo) { > rmmio_valw(ich_spibar + ICH9_REG_PREOP); > @@ -557,9 +570,6 @@ static int program_opcodes(OPCODES *op, int enable_undo) > mmio_writel(opmenu[0], ich_spibar + ICH9_REG_OPMENU); > mmio_writel(opmenu[1], ich_spibar + ICH9_REG_OPMENU + 4); > break; > - default: > - msg_perr("%s: unsupported chipset\n", __func__); > - return -1; > } > > return 0; > @@ -652,7 +662,7 @@ static void ich_fill_data(const uint8_t *data, int len, int reg0_off) > * > * It should be called before ICH sends any spi command. > */ > -static int ich_init_opcodes(void) > +static int ich_init_opcodes(int ich_generation) > { > int rc = 0; > OPCODES *curopcodes_done; > @@ -663,11 +673,11 @@ static int ich_init_opcodes(void) > if (ichspi_lock) { > msg_pdbg("Reading OPCODES... "); > curopcodes_done = &O_EXISTING; > - rc = generate_opcodes(curopcodes_done); > + rc = generate_opcodes(ich_generation, curopcodes_done); > } else { > msg_pdbg("Programming OPCODES... "); > curopcodes_done = &O_ST_M25P; > - rc = program_opcodes(curopcodes_done, 1); > + rc = program_opcodes(ich_generation, curopcodes_done, 1); > } > > if (rc) { > @@ -1343,6 +1353,7 @@ int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, > > /* Assign Virtual Address */ > ich_spibar = rcrb + spibar_offset; > + ich_init_opcodes(ich_generation); > > switch (ich_generation) { > case 7: > @@ -1383,7 +1394,6 @@ int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb, > } > ich_set_bbar(ich_generation, 0); > register_spi_programmer(&spi_programmer_ich7); > - ich_init_opcodes(); > break; > case 8: > case 9: > @@ -1557,7 +1567,7 @@ int via_init_spi(struct pci_dev *dev) > } > > ich_set_bbar(7, 0); > - ich_init_opcodes(); > + ich_init_opcodes(7); > > return 0; > } -- http://www.hailfinger.org/

2 1

Re: [flashrom] Successful test on Asus P5K-VM
by Stefan Tauner 02 Nov '11

02 Nov '11

On Mon, 31 Oct 2011 20:11:54 +0100 Grischa Ebinger <grischa.ebinger(a)gmail.com> wrote: > Hello, > > I was able to successfully reflash the BIOS of a P5K-VM motherboard > with flashrom-0.9.4. It recognized 2 different flash chips (AT25DF081A > and AT26DF081A) at the same address. I selected the first of the two > chipsets. > > I wasn't sure if flashrom did support my hardware. According to your > wiki it wasn't tested before. Luckily, it did its job without a > hiccup. Thank you a lot for providing such a useful tool, I hope I can > help you by sending you this new data. Hello Grischa, Thanks for your report! I have marked the mainboard as supported and will commit that later together with other small changes. > […] > Probing for Atmel AT25DF081A, 1024 kB: probe_spi_rdid_generic: id1 > 0x1f, id2 0x4501 > Chip status register is 00 > Found Atmel flash chip "AT25DF081A" (1024 kB, SPI) at physical address > 0xfff00000. > Ignoring security lockdown (if present) > Ignoring status register byte 2 > Chip status register is 00 > Chip status register: Sector Protection Register Lock (SRPL) is not set > Chip status register: Bit 6 is not set > Chip status register: Erase/Program Error (EPE) is not set > Chip status register: WP# pin (WPP) is asserted > Chip status register: Software Protection Status (SWP): no sectors are protected > Chip status register: Write Enable Latch (WEL) is not set > Chip status register: Write In Progress (WIP/BUSY) is not set > Probing for Atmel AT25DF161, 2048 kB: probe_spi_rdid_generic: id1 > 0x1f, id2 0x4501 > Probing for Atmel AT25DF321, 4096 kB: probe_spi_rdid_generic: id1 > 0x1f, id2 0x4501 > Probing for Atmel AT25DF321A, 4096 kB: probe_spi_rdid_generic: id1 > 0x1f, id2 0x4501 > Probing for Atmel AT25DF641, 8192 kB: probe_spi_rdid_generic: id1 > 0x1f, id2 0x4501 > Probing for Atmel AT25DQ161, 2048 kB: probe_spi_rdid_generic: id1 > 0x1f, id2 0x4501 > Probing for Atmel AT25F512B, 64 kB: probe_spi_rdid_generic: id1 0x1f, id2 0x4501 > Probing for Atmel AT25FS010, 128 kB: probe_spi_rdid_generic: id1 0x1f, > id2 0x4501 > Probing for Atmel AT25FS040, 512 kB: probe_spi_rdid_generic: id1 0x1f, > id2 0x4501 > Probing for Atmel AT26DF041, 512 kB: probe_spi_rdid_generic: id1 0x1f, > id2 0x4501 > Probing for Atmel AT26DF081A, 1024 kB: probe_spi_rdid_generic: id1 > 0x1f, id2 0x4501 > Chip status register is 00 > Found Atmel flash chip "AT26DF081A" (1024 kB, SPI) at physical address > 0xfff00000. > Chip status register is 00 > Chip status register: Sector Protection Register Lock (SRPL) is not set > Chip status register: Sequential Program Mode Status (SPM) is not set > Chip status register: Erase/Program Error (EPE) is not set > Chip status register: WP# pin (WPP) is asserted > Chip status register: Software Protection Status (SWP): no sectors are protected > Chip status register: Write Enable Latch (WEL) is not set > Chip status register: Write In Progress (WIP/BUSY) is not set > […] > Multiple flash chips were detected: "AT25DF081A", "AT26DF081A" the chips are not found "at the same address", but report the same ID when queried. atmel did no give them distinct IDs so we can not distinguish them on our own, hence your help was required*, sorry. * i have not looked at the respective datesheets. it is possible that the other definition would work equally. > […] > > $ lspci -nnvvxxx > […] not needed in this case. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] Flashrom fails to write - Sun Ultra 40 M2
by Stefan Tauner 02 Nov '11

02 Nov '11

On Tue, 25 Oct 2011 11:29:45 -0700 Nick <nochristrequired(a)gmail.com> wrote: > DMI string system-manufacturer: "Sun Microsystems" > DMI string system-product-name: "Sun Ultra 40 M2 Workstation" > DMI string system-version: "11" > DMI string baseboard-manufacturer: "Sun Microsystems" > DMI string baseboard-product-name: "Sun Ultra 40 M2 Workstation" > DMI string baseboard-version: "50" > > nForce Pro 3600 / MCP55, SMSC SuperIO > > Verbose output when flashing coreboot - > http://paste.flashrom.org/view.php?id=880 > Verbose output when flashing original Sun BIOS image - > http://paste.flashrom.org/view.php?id=881 > > lspci -nnvvvxxx output - http://paste.flashrom.org/view.php?id=883 > superiotool -deV output - http://paste.flashrom.org/view.php?id=884 > > Original Sun Ultra 40 M2 BIOS image - > http://paste.flashrom.org/view.php?id=882 hey there, as you know we have a patch to get this working. i have committed it to our repository moments ago so that board will be supported from now (r1458) on. gl with coreboot ;) -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

Re: [flashrom] [PATCH] Add board enable for Sun Ultra 40 M2
by Joshua Roys 02 Nov '11

02 Nov '11

On 11/02/2011 10:15 AM, Stefan Tauner wrote: > Success report: > http://paste.flashrom.org/view.php?id=889 > Signed-off-by: Joshua Roys <roysjosh(a)gmail.com> Stefan, feel free to sign-off also, if you want. > Acked-by: Stefan Tauner<stefan.tauner(a)student.tuwien.ac.at> > --- > board_enable.c | 33 +++++++++++++++++++++++++++++++++ > print.c | 1 + > 2 files changed, 34 insertions(+), 0 deletions(-) > > diff --git a/board_enable.c b/board_enable.c > index 1874459..fe2f021 100644 > --- a/board_enable.c > +++ b/board_enable.c > @@ -1051,6 +1051,38 @@ static int nvidia_mcp_gpio3b_raise(void) > > /* > * Suited for: > + * - Sun Ultra 40 M2: Dual Socket F (1207) + MCP55 > + */ > +static int board_sun_ultra_40_m2(void) > +{ > + int ret; > + uint8_t reg; > + uint16_t base; > + struct pci_dev *dev; > + > + ret = nvidia_mcp_gpio4_lower(); > + if (ret) > + return ret; > + > + dev = pci_dev_find(0x10de, 0x0364); /* NVIDIA MCP55 LPC bridge */ > + if (!dev) { > + msg_perr("\nERROR: NVIDIA MCP55 LPC bridge not found.\n"); > + return -1; > + } > + > + base = pci_read_word(dev, 0xb4); /* some IO BAR? */ > + if (!base) > + return -1; > + > + reg = INB(base + 0x4b); > + reg |= 0x10; > + OUTB(reg, base + 0x4b); > + > + return 0; > +} > + > +/* > + * Suited for: > * - Artec Group DBE61 and DBE62 > */ > static int board_artecgroup_dbe6x(void) > @@ -2109,6 +2141,7 @@ const struct board_match board_matches[] = { > {0x1106, 0x3104, 0x1297, 0xa238, 0x1106, 0x3059, 0x1297, 0xc063, NULL, NULL, NULL, P3, "Shuttle", "AK38N", 256, OK, NULL}, > {0x10DE, 0x0050, 0x1297, 0x5036, 0x1412, 0x1724, 0x1297, 0x5036, NULL, NULL, NULL, P3, "Shuttle", "FN25", 0, OK, board_shuttle_fn25}, > {0x1106, 0x3038, 0x0925, 0x1234, 0x1106, 0x3058, 0x15DD, 0x7609, NULL, NULL, NULL, P3, "Soyo", "SY-7VCA", 0, OK, via_apollo_gpo0_lower}, > + {0x10de, 0x0364, 0x108e, 0x6676, 0x10de, 0x0369, 0x108e, 0x6676, "^Sun Ultra 40 M2", NULL, NULL, P3, "Sun", "Ultra 40 M2", 0, OK, board_sun_ultra_40_m2}, > {0x1106, 0x3038, 0x0925, 0x1234, 0x1106, 0x0596, 0x1106, 0, NULL, NULL, NULL, P3, "Tekram", "P6Pro-A5", 256, OK, NULL}, > {0x1106, 0x3123, 0x1106, 0x3123, 0x1106, 0x3059, 0x1106, 0x4161, NULL, NULL, NULL, P3, "Termtek", "TK-3370 (Rev:2.5B)", 0, OK, w836xx_memw_enable_4e}, > {0x8086, 0x1076, 0x8086, 0x1176, 0x1106, 0x3059, 0x10f1, 0x2498, NULL, NULL, NULL, P3, "Tyan", "S2498 (Tomcat K7M)", 0, OK, w836xx_memw_enable_2e}, > diff --git a/print.c b/print.c > index 05eee9f..91288ee 100644 > --- a/print.c > +++ b/print.c > @@ -846,6 +846,7 @@ const struct board_info boards_known[] = { > B("Sun", "Fire x4200", 0, "http://www.sun.com/servers/entry/x4200/", "No public report found. May work now."), > B("Sun", "Fire x4540", 0, "http://www.sun.com/servers/x64/x4540/", "No public report found. May work now."), > B("Sun", "Fire x4600", 0, "http://www.sun.com/servers/x64/x4600/", "No public report found. May work now."), > + B("Sun", "Ultra 40 M2", 1, NULL, NULL), > B("Supermicro", "H8QC8", 1, "http://www.supermicro.com/Aplus/motherboard/Opteron/nforce/H8QC8.cfm", NULL), > B("Supermicro", "X5DP8-G2", 1, "http://www.supermicro.com/products/motherboard/Xeon/E7501/X5DP8-G2.cfm", NULL), > B("Supermicro", "X7DBT-INF", 1, "http://www.supermicro.com/products/motherboard/Xeon1333/5000P/X7DBT-INF.cfm", NULL),

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom