flashrom

flashrom@flashrom.org

9164 discussions

Re: [flashrom] [PATCH] remove exit call from show_id
by Carl-Daniel Hailfinger 16 Jun '12

16 Jun '12

Am 30.05.2012 21:24 schrieb David Hendricks: > Seems trivial, and I think you're also helping to make sure memory alloc'd > in doit() gets free'd properly. So: > > Acked-by: David Hendricks <dhendrix(a)google.com> Oh sorry, I overlooked that ack. > Thanks for doing this! > > On Wed, May 30, 2012 at 11:21 AM, Niklas Söderlund <niso(a)kth.se> wrote: > >> Sorry I forgot, >> >> Signed-off-by: Niklas Söderlund <niso(a)kth.se> >> >> On 05/30/2012 08:18 PM, Niklas Söderlund wrote: >> >>> The only caller is able to check the return code and handle it correctly Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> and committed in r1545. Regards, Carl-Daniel -- http://www.hailfinger.org/

1 0

[commit] r1545 - trunk
by repository service 16 Jun '12

16 Jun '12

Author: hailfinger Date: Sat Jun 16 02:11:16 2012 New Revision: 1545 URL: http://flashrom.org/trac/flashrom/changeset/1545 Log: Remove exit() call from show_id The only caller is able to check the return code and handle it correctly. Signed-off-by: Niklas Söderlund <niso(a)kth.se> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flashrom.c trunk/layout.c Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sat Jun 16 02:02:27 2012 (r1544) +++ trunk/flashrom.c Sat Jun 16 02:11:16 2012 (r1545) @@ -1787,7 +1787,10 @@ #if CONFIG_INTERNAL == 1 if (programmer == PROGRAMMER_INTERNAL) - show_id(newcontents, size, force); + if (show_id(newcontents, size, force)) { + ret = 1; + goto out; + } #endif } Modified: trunk/layout.c ============================================================================== --- trunk/layout.c Sat Jun 16 02:02:27 2012 (r1544) +++ trunk/layout.c Sat Jun 16 02:11:16 2012 (r1545) @@ -137,7 +137,7 @@ "\n\n", mainboard_vendor, mainboard_part, lb_vendor, lb_part); - exit(1); + return 1; } }

1 0

[PATCH] Add delays to dediprog driver
by Nico Huber 16 Jun '12

16 Jun '12

Some investigations have shown, that the original dediprog driver waits about 200ms after setting voltage up and before setting voltage down. This patch adds those delays. It helps flash chips to come up in time. Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Index: dediprog.c =================================================================== --- dediprog.c (Revision 1541) +++ dediprog.c (Arbeitskopie) @@ -131,6 +131,9 @@ msg_pdbg("Setting SPI voltage to %u.%03u V\n", millivolt / 1000, millivolt % 1000); + if (voltage_selector == 0) + /* Wait some time as the original driver does. */ + programmer_delay(200 * 1000); ret = usb_control_msg(dediprog_handle, 0x42, 0x9, voltage_selector, 0xff, NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { @@ -138,6 +141,9 @@ voltage_selector); return 1; } + if (voltage_selector != 0) + /* Wait some time as the original driver does. */ + programmer_delay(200 * 1000); return 0; }

2 1

[commit] r1544 - trunk
by repository service 16 Jun '12

16 Jun '12

Author: hailfinger Date: Sat Jun 16 02:02:27 2012 New Revision: 1544 URL: http://flashrom.org/trac/flashrom/changeset/1544 Log: Add voltage change delays to dediprog driver Some investigations have shown that the original dediprog driver waits about 200ms after setting voltage up and before setting voltage down. This patch adds those delays. It helps flash chips to come up in time. Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/dediprog.c Modified: trunk/dediprog.c ============================================================================== --- trunk/dediprog.c Sat Jun 16 00:28:12 2012 (r1543) +++ trunk/dediprog.c Sat Jun 16 02:02:27 2012 (r1544) @@ -131,6 +131,10 @@ msg_pdbg("Setting SPI voltage to %u.%03u V\n", millivolt / 1000, millivolt % 1000); + if (voltage_selector == 0) { + /* Wait some time as the original driver does. */ + programmer_delay(200 * 1000); + } ret = usb_control_msg(dediprog_handle, 0x42, 0x9, voltage_selector, 0xff, NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { @@ -138,6 +142,10 @@ voltage_selector); return 1; } + if (voltage_selector != 0) { + /* Wait some time as the original driver does. */ + programmer_delay(200 * 1000); + } return 0; }

1 0

Verbose output of flashrom @ ASUS M3NHT DELUXE Motherboard; everything ok
by Björn Schmidt 16 Jun '12

16 Jun '12

Hello here is the output of flashrom @ ASUS M3NHT DELUXE Motherboard bjoern@Bjoern-Desktop:~/Downloads/Bios$ sudo flashrom -c AT26DF081A -w M3N-HT-DELUXE-3401.BIN -V flashrom v0.9.5.2-r1517 on Linux 3.2.0-25-generic (x86_64), built with libpci 3.1.8, GCC 4.6.3, little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OS timer resolution is 1 usecs, 868M loops per second, 10 myus = 10 us, 100 myus = 99 us, 1000 myus = 998 us, 10000 myus = 10004 us, 4 myus = 4 us, OK. Initializing internal programmer No coreboot table found. DMI string system-manufacturer: "System manufacturer" DMI string system-product-name: "System Product Name" DMI string system-version: "System Version" DMI string baseboard-manufacturer: "ASUSTeK Computer INC." DMI string baseboard-product-name: "M3N-HT DELUXE" DMI string baseboard-version: "1.XX" DMI string chassis-type: "Desktop" Found ITE Super I/O, ID 0x8716 on port 0x2e Found chipset "NVIDIA MCP78S" with PCI ID 10de:075d. Enabling flash write... This chipset is not really supported yet. Guesswork... ISA/LPC bridge reg 0x8a contents: 0x40, bit 6 is 1, bit 5 is 0 Flash bus type is SPI SPI on this chipset is WIP. Please report any success or failure by mailing us the verbose output to flashrom(a)flashrom.org, thanks! Found SMBus device 10de:0752 at 00:01:1 MCP SPI BAR is at 0xfdf80000 Mapping NVIDIA MCP6x SPI at 0xfdf80000, unaligned size 0x544. SPI control is 0xc012, req=0, gnt=0 Please send the output of "flashrom -V" to flashrom(a)flashrom.org with your board name: flashrom -V as the subject to help us finish support for your chipset. Thanks. OK. No IT87* serial flash segment enabled. The following protocols are supported: SPI. Probing for Atmel AT26DF081A, 1024 kB: probe_spi_rdid_generic: id1 0x1f, id2 0x4501 Chip status register is 10 Found Atmel flash chip "AT26DF081A" (1024 kB, SPI) at physical address 0xfff00000. Chip status register is 10 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 not 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 Flash image seems to be a legacy BIOS. Disabling coreboot-related checks. Reading old flash chip contents... done. Erasing and writing flash chip... Trying erase function 0... 0x000000-0x000fff:S, 0x001000-0x001fff:S, 0x002000-0x002fff:S, 0x003000-0x003fff:S, 0x004000-0x004fff:S, 0x005000-0x005fff:S, 0x006000-0x006fff:S, 0x007000-0x007fff:S, 0x008000-0x008fff:S, 0x009000-0x009fff:S, 0x00a000-0x00afff:S, 0x00b000-0x00bfff:S, 0x00c000-0x00cfff:S, 0x00d000-0x00dfff:S, 0x00e000-0x00efff:S, 0x00f000-0x00ffff:S, 0x010000-0x010fff:S, 0x011000-0x011fff:S, 0x012000-0x012fff:S, 0x013000-0x013fff:S, 0x014000-0x014fff:S, 0x015000-0x015fff:S, 0x016000-0x016fff:S, 0x017000-0x017fff:S, 0x018000-0x018fff:S, 0x019000-0x019fff:S, 0x01a000-0x01afff:S, 0x01b000-0x01bfff:S, 0x01c000-0x01cfff:S, 0x01d000-0x01dfff:S, 0x01e000-0x01efff:S, 0x01f000-0x01ffff:S, 0x020000-0x020fff:S, 0x021000-0x021fff:S, 0x022000-0x022fff:S, 0x023000-0x023fff:S, 0x024000-0x024fff:S, 0x025000-0x025fff:S, 0x026000-0x026fff:S, 0x027000-0x027fff:S, 0x028000-0x028fff:S, 0x029000-0x029fff:S, 0x02a000-0x02afff:S, 0x02b000-0x02bfff:S, 0x02c000-0x02cfff:S, 0x02d000-0x02dfff:S, 0x02e000-0x02efff:S, 0x02f000-0x02ffff:S, 0x030000-0x030fff:S, 0x031000-0x031fff:S, 0x032000-0x032fff:S, 0x033000-0x033fff:S, 0x034000-0x034fff:S, 0x035000-0x035fff:S, 0x036000-0x036fff:S, 0x037000-0x037fff:S, 0x038000-0x038fff:S, 0x039000-0x039fff:S, 0x03a000-0x03afff:S, 0x03b000-0x03bfff:S, 0x03c000-0x03cfff:S, 0x03d000-0x03dfff:S, 0x03e000-0x03efff:S, 0x03f000-0x03ffff:S, 0x040000-0x040fff:S, 0x041000-0x041fff:S, 0x042000-0x042fff:S, 0x043000-0x043fff:S, 0x044000-0x044fff:S, 0x045000-0x045fff:S, 0x046000-0x046fff:S, 0x047000-0x047fff:S, 0x048000-0x048fff:S, 0x049000-0x049fff:S, 0x04a000-0x04afff:S, 0x04b000-0x04bfff:S, 0x04c000-0x04cfff:S, 0x04d000-0x04dfff:S, 0x04e000-0x04efff:S, 0x04f000-0x04ffff:S, 0x050000-0x050fff:S, 0x051000-0x051fff:S, 0x052000-0x052fff:S, 0x053000-0x053fff:S, 0x054000-0x054fff:S, 0x055000-0x055fff:S, 0x056000-0x056fff:S, 0x057000-0x057fff:S, 0x058000-0x058fff:S, 0x059000-0x059fff:S, 0x05a000-0x05afff:S, 0x05b000-0x05bfff:S, 0x05c000-0x05cfff:S, 0x05d000-0x05dfff:S, 0x05e000-0x05efff:S, 0x05f000-0x05ffff:S, 0x060000-0x060fff:S, 0x061000-0x061fff:S, 0x062000-0x062fff:S, 0x063000-0x063fff:S, 0x064000-0x064fff:S, 0x065000-0x065fff:S, 0x066000-0x066fff:S, 0x067000-0x067fff:S, 0x068000-0x068fff:S, 0x069000-0x069fff:S, 0x06a000-0x06afff:S, 0x06b000-0x06bfff:S, 0x06c000-0x06cfff:S, 0x06d000-0x06dfff:S, 0x06e000-0x06efff:S, 0x06f000-0x06ffff:S, 0x070000-0x070fff:S, 0x071000-0x071fff:S, 0x072000-0x072fff:S, 0x073000-0x073fff:S, 0x074000-0x074fff:S, 0x075000-0x075fff:S, 0x076000-0x076fff:S, 0x077000-0x077fff:S, 0x078000-0x078fff:S, 0x079000-0x079fff:S, 0x07a000-0x07afff:S, 0x07b000-0x07bfff:S, 0x07c000-0x07cfff:S, 0x07d000-0x07dfff:S, 0x07e000-0x07efff:S, 0x07f000-0x07ffff:S, 0x080000-0x080fff:S, 0x081000-0x081fff:S, 0x082000-0x082fff:S, 0x083000-0x083fff:S, 0x084000-0x084fff:S, 0x085000-0x085fff:S, 0x086000-0x086fff:S, 0x087000-0x087fff:S, 0x088000-0x088fff:S, 0x089000-0x089fff:S, 0x08a000-0x08afff:S, 0x08b000-0x08bfff:S, 0x08c000-0x08cfff:S, 0x08d000-0x08dfff:S, 0x08e000-0x08efff:S, 0x08f000-0x08ffff:S, 0x090000-0x090fff:S, 0x091000-0x091fff:S, 0x092000-0x092fff:S, 0x093000-0x093fff:S, 0x094000-0x094fff:S, 0x095000-0x095fff:S, 0x096000-0x096fff:S, 0x097000-0x097fff:S, 0x098000-0x098fff:S, 0x099000-0x099fff:S, 0x09a000-0x09afff:S, 0x09b000-0x09bfff:S, 0x09c000-0x09cfff:S, 0x09d000-0x09dfff:S, 0x09e000-0x09efff:S, 0x09f000-0x09ffff:S, 0x0a0000-0x0a0fff:S, 0x0a1000-0x0a1fff:S, 0x0a2000-0x0a2fff:S, 0x0a3000-0x0a3fff:S, 0x0a4000-0x0a4fff:S, 0x0a5000-0x0a5fff:S, 0x0a6000-0x0a6fff:S, 0x0a7000-0x0a7fff:S, 0x0a8000-0x0a8fff:S, 0x0a9000-0x0a9fff:S, 0x0aa000-0x0aafff:S, 0x0ab000-0x0abfff:S, 0x0ac000-0x0acfff:S, 0x0ad000-0x0adfff:S, 0x0ae000-0x0aefff:S, 0x0af000-0x0affff:S, 0x0b0000-0x0b0fff:S, 0x0b1000-0x0b1fff:S, 0x0b2000-0x0b2fff:S, 0x0b3000-0x0b3fff:S, 0x0b4000-0x0b4fff:S, 0x0b5000-0x0b5fff:S, 0x0b6000-0x0b6fff:S, 0x0b7000-0x0b7fff:S, 0x0b8000-0x0b8fff:S, 0x0b9000-0x0b9fff:S, 0x0ba000-0x0bafff:S, 0x0bb000-0x0bbfff:S, 0x0bc000-0x0bcfff:S, 0x0bd000-0x0bdfff:S, 0x0be000-0x0befff:S, 0x0bf000-0x0bffff:S, 0x0c0000-0x0c0fff:S, 0x0c1000-0x0c1fff:S, 0x0c2000-0x0c2fff:S, 0x0c3000-0x0c3fff:S, 0x0c4000-0x0c4fff:S, 0x0c5000-0x0c5fff:S, 0x0c6000-0x0c6fff:S, 0x0c7000-0x0c7fff:S, 0x0c8000-0x0c8fff:S, 0x0c9000-0x0c9fff:S, 0x0ca000-0x0cafff:S, 0x0cb000-0x0cbfff:S, 0x0cc000-0x0ccfff:S, 0x0cd000-0x0cdfff:S, 0x0ce000-0x0cefff:S, 0x0cf000-0x0cffff:S, 0x0d0000-0x0d0fff:S, 0x0d1000-0x0d1fff:S, 0x0d2000-0x0d2fff:S, 0x0d3000-0x0d3fff:S, 0x0d4000-0x0d4fff:S, 0x0d5000-0x0d5fff:S, 0x0d6000-0x0d6fff:S, 0x0d7000-0x0d7fff:S, 0x0d8000-0x0d8fff:S, 0x0d9000-0x0d9fff:S, 0x0da000-0x0dafff:S, 0x0db000-0x0dbfff:S, 0x0dc000-0x0dcfff:S, 0x0dd000-0x0ddfff:S, 0x0de000-0x0defff:S, 0x0df000-0x0dffff:S, 0x0e0000-0x0e0fff:S, 0x0e1000-0x0e1fff:S, 0x0e2000-0x0e2fff:S, 0x0e3000-0x0e3fff:S, 0x0e4000-0x0e4fff:S, 0x0e5000-0x0e5fff:S, 0x0e6000-0x0e6fff:S, 0x0e7000-0x0e7fff:S, 0x0e8000-0x0e8fff:S, 0x0e9000-0x0e9fff:S, 0x0ea000-0x0eafff:S, 0x0eb000-0x0ebfff:S, 0x0ec000-0x0ecfff:S, 0x0ed000-0x0edfff:S, 0x0ee000-0x0eefff:S, 0x0ef000-0x0effff:S, 0x0f0000-0x0f0fff:S, 0x0f1000-0x0f1fff:S, 0x0f2000-0x0f2fff:S, 0x0f3000-0x0f3fff:S, 0x0f4000-0x0f4fff:S, 0x0f5000-0x0f5fff:S, 0x0f6000-0x0f6fff:S, 0x0f7000-0x0f7fff:S, 0x0f8000-0x0f8fff:S, 0x0f9000-0x0f9fff:S, 0x0fa000-0x0fafff:S, 0x0fb000-0x0fbfff:S, 0x0fc000-0x0fcfff:S, 0x0fd000-0x0fdfff:S, 0x0fe000-0x0fefff:S, 0x0ff000-0x0fffff:S Erase/write done. Verifying flash... VERIFIED.

2 2

[PATCH] Let the programmer driver decide how to do AAI transfers
by Nico Huber 16 Jun '12

16 Jun '12

Currently spi_aai_write() is implemented without an abstraction mechanism for the programmer driver. This adds another function pointer 'write_aai' to struct spi_programmer, which is set to default_spi_write_aai (renamed spi_aai_write) for all programmers for now. A patch which utilises this abstraction in the dediprog driver will follow. Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Index: it87spi.c =================================================================== --- it87spi.c (Revision 1541) +++ it87spi.c (Arbeitskopie) @@ -120,6 +120,7 @@ .multicommand = default_spi_send_multicommand, .read = it8716f_spi_chip_read, .write_256 = it8716f_spi_chip_write_256, + .write_aai = default_spi_write_aai, }; static uint16_t it87spi_probe(uint16_t port) Index: bitbang_spi.c =================================================================== --- bitbang_spi.c (Revision 1541) +++ bitbang_spi.c (Arbeitskopie) @@ -71,6 +71,7 @@ .multicommand = default_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; #if 0 // until it is needed Index: serprog.c =================================================================== --- serprog.c (Revision 1541) +++ serprog.c (Arbeitskopie) @@ -313,6 +313,7 @@ .multicommand = default_spi_send_multicommand, .read = serprog_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; static void serprog_chip_writeb(const struct flashctx *flash, uint8_t val, Index: dummyflasher.c =================================================================== --- dummyflasher.c (Revision 1541) +++ dummyflasher.c (Arbeitskopie) @@ -127,6 +127,7 @@ .multicommand = default_spi_send_multicommand, .read = default_spi_read, .write_256 = dummy_spi_write_256, + .write_aai = default_spi_write_aai, }; static const struct par_programmer par_programmer_dummy = { Index: ichspi.c =================================================================== --- ichspi.c (Revision 1541) +++ ichspi.c (Arbeitskopie) @@ -1521,6 +1521,7 @@ .multicommand = ich_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; static const struct spi_programmer spi_programmer_ich9 = { @@ -1531,6 +1532,7 @@ .multicommand = ich_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; static const struct opaque_programmer opaque_programmer_ich_hwseq = { @@ -1838,6 +1840,7 @@ .multicommand = ich_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; int via_init_spi(struct pci_dev *dev) Index: dediprog.c =================================================================== --- dediprog.c (Revision 1541) +++ dediprog.c (Arbeitskopie) @@ -709,6 +709,7 @@ .multicommand = default_spi_send_multicommand, .read = dediprog_spi_read, .write_256 = dediprog_spi_write_256, + .write_aai = default_spi_write_aai, }; static int dediprog_shutdown(void *data) Index: spi25.c =================================================================== --- spi25.c (Revision 1541) +++ spi25.c (Arbeitskopie) @@ -1069,8 +1069,8 @@ return 0; } -int spi_aai_write(struct flashctx *flash, uint8_t *buf, unsigned int start, - unsigned int len) +int default_spi_write_aai(struct flashctx *flash, uint8_t *buf, + unsigned int start, unsigned int len) { uint32_t pos = start; int result; Index: it85spi.c =================================================================== --- it85spi.c (Revision 1541) +++ it85spi.c (Arbeitskopie) @@ -283,6 +283,7 @@ .multicommand = default_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; int it85xx_spi_init(struct superio s) Index: buspirate_spi.c =================================================================== --- buspirate_spi.c (Revision 1541) +++ buspirate_spi.c (Arbeitskopie) @@ -124,6 +124,7 @@ .multicommand = default_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; static const struct buspirate_spispeeds spispeeds[] = { Index: linux_spi.c =================================================================== --- linux_spi.c (Revision 1541) +++ linux_spi.c (Arbeitskopie) @@ -54,6 +54,7 @@ .multicommand = default_spi_send_multicommand, .read = linux_spi_read, .write_256 = linux_spi_write_256, + .write_aai = default_spi_write_aai, }; int linux_spi_init(void) Index: spi.c =================================================================== --- spi.c (Revision 1541) +++ spi.c (Arbeitskopie) @@ -161,6 +161,12 @@ } } +int spi_aai_write(struct flashctx *flash, uint8_t *buf, + unsigned int start, unsigned int len) +{ + return flash->pgm->spi.write_aai(flash, buf, start, len); +} + int register_spi_programmer(const struct spi_programmer *pgm) { struct registered_programmer rpgm; Index: ft2232_spi.c =================================================================== --- ft2232_spi.c (Revision 1541) +++ ft2232_spi.c (Arbeitskopie) @@ -148,6 +148,7 @@ .multicommand = default_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; /* Returns 0 upon success, a negative number upon errors. */ Index: wbsio_spi.c =================================================================== --- wbsio_spi.c (Revision 1541) +++ wbsio_spi.c (Arbeitskopie) @@ -75,6 +75,7 @@ .multicommand = default_spi_send_multicommand, .read = wbsio_spi_read, .write_256 = spi_chip_write_1, + .write_aai = default_spi_write_aai, }; int wbsio_check_for_spi(void) Index: sb600spi.c =================================================================== --- sb600spi.c (Revision 1541) +++ sb600spi.c (Arbeitskopie) @@ -201,6 +201,7 @@ .multicommand = default_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; int sb600_probe_spi(struct pci_dev *dev) Index: programmer.h =================================================================== --- programmer.h (Revision 1541) +++ programmer.h (Arbeitskopie) @@ -530,6 +530,8 @@ /* Optimized functions for this programmer */ int (*read)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int (*write_256)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); + int (*write_aai)(struct flashctx *flash, uint8_t *buf, + unsigned int start, unsigned int len); const void *data; }; @@ -538,6 +540,8 @@ int default_spi_send_multicommand(struct flashctx *flash, struct spi_command *cmds); int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int default_spi_write_256(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int default_spi_write_aai(struct flashctx *flash, uint8_t *buf, + unsigned int start, unsigned int len); int register_spi_programmer(const struct spi_programmer *programmer); /* The following enum is needed by ich_descriptor_tool and ich* code. */

2 3

[commit] r1543 - trunk
by repository service 16 Jun '12

16 Jun '12

Author: hailfinger Date: Sat Jun 16 00:28:12 2012 New Revision: 1543 URL: http://flashrom.org/trac/flashrom/changeset/1543 Log: Let the programmer driver decide how to do AAI transfers Currently spi_aai_write() is implemented without an abstraction mechanism for the programmer driver. This adds another function pointer 'write_aai' to struct spi_programmer, which is set to default_spi_write_aai (renamed spi_aai_write) for all programmers for now. A patch which utilises this abstraction in the dediprog driver will follow. Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/bitbang_spi.c trunk/buspirate_spi.c trunk/dediprog.c trunk/dummyflasher.c trunk/ft2232_spi.c trunk/ichspi.c trunk/it85spi.c trunk/it87spi.c trunk/linux_spi.c trunk/programmer.h trunk/sb600spi.c trunk/serprog.c trunk/spi.c trunk/spi25.c trunk/wbsio_spi.c Modified: trunk/bitbang_spi.c ============================================================================== --- trunk/bitbang_spi.c Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/bitbang_spi.c Sat Jun 16 00:28:12 2012 (r1543) @@ -71,6 +71,7 @@ .multicommand = default_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; #if 0 // until it is needed Modified: trunk/buspirate_spi.c ============================================================================== --- trunk/buspirate_spi.c Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/buspirate_spi.c Sat Jun 16 00:28:12 2012 (r1543) @@ -124,6 +124,7 @@ .multicommand = default_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; static const struct buspirate_spispeeds spispeeds[] = { Modified: trunk/dediprog.c ============================================================================== --- trunk/dediprog.c Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/dediprog.c Sat Jun 16 00:28:12 2012 (r1543) @@ -709,6 +709,7 @@ .multicommand = default_spi_send_multicommand, .read = dediprog_spi_read, .write_256 = dediprog_spi_write_256, + .write_aai = default_spi_write_aai, }; static int dediprog_shutdown(void *data) Modified: trunk/dummyflasher.c ============================================================================== --- trunk/dummyflasher.c Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/dummyflasher.c Sat Jun 16 00:28:12 2012 (r1543) @@ -127,6 +127,7 @@ .multicommand = default_spi_send_multicommand, .read = default_spi_read, .write_256 = dummy_spi_write_256, + .write_aai = default_spi_write_aai, }; static const struct par_programmer par_programmer_dummy = { Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/ft2232_spi.c Sat Jun 16 00:28:12 2012 (r1543) @@ -148,6 +148,7 @@ .multicommand = default_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; /* Returns 0 upon success, a negative number upon errors. */ Modified: trunk/ichspi.c ============================================================================== --- trunk/ichspi.c Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/ichspi.c Sat Jun 16 00:28:12 2012 (r1543) @@ -1521,6 +1521,7 @@ .multicommand = ich_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; static const struct spi_programmer spi_programmer_ich9 = { @@ -1531,6 +1532,7 @@ .multicommand = ich_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; static const struct opaque_programmer opaque_programmer_ich_hwseq = { @@ -1838,6 +1840,7 @@ .multicommand = ich_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; int via_init_spi(struct pci_dev *dev) Modified: trunk/it85spi.c ============================================================================== --- trunk/it85spi.c Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/it85spi.c Sat Jun 16 00:28:12 2012 (r1543) @@ -283,6 +283,7 @@ .multicommand = default_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; int it85xx_spi_init(struct superio s) Modified: trunk/it87spi.c ============================================================================== --- trunk/it87spi.c Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/it87spi.c Sat Jun 16 00:28:12 2012 (r1543) @@ -120,6 +120,7 @@ .multicommand = default_spi_send_multicommand, .read = it8716f_spi_chip_read, .write_256 = it8716f_spi_chip_write_256, + .write_aai = default_spi_write_aai, }; static uint16_t it87spi_probe(uint16_t port) Modified: trunk/linux_spi.c ============================================================================== --- trunk/linux_spi.c Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/linux_spi.c Sat Jun 16 00:28:12 2012 (r1543) @@ -54,6 +54,7 @@ .multicommand = default_spi_send_multicommand, .read = linux_spi_read, .write_256 = linux_spi_write_256, + .write_aai = default_spi_write_aai, }; int linux_spi_init(void) Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/programmer.h Sat Jun 16 00:28:12 2012 (r1543) @@ -530,6 +530,7 @@ /* Optimized functions for this programmer */ int (*read)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int (*write_256)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); + int (*write_aai)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); const void *data; }; @@ -538,6 +539,7 @@ int default_spi_send_multicommand(struct flashctx *flash, struct spi_command *cmds); int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int default_spi_write_256(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int default_spi_write_aai(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int register_spi_programmer(const struct spi_programmer *programmer); /* The following enum is needed by ich_descriptor_tool and ich* code. */ Modified: trunk/sb600spi.c ============================================================================== --- trunk/sb600spi.c Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/sb600spi.c Sat Jun 16 00:28:12 2012 (r1543) @@ -201,6 +201,7 @@ .multicommand = default_spi_send_multicommand, .read = default_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; int sb600_probe_spi(struct pci_dev *dev) Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/serprog.c Sat Jun 16 00:28:12 2012 (r1543) @@ -313,6 +313,7 @@ .multicommand = default_spi_send_multicommand, .read = serprog_spi_read, .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, }; static void serprog_chip_writeb(const struct flashctx *flash, uint8_t val, Modified: trunk/spi.c ============================================================================== --- trunk/spi.c Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/spi.c Sat Jun 16 00:28:12 2012 (r1543) @@ -161,11 +161,17 @@ } } +int spi_aai_write(struct flashctx *flash, uint8_t *buf, + unsigned int start, unsigned int len) +{ + return flash->pgm->spi.write_aai(flash, buf, start, len); +} + int register_spi_programmer(const struct spi_programmer *pgm) { struct registered_programmer rpgm; - if (!pgm->write_256 || !pgm->read || !pgm->command || + if (!pgm->write_aai || !pgm->write_256 || !pgm->read || !pgm->command || !pgm->multicommand || ((pgm->command == default_spi_send_command) && (pgm->multicommand == default_spi_send_multicommand))) { Modified: trunk/spi25.c ============================================================================== --- trunk/spi25.c Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/spi25.c Sat Jun 16 00:28:12 2012 (r1543) @@ -1069,8 +1069,7 @@ return 0; } -int spi_aai_write(struct flashctx *flash, uint8_t *buf, unsigned int start, - unsigned int len) +int default_spi_write_aai(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { uint32_t pos = start; int result; Modified: trunk/wbsio_spi.c ============================================================================== --- trunk/wbsio_spi.c Thu Jun 14 15:08:33 2012 (r1542) +++ trunk/wbsio_spi.c Sat Jun 16 00:28:12 2012 (r1543) @@ -75,6 +75,7 @@ .multicommand = default_spi_send_multicommand, .read = wbsio_spi_read, .write_256 = spi_chip_write_1, + .write_aai = default_spi_write_aai, }; int wbsio_check_for_spi(void)

1 0

[PATCH] Add native AAI transfer support to the dediprog driver
by Nico Huber 15 Jun '12

15 Jun '12

This enables native AAI transfer support in the dediprog driver. The function to write chunks of data, dediprog_spi_bulk_write(), is reused. To tell the programmer how to handle the data on the spi bus, a flag in the second word sent with the usb command is used. This word was mistaken for the size of the chunks sent over usb earlier. This patch requires "[PATCH] Let the programmer driver decide how to do AAI transfers". Signed-off-by: Nico Huber <nico.huber(a)secunet.com> diff -urp -x.svn flashrom-spi_write_aai/dediprog.c flashrom-dediprog-own-spi_write_aai/dediprog.c --- flashrom-spi_write_aai/dediprog.c 2012-06-12 13:33:43.301025936 +0200 +++ flashrom-dediprog-own-spi_write_aai/dediprog.c 2012-06-12 13:40:52.223633529 +0200 @@ -31,6 +31,9 @@ static usb_dev_handle *dediprog_handle; static int dediprog_firmwareversion; static int dediprog_endpoint; +#define DEDI_SPI_CMD_PAGEWRITE 0x1 +#define DEDI_SPI_CMD_AAIWRITE 0x4 + #if 0 /* Might be useful for other pieces of code as well. */ static void print_hex(void *buf, size_t len) @@ -305,7 +308,8 @@ static int dediprog_spi_read(struct flas * @return 0 on success, 1 on failure */ static int dediprog_spi_bulk_write(struct flashctx *flash, uint8_t *buf, - unsigned int start, unsigned int len) + unsigned int start, unsigned int len, + uint16_t dedi_spi_cmd) { int ret; unsigned int i; @@ -313,12 +317,12 @@ static int dediprog_spi_bulk_write(struc * chunksize is the real data size per USB bulk transfer. The remaining * space in a USB bulk transfer must be filled with 0xff padding. */ - const unsigned int chunksize = flash->page_size; + const unsigned int chunksize = 256; /* always? flash->page_size; */ const unsigned int count = len / chunksize; - const char count_and_chunk[] = {count & 0xff, + const char count_and_cmd[] = {count & 0xff, (count >> 8) & 0xff, - chunksize & 0xff, - (chunksize >> 8) & 0xff}; + (dedi_spi_cmd >> 8) & 0xff, + dedi_spi_cmd & 0xff}; char usbbuf[512]; if ((start % chunksize) || (len % chunksize)) { @@ -334,9 +338,9 @@ static int dediprog_spi_bulk_write(struc * SPI side. */ ret = usb_control_msg(dediprog_handle, 0x42, 0x30, start % 0x10000, - start / 0x10000, (char *)count_and_chunk, - sizeof(count_and_chunk), DEFAULT_TIMEOUT); - if (ret != sizeof(count_and_chunk)) { + start / 0x10000, (char *)count_and_cmd, + sizeof(count_and_cmd), DEFAULT_TIMEOUT); + if (ret != sizeof(count_and_cmd)) { msg_perr("Command Write SPI Bulk failed, %i %s!\n", ret, usb_strerror()); return 1; @@ -358,8 +362,9 @@ static int dediprog_spi_bulk_write(struc return 0; } -static int dediprog_spi_write_256(struct flashctx *flash, uint8_t *buf, - unsigned int start, unsigned int len) +static int dediprog_write_256(struct flashctx *flash, uint8_t *buf, + unsigned int start, unsigned int len, + uint16_t dedi_spi_cmd) { int ret; const unsigned int chunksize = flash->page_size; @@ -382,7 +387,7 @@ static int dediprog_spi_write_256(struct /* Round down. */ bulklen = (len - residue) / chunksize * chunksize; ret = dediprog_spi_bulk_write(flash, buf + residue, start + residue, - bulklen); + bulklen, dedi_spi_cmd); if (ret) { dediprog_set_leds(PASS_OFF|BUSY_OFF|ERROR_ON); return ret; @@ -404,6 +409,20 @@ static int dediprog_spi_write_256(struct return 0; } +static int dediprog_spi_write_256(struct flashctx *flash, uint8_t *buf, + unsigned int start, unsigned int len) +{ + return dediprog_write_256(flash, buf, start, len, + DEDI_SPI_CMD_PAGEWRITE); +} + +static int dediprog_spi_write_aai(struct flashctx *flash, uint8_t *buf, + unsigned int start, unsigned int len) +{ + return dediprog_write_256(flash, buf, start, len, + DEDI_SPI_CMD_AAIWRITE); +} + static int dediprog_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, @@ -709,7 +728,7 @@ static const struct spi_programmer spi_p .multicommand = default_spi_send_multicommand, .read = dediprog_spi_read, .write_256 = dediprog_spi_write_256, - .write_aai = default_spi_write_aai, + .write_aai = dediprog_spi_write_aai, }; static int dediprog_shutdown(void *data)

2 2

[PATCH] Fix clock setting in ft2232_spi driver
by ilya 14 Jun '12

14 Jun '12

Hello, Looks like set clock divisor command was called with random values for divisor itself. Patch below fixes it. Now my calls to flashrom work much faster :) Signed-off-by: Ilya A. Volynets-Evenbakh <ilya(a)total-knowledge.com> Index: ft2232_spi.c =================================================================== --- ft2232_spi.c (revision 1541) +++ ft2232_spi.c (working copy) @@ -325,12 +354,12 @@ msg_pdbg("Set clock divisor\n"); buf[0] = 0x86; /* command "set divisor" */ + buf[1] = (divisor / 2 - 1) & 0xff; + buf[2] = ((divisor / 2 - 1) >> 8) & 0xff; if (send_buf(ftdic, buf, 3)) { ret = -6; goto ftdi_err; } - buf[1] = (divisor / 2 - 1) & 0xff; - buf[2] = ((divisor / 2 - 1) >> 8) & 0xff; msg_pdbg("MPSSE clock: %f MHz, divisor: %u, SPI clock: %f MHz\n", mpsse_clk, divisor, (double)(mpsse_clk / divisor));

2 1

[commit] r1542 - trunk
by repository service 14 Jun '12

14 Jun '12

Author: stefanct Date: Thu Jun 14 15:08:33 2012 New Revision: 1542 URL: http://flashrom.org/trac/flashrom/changeset/1542 Log: Fix setting the divisor in ft2232_spi. The patch that should have improved the clock divisor setting in r1537 made it much worse: the divisor used was from an uninitialized buffer. Signed-off-by: Ilya A. Volynets-Evenbakh <ilya(a)total-knowledge.com> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/ft2232_spi.c Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Fri Jun 8 17:27:47 2012 (r1541) +++ trunk/ft2232_spi.c Thu Jun 14 15:08:33 2012 (r1542) @@ -325,12 +325,12 @@ msg_pdbg("Set clock divisor\n"); buf[0] = 0x86; /* command "set divisor" */ + buf[1] = (divisor / 2 - 1) & 0xff; + buf[2] = ((divisor / 2 - 1) >> 8) & 0xff; if (send_buf(ftdic, buf, 3)) { ret = -6; goto ftdi_err; } - buf[1] = (divisor / 2 - 1) & 0xff; - buf[2] = ((divisor / 2 - 1) >> 8) & 0xff; msg_pdbg("MPSSE clock: %f MHz, divisor: %u, SPI clock: %f MHz\n", mpsse_clk, divisor, (double)(mpsse_clk / divisor));

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom