- flashrom - mail.coreboot.org

[PATCH] Fix Sharp LHF00L04
by Carl-Daniel Hailfinger 07 Jan '10

07 Jan '10

Fix Sharp LHF00L04. - Add eraseblock definitions - Use correct eraseblock sizes (the datasheet is a bit ambiguous) - Use correct probe function - Fill in probe timing There is a lot more stuff left to clean up, but at least probe and erase should work now. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-sharp_lhf00l04/flashchips.c =================================================================== --- flashrom-sharp_lhf00l04/flashchips.c (Revision 833) +++ flashrom-sharp_lhf00l04/flashchips.c (Arbeitskopie) @@ -2522,9 +2522,24 @@ .total_size = 1024, .page_size = 64 * 1024, .tested = TEST_UNTESTED, - .probe = probe_lhf00l04, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sharplhf00l04.c) */ - .erase = erase_lhf00l04, + .probe = probe_49lfxxxc, + .probe_timing = TIMING_ZERO, + .erase = NULL, + .block_erasers = + { + { + .eraseblocks = { + {64 * 1024, 15}, + {8 * 1024, 8} + }, + .block_erase = erase_lhf00l04_block, + }, { + .eraseblocks = { + {1024 * 1024, 1} + }, + .block_erase = NULL, /* 30 D0, only in PP mode */ + }, + }, .write = write_lhf00l04, .read = read_memmapped, }, Index: flashrom-sharp_lhf00l04/sharplhf00l04.c =================================================================== --- flashrom-sharp_lhf00l04/sharplhf00l04.c (Revision 833) +++ flashrom-sharp_lhf00l04/sharplhf00l04.c (Arbeitskopie) @@ -33,80 +33,20 @@ printf("%s", status & 0x2 ? "WP|TBL#|WP#,ABORT:" : "UNLOCK:"); } -int probe_lhf00l04(struct flashchip *flash) -{ - chipaddr bios = flash->virtual_memory; - uint8_t id1, id2; +/* FIXME: The datasheet is unclear whether we should use toggle_ready_jedec + * or wait_82802ab. + */ -#if 0 - /* Enter ID mode */ - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0x90, bios + 0x5555); -#endif - - chip_writeb(0xff, bios); - programmer_delay(10); - chip_writeb(0x90, bios); - programmer_delay(10); - - id1 = chip_readb(bios); - id2 = chip_readb(bios + 0x01); - - /* Leave ID mode */ - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0xF0, bios + 0x5555); - - programmer_delay(10); - - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); - - if (id1 != flash->manufacture_id || id2 != flash->model_id) - return 0; - - map_flash_registers(flash); - - return 1; -} - -uint8_t wait_lhf00l04(chipaddr bios) +int erase_lhf00l04_block(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen) { + chipaddr bios = flash->virtual_memory + blockaddr; + chipaddr wrprotect = flash->virtual_registers + blockaddr + 2; uint8_t status; - chip_writeb(0x70, bios); - if ((chip_readb(bios) & 0x80) == 0) { // it's busy - while ((chip_readb(bios) & 0x80) == 0) ; - } - - status = chip_readb(bios); - - // put another command to get out of status register mode. - - chip_writeb(0x90, bios); - programmer_delay(10); - - chip_readb(bios); // vendor ID - chip_readb(bios + 0x01); // device ID - - // this is needed to jam it out of "read id" mode - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0xF0, bios + 0x5555); - - return status; -} - -int erase_lhf00l04_block(struct flashchip *flash, int offset) -{ - chipaddr bios = flash->virtual_memory + offset; - chipaddr wrprotect = flash->virtual_registers + offset + 2; - uint8_t status; - // clear status register chip_writeb(0x50, bios); printf("Erase at 0x%lx\n", bios); - status = wait_lhf00l04(flash->virtual_memory); + status = wait_82802ab(flash->virtual_memory); print_lhf00l04_status(status); // clear write protect printf("write protect is at 0x%lx\n", (wrprotect)); @@ -119,34 +59,17 @@ chip_writeb(0xd0, bios); programmer_delay(10); // now let's see what the register is - status = wait_lhf00l04(flash->virtual_memory); + status = wait_82802ab(flash->virtual_memory); print_lhf00l04_status(status); - printf("DONE BLOCK 0x%x\n", offset); + printf("DONE BLOCK 0x%x\n", blockaddr); - if (check_erased_range(flash, offset, flash->page_size)) { + if (check_erased_range(flash, blockaddr, blocklen)) { fprintf(stderr, "ERASE FAILED!\n"); return -1; } return 0; } -int erase_lhf00l04(struct flashchip *flash) -{ - int i; - unsigned int total_size = flash->total_size * 1024; - - printf("total_size is %d; flash->page_size is %d\n", - total_size, flash->page_size); - for (i = 0; i < total_size; i += flash->page_size) - if (erase_lhf00l04_block(flash, i)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - printf("DONE ERASE\n"); - - return 0; -} - void write_page_lhf00l04(chipaddr bios, uint8_t *src, chipaddr dst, int page_size) { @@ -156,7 +79,7 @@ /* transfer data from source to destination */ chip_writeb(0x40, dst); chip_writeb(*src++, dst++); - wait_lhf00l04(bios); + wait_82802ab(bios); } } @@ -167,7 +90,7 @@ int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - if (erase_lhf00l04(flash)) { + if (erase_flash(flash)) { fprintf(stderr, "ERASE FAILED!\n"); return -1; } Index: flashrom-sharp_lhf00l04/chipdrivers.h =================================================================== --- flashrom-sharp_lhf00l04/chipdrivers.h (Revision 833) +++ flashrom-sharp_lhf00l04/chipdrivers.h (Arbeitskopie) @@ -53,6 +53,7 @@ int spi_aai_write(struct flashchip *flash, uint8_t *buf); /* 82802ab.c */ +uint8_t wait_82802ab(chipaddr bios); int probe_82802ab(struct flashchip *flash); int erase_82802ab(struct flashchip *flash); int write_82802ab(struct flashchip *flash, uint8_t *buf); @@ -117,7 +118,7 @@ /* sharplhf00l04.c */ int probe_lhf00l04(struct flashchip *flash); -int erase_lhf00l04(struct flashchip *flash); +int erase_lhf00l04_block(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen); int write_lhf00l04(struct flashchip *flash, uint8_t *buf); void protect_lhf00l04(chipaddr bios); -- Developer quote of the year: "We are juggling too many chainsaws and flaming arrows and tigers."

2 2

[commit] r837 - trunk
by svn＠flashrom.org 07 Jan '10

07 Jan '10

Author: hailfinger Date: 2010-01-07 22:23:45 +0100 (Thu, 07 Jan 2010) New Revision: 837 Modified: trunk/chipdrivers.h trunk/flashchips.c trunk/sharplhf00l04.c Log: Fix Sharp LHF00L04. - Add eraseblock definitions - Use correct eraseblock sizes (the datasheet is a bit ambiguous) - Use correct probe function - Fill in probe timing There is a lot more stuff left to clean up, but at least probe and erase should work now. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/chipdrivers.h =================================================================== --- trunk/chipdrivers.h 2010-01-07 20:21:58 UTC (rev 836) +++ trunk/chipdrivers.h 2010-01-07 21:23:45 UTC (rev 837) @@ -53,6 +53,7 @@ int spi_aai_write(struct flashchip *flash, uint8_t *buf); /* 82802ab.c */ +uint8_t wait_82802ab(chipaddr bios); int probe_82802ab(struct flashchip *flash); int erase_82802ab(struct flashchip *flash); int write_82802ab(struct flashchip *flash, uint8_t *buf); @@ -117,7 +118,7 @@ /* sharplhf00l04.c */ int probe_lhf00l04(struct flashchip *flash); -int erase_lhf00l04(struct flashchip *flash); +int erase_lhf00l04_block(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen); int write_lhf00l04(struct flashchip *flash, uint8_t *buf); void protect_lhf00l04(chipaddr bios); Modified: trunk/flashchips.c =================================================================== --- trunk/flashchips.c 2010-01-07 20:21:58 UTC (rev 836) +++ trunk/flashchips.c 2010-01-07 21:23:45 UTC (rev 837) @@ -2522,9 +2522,24 @@ .total_size = 1024, .page_size = 64 * 1024, .tested = TEST_UNTESTED, - .probe = probe_lhf00l04, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sharplhf00l04.c) */ - .erase = erase_lhf00l04, + .probe = probe_49lfxxxc, + .probe_timing = TIMING_ZERO, + .erase = NULL, + .block_erasers = + { + { + .eraseblocks = { + {64 * 1024, 15}, + {8 * 1024, 8} + }, + .block_erase = erase_lhf00l04_block, + }, { + .eraseblocks = { + {1024 * 1024, 1} + }, + .block_erase = NULL, /* 30 D0, only in PP mode */ + }, + }, .write = write_lhf00l04, .read = read_memmapped, }, Modified: trunk/sharplhf00l04.c =================================================================== --- trunk/sharplhf00l04.c 2010-01-07 20:21:58 UTC (rev 836) +++ trunk/sharplhf00l04.c 2010-01-07 21:23:45 UTC (rev 837) @@ -33,80 +33,20 @@ printf("%s", status & 0x2 ? "WP|TBL#|WP#,ABORT:" : "UNLOCK:"); } -int probe_lhf00l04(struct flashchip *flash) -{ - chipaddr bios = flash->virtual_memory; - uint8_t id1, id2; +/* FIXME: The datasheet is unclear whether we should use toggle_ready_jedec + * or wait_82802ab. + */ -#if 0 - /* Enter ID mode */ - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0x90, bios + 0x5555); -#endif - - chip_writeb(0xff, bios); - programmer_delay(10); - chip_writeb(0x90, bios); - programmer_delay(10); - - id1 = chip_readb(bios); - id2 = chip_readb(bios + 0x01); - - /* Leave ID mode */ - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0xF0, bios + 0x5555); - - programmer_delay(10); - - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); - - if (id1 != flash->manufacture_id || id2 != flash->model_id) - return 0; - - map_flash_registers(flash); - - return 1; -} - -uint8_t wait_lhf00l04(chipaddr bios) +int erase_lhf00l04_block(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen) { + chipaddr bios = flash->virtual_memory + blockaddr; + chipaddr wrprotect = flash->virtual_registers + blockaddr + 2; uint8_t status; - chip_writeb(0x70, bios); - if ((chip_readb(bios) & 0x80) == 0) { // it's busy - while ((chip_readb(bios) & 0x80) == 0) ; - } - - status = chip_readb(bios); - - // put another command to get out of status register mode. - - chip_writeb(0x90, bios); - programmer_delay(10); - - chip_readb(bios); // vendor ID - chip_readb(bios + 0x01); // device ID - - // this is needed to jam it out of "read id" mode - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0xF0, bios + 0x5555); - - return status; -} - -int erase_lhf00l04_block(struct flashchip *flash, int offset) -{ - chipaddr bios = flash->virtual_memory + offset; - chipaddr wrprotect = flash->virtual_registers + offset + 2; - uint8_t status; - // clear status register chip_writeb(0x50, bios); printf("Erase at 0x%lx\n", bios); - status = wait_lhf00l04(flash->virtual_memory); + status = wait_82802ab(flash->virtual_memory); print_lhf00l04_status(status); // clear write protect printf("write protect is at 0x%lx\n", (wrprotect)); @@ -119,34 +59,17 @@ chip_writeb(0xd0, bios); programmer_delay(10); // now let's see what the register is - status = wait_lhf00l04(flash->virtual_memory); + status = wait_82802ab(flash->virtual_memory); print_lhf00l04_status(status); - printf("DONE BLOCK 0x%x\n", offset); + printf("DONE BLOCK 0x%x\n", blockaddr); - if (check_erased_range(flash, offset, flash->page_size)) { + if (check_erased_range(flash, blockaddr, blocklen)) { fprintf(stderr, "ERASE FAILED!\n"); return -1; } return 0; } -int erase_lhf00l04(struct flashchip *flash) -{ - int i; - unsigned int total_size = flash->total_size * 1024; - - printf("total_size is %d; flash->page_size is %d\n", - total_size, flash->page_size); - for (i = 0; i < total_size; i += flash->page_size) - if (erase_lhf00l04_block(flash, i)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - printf("DONE ERASE\n"); - - return 0; -} - void write_page_lhf00l04(chipaddr bios, uint8_t *src, chipaddr dst, int page_size) { @@ -156,7 +79,7 @@ /* transfer data from source to destination */ chip_writeb(0x40, dst); chip_writeb(*src++, dst++); - wait_lhf00l04(bios); + wait_82802ab(bios); } } @@ -167,7 +90,7 @@ int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - if (erase_lhf00l04(flash)) { + if (erase_flash(flash)) { fprintf(stderr, "ERASE FAILED!\n"); return -1; }

1 0

[commit] r836 - trunk
by svn＠flashrom.org 07 Jan '10

07 Jan '10

Author: snelson Date: 2010-01-07 21:21:58 +0100 (Thu, 07 Jan 2010) New Revision: 836 Added: trunk/cli_output.c Log: Converting fprintf(stderr), printf, and printf_debug into a common print interface for flashrom. It also changes so -VV will spit out highly verbose messages for debugging. This is a minimal patch to lessen impact a later patch will convert current printf messages to the new interface. Add file that was suppose to be committed with r835. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Added: trunk/cli_output.c =================================================================== --- trunk/cli_output.c (rev 0) +++ trunk/cli_output.c 2010-01-07 20:21:58 UTC (rev 836) @@ -0,0 +1,51 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2009 Sean Nelson <audiohacked(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <stdio.h> +#include <stdarg.h> +#include "flash.h" + +int print(int type, const char *fmt, ...) +{ + va_list ap; + int ret; + FILE *output_type; + + switch (type) + { + case MSG_ERROR: + output_type = stderr; + break; + case MSG_BARF: + if (verbose < 2) return 0; + case MSG_DEBUG: + if (verbose < 1) return 0; + case MSG_INFO: + default: + output_type = stdout; + break; + } + + va_start(ap, fmt); + ret = vfprintf(output_type, fmt, ap); + va_end(ap); + return ret; +} +

1 0

Re: [flashrom] [PATCH] common print infrastructure
by Sean Nelson 07 Jan '10

07 Jan '10

Converting fprintf(stderr), printf, and printf_debug into a common print interface for flashrom. It also changes so -VV will spit out highly verbose messages for debugging. This is a minimal patch to lessen impact a later patch will convert current printf messages to the new interface. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com>

1 0

Re: [flashrom] [PATCH] common print infrastructure
by Sean Nelson 07 Jan '10

07 Jan '10

Thanks, committed in r835.

1 0

[commit] r835 - trunk
by svn＠flashrom.org 07 Jan '10

07 Jan '10

Author: snelson Date: 2010-01-07 21:09:33 +0100 (Thu, 07 Jan 2010) New Revision: 835 Modified: trunk/Makefile trunk/cli_classic.c trunk/flash.h Log: Converting fprintf(stderr), printf, and printf_debug into a common print interface for flashrom. It also changes so -VV will spit out highly verbose messages for debugging. This is a minimal patch to lessen impact a later patch will convert current printf messages to the new interface. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-07 03:32:17 UTC (rev 834) +++ trunk/Makefile 2010-01-07 20:09:33 UTC (rev 835) @@ -48,7 +48,7 @@ LIB_OBJS = layout.o -CLI_OBJS = flashrom.o cli_classic.o print.o +CLI_OBJS = flashrom.o cli_classic.o cli_output.o print.o PROGRAMMER_OBJS = udelay.o programmer.o Modified: trunk/cli_classic.c =================================================================== --- trunk/cli_classic.c 2010-01-07 03:32:17 UTC (rev 834) +++ trunk/cli_classic.c 2010-01-07 20:09:33 UTC (rev 835) @@ -205,7 +205,7 @@ chip_to_probe = strdup(optarg); break; case 'V': - verbose = 1; + verbose++; break; case 'E': if (++operation_specified > 1) { Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2010-01-07 03:32:17 UTC (rev 834) +++ trunk/flash.h 2010-01-07 20:09:33 UTC (rev 835) @@ -504,6 +504,25 @@ #define OK 0 #define NT 1 /* Not tested */ +/* cli_output.c */ +int print(int type, const char *fmt, ...); +#define MSG_ERROR 0 +#define MSG_INFO 1 +#define MSG_DEBUG 2 +#define MSG_BARF 3 +#define msg_gerr(x) print(MSG_ERROR, x) /* general errors */ +#define msg_perr(x) print(MSG_ERROR, x) /* programmer errors */ +#define msg_cerr(x) print(MSG_ERROR, x) /* chip errors */ +#define msg_ginfo(x) print(MSG_INFO, x) /* general info */ +#define msg_pinfo(x) print(MSG_INFO, x) /* programmer info */ +#define msg_cinfo(x) print(MSG_INFO, x) /* chip info */ +#define msg_gdbg(x) print(MSG_DEBUG, x) /* general debug */ +#define msg_pdbg(x) print(MSG_DEBUG, x) /* programmer debug */ +#define msg_cdbg(x) print(MSG_DEBUG, x) /* chip debug */ +#define msg_gspew(x) print(MSG_BARF, x) /* general debug barf */ +#define msg_pspew(x) print(MSG_BARF, x) /* programmer debug barf */ +#define msg_cspew(x) print(MSG_BARF, x) /* chip debug barf */ + /* cli_classic.c */ int cli_classic(int argc, char *argv[]);

1 0

[PATCH] common print infrastructure
by Sean Nelson 07 Jan '10

07 Jan '10

2 10

Tyan S7025 mainboard
by Carsten Aulbert 07 Jan '10

07 Jan '10

Hi all, as requested no IRC here are some details (although I might have to wait until partial reflashing is ready). flashrom -V -> flashrom.txt superiotool -deV -> superiotool.txt lspci -vvvxxx -> lspci.txt lshw -businfo -numeric -> lshw.txt flashrom -Vr test.bin -> flashrom-read.txt What else can I do to help? Cheers Carsten aka RealMurphy -- Dr. Carsten Aulbert - Max Planck Institute for Gravitational Physics Callinstrasse 38, 30167 Hannover, Germany Phone/Fax: +49 511 762-17185 / -17193 http://www.top500.org/system/9234 | http://www.top500.org/connfam/6/list/3 CaCert Assurer | Get free certificates from http://www.cacert.org/

1 1

[PATCH] Per-programmer command debug setting
by Carl-Daniel Hailfinger 07 Jan '10

07 Jan '10

Programmer debug messages during programmer init/shutdown are useful because they print hardware settings and desired configuration. They help in getting a quick overview of hardware and software state on startup and shutdown. Programmer debug messages during flash chip access are mostly a distraction in logs and should only be enabled if someone is having problems which are suspected to stem from a programmer hardware or programmer software bug. Disable those messages by default, they can be reenabled by #define COMM_DEBUG in the affected programmer file. An added benefit is a tremendous size reduction in verbose probe/read/write/erase logs because only flash chip driver messages remain. In some cases, logs will shrink from 65 MB to 10 kB or less. The right(tm) fix would be two different debug levels (DEBUG and SPEW) and the ability to differentiate between programmer debug messages and flash chip debug messages. Until the design for the message printing infrastructure is finished, this is the best stop-gap measure we can get. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-programmer_command_debug/buspirate_spi.c =================================================================== --- flashrom-programmer_command_debug/buspirate_spi.c (Revision 832) +++ flashrom-programmer_command_debug/buspirate_spi.c (Arbeitskopie) @@ -25,6 +25,17 @@ #include "flash.h" #include "spi.h" +/* Change this to #define if you want lowlevel debugging of commands + * sent to the Bus Pirate. + */ +#undef COMM_DEBUG + +#ifdef COMM_DEBUG +#define msg_comm_debug printf_debug +#else +#define msg_comm_debug(...) do {} while (0) +#endif + /* Change this to #define if you want to test without a serial implementation */ #undef FAKE_COMMUNICATION @@ -47,14 +58,14 @@ { int i, ret = 0; - printf_debug("%s: write %i, read %i\n", __func__, writecnt, readcnt); + msg_comm_debug("%s: write %i, read %i ", __func__, writecnt, readcnt); if (!writecnt && !readcnt) { fprintf(stderr, "Zero length command!\n"); return 1; } - printf_debug("Sending"); + msg_comm_debug("Sending"); for (i = 0; i < writecnt; i++) - printf_debug(" 0x%02x", buf[i]); + msg_comm_debug(" 0x%02x", buf[i]); #ifdef FAKE_COMMUNICATION /* Placate the caller for now. */ if (readcnt) { @@ -72,10 +83,10 @@ if (ret) return ret; #endif - printf_debug(", receiving"); + msg_comm_debug(", receiving"); for (i = 0; i < readcnt; i++) - printf_debug(" 0x%02x", buf[i]); - printf_debug("\n"); + msg_comm_debug(" 0x%02x", buf[i]); + msg_comm_debug("\n"); return 0; } Index: flashrom-programmer_command_debug/ft2232_spi.c =================================================================== --- flashrom-programmer_command_debug/ft2232_spi.c (Revision 832) +++ flashrom-programmer_command_debug/ft2232_spi.c (Arbeitskopie) @@ -29,6 +29,17 @@ #include "spi.h" #include <ftdi.h> +/* Change this to #define if you want lowlevel debugging of commands + * sent to the FT2232 SPI controller. + */ +#undef COMM_DEBUG + +#ifdef COMM_DEBUG +#define msg_comm_debug printf_debug +#else +#define msg_comm_debug(...) do {} while (0) +#endif + /* * The 'H' chips can run internally at either 12MHz or 60MHz. * The non-H chips can only run at 12MHz. @@ -224,7 +235,7 @@ * and deassert CS# all in one shot. If reading, we do three separate * operations. */ - printf_debug("Assert CS#\n"); + msg_comm_debug("Assert CS#\n"); buf[i++] = SET_BITS_LOW; buf[i++] = 0 & ~CS_BIT; /* assertive */ buf[i++] = 0x0b; @@ -266,7 +277,7 @@ } } - printf_debug("De-assert CS#\n"); + msg_comm_debug("De-assert CS#\n"); buf[i++] = SET_BITS_LOW; buf[i++] = CS_BIT; buf[i++] = 0x0b; Index: flashrom-programmer_command_debug/wbsio_spi.c =================================================================== --- flashrom-programmer_command_debug/wbsio_spi.c (Revision 832) +++ flashrom-programmer_command_debug/wbsio_spi.c (Arbeitskopie) @@ -2,6 +2,7 @@ * This file is part of the flashrom project. * * Copyright (C) 2008 Peter Stuge <peter(a)stuge.se> + * Copyright (C) 2009,2010 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 @@ -21,6 +22,17 @@ #include "flash.h" #include "spi.h" +/* Change this to #define if you want lowlevel debugging of commands + * sent to the Winbond W836xx SPI controller. + */ +#undef COMM_DEBUG + +#ifdef COMM_DEBUG +#define msg_comm_debug printf_debug +#else +#define msg_comm_debug(...) do {} while (0) +#endif + #define WBSIO_PORT1 0x2e #define WBSIO_PORT2 0x4e @@ -62,7 +74,7 @@ if (0 == (wbsio_spibase = wbsio_get_spibase(WBSIO_PORT2))) return 1; - printf_debug("\nwbsio_spibase = 0x%x\n", wbsio_spibase); + msg_comm_debug("\nwbsio_spibase = 0x%x\n", wbsio_spibase); buses_supported |= CHIP_BUSTYPE_SPI; spi_controller = SPI_CONTROLLER_WBSIO; @@ -96,42 +108,42 @@ int i; uint8_t mode = 0; - printf_debug("%s:", __func__); + msg_comm_debug("%s:", __func__); if (1 == writecnt && 0 == readcnt) { mode = 0x10; } else if (2 == writecnt && 0 == readcnt) { OUTB(writearr[1], wbsio_spibase + 4); - printf_debug(" data=0x%02x", writearr[1]); + msg_comm_debug(" data=0x%02x", writearr[1]); mode = 0x20; } else if (1 == writecnt && 2 == readcnt) { mode = 0x30; } else if (4 == writecnt && 0 == readcnt) { - printf_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < writecnt; i++) { OUTB(writearr[i], wbsio_spibase + i); - printf_debug("%02x", writearr[i]); + msg_comm_debug("%02x", writearr[i]); } mode = 0x40 | (writearr[1] & 0x0f); } else if (5 == writecnt && 0 == readcnt) { - printf_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < 4; i++) { OUTB(writearr[i], wbsio_spibase + i); - printf_debug("%02x", writearr[i]); + msg_comm_debug("%02x", writearr[i]); } OUTB(writearr[i], wbsio_spibase + i); - printf_debug(" data=0x%02x", writearr[i]); + msg_comm_debug(" data=0x%02x", writearr[i]); mode = 0x50 | (writearr[1] & 0x0f); } else if (8 == writecnt && 0 == readcnt) { - printf_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < 4; i++) { OUTB(writearr[i], wbsio_spibase + i); - printf_debug("%02x", writearr[i]); + msg_comm_debug("%02x", writearr[i]); } - printf_debug(" data=0x"); + msg_comm_debug(" data=0x"); for (; i < writecnt; i++) { OUTB(writearr[i], wbsio_spibase + i); - printf_debug("%02x", writearr[i]); + msg_comm_debug("%02x", writearr[i]); } mode = 0x60 | (writearr[1] & 0x0f); } else if (5 == writecnt && 4 == readcnt) { @@ -142,14 +154,14 @@ */ ; } else if (4 == writecnt && readcnt >= 1 && readcnt <= 4) { - printf_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < writecnt; i++) { OUTB(writearr[i], wbsio_spibase + i); - printf_debug("%02x", writearr[i]); + msg_comm_debug("%02x", writearr[i]); } mode = ((7 + readcnt) << 4) | (writearr[1] & 0x0f); } - printf_debug(" cmd=%02x mode=%02x\n", writearr[0], mode); + msg_comm_debug(" cmd=%02x mode=%02x\n", writearr[0], mode); if (!mode) { fprintf(stderr, "%s: unsupported command type wr=%d rd=%d\n", @@ -165,12 +177,12 @@ if (!readcnt) return 0; - printf_debug("%s: returning data =", __func__); + msg_comm_debug("%s: returning data =", __func__); for (i = 0; i < readcnt; i++) { readarr[i] = INB(wbsio_spibase + 4 + i); - printf_debug(" 0x%02x", readarr[i]); + msg_comm_debug(" 0x%02x", readarr[i]); } - printf_debug("\n"); + msg_comm_debug("\n"); return 0; } Index: flashrom-programmer_command_debug/sb600spi.c =================================================================== --- flashrom-programmer_command_debug/sb600spi.c (Revision 832) +++ flashrom-programmer_command_debug/sb600spi.c (Arbeitskopie) @@ -24,6 +24,17 @@ #include "flash.h" #include "spi.h" +/* Change this to #define if you want lowlevel debugging of commands + * sent to the SB600/SB700 SPI controller. + */ +#undef COMM_DEBUG + +#ifdef COMM_DEBUG +#define msg_comm_debug printf_debug +#else +#define msg_comm_debug(...) do {} while (0) +#endif + /* This struct is unused, but helps visualize the SB600 SPI BAR layout. *struct sb600_spi_controller { * unsigned int spi_cntrl0; / * 00h * / @@ -105,7 +116,7 @@ writecnt--; - printf_debug("%s, cmd=%x, writecnt=%x, readcnt=%x\n", + msg_comm_debug("%s, cmd=%x, writecnt=%x, readcnt=%x\n", __func__, cmd, writecnt, readcnt); if (readcnt > 8) { @@ -135,10 +146,10 @@ /* Send the write byte to FIFO. */ for (count = 0; count < writecnt; count++, writearr++) { - printf_debug(" [%x]", *writearr); + msg_comm_debug(" [%x]", *writearr); mmio_writeb(*writearr, sb600_spibar + 0xC); } - printf_debug("\n"); + msg_comm_debug("\n"); /* * We should send the data by sequence, which means we need to reset @@ -164,16 +175,16 @@ /* Skip the bytes we sent. */ for (count = 0; count < writecnt; count++) { cmd = mmio_readb(sb600_spibar + 0xC); - printf_debug("[ %2x]", cmd); + msg_comm_debug("[ %2x]", cmd); } - printf_debug("The FIFO pointer after skipping is %d.\n", + msg_comm_debug("The FIFO pointer after skipping is %d.\n", mmio_readb(sb600_spibar + 0xd) & 0x07); for (count = 0; count < readcnt; count++, readarr++) { *readarr = mmio_readb(sb600_spibar + 0xC); - printf_debug("[%02x]", *readarr); + msg_comm_debug("[%02x]", *readarr); } - printf_debug("\n"); + msg_comm_debug("\n"); return 0; } Index: flashrom-programmer_command_debug/ichspi.c =================================================================== --- flashrom-programmer_command_debug/ichspi.c (Revision 832) +++ flashrom-programmer_command_debug/ichspi.c (Arbeitskopie) @@ -36,6 +36,17 @@ #include "flash.h" #include "spi.h" +/* Change this to #define if you want lowlevel debugging of commands + * sent to the ICH/VIA SPI controller. + */ +#undef COMM_DEBUG + +#ifdef COMM_DEBUG +#define msg_comm_debug printf_debug +#else +#define msg_comm_debug(...) do {} while (0) +#endif + /* ICH9 controller register definition */ #define ICH9_REG_FADDR 0x08 /* 32 Bits */ #define ICH9_REG_FDATA0 0x10 /* 64 Bytes */ @@ -624,7 +635,7 @@ uint32_t remaining = page_size; int towrite; - printf_debug("ich_spi_write_page: offset=%d, number=%d, buf=%p\n", + msg_comm_debug("ich_spi_write_page: offset=%d, number=%d, buf=%p\n", offset, page_size, bytes); for (; remaining > 0; remaining -= towrite) { -- Developer quote of the year: "We are juggling too many chainsaws and flaming arrows and tigers."

2 2

[commit] r834 - trunk
by svn＠flashrom.org 07 Jan '10

07 Jan '10

Author: hailfinger Date: 2010-01-07 04:32:17 +0100 (Thu, 07 Jan 2010) New Revision: 834 Modified: trunk/buspirate_spi.c trunk/ft2232_spi.c trunk/ichspi.c trunk/sb600spi.c trunk/wbsio_spi.c Log: Programmer debug messages during programmer init/shutdown are useful because they print hardware settings and desired configuration. They help in getting a quick overview of hardware and software state on startup and shutdown. Programmer debug messages during flash chip access are mostly a distraction in logs and should only be enabled if someone is having problems which are suspected to stem from a programmer hardware or programmer software bug. Disable those messages by default, they can be reenabled by #define COMM_DEBUG in the affected programmer file. An added benefit is a tremendous size reduction in verbose probe/read/write/erase logs because only flash chip driver messages remain. In some cases, logs will shrink from 65 MB to 10 kB or less. The right(tm) fix would be two different debug levels (DEBUG and SPEW) and the ability to differentiate between programmer debug messages and flash chip debug messages. Until the design for the message printing infrastructure is finished, this is the best stop-gap measure we can get. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audioahcked(a)gmail.com> Modified: trunk/buspirate_spi.c =================================================================== --- trunk/buspirate_spi.c 2010-01-07 03:24:05 UTC (rev 833) +++ trunk/buspirate_spi.c 2010-01-07 03:32:17 UTC (rev 834) @@ -25,6 +25,17 @@ #include "flash.h" #include "spi.h" +/* Change this to #define if you want lowlevel debugging of commands + * sent to the Bus Pirate. + */ +#undef COMM_DEBUG + +#ifdef COMM_DEBUG +#define msg_comm_debug printf_debug +#else +#define msg_comm_debug(...) do {} while (0) +#endif + /* Change this to #define if you want to test without a serial implementation */ #undef FAKE_COMMUNICATION @@ -47,14 +58,14 @@ { int i, ret = 0; - printf_debug("%s: write %i, read %i\n", __func__, writecnt, readcnt); + msg_comm_debug("%s: write %i, read %i ", __func__, writecnt, readcnt); if (!writecnt && !readcnt) { fprintf(stderr, "Zero length command!\n"); return 1; } - printf_debug("Sending"); + msg_comm_debug("Sending"); for (i = 0; i < writecnt; i++) - printf_debug(" 0x%02x", buf[i]); + msg_comm_debug(" 0x%02x", buf[i]); #ifdef FAKE_COMMUNICATION /* Placate the caller for now. */ if (readcnt) { @@ -72,10 +83,10 @@ if (ret) return ret; #endif - printf_debug(", receiving"); + msg_comm_debug(", receiving"); for (i = 0; i < readcnt; i++) - printf_debug(" 0x%02x", buf[i]); - printf_debug("\n"); + msg_comm_debug(" 0x%02x", buf[i]); + msg_comm_debug("\n"); return 0; } Modified: trunk/ft2232_spi.c =================================================================== --- trunk/ft2232_spi.c 2010-01-07 03:24:05 UTC (rev 833) +++ trunk/ft2232_spi.c 2010-01-07 03:32:17 UTC (rev 834) @@ -29,6 +29,17 @@ #include "spi.h" #include <ftdi.h> +/* Change this to #define if you want lowlevel debugging of commands + * sent to the FT2232 SPI controller. + */ +#undef COMM_DEBUG + +#ifdef COMM_DEBUG +#define msg_comm_debug printf_debug +#else +#define msg_comm_debug(...) do {} while (0) +#endif + /* * The 'H' chips can run internally at either 12MHz or 60MHz. * The non-H chips can only run at 12MHz. @@ -224,7 +235,7 @@ * and deassert CS# all in one shot. If reading, we do three separate * operations. */ - printf_debug("Assert CS#\n"); + msg_comm_debug("Assert CS#\n"); buf[i++] = SET_BITS_LOW; buf[i++] = 0 & ~CS_BIT; /* assertive */ buf[i++] = 0x0b; @@ -266,7 +277,7 @@ } } - printf_debug("De-assert CS#\n"); + msg_comm_debug("De-assert CS#\n"); buf[i++] = SET_BITS_LOW; buf[i++] = CS_BIT; buf[i++] = 0x0b; Modified: trunk/ichspi.c =================================================================== --- trunk/ichspi.c 2010-01-07 03:24:05 UTC (rev 833) +++ trunk/ichspi.c 2010-01-07 03:32:17 UTC (rev 834) @@ -36,6 +36,17 @@ #include "flash.h" #include "spi.h" +/* Change this to #define if you want lowlevel debugging of commands + * sent to the ICH/VIA SPI controller. + */ +#undef COMM_DEBUG + +#ifdef COMM_DEBUG +#define msg_comm_debug printf_debug +#else +#define msg_comm_debug(...) do {} while (0) +#endif + /* ICH9 controller register definition */ #define ICH9_REG_FADDR 0x08 /* 32 Bits */ #define ICH9_REG_FDATA0 0x10 /* 64 Bytes */ @@ -624,7 +635,7 @@ uint32_t remaining = page_size; int towrite; - printf_debug("ich_spi_write_page: offset=%d, number=%d, buf=%p\n", + msg_comm_debug("ich_spi_write_page: offset=%d, number=%d, buf=%p\n", offset, page_size, bytes); for (; remaining > 0; remaining -= towrite) { Modified: trunk/sb600spi.c =================================================================== --- trunk/sb600spi.c 2010-01-07 03:24:05 UTC (rev 833) +++ trunk/sb600spi.c 2010-01-07 03:32:17 UTC (rev 834) @@ -24,6 +24,17 @@ #include "flash.h" #include "spi.h" +/* Change this to #define if you want lowlevel debugging of commands + * sent to the SB600/SB700 SPI controller. + */ +#undef COMM_DEBUG + +#ifdef COMM_DEBUG +#define msg_comm_debug printf_debug +#else +#define msg_comm_debug(...) do {} while (0) +#endif + /* This struct is unused, but helps visualize the SB600 SPI BAR layout. *struct sb600_spi_controller { * unsigned int spi_cntrl0; / * 00h * / @@ -105,7 +116,7 @@ writecnt--; - printf_debug("%s, cmd=%x, writecnt=%x, readcnt=%x\n", + msg_comm_debug("%s, cmd=%x, writecnt=%x, readcnt=%x\n", __func__, cmd, writecnt, readcnt); if (readcnt > 8) { @@ -135,10 +146,10 @@ /* Send the write byte to FIFO. */ for (count = 0; count < writecnt; count++, writearr++) { - printf_debug(" [%x]", *writearr); + msg_comm_debug(" [%x]", *writearr); mmio_writeb(*writearr, sb600_spibar + 0xC); } - printf_debug("\n"); + msg_comm_debug("\n"); /* * We should send the data by sequence, which means we need to reset @@ -164,16 +175,16 @@ /* Skip the bytes we sent. */ for (count = 0; count < writecnt; count++) { cmd = mmio_readb(sb600_spibar + 0xC); - printf_debug("[ %2x]", cmd); + msg_comm_debug("[ %2x]", cmd); } - printf_debug("The FIFO pointer after skipping is %d.\n", + msg_comm_debug("The FIFO pointer after skipping is %d.\n", mmio_readb(sb600_spibar + 0xd) & 0x07); for (count = 0; count < readcnt; count++, readarr++) { *readarr = mmio_readb(sb600_spibar + 0xC); - printf_debug("[%02x]", *readarr); + msg_comm_debug("[%02x]", *readarr); } - printf_debug("\n"); + msg_comm_debug("\n"); return 0; } Modified: trunk/wbsio_spi.c =================================================================== --- trunk/wbsio_spi.c 2010-01-07 03:24:05 UTC (rev 833) +++ trunk/wbsio_spi.c 2010-01-07 03:32:17 UTC (rev 834) @@ -2,6 +2,7 @@ * This file is part of the flashrom project. * * Copyright (C) 2008 Peter Stuge <peter(a)stuge.se> + * Copyright (C) 2009,2010 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 @@ -21,6 +22,17 @@ #include "flash.h" #include "spi.h" +/* Change this to #define if you want lowlevel debugging of commands + * sent to the Winbond W836xx SPI controller. + */ +#undef COMM_DEBUG + +#ifdef COMM_DEBUG +#define msg_comm_debug printf_debug +#else +#define msg_comm_debug(...) do {} while (0) +#endif + #define WBSIO_PORT1 0x2e #define WBSIO_PORT2 0x4e @@ -62,7 +74,7 @@ if (0 == (wbsio_spibase = wbsio_get_spibase(WBSIO_PORT2))) return 1; - printf_debug("\nwbsio_spibase = 0x%x\n", wbsio_spibase); + msg_comm_debug("\nwbsio_spibase = 0x%x\n", wbsio_spibase); buses_supported |= CHIP_BUSTYPE_SPI; spi_controller = SPI_CONTROLLER_WBSIO; @@ -96,42 +108,42 @@ int i; uint8_t mode = 0; - printf_debug("%s:", __func__); + msg_comm_debug("%s:", __func__); if (1 == writecnt && 0 == readcnt) { mode = 0x10; } else if (2 == writecnt && 0 == readcnt) { OUTB(writearr[1], wbsio_spibase + 4); - printf_debug(" data=0x%02x", writearr[1]); + msg_comm_debug(" data=0x%02x", writearr[1]); mode = 0x20; } else if (1 == writecnt && 2 == readcnt) { mode = 0x30; } else if (4 == writecnt && 0 == readcnt) { - printf_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < writecnt; i++) { OUTB(writearr[i], wbsio_spibase + i); - printf_debug("%02x", writearr[i]); + msg_comm_debug("%02x", writearr[i]); } mode = 0x40 | (writearr[1] & 0x0f); } else if (5 == writecnt && 0 == readcnt) { - printf_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < 4; i++) { OUTB(writearr[i], wbsio_spibase + i); - printf_debug("%02x", writearr[i]); + msg_comm_debug("%02x", writearr[i]); } OUTB(writearr[i], wbsio_spibase + i); - printf_debug(" data=0x%02x", writearr[i]); + msg_comm_debug(" data=0x%02x", writearr[i]); mode = 0x50 | (writearr[1] & 0x0f); } else if (8 == writecnt && 0 == readcnt) { - printf_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < 4; i++) { OUTB(writearr[i], wbsio_spibase + i); - printf_debug("%02x", writearr[i]); + msg_comm_debug("%02x", writearr[i]); } - printf_debug(" data=0x"); + msg_comm_debug(" data=0x"); for (; i < writecnt; i++) { OUTB(writearr[i], wbsio_spibase + i); - printf_debug("%02x", writearr[i]); + msg_comm_debug("%02x", writearr[i]); } mode = 0x60 | (writearr[1] & 0x0f); } else if (5 == writecnt && 4 == readcnt) { @@ -142,14 +154,14 @@ */ ; } else if (4 == writecnt && readcnt >= 1 && readcnt <= 4) { - printf_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < writecnt; i++) { OUTB(writearr[i], wbsio_spibase + i); - printf_debug("%02x", writearr[i]); + msg_comm_debug("%02x", writearr[i]); } mode = ((7 + readcnt) << 4) | (writearr[1] & 0x0f); } - printf_debug(" cmd=%02x mode=%02x\n", writearr[0], mode); + msg_comm_debug(" cmd=%02x mode=%02x\n", writearr[0], mode); if (!mode) { fprintf(stderr, "%s: unsupported command type wr=%d rd=%d\n", @@ -165,12 +177,12 @@ if (!readcnt) return 0; - printf_debug("%s: returning data =", __func__); + msg_comm_debug("%s: returning data =", __func__); for (i = 0; i < readcnt; i++) { readarr[i] = INB(wbsio_spibase + 4 + i); - printf_debug(" 0x%02x", readarr[i]); + msg_comm_debug(" 0x%02x", readarr[i]); } - printf_debug("\n"); + msg_comm_debug("\n"); return 0; }

1 0

[PATCH] Split off CLI functions from flashrom.c
by Carl-Daniel Hailfinger 07 Jan '10

07 Jan '10

This was long overdue. Move the CLI related functions main() and cli_usage() to cli_classic.c and rename them accordingly. For now, main() just calls cli_classic(), but alternative frontends can be switched in main(). Annotate remaining help texts with CLI dependency inside flashrom.c with a FIXME comment. Now people can go and create different frontends and be happy. Please note that any other frontend will have to sort of duplicate the probing code in cli_classic.c. Refactoring that part of the code is possible, but not easy because we still want to print instructive help messages for users. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-cli_classic/flash.h =================================================================== --- flashrom-cli_classic/flash.h (Revision 830) +++ flashrom-cli_classic/flash.h (Arbeitskopie) @@ -477,21 +477,31 @@ extern unsigned long flashbase; extern int verbose; extern const char *flashrom_version; +extern char *chip_to_probe; #define printf_debug(x...) { if (verbose) printf(x); } void map_flash_registers(struct flashchip *flash); int read_memmapped(struct flashchip *flash, uint8_t *buf, int start, int len); int erase_flash(struct flashchip *flash); +struct flashchip *probe_flash(struct flashchip *first_flash, int force); +int read_flash(struct flashchip *flash, char *filename); +void check_chip_supported(struct flashchip *flash); +int check_max_decode(enum chipbustype buses, uint32_t size); int min(int a, int b); int max(int a, int b); char *extract_param(char **haystack, char *needle, char *delim); int check_erased_range(struct flashchip *flash, int start, int len); int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message); char *strcat_realloc(char *dest, const char *src); +void print_version(void); +int selfcheck(void); int doit(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it); #define OK 0 #define NT 1 /* Not tested */ +/* cli_classic.c */ +int cli_classic(int argc, char *argv[]); + /* layout.c */ int show_id(uint8_t *bios, int size, int force); int read_romlayout(char *name); Index: flashrom-cli_classic/Makefile =================================================================== --- flashrom-cli_classic/Makefile (Revision 830) +++ flashrom-cli_classic/Makefile (Arbeitskopie) @@ -48,7 +48,7 @@ LIB_OBJS = layout.o -CLI_OBJS = flashrom.o print.o +CLI_OBJS = flashrom.o cli_classic.o print.o PROGRAMMER_OBJS = udelay.o programmer.o Index: flashrom-cli_classic/cli_classic.c =================================================================== --- /dev/null 2009-04-14 16:06:28.000000000 +0200 +++ flashrom-cli_classic/cli_classic.c (Arbeitskopie) @@ -0,0 +1,387 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2000 Silicon Integrated System Corporation + * Copyright (C) 2004 Tyan Corp <yhlu(a)tyan.com> + * Copyright (C) 2005-2008 coresystems GmbH + * Copyright (C) 2008,2009,2010 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; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <fcntl.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <string.h> +#include <stdlib.h> +#include <getopt.h> +#include "flash.h" +#include "flashchips.h" + +void cli_classic_usage(const char *name) +{ + const char *pname; + int pnamelen; + int remaining = 0; + enum programmer p; + + printf("Usage: %s [-VfLzhR] [-E|-r file|-w file|-v file] [-c chipname]\n" + " [-m [vendor:]part] [-l file] [-i image] [-p programmer]\n\n", name); + + printf("Please note that the command line interface for flashrom will " + "change before\nflashrom 1.0. Do not use flashrom in scripts " + "or other automated tools without\nchecking that your flashrom" + " version won't interpret options in a different way.\n\n"); + + printf + (" -r | --read: read flash and save into file\n" + " -w | --write: write file into flash\n" + " -v | --verify: verify flash against file\n" + " -n | --noverify: don't verify flash against file\n" + " -E | --erase: erase flash device\n" + " -V | --verbose: more verbose output\n" + " -c | --chip <chipname>: probe only for specified flash chip\n" +#if INTERNAL_SUPPORT == 1 + " -m | --mainboard <[vendor:]part>: override mainboard settings\n" +#endif + " -f | --force: force write without checking image\n" + " -l | --layout <file.layout>: read ROM layout from file\n" + " -i | --image <name>: only flash image name from flash layout\n" + " -L | --list-supported: print supported devices\n" +#if PRINT_WIKI_SUPPORT == 1 + " -z | --list-supported-wiki: print supported devices in wiki syntax\n" +#endif + " -p | --programmer <name>: specify the programmer device"); + + for (p = 0; p < PROGRAMMER_INVALID; p++) { + pname = programmer_table[p].name; + pnamelen = strlen(pname); + if (remaining - pnamelen - 2 < 0) { + printf("\n "); + remaining = 43; + } else { + printf(" "); + remaining--; + } + if (p == 0) { + printf("("); + remaining--; + } + printf("%s", pname); + remaining -= pnamelen; + if (p < PROGRAMMER_INVALID - 1) { + printf(","); + remaining--; + } else { + printf(")\n"); + } + } + + printf( + " -h | --help: print this help text\n" + " -R | --version: print the version (release)\n" + "\nYou can specify one of -E, -r, -w, -v or no operation. If no operation is\n" + "specified, then all that happens is that flash info is dumped.\n\n"); + exit(1); +} + +int cli_classic(int argc, char *argv[]) +{ + unsigned long size; + /* Probe for up to three flash chips. */ + struct flashchip *flash, *flashes[3]; + const char *name; + int namelen; + int opt; + int option_index = 0; + int force = 0; + int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0; + int dont_verify_it = 0, list_supported = 0; +#if PRINT_WIKI_SUPPORT == 1 + int list_supported_wiki = 0; +#endif + int operation_specified = 0; + int i; + +#if PRINT_WIKI_SUPPORT == 1 + const char *optstring = "rRwvnVEfc:m:l:i:p:Lzh"; +#else + const char *optstring = "rRwvnVEfc:m:l:i:p:Lh"; +#endif + static struct option long_options[] = { + {"read", 0, 0, 'r'}, + {"write", 0, 0, 'w'}, + {"erase", 0, 0, 'E'}, + {"verify", 0, 0, 'v'}, + {"noverify", 0, 0, 'n'}, + {"chip", 1, 0, 'c'}, + {"mainboard", 1, 0, 'm'}, + {"verbose", 0, 0, 'V'}, + {"force", 0, 0, 'f'}, + {"layout", 1, 0, 'l'}, + {"image", 1, 0, 'i'}, + {"list-supported", 0, 0, 'L'}, +#if PRINT_WIKI_SUPPORT == 1 + {"list-supported-wiki", 0, 0, 'z'}, +#endif + {"programmer", 1, 0, 'p'}, + {"help", 0, 0, 'h'}, + {"version", 0, 0, 'R'}, + {0, 0, 0, 0} + }; + + char *filename = NULL; + + char *tempstr = NULL; + + print_version(); + + if (argc > 1) { + /* Yes, print them. */ + int i; + printf_debug("The arguments are:\n"); + for (i = 1; i < argc; ++i) + printf_debug("%s\n", argv[i]); + } + + if (selfcheck()) + exit(1); + + setbuf(stdout, NULL); + while ((opt = getopt_long(argc, argv, optstring, + long_options, &option_index)) != EOF) { + switch (opt) { + case 'r': + if (++operation_specified > 1) { + fprintf(stderr, "More than one operation " + "specified. Aborting.\n"); + exit(1); + } + read_it = 1; + break; + case 'w': + if (++operation_specified > 1) { + fprintf(stderr, "More than one operation " + "specified. Aborting.\n"); + exit(1); + } + write_it = 1; + break; + case 'v': + //FIXME: gracefully handle superfluous -v + if (++operation_specified > 1) { + fprintf(stderr, "More than one operation " + "specified. Aborting.\n"); + exit(1); + } + if (dont_verify_it) { + fprintf(stderr, "--verify and --noverify are" + "mutually exclusive. Aborting.\n"); + exit(1); + } + verify_it = 1; + break; + case 'n': + if (verify_it) { + fprintf(stderr, "--verify and --noverify are" + "mutually exclusive. Aborting.\n"); + exit(1); + } + dont_verify_it = 1; + break; + case 'c': + chip_to_probe = strdup(optarg); + break; + case 'V': + verbose = 1; + break; + case 'E': + if (++operation_specified > 1) { + fprintf(stderr, "More than one operation " + "specified. Aborting.\n"); + exit(1); + } + erase_it = 1; + break; +#if INTERNAL_SUPPORT == 1 + case 'm': + tempstr = strdup(optarg); + lb_vendor_dev_from_string(tempstr); + break; +#endif + case 'f': + force = 1; + break; + case 'l': + tempstr = strdup(optarg); + if (read_romlayout(tempstr)) + exit(1); + break; + case 'i': + tempstr = strdup(optarg); + find_romentry(tempstr); + break; + case 'L': + list_supported = 1; + break; +#if PRINT_WIKI_SUPPORT == 1 + case 'z': + list_supported_wiki = 1; + break; +#endif + case 'p': + for (programmer = 0; programmer < PROGRAMMER_INVALID; programmer++) { + name = programmer_table[programmer].name; + namelen = strlen(name); + if (strncmp(optarg, name, namelen) == 0) { + switch (optarg[namelen]) { + case ':': + programmer_param = strdup(optarg + namelen + 1); + break; + case '\0': + break; + default: + /* The continue refers to the + * for loop. It is here to be + * able to differentiate between + * foo and foobar. + */ + continue; + } + break; + } + } + if (programmer == PROGRAMMER_INVALID) { + printf("Error: Unknown programmer %s.\n", optarg); + exit(1); + } + break; + case 'R': + /* print_version() is always called during startup. */ + exit(0); + break; + case 'h': + default: + cli_classic_usage(argv[0]); + break; + } + } + + if (list_supported) { + print_supported(); + exit(0); + } + +#if PRINT_WIKI_SUPPORT == 1 + if (list_supported_wiki) { + print_supported_wiki(); + exit(0); + } +#endif + + if (read_it && write_it) { + printf("Error: -r and -w are mutually exclusive.\n"); + cli_classic_usage(argv[0]); + } + + if (optind < argc) + filename = argv[optind++]; + + if (optind < argc) { + printf("Error: Extra parameter found.\n"); + cli_classic_usage(argv[0]); + } + + if (programmer_init()) { + fprintf(stderr, "Error: Programmer initialization failed.\n"); + exit(1); + } + + // FIXME: Delay calibration should happen in programmer code. + myusec_calibrate_delay(); + + for (i = 0; i < ARRAY_SIZE(flashes); i++) { + flashes[i] = + probe_flash(i ? flashes[i - 1] + 1 : flashchips, 0); + if (!flashes[i]) + for (i++; i < ARRAY_SIZE(flashes); i++) + flashes[i] = NULL; + } + + if (flashes[1]) { + printf("Multiple flash chips were detected:"); + for (i = 0; i < ARRAY_SIZE(flashes) && flashes[i]; i++) + printf(" %s", flashes[i]->name); + printf("\nPlease specify which chip to use with the -c <chipname> option.\n"); + programmer_shutdown(); + exit(1); + } else if (!flashes[0]) { + printf("No EEPROM/flash device found.\n"); + if (!force || !chip_to_probe) { + printf("If you know which flash chip you have, and if this version of flashrom\n"); + printf("supports a similar flash chip, you can try to force read your chip. Run:\n"); + printf("flashrom -f -r -c similar_supported_flash_chip filename\n"); + printf("\n"); + printf("Note: flashrom can never write when the flash chip isn't found automatically.\n"); + } + if (force && read_it && chip_to_probe) { + printf("Force read (-f -r -c) requested, forcing chip probe success:\n"); + flashes[0] = probe_flash(flashchips, 1); + if (!flashes[0]) { + printf("flashrom does not support a flash chip named '%s'.\n", chip_to_probe); + printf("Run flashrom -L to view the hardware supported in this flashrom version.\n"); + exit(1); + } + printf("Please note that forced reads most likely contain garbage.\n"); + return read_flash(flashes[0], filename); + } + // FIXME: flash writes stay enabled! + programmer_shutdown(); + exit(1); + } + + flash = flashes[0]; + + check_chip_supported(flash); + + size = flash->total_size * 1024; + if (check_max_decode((buses_supported & flash->bustype), size) && + (!force)) { + fprintf(stderr, "Chip is too big for this programmer " + "(-V gives details). Use --force to override.\n"); + programmer_shutdown(); + return 1; + } + + if (!(read_it | write_it | verify_it | erase_it)) { + printf("No operations were specified.\n"); + // FIXME: flash writes stay enabled! + programmer_shutdown(); + exit(1); + } + + if (!filename && !erase_it) { + printf("Error: No filename specified.\n"); + // FIXME: flash writes stay enabled! + programmer_shutdown(); + exit(1); + } + + /* Always verify write operations unless -n is used. */ + if (write_it && !dont_verify_it) + verify_it = 1; + + return doit(flash, force, filename, read_it, write_it, erase_it, verify_it); +} Index: flashrom-cli_classic/flashrom.c =================================================================== --- flashrom-cli_classic/flashrom.c (Revision 830) +++ flashrom-cli_classic/flashrom.c (Arbeitskopie) @@ -692,6 +692,7 @@ * and the limit is not exceeded on all buses. Tell the user. */ if (bitcount(buses) > limitexceeded) + /* FIXME: This message is designed towards CLI users. */ printf_debug("There is at least one common chip/programmer " "interface which can support a chip of this size. " "You can try --force at your own risk.\n"); @@ -911,73 +912,6 @@ printf("\n"); } -void cli_usage(const char *name) -{ - const char *pname; - int pnamelen; - int remaining = 0; - enum programmer p; - - printf("cli_usage: %s [-VfLzhR] [-E|-r file|-w file|-v file] [-c chipname]\n" - " [-m [vendor:]part] [-l file] [-i image] [-p programmer]\n\n", name); - - printf("Please note that the command line interface for flashrom will " - "change before\nflashrom 1.0. Do not use flashrom in scripts " - "or other automated tools without\nchecking that your flashrom" - " version won't interpret options in a different way.\n\n"); - - printf - (" -r | --read: read flash and save into file\n" - " -w | --write: write file into flash\n" - " -v | --verify: verify flash against file\n" - " -n | --noverify: don't verify flash against file\n" - " -E | --erase: erase flash device\n" - " -V | --verbose: more verbose output\n" - " -c | --chip <chipname>: probe only for specified flash chip\n" -#if INTERNAL_SUPPORT == 1 - " -m | --mainboard <[vendor:]part>: override mainboard settings\n" -#endif - " -f | --force: force write without checking image\n" - " -l | --layout <file.layout>: read ROM layout from file\n" - " -i | --image <name>: only flash image name from flash layout\n" - " -L | --list-supported: print supported devices\n" -#if PRINT_WIKI_SUPPORT == 1 - " -z | --list-supported-wiki: print supported devices in wiki syntax\n" -#endif - " -p | --programmer <name>: specify the programmer device"); - - for (p = 0; p < PROGRAMMER_INVALID; p++) { - pname = programmer_table[p].name; - pnamelen = strlen(pname); - if (remaining - pnamelen - 2 < 0) { - printf("\n "); - remaining = 43; - } else { - printf(" "); - remaining--; - } - if (p == 0) { - printf("("); - remaining--; - } - printf("%s", pname); - remaining -= pnamelen; - if (p < PROGRAMMER_INVALID - 1) { - printf(","); - remaining--; - } else { - printf(")\n"); - } - } - - printf( - " -h | --help: print this help text\n" - " -R | --version: print the version (release)\n" - "\nYou can specify one of -E, -r, -w, -v or no operation. If no operation is\n" - "specified, then all that happens is that flash info is dumped.\n\n"); - exit(1); -} - void print_version(void) { printf("flashrom v%s\n", flashrom_version); @@ -1034,6 +968,7 @@ printf(" WRITE"); printf("\n"); } + /* FIXME: This message is designed towards CLI users. */ printf("Please email a report to flashrom(a)flashrom.org if any " "of the above operations\nwork correctly for you with " "this flash part. Please include the flashrom\noutput " @@ -1046,291 +981,7 @@ int main(int argc, char *argv[]) { - unsigned long size; - /* Probe for up to three flash chips. */ - struct flashchip *flash, *flashes[3]; - const char *name; - int namelen; - int opt; - int option_index = 0; - int force = 0; - int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0; - int dont_verify_it = 0, list_supported = 0; -#if PRINT_WIKI_SUPPORT == 1 - int list_supported_wiki = 0; -#endif - int operation_specified = 0; - int i; - -#if PRINT_WIKI_SUPPORT == 1 - const char *optstring = "rRwvnVEfc:m:l:i:p:Lzh"; -#else - const char *optstring = "rRwvnVEfc:m:l:i:p:Lh"; -#endif - static struct option long_options[] = { - {"read", 0, 0, 'r'}, - {"write", 0, 0, 'w'}, - {"erase", 0, 0, 'E'}, - {"verify", 0, 0, 'v'}, - {"noverify", 0, 0, 'n'}, - {"chip", 1, 0, 'c'}, - {"mainboard", 1, 0, 'm'}, - {"verbose", 0, 0, 'V'}, - {"force", 0, 0, 'f'}, - {"layout", 1, 0, 'l'}, - {"image", 1, 0, 'i'}, - {"list-supported", 0, 0, 'L'}, -#if PRINT_WIKI_SUPPORT == 1 - {"list-supported-wiki", 0, 0, 'z'}, -#endif - {"programmer", 1, 0, 'p'}, - {"help", 0, 0, 'h'}, - {"version", 0, 0, 'R'}, - {0, 0, 0, 0} - }; - - char *filename = NULL; - - char *tempstr = NULL; - - print_version(); - - if (argc > 1) { - /* Yes, print them. */ - int i; - printf_debug("The arguments are:\n"); - for (i = 1; i < argc; ++i) - printf_debug("%s\n", argv[i]); - } - - if (selfcheck()) - exit(1); - - setbuf(stdout, NULL); - while ((opt = getopt_long(argc, argv, optstring, - long_options, &option_index)) != EOF) { - switch (opt) { - case 'r': - if (++operation_specified > 1) { - fprintf(stderr, "More than one operation " - "specified. Aborting.\n"); - exit(1); - } - read_it = 1; - break; - case 'w': - if (++operation_specified > 1) { - fprintf(stderr, "More than one operation " - "specified. Aborting.\n"); - exit(1); - } - write_it = 1; - break; - case 'v': - //FIXME: gracefully handle superfluous -v - if (++operation_specified > 1) { - fprintf(stderr, "More than one operation " - "specified. Aborting.\n"); - exit(1); - } - if (dont_verify_it) { - fprintf(stderr, "--verify and --noverify are" - "mutually exclusive. Aborting.\n"); - exit(1); - } - verify_it = 1; - break; - case 'n': - if (verify_it) { - fprintf(stderr, "--verify and --noverify are" - "mutually exclusive. Aborting.\n"); - exit(1); - } - dont_verify_it = 1; - break; - case 'c': - chip_to_probe = strdup(optarg); - break; - case 'V': - verbose = 1; - break; - case 'E': - if (++operation_specified > 1) { - fprintf(stderr, "More than one operation " - "specified. Aborting.\n"); - exit(1); - } - erase_it = 1; - break; -#if INTERNAL_SUPPORT == 1 - case 'm': - tempstr = strdup(optarg); - lb_vendor_dev_from_string(tempstr); - break; -#endif - case 'f': - force = 1; - break; - case 'l': - tempstr = strdup(optarg); - if (read_romlayout(tempstr)) - exit(1); - break; - case 'i': - tempstr = strdup(optarg); - find_romentry(tempstr); - break; - case 'L': - list_supported = 1; - break; -#if PRINT_WIKI_SUPPORT == 1 - case 'z': - list_supported_wiki = 1; - break; -#endif - case 'p': - for (programmer = 0; programmer < PROGRAMMER_INVALID; programmer++) { - name = programmer_table[programmer].name; - namelen = strlen(name); - if (strncmp(optarg, name, namelen) == 0) { - switch (optarg[namelen]) { - case ':': - programmer_param = strdup(optarg + namelen + 1); - break; - case '\0': - break; - default: - /* The continue refers to the - * for loop. It is here to be - * able to differentiate between - * foo and foobar. - */ - continue; - } - break; - } - } - if (programmer == PROGRAMMER_INVALID) { - printf("Error: Unknown programmer %s.\n", optarg); - exit(1); - } - break; - case 'R': - /* print_version() is always called during startup. */ - exit(0); - break; - case 'h': - default: - cli_usage(argv[0]); - break; - } - } - - if (list_supported) { - print_supported(); - exit(0); - } - -#if PRINT_WIKI_SUPPORT == 1 - if (list_supported_wiki) { - print_supported_wiki(); - exit(0); - } -#endif - - if (read_it && write_it) { - printf("Error: -r and -w are mutually exclusive.\n"); - cli_usage(argv[0]); - } - - if (optind < argc) - filename = argv[optind++]; - - if (optind < argc) { - printf("Error: Extra parameter found.\n"); - cli_usage(argv[0]); - } - - if (programmer_init()) { - fprintf(stderr, "Error: Programmer initialization failed.\n"); - exit(1); - } - - // FIXME: Delay calibration should happen in programmer code. - myusec_calibrate_delay(); - - for (i = 0; i < ARRAY_SIZE(flashes); i++) { - flashes[i] = - probe_flash(i ? flashes[i - 1] + 1 : flashchips, 0); - if (!flashes[i]) - for (i++; i < ARRAY_SIZE(flashes); i++) - flashes[i] = NULL; - } - - if (flashes[1]) { - printf("Multiple flash chips were detected:"); - for (i = 0; i < ARRAY_SIZE(flashes) && flashes[i]; i++) - printf(" %s", flashes[i]->name); - printf("\nPlease specify which chip to use with the -c <chipname> option.\n"); - programmer_shutdown(); - exit(1); - } else if (!flashes[0]) { - printf("No EEPROM/flash device found.\n"); - if (!force || !chip_to_probe) { - printf("If you know which flash chip you have, and if this version of flashrom\n"); - printf("supports a similar flash chip, you can try to force read your chip. Run:\n"); - printf("flashrom -f -r -c similar_supported_flash_chip filename\n"); - printf("\n"); - printf("Note: flashrom can never write when the flash chip isn't found automatically.\n"); - } - if (force && read_it && chip_to_probe) { - printf("Force read (-f -r -c) requested, forcing chip probe success:\n"); - flashes[0] = probe_flash(flashchips, 1); - if (!flashes[0]) { - printf("flashrom does not support a flash chip named '%s'.\n", chip_to_probe); - printf("Run flashrom -L to view the hardware supported in this flashrom version.\n"); - exit(1); - } - printf("Please note that forced reads most likely contain garbage.\n"); - return read_flash(flashes[0], filename); - } - // FIXME: flash writes stay enabled! - programmer_shutdown(); - exit(1); - } - - flash = flashes[0]; - - check_chip_supported(flash); - - size = flash->total_size * 1024; - if (check_max_decode((buses_supported & flash->bustype), size) && - (!force)) { - fprintf(stderr, "Chip is too big for this programmer " - "(-V gives details). Use --force to override.\n"); - programmer_shutdown(); - return 1; - } - - if (!(read_it | write_it | verify_it | erase_it)) { - printf("No operations were specified.\n"); - // FIXME: flash writes stay enabled! - programmer_shutdown(); - exit(1); - } - - if (!filename && !erase_it) { - printf("Error: No filename specified.\n"); - // FIXME: flash writes stay enabled! - programmer_shutdown(); - exit(1); - } - - /* Always verify write operations unless -n is used. */ - if (write_it && !dont_verify_it) - verify_it = 1; - - return doit(flash, force, filename, read_it, write_it, erase_it, verify_it); + return cli_classic(argc, argv); } /* This function signature is horrible. We need to design a better interface, -- Developer quote of the year: "We are juggling too many chainsaws and flaming arrows and tigers."

2 2

[commit] r833 - trunk
by svn＠flashrom.org 07 Jan '10

07 Jan '10

Author: hailfinger Date: 2010-01-07 04:24:05 +0100 (Thu, 07 Jan 2010) New Revision: 833 Added: trunk/cli_classic.c Modified: trunk/Makefile trunk/flash.h trunk/flashrom.c Log: Move the CLI related functions main() and cli_usage() to cli_classic.c and rename them accordingly. For now, main() just calls cli_classic(), but alternative frontends can be switched in main(). Annotate remaining help texts with CLI dependency inside flashrom.c with a FIXME comment. Now people can go and create different frontends and be happy. Please note that any other frontend will have to sort of duplicate the probing code in cli_classic.c. Refactoring that part of the code is possible, but not easy because we still want to print instructive help messages for users. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-06 22:14:39 UTC (rev 832) +++ trunk/Makefile 2010-01-07 03:24:05 UTC (rev 833) @@ -48,7 +48,7 @@ LIB_OBJS = layout.o -CLI_OBJS = flashrom.o print.o +CLI_OBJS = flashrom.o cli_classic.o print.o PROGRAMMER_OBJS = udelay.o programmer.o Copied: trunk/cli_classic.c (from rev 830, trunk/flashrom.c) =================================================================== --- trunk/cli_classic.c (rev 0) +++ trunk/cli_classic.c 2010-01-07 03:24:05 UTC (rev 833) @@ -0,0 +1,387 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2000 Silicon Integrated System Corporation + * Copyright (C) 2004 Tyan Corp <yhlu(a)tyan.com> + * Copyright (C) 2005-2008 coresystems GmbH + * Copyright (C) 2008,2009,2010 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; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <fcntl.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <string.h> +#include <stdlib.h> +#include <getopt.h> +#include "flash.h" +#include "flashchips.h" + +void cli_classic_usage(const char *name) +{ + const char *pname; + int pnamelen; + int remaining = 0; + enum programmer p; + + printf("Usage: %s [-VfLzhR] [-E|-r file|-w file|-v file] [-c chipname]\n" + " [-m [vendor:]part] [-l file] [-i image] [-p programmer]\n\n", name); + + printf("Please note that the command line interface for flashrom will " + "change before\nflashrom 1.0. Do not use flashrom in scripts " + "or other automated tools without\nchecking that your flashrom" + " version won't interpret options in a different way.\n\n"); + + printf + (" -r | --read: read flash and save into file\n" + " -w | --write: write file into flash\n" + " -v | --verify: verify flash against file\n" + " -n | --noverify: don't verify flash against file\n" + " -E | --erase: erase flash device\n" + " -V | --verbose: more verbose output\n" + " -c | --chip <chipname>: probe only for specified flash chip\n" +#if INTERNAL_SUPPORT == 1 + " -m | --mainboard <[vendor:]part>: override mainboard settings\n" +#endif + " -f | --force: force write without checking image\n" + " -l | --layout <file.layout>: read ROM layout from file\n" + " -i | --image <name>: only flash image name from flash layout\n" + " -L | --list-supported: print supported devices\n" +#if PRINT_WIKI_SUPPORT == 1 + " -z | --list-supported-wiki: print supported devices in wiki syntax\n" +#endif + " -p | --programmer <name>: specify the programmer device"); + + for (p = 0; p < PROGRAMMER_INVALID; p++) { + pname = programmer_table[p].name; + pnamelen = strlen(pname); + if (remaining - pnamelen - 2 < 0) { + printf("\n "); + remaining = 43; + } else { + printf(" "); + remaining--; + } + if (p == 0) { + printf("("); + remaining--; + } + printf("%s", pname); + remaining -= pnamelen; + if (p < PROGRAMMER_INVALID - 1) { + printf(","); + remaining--; + } else { + printf(")\n"); + } + } + + printf( + " -h | --help: print this help text\n" + " -R | --version: print the version (release)\n" + "\nYou can specify one of -E, -r, -w, -v or no operation. If no operation is\n" + "specified, then all that happens is that flash info is dumped.\n\n"); + exit(1); +} + +int cli_classic(int argc, char *argv[]) +{ + unsigned long size; + /* Probe for up to three flash chips. */ + struct flashchip *flash, *flashes[3]; + const char *name; + int namelen; + int opt; + int option_index = 0; + int force = 0; + int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0; + int dont_verify_it = 0, list_supported = 0; +#if PRINT_WIKI_SUPPORT == 1 + int list_supported_wiki = 0; +#endif + int operation_specified = 0; + int i; + +#if PRINT_WIKI_SUPPORT == 1 + const char *optstring = "rRwvnVEfc:m:l:i:p:Lzh"; +#else + const char *optstring = "rRwvnVEfc:m:l:i:p:Lh"; +#endif + static struct option long_options[] = { + {"read", 0, 0, 'r'}, + {"write", 0, 0, 'w'}, + {"erase", 0, 0, 'E'}, + {"verify", 0, 0, 'v'}, + {"noverify", 0, 0, 'n'}, + {"chip", 1, 0, 'c'}, + {"mainboard", 1, 0, 'm'}, + {"verbose", 0, 0, 'V'}, + {"force", 0, 0, 'f'}, + {"layout", 1, 0, 'l'}, + {"image", 1, 0, 'i'}, + {"list-supported", 0, 0, 'L'}, +#if PRINT_WIKI_SUPPORT == 1 + {"list-supported-wiki", 0, 0, 'z'}, +#endif + {"programmer", 1, 0, 'p'}, + {"help", 0, 0, 'h'}, + {"version", 0, 0, 'R'}, + {0, 0, 0, 0} + }; + + char *filename = NULL; + + char *tempstr = NULL; + + print_version(); + + if (argc > 1) { + /* Yes, print them. */ + int i; + printf_debug("The arguments are:\n"); + for (i = 1; i < argc; ++i) + printf_debug("%s\n", argv[i]); + } + + if (selfcheck()) + exit(1); + + setbuf(stdout, NULL); + while ((opt = getopt_long(argc, argv, optstring, + long_options, &option_index)) != EOF) { + switch (opt) { + case 'r': + if (++operation_specified > 1) { + fprintf(stderr, "More than one operation " + "specified. Aborting.\n"); + exit(1); + } + read_it = 1; + break; + case 'w': + if (++operation_specified > 1) { + fprintf(stderr, "More than one operation " + "specified. Aborting.\n"); + exit(1); + } + write_it = 1; + break; + case 'v': + //FIXME: gracefully handle superfluous -v + if (++operation_specified > 1) { + fprintf(stderr, "More than one operation " + "specified. Aborting.\n"); + exit(1); + } + if (dont_verify_it) { + fprintf(stderr, "--verify and --noverify are" + "mutually exclusive. Aborting.\n"); + exit(1); + } + verify_it = 1; + break; + case 'n': + if (verify_it) { + fprintf(stderr, "--verify and --noverify are" + "mutually exclusive. Aborting.\n"); + exit(1); + } + dont_verify_it = 1; + break; + case 'c': + chip_to_probe = strdup(optarg); + break; + case 'V': + verbose = 1; + break; + case 'E': + if (++operation_specified > 1) { + fprintf(stderr, "More than one operation " + "specified. Aborting.\n"); + exit(1); + } + erase_it = 1; + break; +#if INTERNAL_SUPPORT == 1 + case 'm': + tempstr = strdup(optarg); + lb_vendor_dev_from_string(tempstr); + break; +#endif + case 'f': + force = 1; + break; + case 'l': + tempstr = strdup(optarg); + if (read_romlayout(tempstr)) + exit(1); + break; + case 'i': + tempstr = strdup(optarg); + find_romentry(tempstr); + break; + case 'L': + list_supported = 1; + break; +#if PRINT_WIKI_SUPPORT == 1 + case 'z': + list_supported_wiki = 1; + break; +#endif + case 'p': + for (programmer = 0; programmer < PROGRAMMER_INVALID; programmer++) { + name = programmer_table[programmer].name; + namelen = strlen(name); + if (strncmp(optarg, name, namelen) == 0) { + switch (optarg[namelen]) { + case ':': + programmer_param = strdup(optarg + namelen + 1); + break; + case '\0': + break; + default: + /* The continue refers to the + * for loop. It is here to be + * able to differentiate between + * foo and foobar. + */ + continue; + } + break; + } + } + if (programmer == PROGRAMMER_INVALID) { + printf("Error: Unknown programmer %s.\n", optarg); + exit(1); + } + break; + case 'R': + /* print_version() is always called during startup. */ + exit(0); + break; + case 'h': + default: + cli_classic_usage(argv[0]); + break; + } + } + + if (list_supported) { + print_supported(); + exit(0); + } + +#if PRINT_WIKI_SUPPORT == 1 + if (list_supported_wiki) { + print_supported_wiki(); + exit(0); + } +#endif + + if (read_it && write_it) { + printf("Error: -r and -w are mutually exclusive.\n"); + cli_classic_usage(argv[0]); + } + + if (optind < argc) + filename = argv[optind++]; + + if (optind < argc) { + printf("Error: Extra parameter found.\n"); + cli_classic_usage(argv[0]); + } + + if (programmer_init()) { + fprintf(stderr, "Error: Programmer initialization failed.\n"); + exit(1); + } + + // FIXME: Delay calibration should happen in programmer code. + myusec_calibrate_delay(); + + for (i = 0; i < ARRAY_SIZE(flashes); i++) { + flashes[i] = + probe_flash(i ? flashes[i - 1] + 1 : flashchips, 0); + if (!flashes[i]) + for (i++; i < ARRAY_SIZE(flashes); i++) + flashes[i] = NULL; + } + + if (flashes[1]) { + printf("Multiple flash chips were detected:"); + for (i = 0; i < ARRAY_SIZE(flashes) && flashes[i]; i++) + printf(" %s", flashes[i]->name); + printf("\nPlease specify which chip to use with the -c <chipname> option.\n"); + programmer_shutdown(); + exit(1); + } else if (!flashes[0]) { + printf("No EEPROM/flash device found.\n"); + if (!force || !chip_to_probe) { + printf("If you know which flash chip you have, and if this version of flashrom\n"); + printf("supports a similar flash chip, you can try to force read your chip. Run:\n"); + printf("flashrom -f -r -c similar_supported_flash_chip filename\n"); + printf("\n"); + printf("Note: flashrom can never write when the flash chip isn't found automatically.\n"); + } + if (force && read_it && chip_to_probe) { + printf("Force read (-f -r -c) requested, forcing chip probe success:\n"); + flashes[0] = probe_flash(flashchips, 1); + if (!flashes[0]) { + printf("flashrom does not support a flash chip named '%s'.\n", chip_to_probe); + printf("Run flashrom -L to view the hardware supported in this flashrom version.\n"); + exit(1); + } + printf("Please note that forced reads most likely contain garbage.\n"); + return read_flash(flashes[0], filename); + } + // FIXME: flash writes stay enabled! + programmer_shutdown(); + exit(1); + } + + flash = flashes[0]; + + check_chip_supported(flash); + + size = flash->total_size * 1024; + if (check_max_decode((buses_supported & flash->bustype), size) && + (!force)) { + fprintf(stderr, "Chip is too big for this programmer " + "(-V gives details). Use --force to override.\n"); + programmer_shutdown(); + return 1; + } + + if (!(read_it | write_it | verify_it | erase_it)) { + printf("No operations were specified.\n"); + // FIXME: flash writes stay enabled! + programmer_shutdown(); + exit(1); + } + + if (!filename && !erase_it) { + printf("Error: No filename specified.\n"); + // FIXME: flash writes stay enabled! + programmer_shutdown(); + exit(1); + } + + /* Always verify write operations unless -n is used. */ + if (write_it && !dont_verify_it) + verify_it = 1; + + return doit(flash, force, filename, read_it, write_it, erase_it, verify_it); +} Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2010-01-06 22:14:39 UTC (rev 832) +++ trunk/flash.h 2010-01-07 03:24:05 UTC (rev 833) @@ -482,21 +482,31 @@ extern unsigned long flashbase; extern int verbose; extern const char *flashrom_version; +extern char *chip_to_probe; #define printf_debug(x...) { if (verbose) printf(x); } void map_flash_registers(struct flashchip *flash); int read_memmapped(struct flashchip *flash, uint8_t *buf, int start, int len); int erase_flash(struct flashchip *flash); +struct flashchip *probe_flash(struct flashchip *first_flash, int force); +int read_flash(struct flashchip *flash, char *filename); +void check_chip_supported(struct flashchip *flash); +int check_max_decode(enum chipbustype buses, uint32_t size); int min(int a, int b); int max(int a, int b); char *extract_param(char **haystack, char *needle, char *delim); int check_erased_range(struct flashchip *flash, int start, int len); int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message); char *strcat_realloc(char *dest, const char *src); +void print_version(void); +int selfcheck(void); int doit(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it); #define OK 0 #define NT 1 /* Not tested */ +/* cli_classic.c */ +int cli_classic(int argc, char *argv[]); + /* layout.c */ int show_id(uint8_t *bios, int size, int force); int read_romlayout(char *name); Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2010-01-06 22:14:39 UTC (rev 832) +++ trunk/flashrom.c 2010-01-07 03:24:05 UTC (rev 833) @@ -692,6 +692,7 @@ * and the limit is not exceeded on all buses. Tell the user. */ if (bitcount(buses) > limitexceeded) + /* FIXME: This message is designed towards CLI users. */ printf_debug("There is at least one common chip/programmer " "interface which can support a chip of this size. " "You can try --force at your own risk.\n"); @@ -911,73 +912,6 @@ printf("\n"); } -void cli_usage(const char *name) -{ - const char *pname; - int pnamelen; - int remaining = 0; - enum programmer p; - - printf("cli_usage: %s [-VfLzhR] [-E|-r file|-w file|-v file] [-c chipname]\n" - " [-m [vendor:]part] [-l file] [-i image] [-p programmer]\n\n", name); - - printf("Please note that the command line interface for flashrom will " - "change before\nflashrom 1.0. Do not use flashrom in scripts " - "or other automated tools without\nchecking that your flashrom" - " version won't interpret options in a different way.\n\n"); - - printf - (" -r | --read: read flash and save into file\n" - " -w | --write: write file into flash\n" - " -v | --verify: verify flash against file\n" - " -n | --noverify: don't verify flash against file\n" - " -E | --erase: erase flash device\n" - " -V | --verbose: more verbose output\n" - " -c | --chip <chipname>: probe only for specified flash chip\n" -#if INTERNAL_SUPPORT == 1 - " -m | --mainboard <[vendor:]part>: override mainboard settings\n" -#endif - " -f | --force: force write without checking image\n" - " -l | --layout <file.layout>: read ROM layout from file\n" - " -i | --image <name>: only flash image name from flash layout\n" - " -L | --list-supported: print supported devices\n" -#if PRINT_WIKI_SUPPORT == 1 - " -z | --list-supported-wiki: print supported devices in wiki syntax\n" -#endif - " -p | --programmer <name>: specify the programmer device"); - - for (p = 0; p < PROGRAMMER_INVALID; p++) { - pname = programmer_table[p].name; - pnamelen = strlen(pname); - if (remaining - pnamelen - 2 < 0) { - printf("\n "); - remaining = 43; - } else { - printf(" "); - remaining--; - } - if (p == 0) { - printf("("); - remaining--; - } - printf("%s", pname); - remaining -= pnamelen; - if (p < PROGRAMMER_INVALID - 1) { - printf(","); - remaining--; - } else { - printf(")\n"); - } - } - - printf( - " -h | --help: print this help text\n" - " -R | --version: print the version (release)\n" - "\nYou can specify one of -E, -r, -w, -v or no operation. If no operation is\n" - "specified, then all that happens is that flash info is dumped.\n\n"); - exit(1); -} - void print_version(void) { printf("flashrom v%s\n", flashrom_version); @@ -1034,6 +968,7 @@ printf(" WRITE"); printf("\n"); } + /* FIXME: This message is designed towards CLI users. */ printf("Please email a report to flashrom(a)flashrom.org if any " "of the above operations\nwork correctly for you with " "this flash part. Please include the flashrom\noutput " @@ -1046,291 +981,7 @@ int main(int argc, char *argv[]) { - unsigned long size; - /* Probe for up to three flash chips. */ - struct flashchip *flash, *flashes[3]; - const char *name; - int namelen; - int opt; - int option_index = 0; - int force = 0; - int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0; - int dont_verify_it = 0, list_supported = 0; -#if PRINT_WIKI_SUPPORT == 1 - int list_supported_wiki = 0; -#endif - int operation_specified = 0; - int i; - -#if PRINT_WIKI_SUPPORT == 1 - const char *optstring = "rRwvnVEfc:m:l:i:p:Lzh"; -#else - const char *optstring = "rRwvnVEfc:m:l:i:p:Lh"; -#endif - static struct option long_options[] = { - {"read", 0, 0, 'r'}, - {"write", 0, 0, 'w'}, - {"erase", 0, 0, 'E'}, - {"verify", 0, 0, 'v'}, - {"noverify", 0, 0, 'n'}, - {"chip", 1, 0, 'c'}, - {"mainboard", 1, 0, 'm'}, - {"verbose", 0, 0, 'V'}, - {"force", 0, 0, 'f'}, - {"layout", 1, 0, 'l'}, - {"image", 1, 0, 'i'}, - {"list-supported", 0, 0, 'L'}, -#if PRINT_WIKI_SUPPORT == 1 - {"list-supported-wiki", 0, 0, 'z'}, -#endif - {"programmer", 1, 0, 'p'}, - {"help", 0, 0, 'h'}, - {"version", 0, 0, 'R'}, - {0, 0, 0, 0} - }; - - char *filename = NULL; - - char *tempstr = NULL; - - print_version(); - - if (argc > 1) { - /* Yes, print them. */ - int i; - printf_debug("The arguments are:\n"); - for (i = 1; i < argc; ++i) - printf_debug("%s\n", argv[i]); - } - - if (selfcheck()) - exit(1); - - setbuf(stdout, NULL); - while ((opt = getopt_long(argc, argv, optstring, - long_options, &option_index)) != EOF) { - switch (opt) { - case 'r': - if (++operation_specified > 1) { - fprintf(stderr, "More than one operation " - "specified. Aborting.\n"); - exit(1); - } - read_it = 1; - break; - case 'w': - if (++operation_specified > 1) { - fprintf(stderr, "More than one operation " - "specified. Aborting.\n"); - exit(1); - } - write_it = 1; - break; - case 'v': - //FIXME: gracefully handle superfluous -v - if (++operation_specified > 1) { - fprintf(stderr, "More than one operation " - "specified. Aborting.\n"); - exit(1); - } - if (dont_verify_it) { - fprintf(stderr, "--verify and --noverify are" - "mutually exclusive. Aborting.\n"); - exit(1); - } - verify_it = 1; - break; - case 'n': - if (verify_it) { - fprintf(stderr, "--verify and --noverify are" - "mutually exclusive. Aborting.\n"); - exit(1); - } - dont_verify_it = 1; - break; - case 'c': - chip_to_probe = strdup(optarg); - break; - case 'V': - verbose = 1; - break; - case 'E': - if (++operation_specified > 1) { - fprintf(stderr, "More than one operation " - "specified. Aborting.\n"); - exit(1); - } - erase_it = 1; - break; -#if INTERNAL_SUPPORT == 1 - case 'm': - tempstr = strdup(optarg); - lb_vendor_dev_from_string(tempstr); - break; -#endif - case 'f': - force = 1; - break; - case 'l': - tempstr = strdup(optarg); - if (read_romlayout(tempstr)) - exit(1); - break; - case 'i': - tempstr = strdup(optarg); - find_romentry(tempstr); - break; - case 'L': - list_supported = 1; - break; -#if PRINT_WIKI_SUPPORT == 1 - case 'z': - list_supported_wiki = 1; - break; -#endif - case 'p': - for (programmer = 0; programmer < PROGRAMMER_INVALID; programmer++) { - name = programmer_table[programmer].name; - namelen = strlen(name); - if (strncmp(optarg, name, namelen) == 0) { - switch (optarg[namelen]) { - case ':': - programmer_param = strdup(optarg + namelen + 1); - break; - case '\0': - break; - default: - /* The continue refers to the - * for loop. It is here to be - * able to differentiate between - * foo and foobar. - */ - continue; - } - break; - } - } - if (programmer == PROGRAMMER_INVALID) { - printf("Error: Unknown programmer %s.\n", optarg); - exit(1); - } - break; - case 'R': - /* print_version() is always called during startup. */ - exit(0); - break; - case 'h': - default: - cli_usage(argv[0]); - break; - } - } - - if (list_supported) { - print_supported(); - exit(0); - } - -#if PRINT_WIKI_SUPPORT == 1 - if (list_supported_wiki) { - print_supported_wiki(); - exit(0); - } -#endif - - if (read_it && write_it) { - printf("Error: -r and -w are mutually exclusive.\n"); - cli_usage(argv[0]); - } - - if (optind < argc) - filename = argv[optind++]; - - if (optind < argc) { - printf("Error: Extra parameter found.\n"); - cli_usage(argv[0]); - } - - if (programmer_init()) { - fprintf(stderr, "Error: Programmer initialization failed.\n"); - exit(1); - } - - // FIXME: Delay calibration should happen in programmer code. - myusec_calibrate_delay(); - - for (i = 0; i < ARRAY_SIZE(flashes); i++) { - flashes[i] = - probe_flash(i ? flashes[i - 1] + 1 : flashchips, 0); - if (!flashes[i]) - for (i++; i < ARRAY_SIZE(flashes); i++) - flashes[i] = NULL; - } - - if (flashes[1]) { - printf("Multiple flash chips were detected:"); - for (i = 0; i < ARRAY_SIZE(flashes) && flashes[i]; i++) - printf(" %s", flashes[i]->name); - printf("\nPlease specify which chip to use with the -c <chipname> option.\n"); - programmer_shutdown(); - exit(1); - } else if (!flashes[0]) { - printf("No EEPROM/flash device found.\n"); - if (!force || !chip_to_probe) { - printf("If you know which flash chip you have, and if this version of flashrom\n"); - printf("supports a similar flash chip, you can try to force read your chip. Run:\n"); - printf("flashrom -f -r -c similar_supported_flash_chip filename\n"); - printf("\n"); - printf("Note: flashrom can never write when the flash chip isn't found automatically.\n"); - } - if (force && read_it && chip_to_probe) { - printf("Force read (-f -r -c) requested, forcing chip probe success:\n"); - flashes[0] = probe_flash(flashchips, 1); - if (!flashes[0]) { - printf("flashrom does not support a flash chip named '%s'.\n", chip_to_probe); - printf("Run flashrom -L to view the hardware supported in this flashrom version.\n"); - exit(1); - } - printf("Please note that forced reads most likely contain garbage.\n"); - return read_flash(flashes[0], filename); - } - // FIXME: flash writes stay enabled! - programmer_shutdown(); - exit(1); - } - - flash = flashes[0]; - - check_chip_supported(flash); - - size = flash->total_size * 1024; - if (check_max_decode((buses_supported & flash->bustype), size) && - (!force)) { - fprintf(stderr, "Chip is too big for this programmer " - "(-V gives details). Use --force to override.\n"); - programmer_shutdown(); - return 1; - } - - if (!(read_it | write_it | verify_it | erase_it)) { - printf("No operations were specified.\n"); - // FIXME: flash writes stay enabled! - programmer_shutdown(); - exit(1); - } - - if (!filename && !erase_it) { - printf("Error: No filename specified.\n"); - // FIXME: flash writes stay enabled! - programmer_shutdown(); - exit(1); - } - - /* Always verify write operations unless -n is used. */ - if (write_it && !dont_verify_it) - verify_it = 1; - - return doit(flash, force, filename, read_it, write_it, erase_it, verify_it); + return cli_classic(argc, argv); } /* This function signature is horrible. We need to design a better interface,

1 0

[commit] r832 - trunk
by svn＠flashrom.org 06 Jan '10

06 Jan '10

Author: oxygene Date: 2010-01-06 23:14:39 +0100 (Wed, 06 Jan 2010) New Revision: 832 Modified: trunk/flash.h trunk/serial.c Log: buspiratespi support on mingw Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2010-01-06 19:09:40 UTC (rev 831) +++ trunk/flash.h 2010-01-06 22:14:39 UTC (rev 832) @@ -28,6 +28,11 @@ #include <stdint.h> #include <stdio.h> #include "hwaccess.h" +#ifdef _WIN32 +#include <windows.h> +#undef min +#undef max +#endif typedef unsigned long chipaddr; @@ -591,10 +596,16 @@ void serprog_delay(int delay); /* serial.c */ +#if _WIN32 +typedef HANDLE fdtype; +#else +typedef int fdtype; +#endif + void sp_flush_incoming(void); -int sp_openserport(char *dev, unsigned int baud); +fdtype sp_openserport(char *dev, unsigned int baud); void __attribute__((noreturn)) sp_die(char *msg); -extern int sp_fd; +extern fdtype sp_fd; int serialport_shutdown(void); int serialport_write(unsigned char *buf, unsigned int writecnt); int serialport_read(unsigned char *buf, unsigned int readcnt); Modified: trunk/serial.c =================================================================== --- trunk/serial.c 2010-01-06 19:09:40 UTC (rev 831) +++ trunk/serial.c 2010-01-06 22:14:39 UTC (rev 832) @@ -30,9 +30,13 @@ #include <sys/stat.h> #include <errno.h> #include <inttypes.h> +#ifdef _WIN32 +#include <conio.h> +#else #include <termios.h> +#endif -int sp_fd; +fdtype sp_fd; void __attribute__((noreturn)) sp_die(char *msg) { @@ -40,6 +44,7 @@ exit(1); } +#ifndef _WIN32 struct baudentry { int flag; unsigned int baud; @@ -94,9 +99,36 @@ #endif {0, 0} /* Terminator */ }; +#endif -int sp_openserport(char *dev, unsigned int baud) +fdtype sp_openserport(char *dev, unsigned int baud) { +#ifdef _WIN32 + HANDLE fd; + fd = CreateFile(dev, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + if (fd == INVALID_HANDLE_VALUE) { + sp_die("Error: cannot open serial port"); + } + DCB dcb; + if (!GetCommState(fd, &dcb)) { + sp_die("Error: Could not fetch serial port configuration"); + } + switch (baud) { + case 9600: dcb.BaudRate = CBR_9600; break; + case 19200: dcb.BaudRate = CBR_19200; break; + case 38400: dcb.BaudRate = CBR_38400; break; + case 57600: dcb.BaudRate = CBR_57600; break; + case 115200: dcb.BaudRate = CBR_115200; break; + default: sp_die("Error: Could not set baud rate"); + } + dcb.ByteSize=8; + dcb.Parity=NOPARITY; + dcb.StopBits=ONESTOPBIT; + if (!SetCommState(fd, &dcb)) { + sp_die("Error: Could not change serial port configuration"); + } + return fd; +#else struct termios options; int fd, i; fd = open(dev, O_RDWR | O_NOCTTY | O_NDELAY); @@ -125,26 +157,39 @@ options.c_oflag &= ~OPOST; tcsetattr(fd, TCSANOW, &options); return fd; +#endif } void sp_flush_incoming(void) { +#ifdef _WIN32 + PurgeComm(sp_fd, PURGE_RXCLEAR); +#else tcflush(sp_fd, TCIFLUSH); +#endif return; } int serialport_shutdown(void) { +#ifdef _WIN32 + CloseHandle(sp_fd); +#else close(sp_fd); +#endif return 0; } int serialport_write(unsigned char *buf, unsigned int writecnt) { - int tmp = 0; + long tmp = 0; while (writecnt > 0) { +#ifdef _WIN32 + WriteFile(sp_fd, buf, writecnt, &tmp, NULL); +#else tmp = write(sp_fd, buf, writecnt); +#endif if (tmp == -1) return 1; if (!tmp) @@ -158,10 +203,14 @@ int serialport_read(unsigned char *buf, unsigned int readcnt) { - int tmp = 0; + long tmp = 0; while (readcnt > 0) { +#ifdef _WIN32 + ReadFile(sp_fd, buf, readcnt, &tmp, NULL); +#else tmp = read(sp_fd, buf, readcnt); +#endif if (tmp == -1) return 1; if (!tmp)

1 0

[PATCH]buspiratespi on mingw
by Patrick Georgi 06 Jan '10

06 Jan '10

Hi, attached patch makes the buspiratespi programmer compile and run on mingw. Build tested on linux, too. Tested without any device attached to the buspirate, which gave me much text (with -V) ending in: Found chip "Generic unknown SPI chip (REMS)" (0 KB, SPI) at physical address 0x0. === This flash part has status NOT WORKING for operations: PROBE READ ERASE WRITE Please email a report to flashrom(a)flashrom.org if any of the above operations work correctly for you with this flash part. Please include the flashrom output with the additional -V option for all operations you tested (-V, -rV, -wV, -EV), and mention which mainboard or programmer you tested. Thanks for your help! === No operations were specified. buspirate_sendrecv: write 1, read 5 Sending 0x00, receiving 0x42 0x42 0x49 0x4f 0x31 Raw bitbang mode version 1 buspirate_sendrecv: write 1, read 0 Sending 0x0f, receiving Bus Pirate shutdown completed. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de>

2 1

[PATCH]various serial fixes
by Patrick Georgi 06 Jan '10

06 Jan '10

Hi, attached patch changes: - replace the hand written serial input flush routine with the termios one. - serialport_discard_read isn't necessary anymore - it just wrapped sp_flush_incoming with no extra value. - serialport_read and serialport_write would misbehave if read or write didn't process everything in one go. All untested as I don't have a system where these are used. Just wanted these issues out in public. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de>

3 3

[commit] r831 - trunk
by svn＠flashrom.org 06 Jan '10

06 Jan '10

Author: oxygene Date: 2010-01-06 20:09:40 +0100 (Wed, 06 Jan 2010) New Revision: 831 Modified: trunk/buspirate_spi.c trunk/flash.h trunk/serial.c Log: - replace the hand written serial input flush routine with the termios one. - serialport_discard_read isn't necessary anymore - it just wrapped sp_flush_incoming with no extra value. - serialport_read and serialport_write would misbehave if read or write didn't process everything in one go. - sp_flush_incoming should be #define'd out for FAKE_COMMUNICATION like serialport_discard_read was Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/buspirate_spi.c =================================================================== --- trunk/buspirate_spi.c 2010-01-06 16:09:10 UTC (rev 830) +++ trunk/buspirate_spi.c 2010-01-06 19:09:40 UTC (rev 831) @@ -40,7 +40,7 @@ #define serialport_shutdown(...) 0 #define serialport_write(...) 0 #define serialport_read(...) 0 -#define serialport_discard_read(...) 0 +#define sp_flush_incoming(...) 0 #endif int buspirate_sendrecv(unsigned char *buf, unsigned int writecnt, unsigned int readcnt) @@ -144,9 +144,7 @@ if (ret) return ret; /* Read any response and discard it. */ - ret = serialport_discard_read(); - if (ret) - return ret; + sp_flush_incoming(); } /* Enter raw bitbang mode */ buf[0] = 0x00; Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2010-01-06 16:09:10 UTC (rev 830) +++ trunk/flash.h 2010-01-06 19:09:40 UTC (rev 831) @@ -598,7 +598,6 @@ int serialport_shutdown(void); int serialport_write(unsigned char *buf, unsigned int writecnt); int serialport_read(unsigned char *buf, unsigned int readcnt); -int serialport_discard_read(void); #include "chipdrivers.h" Modified: trunk/serial.c =================================================================== --- trunk/serial.c 2010-01-06 16:09:10 UTC (rev 830) +++ trunk/serial.c 2010-01-06 19:09:40 UTC (rev 831) @@ -129,16 +129,7 @@ void sp_flush_incoming(void) { - int i; - for (i=0;i<100;i++) { /* In case the device doesnt do EAGAIN, just read 0 */ - unsigned char flush[16]; - ssize_t rv; - rv = read(sp_fd, flush, sizeof(flush)); - if ((rv == -1) && (errno == EAGAIN)) - break; - if (rv == -1) - sp_die("flush read"); - } + tcflush(sp_fd, TCIFLUSH); return; } @@ -152,12 +143,14 @@ { int tmp = 0; - while (tmp != writecnt) { - tmp = write(sp_fd, buf + tmp, writecnt - tmp); + while (writecnt > 0) { + tmp = write(sp_fd, buf, writecnt); if (tmp == -1) return 1; if (!tmp) printf_debug("Empty write\n"); + writecnt -= tmp; + buf += tmp; } return 0; @@ -167,28 +160,15 @@ { int tmp = 0; - while (tmp != readcnt) { - tmp = read(sp_fd, buf + tmp, readcnt - tmp); + while (readcnt > 0) { + tmp = read(sp_fd, buf, readcnt); if (tmp == -1) return 1; if (!tmp) printf_debug("Empty read\n"); + readcnt -= tmp; + buf += tmp; } return 0; } - -int serialport_discard_read(void) -{ - int flags; - - printf_debug("%s\n", __func__); - flags = fcntl(sp_fd, F_GETFL); - flags |= O_NONBLOCK; - fcntl(sp_fd, F_SETFL, flags); - sp_flush_incoming(); - flags &= ~O_NONBLOCK; - fcntl(sp_fd, F_SETFL, flags); - - return 0; -}

1 0

[PATCH] Move OS-dependent serial code from buspirate_spi.c to serial.c
by Carl-Daniel Hailfinger 06 Jan '10

06 Jan '10

Move OS-dependent serial code from buspirate_spi.c to serial.c and rename a few functions to make it obvious that they are generic and not specific to the Bus Pirate. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-serial_move/flash.h =================================================================== --- flashrom-serial_move/flash.h (Revision 829) +++ flashrom-serial_move/flash.h (Arbeitskopie) @@ -595,6 +595,10 @@ int sp_openserport(char *dev, unsigned int baud); void __attribute__((noreturn)) sp_die(char *msg); extern int sp_fd; +int serialport_shutdown(void); +int serialport_write(unsigned char *buf, unsigned int writecnt); +int serialport_read(unsigned char *buf, unsigned int readcnt); +int serialport_discard_read(void); #include "chipdrivers.h" Index: flashrom-serial_move/buspirate_spi.c =================================================================== --- flashrom-serial_move/buspirate_spi.c (Revision 829) +++ flashrom-serial_move/buspirate_spi.c (Arbeitskopie) @@ -22,7 +22,6 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> -#include <fcntl.h> #include "flash.h" #include "spi.h" @@ -36,63 +35,12 @@ sp_fd = sp_openserport(dev, 115200); return 0; } - -int buspirate_serialport_shutdown(void) -{ - close(sp_fd); - return 0; -} - -int serialport_write(unsigned char *buf, unsigned int writecnt) -{ - int tmp = 0; - - while (tmp != writecnt) { - tmp = write(sp_fd, buf + tmp, writecnt - tmp); - if (tmp == -1) - return 1; - if (!tmp) - printf_debug("Empty write\n"); - } - - return 0; -} - -int serialport_read(unsigned char *buf, unsigned int readcnt) -{ - int tmp = 0; - - while (tmp != readcnt) { - tmp = read(sp_fd, buf + tmp, readcnt - tmp); - if (tmp == -1) - return 1; - if (!tmp) - printf_debug("Empty read\n"); - } - - return 0; -} - -int buspirate_discard_read(void) -{ - int flags; - - printf_debug("%s\n", __func__); - flags = fcntl(sp_fd, F_GETFL); - flags |= O_NONBLOCK; - fcntl(sp_fd, F_SETFL, flags); - sp_flush_incoming(); - flags &= ~O_NONBLOCK; - fcntl(sp_fd, F_SETFL, flags); - - return 0; -} #else #define buspirate_serialport_setup(...) 0 -#define buspirate_serialport_shutdown(...) 0 +#define serialport_shutdown(...) 0 #define serialport_write(...) 0 #define serialport_read(...) 0 -#define buspirate_discard_read(...) 0 +#define serialport_discard_read(...) 0 #endif int buspirate_sendrecv(unsigned char *buf, unsigned int writecnt, unsigned int readcnt) @@ -196,7 +144,7 @@ if (ret) return ret; /* Read any response and discard it. */ - ret = buspirate_discard_read(); + ret = serialport_discard_read(); if (ret) return ret; } @@ -302,7 +250,7 @@ return ret; /* Shut down serial port communication */ - ret = buspirate_serialport_shutdown(); + ret = serialport_shutdown(); if (ret) return ret; printf_debug("Bus Pirate shutdown completed.\n"); Index: flashrom-serial_move/serial.c =================================================================== --- flashrom-serial_move/serial.c (Revision 829) +++ flashrom-serial_move/serial.c (Arbeitskopie) @@ -2,6 +2,7 @@ * This file is part of the flashrom project. * * Copyright (C) 2009 Urja Rannikko <urjaman(a)gmail.com> + * Copyright (C) 2009,2010 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 @@ -140,3 +141,54 @@ } return; } + +int serialport_shutdown(void) +{ + close(sp_fd); + return 0; +} + +int serialport_write(unsigned char *buf, unsigned int writecnt) +{ + int tmp = 0; + + while (tmp != writecnt) { + tmp = write(sp_fd, buf + tmp, writecnt - tmp); + if (tmp == -1) + return 1; + if (!tmp) + printf_debug("Empty write\n"); + } + + return 0; +} + +int serialport_read(unsigned char *buf, unsigned int readcnt) +{ + int tmp = 0; + + while (tmp != readcnt) { + tmp = read(sp_fd, buf + tmp, readcnt - tmp); + if (tmp == -1) + return 1; + if (!tmp) + printf_debug("Empty read\n"); + } + + return 0; +} + +int serialport_discard_read(void) +{ + int flags; + + printf_debug("%s\n", __func__); + flags = fcntl(sp_fd, F_GETFL); + flags |= O_NONBLOCK; + fcntl(sp_fd, F_SETFL, flags); + sp_flush_incoming(); + flags &= ~O_NONBLOCK; + fcntl(sp_fd, F_SETFL, flags); + + return 0; +} -- Developer quote of the year: "We are juggling too many chainsaws and flaming arrows and tigers."

3 5

[commit] r830 - trunk
by svn＠flashrom.org 06 Jan '10

06 Jan '10

Author: hailfinger Date: 2010-01-06 17:09:10 +0100 (Wed, 06 Jan 2010) New Revision: 830 Modified: trunk/buspirate_spi.c trunk/flash.h trunk/serial.c Log: Move OS-dependent serial code from buspirate_spi.c to serial.c and rename a few functions to make it obvious that they are generic and not specific to the Bus Pirate. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Modified: trunk/buspirate_spi.c =================================================================== --- trunk/buspirate_spi.c 2010-01-06 10:21:00 UTC (rev 829) +++ trunk/buspirate_spi.c 2010-01-06 16:09:10 UTC (rev 830) @@ -22,7 +22,6 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> -#include <fcntl.h> #include "flash.h" #include "spi.h" @@ -36,63 +35,12 @@ sp_fd = sp_openserport(dev, 115200); return 0; } - -int buspirate_serialport_shutdown(void) -{ - close(sp_fd); - return 0; -} - -int serialport_write(unsigned char *buf, unsigned int writecnt) -{ - int tmp = 0; - - while (tmp != writecnt) { - tmp = write(sp_fd, buf + tmp, writecnt - tmp); - if (tmp == -1) - return 1; - if (!tmp) - printf_debug("Empty write\n"); - } - - return 0; -} - -int serialport_read(unsigned char *buf, unsigned int readcnt) -{ - int tmp = 0; - - while (tmp != readcnt) { - tmp = read(sp_fd, buf + tmp, readcnt - tmp); - if (tmp == -1) - return 1; - if (!tmp) - printf_debug("Empty read\n"); - } - - return 0; -} - -int buspirate_discard_read(void) -{ - int flags; - - printf_debug("%s\n", __func__); - flags = fcntl(sp_fd, F_GETFL); - flags |= O_NONBLOCK; - fcntl(sp_fd, F_SETFL, flags); - sp_flush_incoming(); - flags &= ~O_NONBLOCK; - fcntl(sp_fd, F_SETFL, flags); - - return 0; -} #else #define buspirate_serialport_setup(...) 0 -#define buspirate_serialport_shutdown(...) 0 +#define serialport_shutdown(...) 0 #define serialport_write(...) 0 #define serialport_read(...) 0 -#define buspirate_discard_read(...) 0 +#define serialport_discard_read(...) 0 #endif int buspirate_sendrecv(unsigned char *buf, unsigned int writecnt, unsigned int readcnt) @@ -196,7 +144,7 @@ if (ret) return ret; /* Read any response and discard it. */ - ret = buspirate_discard_read(); + ret = serialport_discard_read(); if (ret) return ret; } @@ -302,7 +250,7 @@ return ret; /* Shut down serial port communication */ - ret = buspirate_serialport_shutdown(); + ret = serialport_shutdown(); if (ret) return ret; printf_debug("Bus Pirate shutdown completed.\n"); Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2010-01-06 10:21:00 UTC (rev 829) +++ trunk/flash.h 2010-01-06 16:09:10 UTC (rev 830) @@ -595,6 +595,10 @@ int sp_openserport(char *dev, unsigned int baud); void __attribute__((noreturn)) sp_die(char *msg); extern int sp_fd; +int serialport_shutdown(void); +int serialport_write(unsigned char *buf, unsigned int writecnt); +int serialport_read(unsigned char *buf, unsigned int readcnt); +int serialport_discard_read(void); #include "chipdrivers.h" Modified: trunk/serial.c =================================================================== --- trunk/serial.c 2010-01-06 10:21:00 UTC (rev 829) +++ trunk/serial.c 2010-01-06 16:09:10 UTC (rev 830) @@ -2,6 +2,7 @@ * This file is part of the flashrom project. * * Copyright (C) 2009 Urja Rannikko <urjaman(a)gmail.com> + * Copyright (C) 2009,2010 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 @@ -140,3 +141,54 @@ } return; } + +int serialport_shutdown(void) +{ + close(sp_fd); + return 0; +} + +int serialport_write(unsigned char *buf, unsigned int writecnt) +{ + int tmp = 0; + + while (tmp != writecnt) { + tmp = write(sp_fd, buf + tmp, writecnt - tmp); + if (tmp == -1) + return 1; + if (!tmp) + printf_debug("Empty write\n"); + } + + return 0; +} + +int serialport_read(unsigned char *buf, unsigned int readcnt) +{ + int tmp = 0; + + while (tmp != readcnt) { + tmp = read(sp_fd, buf + tmp, readcnt - tmp); + if (tmp == -1) + return 1; + if (!tmp) + printf_debug("Empty read\n"); + } + + return 0; +} + +int serialport_discard_read(void) +{ + int flags; + + printf_debug("%s\n", __func__); + flags = fcntl(sp_fd, F_GETFL); + flags |= O_NONBLOCK; + fcntl(sp_fd, F_SETFL, flags); + sp_flush_incoming(); + flags &= ~O_NONBLOCK; + fcntl(sp_fd, F_SETFL, flags); + + return 0; +}

1 0

[PATCH] Fix FT2232-only compilation
by Carl-Daniel Hailfinger 06 Jan '10

06 Jan '10

Some programmers (most notably FT2232SPI) use fallback_* and noop_*, but those functions lived inside internal.c and were unavailable if no PCI-based programmers were compiled in. Move those functions to the new file programmer.c. Thanks to Patrick Georgi for finding this. In the future, we should move other stuff to programmer.c as well, especially programmer definitions and wrappers which now live in flashrom.c. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-fallback_noop_programmerc/flash.h =================================================================== --- flashrom-fallback_noop_programmerc/flash.h (Revision 828) +++ flashrom-fallback_noop_programmerc/flash.h (Arbeitskopie) @@ -370,6 +370,8 @@ uint8_t mmio_readb(void *addr); uint16_t mmio_readw(void *addr); uint32_t mmio_readl(void *addr); + +/* programmer.c */ int noop_shutdown(void); void *fallback_map(const char *descr, unsigned long phys_addr, size_t len); void fallback_unmap(void *virt_addr, size_t len); Index: flashrom-fallback_noop_programmerc/Makefile =================================================================== --- flashrom-fallback_noop_programmerc/Makefile (Revision 828) +++ flashrom-fallback_noop_programmerc/Makefile (Arbeitskopie) @@ -50,7 +50,7 @@ CLI_OBJS = flashrom.o print.o -PROGRAMMER_OBJS = udelay.o +PROGRAMMER_OBJS = udelay.o programmer.o all: pciutils features dep $(PROGRAM) Index: flashrom-fallback_noop_programmerc/programmer.c =================================================================== --- flashrom-fallback_noop_programmerc/programmer.c (Revision 0) +++ flashrom-fallback_noop_programmerc/programmer.c (Revision 0) @@ -0,0 +1,99 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2009,2010 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; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <stdlib.h> +#include "flash.h" + +/* No-op shutdown() for programmers which don't need special handling */ +int noop_shutdown(void) +{ + return 0; +} + +/* Fallback map() for programmers which don't need special handling */ +void *fallback_map(const char *descr, unsigned long phys_addr, size_t len) +{ + /* FIXME: Should return phys_addr. */ + return 0; +} + +/* No-op/fallback unmap() for programmers which don't need special handling */ +void fallback_unmap(void *virt_addr, size_t len) +{ +} + +/* No-op chip_writeb() for drivers not supporting addr/data pair accesses */ +uint8_t noop_chip_readb(const chipaddr addr) +{ + return 0xff; +} + +/* No-op chip_writeb() for drivers not supporting addr/data pair accesses */ +void noop_chip_writeb(uint8_t val, chipaddr addr) +{ +} + +/* Little-endian fallback for drivers not supporting 16 bit accesses */ +void fallback_chip_writew(uint16_t val, chipaddr addr) +{ + chip_writeb(val & 0xff, addr); + chip_writeb((val >> 8) & 0xff, addr + 1); +} + +/* Little-endian fallback for drivers not supporting 16 bit accesses */ +uint16_t fallback_chip_readw(const chipaddr addr) +{ + uint16_t val; + val = chip_readb(addr); + val |= chip_readb(addr + 1) << 8; + return val; +} + +/* Little-endian fallback for drivers not supporting 32 bit accesses */ +void fallback_chip_writel(uint32_t val, chipaddr addr) +{ + chip_writew(val & 0xffff, addr); + chip_writew((val >> 16) & 0xffff, addr + 2); +} + +/* Little-endian fallback for drivers not supporting 32 bit accesses */ +uint32_t fallback_chip_readl(const chipaddr addr) +{ + uint32_t val; + val = chip_readw(addr); + val |= chip_readw(addr + 2) << 16; + return val; +} + +void fallback_chip_writen(uint8_t *buf, chipaddr addr, size_t len) +{ + size_t i; + for (i = 0; i < len; i++) + chip_writeb(buf[i], addr + i); + return; +} + +void fallback_chip_readn(uint8_t *buf, chipaddr addr, size_t len) +{ + size_t i; + for (i = 0; i < len; i++) + buf[i] = chip_readb(addr + i); + return; +} Index: flashrom-fallback_noop_programmerc/internal.c =================================================================== --- flashrom-fallback_noop_programmerc/internal.c (Revision 828) +++ flashrom-fallback_noop_programmerc/internal.c (Arbeitskopie) @@ -247,80 +247,3 @@ { return *(volatile uint32_t *) addr; } - -/* No-op shutdown() for programmers which don't need special handling */ -int noop_shutdown(void) -{ - return 0; -} - -/* Fallback map() for programmers which don't need special handling */ -void *fallback_map(const char *descr, unsigned long phys_addr, size_t len) -{ - /* FIXME: Should return phys_addr. */ - return 0; -} - -/* No-op/fallback unmap() for programmers which don't need special handling */ -void fallback_unmap(void *virt_addr, size_t len) -{ -} - -/* No-op chip_writeb() for drivers not supporting addr/data pair accesses */ -uint8_t noop_chip_readb(const chipaddr addr) -{ - return 0xff; -} - -/* No-op chip_writeb() for drivers not supporting addr/data pair accesses */ -void noop_chip_writeb(uint8_t val, chipaddr addr) -{ -} - -/* Little-endian fallback for drivers not supporting 16 bit accesses */ -void fallback_chip_writew(uint16_t val, chipaddr addr) -{ - chip_writeb(val & 0xff, addr); - chip_writeb((val >> 8) & 0xff, addr + 1); -} - -/* Little-endian fallback for drivers not supporting 16 bit accesses */ -uint16_t fallback_chip_readw(const chipaddr addr) -{ - uint16_t val; - val = chip_readb(addr); - val |= chip_readb(addr + 1) << 8; - return val; -} - -/* Little-endian fallback for drivers not supporting 32 bit accesses */ -void fallback_chip_writel(uint32_t val, chipaddr addr) -{ - chip_writew(val & 0xffff, addr); - chip_writew((val >> 16) & 0xffff, addr + 2); -} - -/* Little-endian fallback for drivers not supporting 32 bit accesses */ -uint32_t fallback_chip_readl(const chipaddr addr) -{ - uint32_t val; - val = chip_readw(addr); - val |= chip_readw(addr + 2) << 16; - return val; -} - -void fallback_chip_writen(uint8_t *buf, chipaddr addr, size_t len) -{ - size_t i; - for (i = 0; i < len; i++) - chip_writeb(buf[i], addr + i); - return; -} - -void fallback_chip_readn(uint8_t *buf, chipaddr addr, size_t len) -{ - size_t i; - for (i = 0; i < len; i++) - buf[i] = chip_readb(addr + i); - return; -} -- Developer quote of the year: "We are juggling too many chainsaws and flaming arrows and tigers."

2 2

[commit] r829 - trunk
by svn＠flashrom.org 06 Jan '10

06 Jan '10

Author: hailfinger Date: 2010-01-06 11:21:00 +0100 (Wed, 06 Jan 2010) New Revision: 829 Added: trunk/programmer.c Modified: trunk/Makefile trunk/flash.h trunk/internal.c Log: Some programmers (most notably FT2232SPI) use fallback_* and noop_*, but those functions lived inside internal.c and were unavailable if no PCI-based programmers were compiled in. Move those functions to the new file programmer.c. Thanks to Patrick Georgi for finding this. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-04 17:15:23 UTC (rev 828) +++ trunk/Makefile 2010-01-06 10:21:00 UTC (rev 829) @@ -50,7 +50,7 @@ CLI_OBJS = flashrom.o print.o -PROGRAMMER_OBJS = udelay.o +PROGRAMMER_OBJS = udelay.o programmer.o all: pciutils features dep $(PROGRAM) Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2010-01-04 17:15:23 UTC (rev 828) +++ trunk/flash.h 2010-01-06 10:21:00 UTC (rev 829) @@ -370,6 +370,8 @@ uint8_t mmio_readb(void *addr); uint16_t mmio_readw(void *addr); uint32_t mmio_readl(void *addr); + +/* programmer.c */ int noop_shutdown(void); void *fallback_map(const char *descr, unsigned long phys_addr, size_t len); void fallback_unmap(void *virt_addr, size_t len); Modified: trunk/internal.c =================================================================== --- trunk/internal.c 2010-01-04 17:15:23 UTC (rev 828) +++ trunk/internal.c 2010-01-06 10:21:00 UTC (rev 829) @@ -247,80 +247,3 @@ { return *(volatile uint32_t *) addr; } - -/* No-op shutdown() for programmers which don't need special handling */ -int noop_shutdown(void) -{ - return 0; -} - -/* Fallback map() for programmers which don't need special handling */ -void *fallback_map(const char *descr, unsigned long phys_addr, size_t len) -{ - /* FIXME: Should return phys_addr. */ - return 0; -} - -/* No-op/fallback unmap() for programmers which don't need special handling */ -void fallback_unmap(void *virt_addr, size_t len) -{ -} - -/* No-op chip_writeb() for drivers not supporting addr/data pair accesses */ -uint8_t noop_chip_readb(const chipaddr addr) -{ - return 0xff; -} - -/* No-op chip_writeb() for drivers not supporting addr/data pair accesses */ -void noop_chip_writeb(uint8_t val, chipaddr addr) -{ -} - -/* Little-endian fallback for drivers not supporting 16 bit accesses */ -void fallback_chip_writew(uint16_t val, chipaddr addr) -{ - chip_writeb(val & 0xff, addr); - chip_writeb((val >> 8) & 0xff, addr + 1); -} - -/* Little-endian fallback for drivers not supporting 16 bit accesses */ -uint16_t fallback_chip_readw(const chipaddr addr) -{ - uint16_t val; - val = chip_readb(addr); - val |= chip_readb(addr + 1) << 8; - return val; -} - -/* Little-endian fallback for drivers not supporting 32 bit accesses */ -void fallback_chip_writel(uint32_t val, chipaddr addr) -{ - chip_writew(val & 0xffff, addr); - chip_writew((val >> 16) & 0xffff, addr + 2); -} - -/* Little-endian fallback for drivers not supporting 32 bit accesses */ -uint32_t fallback_chip_readl(const chipaddr addr) -{ - uint32_t val; - val = chip_readw(addr); - val |= chip_readw(addr + 2) << 16; - return val; -} - -void fallback_chip_writen(uint8_t *buf, chipaddr addr, size_t len) -{ - size_t i; - for (i = 0; i < len; i++) - chip_writeb(buf[i], addr + i); - return; -} - -void fallback_chip_readn(uint8_t *buf, chipaddr addr, size_t len) -{ - size_t i; - for (i = 0; i < len; i++) - buf[i] = chip_readb(addr + i); - return; -} Added: trunk/programmer.c =================================================================== --- trunk/programmer.c (rev 0) +++ trunk/programmer.c 2010-01-06 10:21:00 UTC (rev 829) @@ -0,0 +1,99 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2009,2010 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; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <stdlib.h> +#include "flash.h" + +/* No-op shutdown() for programmers which don't need special handling */ +int noop_shutdown(void) +{ + return 0; +} + +/* Fallback map() for programmers which don't need special handling */ +void *fallback_map(const char *descr, unsigned long phys_addr, size_t len) +{ + /* FIXME: Should return phys_addr. */ + return 0; +} + +/* No-op/fallback unmap() for programmers which don't need special handling */ +void fallback_unmap(void *virt_addr, size_t len) +{ +} + +/* No-op chip_writeb() for drivers not supporting addr/data pair accesses */ +uint8_t noop_chip_readb(const chipaddr addr) +{ + return 0xff; +} + +/* No-op chip_writeb() for drivers not supporting addr/data pair accesses */ +void noop_chip_writeb(uint8_t val, chipaddr addr) +{ +} + +/* Little-endian fallback for drivers not supporting 16 bit accesses */ +void fallback_chip_writew(uint16_t val, chipaddr addr) +{ + chip_writeb(val & 0xff, addr); + chip_writeb((val >> 8) & 0xff, addr + 1); +} + +/* Little-endian fallback for drivers not supporting 16 bit accesses */ +uint16_t fallback_chip_readw(const chipaddr addr) +{ + uint16_t val; + val = chip_readb(addr); + val |= chip_readb(addr + 1) << 8; + return val; +} + +/* Little-endian fallback for drivers not supporting 32 bit accesses */ +void fallback_chip_writel(uint32_t val, chipaddr addr) +{ + chip_writew(val & 0xffff, addr); + chip_writew((val >> 16) & 0xffff, addr + 2); +} + +/* Little-endian fallback for drivers not supporting 32 bit accesses */ +uint32_t fallback_chip_readl(const chipaddr addr) +{ + uint32_t val; + val = chip_readw(addr); + val |= chip_readw(addr + 2) << 16; + return val; +} + +void fallback_chip_writen(uint8_t *buf, chipaddr addr, size_t len) +{ + size_t i; + for (i = 0; i < len; i++) + chip_writeb(buf[i], addr + i); + return; +} + +void fallback_chip_readn(uint8_t *buf, chipaddr addr, size_t len) +{ + size_t i; + for (i = 0; i < len; i++) + buf[i] = chip_readb(addr + i); + return; +}

1 0

[RFC] JEDEC refactor w/ conversion notes and file eliminations
by Sean Nelson 04 Jan '10

04 Jan '10

This patch demonstrates how we could refactor the jedec code. After the refactor we can delete these: * am29f040b * en29f002a -> file_not_used * m29f002 * mx29f002 * pm29f002 * sst49lf040 * w49f002u These files can be deleted if we *could* find a way to integrate the problems into jedec.c: * w29ee011 -> checks specifically for w29ee011 * w39v040c -> checks for lock in probe: address 0xfff2 * pm49fl00x -> uses chip protect code * m29f002 -> block based writing * m29f400bt -> block based writing I was looking through these two files and saw that they used variable block sizes for writing sectors, maybe we can do something simpler to block_erasers: * m29f002 * m29f400bt There are a few files that performs another map_flash_registers() after successful probe, I was wondering if we could add the re-mapping to probe_jedec_common or if its safe to omit the function call: * pm49fl00x * stm50flw0x0x * w39v080fa List of chips that use a specific addressing for command codes: 0x2AA based chips: * am29f040b * mx29f002 * pm29f002 0xAAA based chips: * m29f002 * m29f400bt 0x2AAA based chips: * pm49fl00x * sst49lf040 * stm50flw0x0x * w29ee011 * w39v040c * w39v080fa * w49f002u If you want I can send my full notes so you can see what each file's functions can be converted to, on request. I don't know if my methods for the address mask is proper. If you can think of a better way, I'm all ears. Yes, I did work on this all Christmas Eve.

3 14

[commit] r828 - trunk
by svn＠flashrom.org 04 Jan '10

04 Jan '10

Author: snelson Date: 2010-01-04 18:15:23 +0100 (Mon, 04 Jan 2010) New Revision: 828 Modified: trunk/chipdrivers.h trunk/flash.h trunk/flashchips.c trunk/jedec.c trunk/pm49fl00x.c trunk/sst49lf040.c trunk/sst_fwhub.c trunk/w39v040c.c trunk/w39v080fa.c trunk/w49f002u.c Log: The patch converts jedec functions into mask-based generics which can be used for many chip provided the only changes are the addresses are converted from 0x5555/0x2AAA to 0x555/0x2AA or similar. The patch mostly changes jedec.c, but a few other files are changed because they use the jedec functions within their own functions. The patch also adds a copyright line to flashchips.c because of my recent work in converting AMD and Atmel chips to use struct erase_block. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/chipdrivers.h =================================================================== --- trunk/chipdrivers.h 2010-01-03 23:50:28 UTC (rev 827) +++ trunk/chipdrivers.h 2010-01-04 17:15:23 UTC (rev 828) @@ -76,7 +76,6 @@ uint8_t oddparity(uint8_t val); void toggle_ready_jedec(chipaddr dst); void data_polling_jedec(chipaddr dst, uint8_t data); -void start_program_jedec(chipaddr bios); int write_byte_program_jedec(chipaddr bios, uint8_t *src, chipaddr dst); int probe_jedec(struct flashchip *flash); @@ -86,8 +85,7 @@ int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int pagesize); int erase_block_jedec(struct flashchip *flash, unsigned int page, unsigned int blocksize); int erase_chip_block_jedec(struct flashchip *flash, unsigned int page, unsigned int blocksize); -int write_sector_jedec(chipaddr bios, uint8_t *src, - chipaddr dst, unsigned int page_size); +int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, chipaddr dst, unsigned int page_size, unsigned int mask); /* m29f002.c */ int erase_m29f002(struct flashchip *flash); Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2010-01-03 23:50:28 UTC (rev 827) +++ trunk/flash.h 2010-01-04 17:15:23 UTC (rev 828) @@ -144,6 +144,9 @@ */ #define NUM_ERASEFUNCTIONS 5 +#define FEATURE_REGISTERMAP (1 << 0) +#define FEATURE_BYTEWRITES (1 << 1) + struct flashchip { const char *vendor; const char *name; @@ -160,6 +163,7 @@ int total_size; int page_size; + int feature_bits; /* * Indicate if flashrom has been tested with this flash chip and if Modified: trunk/flashchips.c =================================================================== --- trunk/flashchips.c 2010-01-03 23:50:28 UTC (rev 827) +++ trunk/flashchips.c 2010-01-04 17:15:23 UTC (rev 828) @@ -5,6 +5,7 @@ * Copyright (C) 2004 Tyan Corp * Copyright (C) 2005-2008 coresystems GmbH <stepan(a)openbios.org> * Copyright (C) 2006-2009 Carl-Daniel Hailfinger + * Copyright (C) 2009 Sean Nelson <audiohacked(a)gmail.com> * * 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 Modified: trunk/jedec.c =================================================================== --- trunk/jedec.c 2010-01-03 23:50:28 UTC (rev 827) +++ trunk/jedec.c 2010-01-04 17:15:23 UTC (rev 828) @@ -5,6 +5,7 @@ * Copyright (C) 2006 Giampiero Giancipoli <gianci(a)email.it> * Copyright (C) 2006 coresystems GmbH <info(a)coresystems.de> * Copyright (C) 2007 Carl-Daniel Hailfinger + * Copyright (C) 2009 Sean Nelson <audiohacked(a)gmail.com> * * 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 @@ -24,6 +25,8 @@ #include "flash.h" #define MAX_REFLASH_TRIES 0x10 +#define MASK_FULL 0xffff +#define MASK_2AA 0x7ff /* Check one byte for odd parity */ uint8_t oddparity(uint8_t val) @@ -87,14 +90,16 @@ printf_debug("%s: excessive loops, i=0x%x\n", __func__, i); } -void start_program_jedec(chipaddr bios) +void start_program_jedec_common(struct flashchip *flash, unsigned int mask) { - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0xA0, bios + 0x5555); + chipaddr bios = flash->virtual_memory; + chip_writeb(0xAA, bios + (0x5555 & mask)); + chip_writeb(0x55, bios + (0x2AAA & mask)); + chip_writeb(0xA0, bios + (0x5555 & mask)); } -int probe_jedec(struct flashchip *flash) +int probe_jedec_common(struct flashchip *flash, + unsigned int mask, int long_reset) { chipaddr bios = flash->virtual_memory; uint8_t id1, id2; @@ -118,13 +123,13 @@ } /* Issue JEDEC Product ID Entry command */ - chip_writeb(0xAA, bios + 0x5555); + chip_writeb(0xAA, bios + (0x5555 & mask)); if (probe_timing_enter) programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); + chip_writeb(0x55, bios + (0x2AAA & mask)); if (probe_timing_enter) programmer_delay(10); - chip_writeb(0x90, bios + 0x5555); + chip_writeb(0x90, bios + (0x5555 & mask)); if (probe_timing_enter) programmer_delay(probe_timing_enter); @@ -147,14 +152,17 @@ } /* Issue JEDEC Product ID Exit command */ - chip_writeb(0xAA, bios + 0x5555); + if (long_reset) + { + chip_writeb(0xAA, bios + (0x5555 & mask)); + if (probe_timing_exit) + programmer_delay(10); + chip_writeb(0x55, bios + (0x2AAA & mask)); + if (probe_timing_exit) + programmer_delay(10); + } + chip_writeb(0xF0, bios + (0x5555 & mask)); if (probe_timing_exit) - programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); - if (probe_timing_exit) - programmer_delay(10); - chip_writeb(0xF0, bios + 0x5555); - if (probe_timing_exit) programmer_delay(probe_timing_exit); printf_debug("%s: id1 0x%02x, id2 0x%02x", __func__, largeid1, largeid2); @@ -184,24 +192,28 @@ if (largeid1 == flash->manufacture_id && largeid2 == flash->model_id) return 1; + if (flash->feature_bits & FEATURE_REGISTERMAP) + map_flash_registers(flash); + return 0; } -int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int pagesize) +int erase_sector_jedec_common(struct flashchip *flash, unsigned int page, + unsigned int pagesize, unsigned int mask) { chipaddr bios = flash->virtual_memory; /* Issue the Sector Erase command */ - chip_writeb(0xAA, bios + 0x5555); + chip_writeb(0xAA, bios + (0x5555 & mask)); programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); + chip_writeb(0x55, bios + (0x2AAA & mask)); programmer_delay(10); - chip_writeb(0x80, bios + 0x5555); + chip_writeb(0x80, bios + (0x5555 & mask)); programmer_delay(10); - chip_writeb(0xAA, bios + 0x5555); + chip_writeb(0xAA, bios + (0x5555 & mask)); programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); + chip_writeb(0x55, bios + (0x2AAA & mask)); programmer_delay(10); chip_writeb(0x30, bios + page); programmer_delay(10); @@ -216,21 +228,22 @@ return 0; } -int erase_block_jedec(struct flashchip *flash, unsigned int block, unsigned int blocksize) +int erase_block_jedec_common(struct flashchip *flash, unsigned int block, + unsigned int blocksize, unsigned int mask) { chipaddr bios = flash->virtual_memory; /* Issue the Sector Erase command */ - chip_writeb(0xAA, bios + 0x5555); + chip_writeb(0xAA, bios + (0x5555 & mask)); programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); + chip_writeb(0x55, bios + (0x2AAA & mask)); programmer_delay(10); - chip_writeb(0x80, bios + 0x5555); + chip_writeb(0x80, bios + (0x5555 & mask)); programmer_delay(10); - chip_writeb(0xAA, bios + 0x5555); + chip_writeb(0xAA, bios + (0x5555 & mask)); programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); + chip_writeb(0x55, bios + (0x2AAA & mask)); programmer_delay(10); chip_writeb(0x50, bios + block); programmer_delay(10); @@ -245,35 +258,24 @@ return 0; } -/* erase chip with block_erase() prototype */ -int erase_chip_block_jedec(struct flashchip *flash, unsigned int addr, unsigned int blocksize) +int erase_chip_jedec_common(struct flashchip *flash, unsigned int mask) { - if ((addr != 0) || (blocksize != flash->total_size * 1024)) { - fprintf(stderr, "%s called with incorrect arguments\n", - __func__); - return -1; - } - return erase_chip_jedec(flash); -} - -int erase_chip_jedec(struct flashchip *flash) -{ int total_size = flash->total_size * 1024; chipaddr bios = flash->virtual_memory; /* Issue the JEDEC Chip Erase command */ - chip_writeb(0xAA, bios + 0x5555); + chip_writeb(0xAA, bios + (0x5555 & mask)); programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); + chip_writeb(0x55, bios + (0x2AAA & mask)); programmer_delay(10); - chip_writeb(0x80, bios + 0x5555); + chip_writeb(0x80, bios + (0x5555 & mask)); programmer_delay(10); - chip_writeb(0xAA, bios + 0x5555); + chip_writeb(0xAA, bios + (0x5555 & mask)); programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); + chip_writeb(0x55, bios + (0x2AAA & mask)); programmer_delay(10); - chip_writeb(0x10, bios + 0x5555); + chip_writeb(0x10, bios + (0x5555 & mask)); programmer_delay(10); toggle_ready_jedec_slow(bios); @@ -285,50 +287,12 @@ return 0; } -int write_page_write_jedec(struct flashchip *flash, uint8_t *src, - int start, int page_size) +int write_byte_program_jedec_common(struct flashchip *flash, uint8_t *src, + chipaddr dst, unsigned int mask) { - int i, tried = 0, failed; - uint8_t *s = src; + int tried = 0, failed = 0; chipaddr bios = flash->virtual_memory; - chipaddr dst = bios + start; - chipaddr d = dst; -retry: - /* Issue JEDEC Data Unprotect comand */ - start_program_jedec(bios); - - /* transfer data from source to destination */ - for (i = 0; i < page_size; i++) { - /* If the data is 0xFF, don't program it */ - if (*src != 0xFF) - chip_writeb(*src, dst); - dst++; - src++; - } - - toggle_ready_jedec(dst - 1); - - dst = d; - src = s; - failed = verify_range(flash, src, start, page_size, NULL); - - if (failed && tried++ < MAX_REFLASH_TRIES) { - fprintf(stderr, "retrying.\n"); - goto retry; - } - if (failed) { - fprintf(stderr, " page 0x%lx failed!\n", - (d - bios) / page_size); - } - return failed; -} - -int write_byte_program_jedec(chipaddr bios, uint8_t *src, - chipaddr dst) -{ - int tried = 0, failed = 0; - /* If the data is 0xFF, don't program it and don't complain. */ if (*src == 0xFF) { return 0; @@ -336,7 +300,7 @@ retry: /* Issue JEDEC Byte Program command */ - start_program_jedec(bios); + start_program_jedec_common(flash, mask); /* transfer data from source to destination */ chip_writeb(*src, dst); @@ -352,15 +316,15 @@ return failed; } -int write_sector_jedec(chipaddr bios, uint8_t *src, - chipaddr dst, unsigned int page_size) +int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, + chipaddr dst, unsigned int page_size, unsigned int mask) { int i, failed = 0; chipaddr olddst; olddst = dst; for (i = 0; i < page_size; i++) { - if (write_byte_program_jedec(bios, src, dst)) + if (write_byte_program_jedec_common(flash, src, dst, mask)) failed = 1; dst++, src++; } @@ -370,6 +334,45 @@ return failed; } +int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, + int start, int page_size, unsigned int mask) +{ + int i, tried = 0, failed; + uint8_t *s = src; + chipaddr bios = flash->virtual_memory; + chipaddr dst = bios + start; + chipaddr d = dst; + +retry: + /* Issue JEDEC Start Program comand */ + start_program_jedec_common(flash, mask); + + /* transfer data from source to destination */ + for (i = 0; i < page_size; i++) { + /* If the data is 0xFF, don't program it */ + if (*src != 0xFF) + chip_writeb(*src, dst); + dst++; + src++; + } + + toggle_ready_jedec(dst - 1); + + dst = d; + src = s; + failed = verify_range(flash, src, start, page_size, NULL); + + if (failed && tried++ < MAX_REFLASH_TRIES) { + fprintf(stderr, "retrying.\n"); + goto retry; + } + if (failed) { + fprintf(stderr, " page 0x%lx failed!\n", + (d - bios) / page_size); + } + return failed; +} + int write_jedec(struct flashchip *flash, uint8_t *buf) { int i, failed = 0; @@ -384,8 +387,8 @@ printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); - if (write_page_write_jedec(flash, buf + i * page_size, - i * page_size, page_size)) + if (write_page_write_jedec_common(flash, buf + i * page_size, + i * page_size, page_size, MASK_FULL)) failed = 1; printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } @@ -411,7 +414,7 @@ if ((i & 0x3) == 0) printf("address: 0x%08lx", (unsigned long)i * 1024); - write_sector_jedec(bios, buf + i * 1024, dst + i * 1024, 1024); + write_sector_jedec_common(flash, buf + i * 1024, dst + i * 1024, 1024, MASK_FULL); if ((i & 0x3) == 0) printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); @@ -420,3 +423,35 @@ printf("\n"); return 0; } + +/* erase chip with block_erase() prototype */ +int erase_chip_block_jedec(struct flashchip *flash, unsigned int addr, + unsigned int blocksize) +{ + if ((addr != 0) || (blocksize != flash->total_size * 1024)) { + fprintf(stderr, "%s called with incorrect arguments\n", + __func__); + return -1; + } + return erase_chip_jedec_common(flash, MASK_FULL); +} + +int probe_jedec(struct flashchip *flash) +{ + return probe_jedec_common(flash, MASK_FULL, 1); +} + +int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int size) +{ + return erase_sector_jedec_common(flash, page, size, MASK_FULL); +} + +int erase_block_jedec(struct flashchip *flash, unsigned int page, unsigned int size) +{ + return erase_block_jedec_common(flash, page, size, MASK_FULL); +} + +int erase_chip_jedec(struct flashchip *flash) +{ + return erase_chip_jedec_common(flash, MASK_FULL); +} Modified: trunk/pm49fl00x.c =================================================================== --- trunk/pm49fl00x.c 2010-01-03 23:50:28 UTC (rev 827) +++ trunk/pm49fl00x.c 2010-01-04 17:15:23 UTC (rev 828) @@ -101,8 +101,8 @@ /* write to the sector */ printf("%04d at address: 0x%08x", i, i * page_size); - write_sector_jedec(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_sector_jedec_common(flash, buf + i * page_size, + bios + i * page_size, page_size, 0xffff); printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); fflush(stdout); } Modified: trunk/sst49lf040.c =================================================================== --- trunk/sst49lf040.c 2010-01-03 23:50:28 UTC (rev 827) +++ trunk/sst49lf040.c 2010-01-04 17:15:23 UTC (rev 828) @@ -59,8 +59,8 @@ if (i % 10 == 0) printf("%04d at address: 0x%08x ", i, i * page_size); - write_sector_jedec(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_sector_jedec_common(flash, buf + i * page_size, + bios + i * page_size, page_size, 0xffff); if (i % 10 == 0) printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); Modified: trunk/sst_fwhub.c =================================================================== --- trunk/sst_fwhub.c 2010-01-03 23:50:28 UTC (rev 827) +++ trunk/sst_fwhub.c 2010-01-04 17:15:23 UTC (rev 828) @@ -157,8 +157,8 @@ page_size); if (rc) return 1; - write_sector_jedec(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_sector_jedec_common(flash, buf + i * page_size, + bios + i * page_size, page_size, 0xffff); } printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } Modified: trunk/w39v040c.c =================================================================== --- trunk/w39v040c.c 2010-01-03 23:50:28 UTC (rev 827) +++ trunk/w39v040c.c 2010-01-04 17:15:23 UTC (rev 828) @@ -80,8 +80,8 @@ printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); - write_sector_jedec(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_sector_jedec_common(flash, buf + i * page_size, + bios + i * page_size, page_size, 0xffff); printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } printf("\n"); Modified: trunk/w39v080fa.c =================================================================== --- trunk/w39v080fa.c 2010-01-03 23:50:28 UTC (rev 827) +++ trunk/w39v080fa.c 2010-01-04 17:15:23 UTC (rev 828) @@ -182,7 +182,7 @@ printf("Programming: "); for (i = 0; i < total_size; i += flash->page_size) { printf("0x%08x\b\b\b\b\b\b\b\b\b\b", i); - write_sector_jedec(bios, buf + i, bios + i, flash->page_size); + write_sector_jedec_common(flash, buf + i, bios + i, flash->page_size, 0xffff); } printf("\n"); Modified: trunk/w49f002u.c =================================================================== --- trunk/w49f002u.c 2010-01-03 23:50:28 UTC (rev 827) +++ trunk/w49f002u.c 2010-01-04 17:15:23 UTC (rev 828) @@ -36,8 +36,8 @@ for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x ", i, i * page_size); /* Byte-wise writing of 'page_size' bytes. */ - write_sector_jedec(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_sector_jedec_common(flash, buf + i * page_size, + bios + i * page_size, page_size, 0xffff); printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); fflush(stdout); }

1 0

[PATCH] cleanup README
by Stefan Reinauer 04 Jan '10

04 Jan '10

see patch -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/ Registergericht: Amtsgericht Freiburg • HRB 7656 Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866

2 2

[commit] r827 - trunk
by svn＠flashrom.org 04 Jan '10

04 Jan '10

Author: stepan Date: 2010-01-04 00:50:28 +0100 (Mon, 04 Jan 2010) New Revision: 827 Modified: trunk/README Log: Drop multiple forwards to man page and add a single one more prominently. Drop usage information that is already mentioned in the man page. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/README =================================================================== --- trunk/README 2010-01-03 15:09:17 UTC (rev 826) +++ trunk/README 2010-01-03 23:50:28 UTC (rev 827) @@ -11,7 +11,9 @@ It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, and TSOP40 chips, which use various protocols such as LPC, FWH, parallel flash, or SPI. +Please see the flashrom(8) manpage. + Packaging --------- @@ -89,37 +91,6 @@ by adding sudo in front of the commands above. -Usage / Options ---------------- - -Please see the flashrom(8) manpage. - - -Exit status ------------ - -Please see the flashrom(8) manpage. - - -coreboot Table and Mainboard Identification --------------------------------------------- - -Please see the flashrom(8) manpage. - - -ROM Layout Support ------------------- - -Please see the flashrom(8) manpage. - - -Supported Flash Chips / Chipsets / Mainboards ---------------------------------------------- - -Please check the output of 'flashrom -L' for the list of supported -flash chips, chipsets/southbridges, mainboards, and flash programmers. - - Contact -------

1 0

Fix FWH decode size.
by Michael Karcher 04 Jan '10

04 Jan '10

Fix logic error in determining the decode size of the Intel FWH bridge chip. Signed-Off-By: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Index: chipset_enable.c =================================================================== --- chipset_enable.c (Revision 824) +++ chipset_enable.c (Arbeitskopie) @@ -364,7 +364,7 @@ (0x1ff8 + i) * 0x80000, (0x1ff0 + i) * 0x80000, tmp ? "en" : "dis"); - if ((tmp == 0) && contiguous) { + if ((tmp == 1) && contiguous) { max_decode_fwh_decode = (8 - i) * 0x80000; } else { contiguous = 0; @@ -376,7 +376,7 @@ (0xff4 + i) * 0x100000, (0xff0 + i) * 0x100000, tmp ? "en" : "dis"); - if ((tmp == 0) && contiguous) { + if ((tmp == 1) && contiguous) { max_decode_fwh_decode = (8 - i) * 0x100000; } else { contiguous = 0;

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom