flashrom March 2012

flashrom@flashrom.org

46 participants
131 discussions

Re: [flashrom] [PATCH] linux_spi.c: set SPI mode, bit order and bits per word on init.
by Stefan Tauner 03 Mar '12

03 Mar '12

On Sat, 3 Mar 2012 14:48:34 +0100 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > Previously we relied on a correctly set up state. > > Also, we start to rely on the shutdown function for cleanup after > registering it, i.e. we no longer explicitly call close(fd) after > register_shutdown(). > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > linux_spi.c | 22 +++++++++++++++++++--- > 1 files changed, 19 insertions(+), 3 deletions(-) > > […] tested by GNUtoo, acked by carldani on IRC and committed in r1512. thanks everyone involved! -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1512 - trunk
by repository service 03 Mar '12

03 Mar '12

Author: stefanct Date: Sat Mar 3 19:09:33 2012 New Revision: 1512 URL: http://flashrom.org/trac/flashrom/changeset/1512 Log: linux_spi.c: set SPI mode, bit order and bits per word on init. Previously we relied on a correctly set up state. Also, we start to rely on the shutdown function for cleanup after registering it, i.e. we no longer explicitly call close(fd) after register_shutdown(). Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Tested-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/linux_spi.c Modified: trunk/linux_spi.c ============================================================================== --- trunk/linux_spi.c Thu Mar 1 23:38:27 2012 (r1511) +++ trunk/linux_spi.c Sat Mar 3 19:09:33 2012 (r1512) @@ -57,6 +57,10 @@ { char *p, *endp, *dev; uint32_t speed = 0; + /* FIXME: make the following configurable by CLI options. */ + /* SPI mode 0 (beware this also includes: MSB first, CS active low and others */ + const uint8_t mode = SPI_MODE_0; + const uint8_t bits = 8; dev = extract_programmer_param("dev"); if (!dev || !strlen(dev)) { @@ -81,19 +85,31 @@ return 1; } + if (register_shutdown(linux_spi_shutdown, NULL)) + return 1; + /* We rely on the shutdown function for cleanup from here on. */ + if (speed > 0) { if (ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed) == -1) { - msg_perr("%s: failed to set speed %dHz: %s\n", + msg_perr("%s: failed to set speed to %d Hz: %s\n", __func__, speed, strerror(errno)); - close(fd); return 1; } msg_pdbg("Using %d kHz clock\n", speed); } - if (register_shutdown(linux_spi_shutdown, NULL)) + if (ioctl(fd, SPI_IOC_WR_MODE, &mode) == -1) { + msg_perr("%s: failed to set SPI mode to 0x%02x: %s\n", + __func__, mode, strerror(errno)); return 1; + } + + if (ioctl(fd, SPI_IOC_WR_BITS_PER_WORD, &bits) == -1) { + msg_perr("%s: failed to set the number of bits per SPI word to %u: %s\n", + __func__, bits == 0 ? 8 : bits, strerror(errno)); + return 1; + } register_spi_programmer(&spi_programmer_linux);

1 0

[PATCH] Prevent submission of empty read requests in linux_spi
by Michael Karcher 03 Mar '12

03 Mar '12

The submission of zero-sized read requests in a write-only transaction fails at least for omap2_mcspi drivers and is pointless in general. Even with this patch, zero-sized write requests might be submitted for read-only transactions, but for most SPI chips, there always is a command transferred (written) before reading data, so there is no such thing as a pure-read transaction. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> --- linux_spi.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/linux_spi.c b/linux_spi.c index d994389..3d1ca3e 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -114,6 +114,7 @@ static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, const unsigned char *txbuf, unsigned char *rxbuf) { + unsigned iocontrol_code; struct spi_ioc_transfer msg[2] = { { .tx_buf = (uint64_t)(ptrdiff_t)txbuf, @@ -128,7 +129,14 @@ static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, if (fd == -1) return -1; - if (ioctl(fd, SPI_IOC_MESSAGE(2), msg) == -1) { + /* Just submit the first (write) request in case there is nothing + to read. Otherwise submit both requests */ + if (readcnt == 0) + iocontrol_code = SPI_IOC_MESSAGE(1); + else + iocontrol_code = SPI_IOC_MESSAGE(2); + + if (ioctl(fd, iocontrol_code, msg) == -1) { msg_cerr("%s: ioctl: %s\n", __func__, strerror(errno)); return -1; } -- 1.7.9

1 0

Re: [flashrom] [PATCH] linux_spi.c: set SPI mode, word justification and bits per word on init.
by Carl-Daniel Hailfinger 03 Mar '12

03 Mar '12

Am 02.03.2012 00:43 schrieb Stefan Tauner: > Previously we relied on a correctly set up state. > > --- > untested. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > linux_spi.c | 23 +++++++++++++++++++++++ > 1 files changed, 23 insertions(+), 0 deletions(-) > > diff --git a/linux_spi.c b/linux_spi.c > index d994389..d29c59a 100644 > --- a/linux_spi.c > +++ b/linux_spi.c > @@ -57,6 +57,8 @@ int linux_spi_init(void) > { > char *p, *endp, *dev; > uint32_t speed = 0; > + /* FIXME: make the following configurable by CLI options. */ > + uint8_t mode = SPI_MODE_0, lsb = 0, bits = 0; /* mode 0, msb first, 8 bits */ Can you move that comment above the variable definitions? Where should we note that SPI_MODE_0 also implies CS# active low? > > dev = extract_programmer_param("dev"); > if (!dev || !strlen(dev)) { > @@ -92,6 +94,27 @@ int linux_spi_init(void) > msg_pdbg("Using %d kHz clock\n", speed); > } > > + if (ioctl(fd, SPI_IOC_WR_MODE, &mode) == -1) { > + msg_perr("%s: failed to set SPI mode to %u: %s\n", > + __func__, mode, strerror(errno)); > + close(fd); > + return 1; > + } > + > + if (ioctl(fd, SPI_IOC_WR_LSB_FIRST, &lsb) == -1) { > + msg_perr("%s: failed to set SPI justification to %u: %s\n", > + __func__, lsb, strerror(errno)); This message would benefit from an explanation what SPI justification is. Suggestion: msg_perr("%s: failed to set SPI bit order to %s first: %s\n", __func_, lsb ? "LSB" : "MSB", strerror(errno)); > + close(fd); > + return 1; > + } > + > + if (ioctl(fd, SPI_IOC_WR_BITS_PER_WORD, &bits) == -1) { > + msg_perr("%s: failed to set the number of bits in an SPI word to %u: %s\n", > + __func__, bits, strerror(errno)); bits is 0. The error message would suggest that we tried to set the number of bits to 0. Does 0 also mean 8 bits, or would we have to set 8 bits with bits=8? > + close(fd); > + return 1; > + } > + > if (register_shutdown(linux_spi_shutdown, NULL)) > return 1; > As an alternative, we could avoid the whole close(fd) dance by calling register_shutdown() first, and then letting it do the work for us automatically after we return 1. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 3

ASUSTeK M2N-MX SE / chipset NVIDIA MCP61
by Arnaud DEBEAUVAIS 02 Mar '12

02 Mar '12

Hi, I guess the later versions might already support this shipset, as I am on Debian Squeeze (Stable), but just in case it can help you : flashrom v0.9.2-r1141 on Linux 2.6.32-5-amd64 (x86_64), built with libpci 3.1.7, GCC 4.4.5 20100728 (prerelease), little endian DMI string baseboard-manufacturer: "ASUSTeK Computer INC." DMI string baseboard-product-name: "M2N-MX SE" Found ITE Super I/O, id 8712 Found chipset "NVIDIA MCP61", enabling flash write... chipset PCI ID is 10de:03e0, This chipset is not really supported yet. Guesswork... ISA/LPC bridge reg 0x8a contents: 0x00, bit 6 is 0, bit 5 is 0 Flash bus type is LPC Found SMBus device 10de:03eb at 00:01:1 MCP SPI BAR is at 0x00000000 MCP SPI is not used. Have a great weekend. Openly yours, -- Arnaud DEBEAUVAIS arnaud(a)debeauvais.org Tux 100 10& 10 100 Tux :wq

1 0

Re: [flashrom] compiling flashrom for Debian/kFreeBSD
by Carl-Daniel Hailfinger 02 Mar '12

02 Mar '12

Am 25.02.2012 11:46 schrieb Robert Millan: > El 25 de febrer de 2012 0:49, Carl-Daniel Hailfinger >> El 24 de > febrer de 2012 0:55, Carl-Daniel Hailfinger >>> <c-d.hailfinger.devel.2006(a)gmx.net> ha escrit: >>>> #include <machine/cpufunc.h> >>>> #define off64_t off_t >>>> #define lseek64 lseek >>> Actually, we have machine/cpufunc.h (we have everything in machine/* >>> actually). The off_t / lseek defines after this look dangerous though >>> (they collide with glibc definitions). >> Comment has been replaced with >> /* Note that FreeBSD kernel with glibc has conflicting out[bwl] definitions >> * in machine/cpufunc.h and sys/io.h. Use cpufunc.h only for plain FreeBSD. >> */ > Uhm no, we removed the conflicts. We need to allow programs to > include both headers painlessly. Again, just pick the one you prefer. > cpufunc.h is supposed to work, and if it doesn't it's a bug. Thanks for the info, I have adjusted the comment: /* Note that Debian/kFreeBSD (FreeBSD with glibc) machine/cpufunc.h contains out[bwl] definitions which are incompatible with FreeBSD machine/cpufunc.h. Use machine/cpufunc.h only for plain FreeBSD. */ Background: FreeBSD machine/cpufunc.h has outb(port,data). Linux/glibc sys/io.h has outb(data,port). Regards, Carl-Daniel -- http://www.hailfinger.org/

2 2

Re: [flashrom] [PATCH] linux_spi.c: set SPI mode, word justification and bits per word on init.
by Michael Karcher 02 Mar '12

02 Mar '12

Am Freitag, den 02.03.2012, 00:43 +0100 schrieb Stefan Tauner: > Previously we relied on a correctly set up state. Looks good. Still untested, though. > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> A test would be nice, though, but I'm afraid we can't find a tester quickly. Regards, Michael Karcher

1 0

[PATCH] linux_spi.c: set SPI mode, word justification and bits per word on init.
by Stefan Tauner 01 Mar '12

01 Mar '12

Previously we relied on a correctly set up state. --- untested. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- linux_spi.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/linux_spi.c b/linux_spi.c index d994389..d29c59a 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -57,6 +57,8 @@ int linux_spi_init(void) { char *p, *endp, *dev; uint32_t speed = 0; + /* FIXME: make the following configurable by CLI options. */ + uint8_t mode = SPI_MODE_0, lsb = 0, bits = 0; /* mode 0, msb first, 8 bits */ dev = extract_programmer_param("dev"); if (!dev || !strlen(dev)) { @@ -92,6 +94,27 @@ int linux_spi_init(void) msg_pdbg("Using %d kHz clock\n", speed); } + if (ioctl(fd, SPI_IOC_WR_MODE, &mode) == -1) { + msg_perr("%s: failed to set SPI mode to %u: %s\n", + __func__, mode, strerror(errno)); + close(fd); + return 1; + } + + if (ioctl(fd, SPI_IOC_WR_LSB_FIRST, &lsb) == -1) { + msg_perr("%s: failed to set SPI justification to %u: %s\n", + __func__, lsb, strerror(errno)); + close(fd); + return 1; + } + + if (ioctl(fd, SPI_IOC_WR_BITS_PER_WORD, &bits) == -1) { + msg_perr("%s: failed to set the number of bits in an SPI word to %u: %s\n", + __func__, bits, strerror(errno)); + close(fd); + return 1; + } + if (register_shutdown(linux_spi_shutdown, NULL)) return 1; -- 1.7.1

1 0

[PATCH] Fix parallel-style programmer access from SPI
by Carl-Daniel Hailfinger 01 Mar '12

01 Mar '12

Joey: This patch applies to current svn HEAD. Patch is untested, but it should work and not spit out any new error messages. RFC: Are those checks with abort a good idea or do they break stuff? exit(1) is not a nice thing for libflashrom, but then again, it's probably better than exploding. I'm also unsure about the parameter order of mmio_readn. The IT87 SPI driver has one quirk to speed up reading and writing: If a flash chip is 512 kByte or less, the flash chip can be completely mapped in memory and both read and write accesses are faster that way. The current IT87 SPI code did use the parallel programmer interface for memory mapped reads and writes, but that's the wrong abstraction. It has been fixed to use mmio_read*/mmio_write* for that purpose. Introduce sanity checks for all SPI/Parallel-style accesses before a possibly undefined union member is dereferenced. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-fix_par_programmer_access_from_spi/hwaccess.c =================================================================== --- flashrom-fix_par_programmer_access_from_spi/hwaccess.c (Revision 1510) +++ flashrom-fix_par_programmer_access_from_spi/hwaccess.c (Arbeitskopie) @@ -169,6 +169,12 @@ return *(volatile uint32_t *) addr; } +void mmio_readn(void *addr, uint8_t *buf, size_t len) +{ + memcpy(buf, addr, len); + return; +} + void mmio_le_writeb(uint8_t val, void *addr) { mmio_writeb(cpu_to_le8(val), addr); Index: flashrom-fix_par_programmer_access_from_spi/flash.h =================================================================== --- flashrom-fix_par_programmer_access_from_spi/flash.h (Revision 1510) +++ flashrom-fix_par_programmer_access_from_spi/flash.h (Arbeitskopie) @@ -247,6 +247,7 @@ void print_banner(void); void list_programmers_linebreak(int startcol, int cols, int paren); int selfcheck(void); +void shutdown_and_exit(int exitcode); int doit(struct flashctx *flash, int force, const char *filename, int read_it, int write_it, int erase_it, int verify_it); int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename); int write_buf_to_file(unsigned char *buf, unsigned long size, const char *filename); Index: flashrom-fix_par_programmer_access_from_spi/it87spi.c =================================================================== --- flashrom-fix_par_programmer_access_from_spi/it87spi.c (Revision 1510) +++ flashrom-fix_par_programmer_access_from_spi/it87spi.c (Arbeitskopie) @@ -330,7 +330,7 @@ OUTB(0x06, it8716f_flashport + 1); OUTB(((2 + (fast_spi ? 1 : 0)) << 4), it8716f_flashport); for (i = 0; i < flash->page_size; i++) - chip_writeb(flash, buf[i], bios + start + i); + mmio_writeb(buf[i], (void *)(bios + start + i)); OUTB(0, it8716f_flashport); /* Wait until the Write-In-Progress bit is cleared. * This usually takes 1-10 ms, so wait in 1 ms steps. @@ -356,7 +356,7 @@ if ((flash->total_size * 1024 > 512 * 1024)) { spi_read_chunked(flash, buf, start, len, 3); } else { - read_memmapped(flash, buf, start, len); + mmio_readn((void *)(flash->virtual_memory + start), buf, len); } return 0; Index: flashrom-fix_par_programmer_access_from_spi/internal.c =================================================================== --- flashrom-fix_par_programmer_access_from_spi/internal.c (Revision 1510) +++ flashrom-fix_par_programmer_access_from_spi/internal.c (Arbeitskopie) @@ -387,6 +387,6 @@ static void internal_chip_readn(const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len) { - memcpy(buf, (void *)addr, len); + mmio_readn((void *)addr, buf, len); return; } Index: flashrom-fix_par_programmer_access_from_spi/spi.c =================================================================== --- flashrom-fix_par_programmer_access_from_spi/spi.c (Revision 1510) +++ flashrom-fix_par_programmer_access_from_spi/spi.c (Arbeitskopie) @@ -34,12 +34,22 @@ unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { + if (!(flash->pgm->buses_supported & BUS_SPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } return flash->pgm->spi.command(flash, writecnt, readcnt, writearr, readarr); } int spi_send_multicommand(struct flashctx *flash, struct spi_command *cmds) { + if (!(flash->pgm->buses_supported & BUS_SPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } return flash->pgm->spi.multicommand(flash, cmds); } @@ -78,7 +88,13 @@ int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { - unsigned int max_data = flash->pgm->spi.max_data_read; + unsigned int max_data; + if (!(flash->pgm->buses_supported & BUS_SPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } + max_data = flash->pgm->spi.max_data_read; if (max_data == MAX_DATA_UNSPECIFIED) { msg_perr("%s called, but SPI read chunk size not defined " "on this hardware. Please report a bug at " @@ -91,7 +107,13 @@ int default_spi_write_256(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { - unsigned int max_data = flash->pgm->spi.max_data_write; + unsigned int max_data; + if (!(flash->pgm->buses_supported & BUS_SPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } + max_data = flash->pgm->spi.max_data_write; if (max_data == MAX_DATA_UNSPECIFIED) { msg_perr("%s called, but SPI write chunk size not defined " "on this hardware. Please report a bug at " @@ -106,6 +128,11 @@ { unsigned int addrbase = 0; + if (!(flash->pgm->buses_supported & BUS_SPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } /* Check if the chip fits between lowest valid and highest possible * address. Highest possible address with the current SPI implementation * means 0xffffff, the highest unsigned 24bit number. @@ -138,6 +165,11 @@ int spi_chip_write_256(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { + if (!(flash->pgm->buses_supported & BUS_SPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } return flash->pgm->spi.write_256(flash, buf, start, len); } @@ -148,6 +180,11 @@ */ uint32_t spi_get_valid_read_addr(struct flashctx *flash) { + if (!(flash->pgm->buses_supported & BUS_SPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } switch (flash->pgm->spi.type) { #if CONFIG_INTERNAL == 1 #if defined(__i386__) || defined(__x86_64__) Index: flashrom-fix_par_programmer_access_from_spi/flashrom.c =================================================================== --- flashrom-fix_par_programmer_access_from_spi/flashrom.c (Revision 1510) +++ flashrom-fix_par_programmer_access_from_spi/flashrom.c (Arbeitskopie) @@ -357,43 +357,83 @@ void chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr) { + if (!(flash->pgm->buses_supported & BUS_NONSPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } flash->pgm->par.chip_writeb(flash, val, addr); } void chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr) { + if (!(flash->pgm->buses_supported & BUS_NONSPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } flash->pgm->par.chip_writew(flash, val, addr); } void chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr) { + if (!(flash->pgm->buses_supported & BUS_NONSPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } flash->pgm->par.chip_writel(flash, val, addr); } void chip_writen(const struct flashctx *flash, uint8_t *buf, chipaddr addr, size_t len) { + if (!(flash->pgm->buses_supported & BUS_NONSPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } flash->pgm->par.chip_writen(flash, buf, addr, len); } uint8_t chip_readb(const struct flashctx *flash, const chipaddr addr) { + if (!(flash->pgm->buses_supported & BUS_NONSPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } return flash->pgm->par.chip_readb(flash, addr); } uint16_t chip_readw(const struct flashctx *flash, const chipaddr addr) { + if (!(flash->pgm->buses_supported & BUS_NONSPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } return flash->pgm->par.chip_readw(flash, addr); } uint32_t chip_readl(const struct flashctx *flash, const chipaddr addr) { + if (!(flash->pgm->buses_supported & BUS_NONSPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } return flash->pgm->par.chip_readl(flash, addr); } void chip_readn(const struct flashctx *flash, uint8_t *buf, chipaddr addr, size_t len) { + if (!(flash->pgm->buses_supported & BUS_NONSPI)) { + msg_perr("%s called for wrong programmer type! Please report " + "a bug at flashrom(a)flashrom.org.\n", __func__); + shutdown_and_exit(1); + } flash->pgm->par.chip_readn(flash, buf, addr, len); } @@ -1700,6 +1740,15 @@ return 0; } +/* FIXME: Totally unacceptable for libflashrom, but it's better than a simple + * exit(1) for most places which just exit(1) for now. + */ +void shutdown_and_exit(int exitcode) +{ + programmer_shutdown(); + exit(exitcode); +} + /* This function signature is horrible. We need to design a better interface, * but right now it allows us to split off the CLI code. * Besides that, the function itself is a textbook example of abysmal code flow. Index: flashrom-fix_par_programmer_access_from_spi/programmer.h =================================================================== --- flashrom-fix_par_programmer_access_from_spi/programmer.h (Revision 1510) +++ flashrom-fix_par_programmer_access_from_spi/programmer.h (Arbeitskopie) @@ -312,6 +312,7 @@ uint8_t mmio_readb(void *addr); uint16_t mmio_readw(void *addr); uint32_t mmio_readl(void *addr); +void mmio_readn(void *addr, uint8_t *buf, size_t len); void mmio_le_writeb(uint8_t val, void *addr); void mmio_le_writew(uint16_t val, void *addr); void mmio_le_writel(uint32_t val, void *addr); -- http://www.hailfinger.org/

3 7

[commit] r1511 - trunk
by repository service 01 Mar '12

01 Mar '12

Author: hailfinger Date: Thu Mar 1 23:38:27 2012 New Revision: 1511 URL: http://flashrom.org/trac/flashrom/changeset/1511 Log: Fix parallel-style programmer access from ITE IT87/Winbond W83627 SPI The ITE IT87 SPI driver uses a trick to speed up reading and writing: If a flash chip is 512 kByte or less, the flash chip can be completely mapped in memory and both read and write accesses are faster that way. The current IT87 SPI code did use the parallel programmer interface for memory mapped reads and writes, but that's the wrong abstraction. It has been fixed to use mmio_read*/mmio_write* for that purpose. The Winbond W83627 SPI driver uses the same trick in its read path for all supported chip sizes. Fix it the same way. Switch internal_chip_readn to use mmio_readn as proper abstraction. Kudos to Michael Karcher for spotting the bugs. Reported-by: Johan Svensson <flashrom.js(a)crypt.se> 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> Tested-by: Johan Svensson <flashrom.js(a)crypt.se> Modified: trunk/hwaccess.c trunk/internal.c trunk/it87spi.c trunk/programmer.h trunk/wbsio_spi.c Modified: trunk/hwaccess.c ============================================================================== --- trunk/hwaccess.c Mon Feb 27 20:44:16 2012 (r1510) +++ trunk/hwaccess.c Thu Mar 1 23:38:27 2012 (r1511) @@ -169,6 +169,12 @@ return *(volatile uint32_t *) addr; } +void mmio_readn(void *addr, uint8_t *buf, size_t len) +{ + memcpy(buf, addr, len); + return; +} + void mmio_le_writeb(uint8_t val, void *addr) { mmio_writeb(cpu_to_le8(val), addr); Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Mon Feb 27 20:44:16 2012 (r1510) +++ trunk/internal.c Thu Mar 1 23:38:27 2012 (r1511) @@ -387,6 +387,6 @@ static void internal_chip_readn(const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len) { - memcpy(buf, (void *)addr, len); + mmio_readn((void *)addr, buf, len); return; } Modified: trunk/it87spi.c ============================================================================== --- trunk/it87spi.c Mon Feb 27 20:44:16 2012 (r1510) +++ trunk/it87spi.c Thu Mar 1 23:38:27 2012 (r1511) @@ -330,7 +330,7 @@ OUTB(0x06, it8716f_flashport + 1); OUTB(((2 + (fast_spi ? 1 : 0)) << 4), it8716f_flashport); for (i = 0; i < flash->page_size; i++) - chip_writeb(flash, buf[i], bios + start + i); + mmio_writeb(buf[i], (void *)(bios + start + i)); OUTB(0, it8716f_flashport); /* Wait until the Write-In-Progress bit is cleared. * This usually takes 1-10 ms, so wait in 1 ms steps. @@ -356,7 +356,7 @@ if ((flash->total_size * 1024 > 512 * 1024)) { spi_read_chunked(flash, buf, start, len, 3); } else { - read_memmapped(flash, buf, start, len); + mmio_readn((void *)(flash->virtual_memory + start), buf, len); } return 0; Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Mon Feb 27 20:44:16 2012 (r1510) +++ trunk/programmer.h Thu Mar 1 23:38:27 2012 (r1511) @@ -312,6 +312,7 @@ uint8_t mmio_readb(void *addr); uint16_t mmio_readw(void *addr); uint32_t mmio_readl(void *addr); +void mmio_readn(void *addr, uint8_t *buf, size_t len); void mmio_le_writeb(uint8_t val, void *addr); void mmio_le_writew(uint16_t val, void *addr); void mmio_le_writel(uint32_t val, void *addr); Modified: trunk/wbsio_spi.c ============================================================================== --- trunk/wbsio_spi.c Mon Feb 27 20:44:16 2012 (r1510) +++ trunk/wbsio_spi.c Thu Mar 1 23:38:27 2012 (r1511) @@ -202,7 +202,8 @@ static int wbsio_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { - return read_memmapped(flash, buf, start, len); + mmio_readn((void *)(flash->virtual_memory + start), buf, len); + return 0; } #endif

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom March 2012