flashrom

flashrom@flashrom.org

3 participants
9188 discussions

directio for flashrom
by Carl-Daniel Hailfinger 22 Jul '12

22 Jul '12

Hi Jernej, I saw that you sent a pciutils/libpci patch to support your Direct IO driver on Windows. flashrom is a GPL'ed utility to read/write flash chips, e.g. the one storing BIOS/EFI on a mainboard. Right now, flashrom is quite limited on Windows: It doesn't support anything which needs MMIO/IOPort access. While it would be possible to use WinIo, the WinIo license seems to be a bit odd and may be incompatible with the GPL. Your Direct IO driver has the advantage of being GPL, but it is missing a key feature needed by flashrom: Mapping physical memory to the application (similar to MapPhysToLin in WinIo). flashrom needs uncached mappings of device memory regions, and cached mappings of RAM regions storing DMI info. I'm not sure whether NtMapViewOfSection would already be enough for this purpose, or if your Direct IO driver would have to be extended to offer such functionality. Regards, Carl-Daniel

2 1

[PATCH] No default driver if more than one driver is available
by Carl-Daniel Hailfinger 22 Jul '12

22 Jul '12

If only one programmer driver is compiled in, make that driver the default. If more than one driver is compiled in, require --programmer specification at the command line. 3 results from a default flashrom configuration: compiler@p35:/sources/tmptrees/ready/flashrom-programmer_no_default> ./flashrom flashrom v0.9.5.2-r1547 on Linux 2.6.34.10-0.6-default (i686) Please select a programmer with --programmer . Valid choices are: internal, dummy, nic3com, nicrealtek, gfxnvidia, drkaiser, satasii, ft2232_spi, serprog, buspirate_spi, rayer_spi, pony_spi, nicintel, nicintel_spi, ogp_spi, satamv, linux_spi compiler@p35:/sources/tmptrees/ready/flashrom-programmer_no_default> ./flashrom -p foo flashrom v0.9.5.2-r1547 on Linux 2.6.34.10-0.6-default (i686) Error: Unknown programmer foo. Valid choices are: internal, dummy, nic3com, nicrealtek, gfxnvidia, drkaiser, satasii, ft2232_spi, serprog, buspirate_spi, rayer_spi, pony_spi, nicintel, nicintel_spi, ogp_spi, satamv, linux_spi Please run "flashrom --help" for usage info. compiler@p35:/sources/tmptrees/ready/flashrom-programmer_no_default> ./flashrom -p internal -p internal flashrom v0.9.5.2-r1547 on Linux 2.6.34.10-0.6-default (i686) Error: --programmer specified more than once. You can separate multiple parameters for a programmer with ",". Please see the man page for details. Please run "flashrom --help" for usage info. 1 result from a flashrom configuration with only dummy compiled in: compiler@p35:/sources/tmptrees/ready/flashrom-programmer_no_default> ./flashrom flashrom v0.9.5.2-r1547 on Linux 2.6.34.10-0.6-default (i686) Calibrating delay loop... OK. No EEPROM/flash device found. Note: flashrom can never write if the flash chip isn't found automatically. This patch represents rough consensus from IRC. I would like to require --programmer in all cases to make sure nobody gets bitten by two different single-programmer builds (e.g. dediprog and internal), but this patch is already a step in the right direction. Please check that the printed error messages make sense. I took the liberty of removing "flashrom is free software..." from the output to keep this mail readable. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-programmer_no_default/cli_classic.c =================================================================== --- flashrom-programmer_no_default/cli_classic.c (Revision 1547) +++ flashrom-programmer_no_default/cli_classic.c (Arbeitskopie) @@ -31,20 +31,19 @@ #include "flashchips.h" #include "programmer.h" -#if CONFIG_INTERNAL == 1 -static enum programmer default_programmer = PROGRAMMER_INTERNAL; -#elif CONFIG_DUMMY == 1 -static enum programmer default_programmer = PROGRAMMER_DUMMY; -#else -/* If neither internal nor dummy are selected, we must pick a sensible default. - * Since there is no reason to prefer a particular external programmer, we fail - * if more than one of them is selected. If only one is selected, it is clear - * that the user wants that one to become the default. +/* If only one programmer is compiled in, it is the default. + * In all other cases there is no default and the user has to specify the programmer with -p . */ +static enum programmer default_programmer = #if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_FT2232_SPI+CONFIG_SERPROG+CONFIG_BUSPIRATE_SPI+CONFIG_DEDIPROG+CONFIG_RAYER_SPI+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV > 1 -#error Please enable either CONFIG_DUMMY or CONFIG_INTERNAL or disable support for all programmers except one. + PROGRAMMER_INVALID +#else +#if CONFIG_INTERNAL == 1 + PROGRAMMER_INTERNAL #endif -static enum programmer default_programmer = +#if CONFIG_DUMMY == 1 + PROGRAMMER_DUMMY +#endif #if CONFIG_NIC3COM == 1 PROGRAMMER_NIC3COM #endif @@ -96,8 +95,8 @@ #if CONFIG_LINUX_SPI == 1 PROGRAMMER_LINUX_SPI #endif +#endif ; -#endif static void cli_classic_usage(const char *name) { @@ -107,11 +106,11 @@ #endif "-E|-r <file>|-w <file>|-v <file>]\n" " [-c <chipname>] [-l <file>] [-o <file>]\n" - " [-i <image>] [-p <programmername>[:<parameters>]]\n\n"); + " [-i <image>] -p <programmername>[:<parameters>]\n\n"); printf("Please note that the command line interface for flashrom has " "changed between\n" - "0.9.1 and 0.9.2 and will change again before flashrom 1.0.\n" + "0.9.5 and 0.9.6 and will change again before flashrom 1.0.\n" "Do not use flashrom in scripts or other automated tools " "without checking\n" "that your flashrom version won't interpret options in a " @@ -360,8 +359,8 @@ } } if (prog == PROGRAMMER_INVALID) { - fprintf(stderr, "Error: Unknown programmer " - "%s.\n", optarg); + fprintf(stderr, "Error: Unknown programmer %s. Valid choices are:\n", optarg); + list_programmers_linebreak(0, 80, 0); cli_classic_abort_usage(); } break; @@ -469,7 +468,15 @@ } if (prog == PROGRAMMER_INVALID) - prog = default_programmer; + if (default_programmer == PROGRAMMER_INVALID) { + /* More than one programmer compiled in, there is no default choice. */ + msg_perr("Please select a programmer with --programmer . Valid choices are:\n"); + list_programmers_linebreak(0, 80, 0); + ret = 1; + goto out; + } else { + prog = default_programmer; + } /* FIXME: Delay calibration should happen in programmer code. */ myusec_calibrate_delay(); -- http://www.hailfinger.org/

2 7

[commit] r1552 - trunk
by repository service 22 Jul '12

22 Jul '12

Author: hailfinger Date: Sun Jul 22 14:01:43 2012 New Revision: 1552 URL: http://flashrom.org/trac/flashrom/changeset/1552 Log: Always require the --programmer parameter on the command line if any flash chip access (probe/read/write/erase/...) is requested. Fix a few man page oddities as well. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/cli_classic.c trunk/flashrom.8 trunk/flashrom.c Modified: trunk/cli_classic.c ============================================================================== --- trunk/cli_classic.c Sat Jul 21 19:27:08 2012 (r1551) +++ trunk/cli_classic.c Sun Jul 22 14:01:43 2012 (r1552) @@ -31,87 +31,20 @@ #include "flashchips.h" #include "programmer.h" -#if CONFIG_INTERNAL == 1 -static enum programmer default_programmer = PROGRAMMER_INTERNAL; -#elif CONFIG_DUMMY == 1 -static enum programmer default_programmer = PROGRAMMER_DUMMY; -#else -/* If neither internal nor dummy are selected, we must pick a sensible default. - * Since there is no reason to prefer a particular external programmer, we fail - * if more than one of them is selected. If only one is selected, it is clear - * that the user wants that one to become the default. - */ -#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_FT2232_SPI+CONFIG_SERPROG+CONFIG_BUSPIRATE_SPI+CONFIG_DEDIPROG+CONFIG_RAYER_SPI+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV > 1 -#error Please enable either CONFIG_DUMMY or CONFIG_INTERNAL or disable support for all programmers except one. -#endif -static enum programmer default_programmer = -#if CONFIG_NIC3COM == 1 - PROGRAMMER_NIC3COM -#endif -#if CONFIG_NICREALTEK == 1 - PROGRAMMER_NICREALTEK -#endif -#if CONFIG_NICNATSEMI == 1 - PROGRAMMER_NICNATSEMI -#endif -#if CONFIG_GFXNVIDIA == 1 - PROGRAMMER_GFXNVIDIA -#endif -#if CONFIG_DRKAISER == 1 - PROGRAMMER_DRKAISER -#endif -#if CONFIG_SATASII == 1 - PROGRAMMER_SATASII -#endif -#if CONFIG_ATAHPT == 1 - PROGRAMMER_ATAHPT -#endif -#if CONFIG_FT2232_SPI == 1 - PROGRAMMER_FT2232_SPI -#endif -#if CONFIG_SERPROG == 1 - PROGRAMMER_SERPROG -#endif -#if CONFIG_BUSPIRATE_SPI == 1 - PROGRAMMER_BUSPIRATE_SPI -#endif -#if CONFIG_DEDIPROG == 1 - PROGRAMMER_DEDIPROG -#endif -#if CONFIG_RAYER_SPI == 1 - PROGRAMMER_RAYER_SPI -#endif -#if CONFIG_NICINTEL == 1 - PROGRAMMER_NICINTEL -#endif -#if CONFIG_NICINTEL_SPI == 1 - PROGRAMMER_NICINTEL_SPI -#endif -#if CONFIG_OGP_SPI == 1 - PROGRAMMER_OGP_SPI -#endif -#if CONFIG_SATAMV == 1 - PROGRAMMER_SATAMV -#endif -#if CONFIG_LINUX_SPI == 1 - PROGRAMMER_LINUX_SPI -#endif -; -#endif - static void cli_classic_usage(const char *name) { - printf("Usage: flashrom [-n] [-V] [-f] [-h|-R|-L|" + printf("Usage: flashrom [-h|-R|-L|" #if CONFIG_PRINT_WIKI == 1 - "-z|" + "-z|" #endif - "-E|-r <file>|-w <file>|-v <file>]\n" - " [-c <chipname>] [-l <file>] [-o <file>]\n" - " [-i <image>] [-p <programmername>[:<parameters>]]\n\n"); + "-p <programmername>[:<parameters>]\n" + " [-E|-r <file>|-w <file>|-v <file>] [-c <chipname>]\n" + " [-l <file> [-i <image>]] [-n] [-f]]\n" + " [-V[V[V]]] [-o <logfile>]\n\n"); printf("Please note that the command line interface for flashrom has " "changed between\n" - "0.9.1 and 0.9.2 and will change again before flashrom 1.0.\n" + "0.9.5 and 0.9.6 and will change again before flashrom 1.0.\n" "Do not use flashrom in scripts or other automated tools " "without checking\n" "that your flashrom version won't interpret options in a " @@ -360,8 +293,9 @@ } } if (prog == PROGRAMMER_INVALID) { - fprintf(stderr, "Error: Unknown programmer " - "%s.\n", optarg); + fprintf(stderr, "Error: Unknown programmer \"%s\". Valid choices are:\n", + optarg); + list_programmers_linebreak(0, 80, 0); cli_classic_abort_usage(); } break; @@ -468,8 +402,13 @@ flash = NULL; } - if (prog == PROGRAMMER_INVALID) - prog = default_programmer; + if (prog == PROGRAMMER_INVALID) { + msg_perr("Please select a programmer with the --programmer parameter.\n" + "Valid choices are:\n"); + list_programmers_linebreak(0, 80, 0); + ret = 1; + goto out; + } /* FIXME: Delay calibration should happen in programmer code. */ myusec_calibrate_delay(); Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Sat Jul 21 19:27:08 2012 (r1551) +++ trunk/flashrom.8 Sun Jul 22 14:01:43 2012 (r1552) @@ -2,13 +2,12 @@ .SH NAME flashrom \- detect, read, write, verify and erase flash chips .SH SYNOPSIS -.B flashrom \fR[\fB\-n\fR] [\fB\-V\fR] [\fB\-f\fR] [\fB\-h\fR|\fB\-R\fR|\ -\fB\-L\fR|\fB\-z\fR|\fB\-E\fR|\fB\-r\fR <file>|\fB\-w\fR <file>|\ -\fB\-v\fR <file>] - [\fB\-c\fR <chipname>] \ -[\fB\-l\fR <file>] - [\fB\-i\fR <image>] [\fB\-p\fR <programmername>[:<parameters>]] - [\fB-o\fR <logfile>] +.B flashrom \fR[\fB\-h\fR|\fB\-R\fR|\fB\-L\fR|\fB\-z\fR|\ +\fB\-p\fR <programmername>[:<parameters>] + [\fB\-E\fR|\fB\-r\fR <file>|\fB\-w\fR <file>|\fB\-v\fR <file>] \ +[\fB\-c\fR <chipname>] + [\fB\-l\fR <file> [\fB\-i\fR <image>]] [\fB\-n\fR] [\fB\-f\fR]] + [\fB\-V\fR[\fBV\fR[\fBV\fR]]] [\fB-o\fR <logfile>] .SH DESCRIPTION .B flashrom is a utility for detecting, reading, writing, verifying and erasing flash @@ -64,7 +63,7 @@ feel that the time for verification takes too long. .sp Typical usage is: -.B "flashrom \-n \-w <file>" +.B "flashrom \-p prog \-n \-w <file>" .sp This option is only useful in combination with .BR \-\-write . @@ -106,31 +105,39 @@ .BR <file> . .sp flashrom supports ROM layouts. This allows you to flash certain parts of -the flash chip only. A ROM layout file looks like follows: +the flash chip only. A ROM layout file contains multiple lines with the +following syntax: +.sp +.B " startaddr:endaddr imagename" +.sp +.BR "startaddr " "and " "endaddr " +are hexadecimal addresses within the ROM file and do not refer to any +physical address. Please note that using a 0x prefix for those hexadecimal +numbers is not necessary, but you can't specify decimal/octal numbers. +.BR "imagename " "is an arbitrary name for the region/image from" +.BR " startaddr " "to " "endaddr " "(both addresses included)." +.sp +Example: .sp 00000000:00008fff gfxrom 00009000:0003ffff normal 00040000:0007ffff fallback .sp - i.e.: - startaddr:endaddr name -.sp -All addresses are offsets within the file, not absolute addresses! -If you only want to update the normal image in a ROM you can say: +If you only want to update the image named +.BR "normal " "in a ROM based on the layout above, run" .sp -.B " flashrom \-\-layout rom.layout \-\-image normal \-w agami_aruma.rom" +.B " flashrom \-p prog \-\-layout rom.layout \-\-image normal \-w some.rom" .sp -To update normal and fallback but leave the VGA BIOS alone, say: +To update only the images named +.BR "normal " "and " "fallback" ", run:" .sp -.B " flashrom \-l rom.layout \-i normal \" -.br -.B " \-i fallback \-w agami_aruma.rom" +.B " flashrom \-p prog \-l rom.layout \-i normal -i fallback \-w some.rom" .sp -Currently overlapping sections are not supported. +Overlapping sections are not supported. .TP -.B "\-i, \-\-image <name>" -Only flash image -.B <name> +.B "\-i, \-\-image <imagename>" +Only flash region/image +.B <imagename> from flash layout. .TP .B "\-L, \-\-list\-supported" @@ -156,7 +163,8 @@ Please note that MediaWiki output is not compiled in by default. .TP .B "\-p, \-\-programmer <name>[:parameter[,parameter[,parameter]]]" -Specify the programmer device. Currently supported are: +Specify the programmer device. This is mandatory for all operations +involving any chip access (probe/read/write/...). Currently supported are: .sp .BR "* internal" " (default, for in-system flashing in the mainboard)" .sp @@ -330,7 +338,8 @@ .sp .B " flashrom \-p internal:ich_spi_mode=value" .sp -syntax where value can be +syntax where +.BR "value " "can be" .BR auto ", " swseq " or " hwseq . By default .RB "(or when setting " ich_spi_mode=auto ) @@ -360,7 +369,9 @@ .sp .B " flashrom \-p internal:fwh_idsel=value" .sp -syntax where value is the 48-bit hexadecimal raw value to be written in the +syntax where +.B value +is the 48-bit hexadecimal raw value to be written in the IDSEL registers of the Intel southbridge. The upper 32 bits use one hex digit each per 512 kB range between 0xffc00000 and 0xffffffff, and the lower 16 bits use one hex digit each per 1024 kB range between 0xff400000 and 0xff7fffff. @@ -486,7 +497,9 @@ .sp .B " flashrom -p dummy:spi_blacklist=commandlist" .sp -syntax where commandlist is a list of two-digit hexadecimal representations of +syntax where +.B commandlist +is a list of two-digit hexadecimal representations of SPI commands. If commandlist is e.g. 0302, flashrom will behave as if the SPI controller refuses to run command 0x03 (READ) and command 0x02 (WRITE). commandlist may be up to 512 characters (256 commands) long. @@ -500,7 +513,9 @@ .sp .B " flashrom -p dummy:spi_ignorelist=commandlist" .sp -syntax where commandlist is a list of two-digit hexadecimal representations of +syntax where +.B commandlist +is a list of two-digit hexadecimal representations of SPI commands. If commandlist is e.g. 0302, the emulated flash chip will ignore command 0x03 (READ) and command 0x02 (WRITE). commandlist may be up to 512 characters (256 commands) long. @@ -513,7 +528,9 @@ .sp .B " flashrom -p dummy:spi_status=content" .sp -syntax where content is an 8-bit hexadecimal value. +syntax where +.B content +is an 8-bit hexadecimal value. .SS .BR "nic3com" , " nicrealtek" , " nicsmc1211" , " nicnatsemi" , " nicintel\ " , " nicintel_spi" , " gfxnvidia" , " ogp_spi" , " drkaiser" , " satasii\ Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sat Jul 21 19:27:08 2012 (r1551) +++ trunk/flashrom.c Sun Jul 22 14:01:43 2012 (r1552) @@ -59,6 +59,10 @@ /* Is writing allowed with this programmer? */ int programmer_may_write; +#if CONFIG_INTERNAL+CONFIG_DUMMY+CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_FT2232_SPI+CONFIG_SERPROG+CONFIG_BUSPIRATE_SPI+CONFIG_DEDIPROG+CONFIG_RAYER_SPI+CONFIG_PONY_SPI+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV+CONFIG_LINUX_SPI < 1 +#error You have to enable at least one programmer! +#endif + const struct programmer_entry programmer_table[] = { #if CONFIG_INTERNAL == 1 {

1 0

Which hardware do you want supported?
by Vitali Druzhinin 21 Jul '12

21 Jul '12

Hello! Did not find my motherboards in supported hardware list, but found chipsets. I would like to flash the following: ASUS M3A-H/HDMI (SB7x0/SB8x0/SB9x0 1002:439d) Elitegroup NFORCE6M-A2 (MCP61 10de:03e0) How safe is to try flash Coreboot on these MoBo? What information do you need else? BR, Vitali

1 0

[PATCH] remove exit call from get_id_perms
by Niklas Söderlund 21 Jul '12

21 Jul '12

In order to remove the exit call in the get_ip_perm function the function needs to return a value indicating success or failure. This patch adds such return value and make all callers check for it. Signed-off-by: Niklas Söderlund <niso(a)kth.se> --- atahpt.c | 3 ++- drkaiser.c | 3 ++- gfxnvidia.c | 3 ++- hwaccess.c | 17 +++++++++++------ internal.c | 4 +++- nic3com.c | 3 ++- nicintel.c | 3 ++- nicintel_spi.c | 3 ++- nicnatsemi.c | 3 ++- nicrealtek.c | 3 ++- ogp_spi.c | 3 ++- programmer.h | 2 +- rayer_spi.c | 3 ++- satamv.c | 3 ++- satasii.c | 3 ++- 15 files changed, 39 insertions(+), 20 deletions(-) diff --git a/atahpt.c b/atahpt.c index 4234f6d..b692b88 100644 --- a/atahpt.c +++ b/atahpt.c @@ -67,7 +67,8 @@ int atahpt_init(void) { uint32_t reg32; - get_io_perms(); + if (get_io_perms()) + return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_4, ata_hpt); diff --git a/drkaiser.c b/drkaiser.c index 362db57..d4b6120 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -67,7 +67,8 @@ int drkaiser_init(void) { uint32_t addr; - get_io_perms(); + if (get_io_perms()) + return 1; addr = pcidev_init(PCI_BASE_ADDRESS_2, drkaiser_pcidev); diff --git a/gfxnvidia.c b/gfxnvidia.c index b8750b3..457172d 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -91,7 +91,8 @@ int gfxnvidia_init(void) { uint32_t reg32; - get_io_perms(); + if (get_io_perms()) + return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, gfx_nvidia); diff --git a/hwaccess.c b/hwaccess.c index 571edd7..b54fbdf 100644 --- a/hwaccess.c +++ b/hwaccess.c @@ -44,11 +44,11 @@ static inline void sync_primitive(void) int io_fd; #endif -void get_io_perms(void) +int get_io_perms(void) { #if defined(__DJGPP__) || defined(__LIBPAYLOAD__) /* We have full permissions by default. */ - return; + return 0; #else #if defined (__sun) && (defined(__i386) || defined(__amd64)) if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) != 0) { @@ -64,8 +64,10 @@ void get_io_perms(void) "and reboot, or reboot into \n"); msg_perr("single user mode.\n"); #endif - exit(1); + return 1; } + + return 0; #endif } @@ -88,8 +90,9 @@ static inline void sync_primitive(void) } /* PCI port I/O is not yet implemented on PowerPC. */ -void get_io_perms(void) +int get_io_perms(void) { + return 0; } /* PCI port I/O is not yet implemented on PowerPC. */ @@ -107,8 +110,9 @@ static inline void sync_primitive(void) } /* PCI port I/O is not yet implemented on MIPS. */ -void get_io_perms(void) +int get_io_perms(void) { + return 0; } /* PCI port I/O is not yet implemented on MIPS. */ @@ -122,8 +126,9 @@ static inline void sync_primitive(void) { } -void get_io_perms(void) +int get_io_perms(void) { + return 0; } void release_io_perms(void) diff --git a/internal.c b/internal.c index 75e526b..ec7cba1 100644 --- a/internal.c +++ b/internal.c @@ -225,7 +225,9 @@ int internal_init(void) } free(arg); - get_io_perms(); + if (get_io_perms()) + return 1; + if (register_shutdown(internal_shutdown, NULL)) return 1; diff --git a/nic3com.c b/nic3com.c index 473c7b1..4df720f 100644 --- a/nic3com.c +++ b/nic3com.c @@ -87,7 +87,8 @@ static int nic3com_shutdown(void *data) int nic3com_init(void) { - get_io_perms(); + if (get_io_perms()) + return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_3com); diff --git a/nicintel.c b/nicintel.c index 0415f46..f2d4529 100644 --- a/nicintel.c +++ b/nicintel.c @@ -74,7 +74,8 @@ int nicintel_init(void) /* Needed only for PCI accesses on some platforms. * FIXME: Refactor that into get_mem_perms/get_io_perms/get_pci_perms? */ - get_io_perms(); + if (get_io_perms()) + return 1; /* No need to check for errors, pcidev_init() will not return in case * of errors. diff --git a/nicintel_spi.c b/nicintel_spi.c index 4ff8554..7eb3af3 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -167,7 +167,8 @@ int nicintel_spi_init(void) { uint32_t tmp; - get_io_perms(); + if (get_io_perms()) + return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_intel_spi); diff --git a/nicnatsemi.c b/nicnatsemi.c index eb2a7f8..c39637a 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -59,7 +59,8 @@ static int nicnatsemi_shutdown(void *data) int nicnatsemi_init(void) { - get_io_perms(); + if (get_io_perms()) + return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_natsemi); diff --git a/nicrealtek.c b/nicrealtek.c index 32aa434..f808e06 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -61,7 +61,8 @@ static int nicrealtek_shutdown(void *data) int nicrealtek_init(void) { - get_io_perms(); + if (get_io_perms()) + return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_realtek); diff --git a/ogp_spi.c b/ogp_spi.c index 812420c..8502847 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -128,7 +128,8 @@ int ogp_spi_init(void) return 1; } - get_io_perms(); + if (get_io_perms()) + return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, ogp_spi); diff --git a/programmer.h b/programmer.h index d60fc5d..47be768 100644 --- a/programmer.h +++ b/programmer.h @@ -300,7 +300,7 @@ struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device); struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, uint16_t card_vendor, uint16_t card_device); #endif -void get_io_perms(void); +int get_io_perms(void); void release_io_perms(void); #if CONFIG_INTERNAL == 1 extern int is_laptop; diff --git a/rayer_spi.c b/rayer_spi.c index 0011bc0..62f0e12 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -167,7 +167,8 @@ int rayer_spi_init(void) rayer_miso_bit = 4; } - get_io_perms(); + if (get_io_perms()) + return 1; /* Get the initial value before writing to any line. */ lpt_outbyte = INB(lpt_iobase); diff --git a/satamv.c b/satamv.c index e39385b..0b83a14 100644 --- a/satamv.c +++ b/satamv.c @@ -85,7 +85,8 @@ int satamv_init(void) uintptr_t addr; uint32_t tmp; - get_io_perms(); + if (get_io_perms()) + return 1; /* BAR0 has all internal registers memory mapped. */ /* No need to check for errors, pcidev_init() will not return in case diff --git a/satasii.c b/satasii.c index 387c605..75378be 100644 --- a/satasii.c +++ b/satasii.c @@ -70,7 +70,8 @@ int satasii_init(void) uint32_t addr; uint16_t reg_offset; - get_io_perms(); + if (get_io_perms()) + return 1; pcidev_init(PCI_BASE_ADDRESS_0, satas_sii); -- 1.7.11.1

2 1

[commit] r1551 - trunk
by repository service 21 Jul '12

21 Jul '12

Author: hailfinger Date: Sat Jul 21 19:27:08 2012 New Revision: 1551 URL: http://flashrom.org/trac/flashrom/changeset/1551 Log: Automatically release I/O permissions on shutdown. get_io_perms() is renamed to rget_io_perms() and automatically registers a function to release I/O permissions on shutdown. Actually release I/O permissions on Solaris and iopl()-supporting operating systems like Linux. This patch fixes quite a few programmers which forgot to release I/O permissions on shutdown, and it simplifies the shutdown and error handling code for all others. Do not call exit(1) if I/O permissions are denied and return an error instead. This part of the patch was written by Niklas Söderlund. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Signed-off-by: Niklas Söderlund <niso(a)kth.se> Acked-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Modified: trunk/atahpt.c trunk/drkaiser.c trunk/gfxnvidia.c trunk/hwaccess.c trunk/internal.c trunk/nic3com.c trunk/nicintel.c trunk/nicintel_spi.c trunk/nicnatsemi.c trunk/nicrealtek.c trunk/ogp_spi.c trunk/programmer.h trunk/rayer_spi.c trunk/satamv.c trunk/satasii.c Modified: trunk/atahpt.c ============================================================================== --- trunk/atahpt.c Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/atahpt.c Sat Jul 21 19:27:08 2012 (r1551) @@ -60,7 +60,6 @@ { /* Flash access is disabled automatically by PCI restore. */ pci_cleanup(pacc); - release_io_perms(); return 0; } @@ -68,7 +67,8 @@ { uint32_t reg32; - get_io_perms(); + if (rget_io_perms()) + return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_4, ata_hpt); Modified: trunk/drkaiser.c ============================================================================== --- trunk/drkaiser.c Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/drkaiser.c Sat Jul 21 19:27:08 2012 (r1551) @@ -60,7 +60,6 @@ physunmap(drkaiser_bar, DRKAISER_MEMMAP_SIZE); /* Flash write is disabled automatically by PCI restore. */ pci_cleanup(pacc); - release_io_perms(); return 0; }; @@ -68,7 +67,8 @@ { uint32_t addr; - get_io_perms(); + if (rget_io_perms()) + return 1; addr = pcidev_init(PCI_BASE_ADDRESS_2, drkaiser_pcidev); Modified: trunk/gfxnvidia.c ============================================================================== --- trunk/gfxnvidia.c Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/gfxnvidia.c Sat Jul 21 19:27:08 2012 (r1551) @@ -84,7 +84,6 @@ * by PCI restore. */ pci_cleanup(pacc); - release_io_perms(); return 0; } @@ -92,7 +91,8 @@ { uint32_t reg32; - get_io_perms(); + if (rget_io_perms()) + return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, gfx_nvidia); Modified: trunk/hwaccess.c ============================================================================== --- trunk/hwaccess.c Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/hwaccess.c Sat Jul 21 19:27:08 2012 (r1551) @@ -45,11 +45,27 @@ int io_fd; #endif -void get_io_perms(void) +int release_io_perms(void *p) +{ +#if defined(__DJGPP__) || defined(__LIBPAYLOAD__) +#else +#if defined (__sun) && (defined(__i386) || defined(__amd64)) + sysi86(SI86V86, V86SC_IOPL, 0); +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined (__DragonFly__) + close(io_fd); +#else + iopl(0); +#endif +#endif + return 0; +} + +/* Get I/O permissions with automatic permission release on shutdown. */ +int rget_io_perms(void) { #if defined(__DJGPP__) || defined(__LIBPAYLOAD__) /* We have full permissions by default. */ - return; + return 0; #else #if defined (__sun) && (defined(__i386) || defined(__amd64)) if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) != 0) { @@ -65,15 +81,11 @@ "and reboot, or reboot into \n"); msg_perr("single user mode.\n"); #endif - exit(1); + return 1; + } else { + register_shutdown(release_io_perms, NULL); } -#endif -} - -void release_io_perms(void) -{ -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) - close(io_fd); + return 0; #endif } @@ -89,13 +101,9 @@ } /* PCI port I/O is not yet implemented on PowerPC. */ -void get_io_perms(void) -{ -} - -/* PCI port I/O is not yet implemented on PowerPC. */ -void release_io_perms(void) +int rget_io_perms(void) { + return 0; } #elif defined (__mips) || defined (__mips__) || defined (_mips) || defined (mips) @@ -108,13 +116,9 @@ } /* PCI port I/O is not yet implemented on MIPS. */ -void get_io_perms(void) -{ -} - -/* PCI port I/O is not yet implemented on MIPS. */ -void release_io_perms(void) +int rget_io_perms(void) { + return 0; } #elif defined (__arm__) @@ -123,12 +127,9 @@ { } -void get_io_perms(void) -{ -} - -void release_io_perms(void) +int rget_io_perms(void) { + return 0; } #else Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/internal.c Sat Jul 21 19:27:08 2012 (r1551) @@ -159,7 +159,6 @@ static int internal_shutdown(void *data) { - release_io_perms(); return 0; } @@ -226,7 +225,8 @@ } free(arg); - get_io_perms(); + if (rget_io_perms()) + return 1; if (register_shutdown(internal_shutdown, NULL)) return 1; Modified: trunk/nic3com.c ============================================================================== --- trunk/nic3com.c Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/nic3com.c Sat Jul 21 19:27:08 2012 (r1551) @@ -82,13 +82,13 @@ } pci_cleanup(pacc); - release_io_perms(); return 0; } int nic3com_init(void) { - get_io_perms(); + if (rget_io_perms()) + return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_3com); Modified: trunk/nicintel.c ============================================================================== --- trunk/nicintel.c Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/nicintel.c Sat Jul 21 19:27:08 2012 (r1551) @@ -64,7 +64,6 @@ physunmap(nicintel_control_bar, NICINTEL_CONTROL_MEMMAP_SIZE); physunmap(nicintel_bar, NICINTEL_MEMMAP_SIZE); pci_cleanup(pacc); - release_io_perms(); return 0; } @@ -73,9 +72,10 @@ uintptr_t addr; /* Needed only for PCI accesses on some platforms. - * FIXME: Refactor that into get_mem_perms/get_io_perms/get_pci_perms? + * FIXME: Refactor that into get_mem_perms/rget_io_perms/get_pci_perms? */ - get_io_perms(); + if (rget_io_perms()) + return 1; /* No need to check for errors, pcidev_init() will not return in case * of errors. @@ -118,7 +118,6 @@ physunmap(nicintel_bar, NICINTEL_MEMMAP_SIZE); error_out: pci_cleanup(pacc); - release_io_perms(); return 1; } Modified: trunk/nicintel_spi.c ============================================================================== --- trunk/nicintel_spi.c Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/nicintel_spi.c Sat Jul 21 19:27:08 2012 (r1551) @@ -159,7 +159,6 @@ physunmap(nicintel_spibar, 4096); pci_cleanup(pacc); - release_io_perms(); return 0; } @@ -168,7 +167,8 @@ { uint32_t tmp; - get_io_perms(); + if (rget_io_perms()) + return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_intel_spi); Modified: trunk/nicnatsemi.c ============================================================================== --- trunk/nicnatsemi.c Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/nicnatsemi.c Sat Jul 21 19:27:08 2012 (r1551) @@ -54,13 +54,13 @@ static int nicnatsemi_shutdown(void *data) { pci_cleanup(pacc); - release_io_perms(); return 0; } int nicnatsemi_init(void) { - get_io_perms(); + if (rget_io_perms()) + return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_natsemi); Modified: trunk/nicrealtek.c ============================================================================== --- trunk/nicrealtek.c Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/nicrealtek.c Sat Jul 21 19:27:08 2012 (r1551) @@ -56,13 +56,13 @@ { /* FIXME: We forgot to disable software access again. */ pci_cleanup(pacc); - release_io_perms(); return 0; } int nicrealtek_init(void) { - get_io_perms(); + if (rget_io_perms()) + return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_realtek); Modified: trunk/ogp_spi.c ============================================================================== --- trunk/ogp_spi.c Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/ogp_spi.c Sat Jul 21 19:27:08 2012 (r1551) @@ -99,7 +99,6 @@ { physunmap(ogp_spibar, 4096); pci_cleanup(pacc); - release_io_perms(); return 0; } @@ -129,7 +128,8 @@ return 1; } - get_io_perms(); + if (rget_io_perms()) + return 1; io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, ogp_spi); Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/programmer.h Sat Jul 21 19:27:08 2012 (r1551) @@ -302,8 +302,7 @@ struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, uint16_t card_vendor, uint16_t card_device); #endif -void get_io_perms(void); -void release_io_perms(void); +int rget_io_perms(void); #if CONFIG_INTERNAL == 1 extern int is_laptop; extern int laptop_ok; Modified: trunk/rayer_spi.c ============================================================================== --- trunk/rayer_spi.c Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/rayer_spi.c Sat Jul 21 19:27:08 2012 (r1551) @@ -168,7 +168,8 @@ rayer_miso_bit = 4; } - get_io_perms(); + if (rget_io_perms()) + return 1; /* Get the initial value before writing to any line. */ lpt_outbyte = INB(lpt_iobase); Modified: trunk/satamv.c ============================================================================== --- trunk/satamv.c Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/satamv.c Sat Jul 21 19:27:08 2012 (r1551) @@ -61,7 +61,6 @@ { physunmap(mv_bar, 0x20000); pci_cleanup(pacc); - release_io_perms(); return 0; } @@ -86,7 +85,8 @@ uintptr_t addr; uint32_t tmp; - get_io_perms(); + if (rget_io_perms()) + return 1; /* BAR0 has all internal registers memory mapped. */ /* No need to check for errors, pcidev_init() will not return in case @@ -162,7 +162,6 @@ error_out: pci_cleanup(pacc); - release_io_perms(); return 1; } Modified: trunk/satasii.c ============================================================================== --- trunk/satasii.c Sat Jul 21 18:56:04 2012 (r1550) +++ trunk/satasii.c Sat Jul 21 19:27:08 2012 (r1551) @@ -62,7 +62,6 @@ { physunmap(sii_bar, SATASII_MEMMAP_SIZE); pci_cleanup(pacc); - release_io_perms(); return 0; } @@ -71,7 +70,8 @@ uint32_t addr; uint16_t reg_offset; - get_io_perms(); + if (rget_io_perms()) + return 1; pcidev_init(PCI_BASE_ADDRESS_0, satas_sii);

1 0

[PATCH] Document --output in the man page
by Carl-Daniel Hailfinger 21 Jul '12

21 Jul '12

Document --output in the man page. Add an examples section to the man page. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-logfile_manpage/flashrom.8 =================================================================== --- flashrom-logfile_manpage/flashrom.8 (Revision 1549) +++ flashrom-logfile_manpage/flashrom.8 (Arbeitskopie) @@ -8,6 +8,7 @@ [\fB\-c\fR <chipname>] \ [\fB\-l\fR <file>] [\fB\-i\fR <image>] [\fB\-p\fR <programmername>[:<parameters>]] + [\fB-o\fR <logfile>] .SH DESCRIPTION .B flashrom is a utility for detecting, reading, writing, verifying and erasing flash @@ -220,6 +221,13 @@ .B "\-h, \-\-help" Show a help text and exit. .TP +.B "\-o, \-\-output <logfile>" +Save a full debug log to +.BR <logfile> . +If the file already exists, it will be overwritten. This is the recommended +way to gather logs from flashrom because they will be verbose even if the +on-screen messages are not verbose. +.TP .B "\-R, \-\-version" Show version information and exit. .SH PROGRAMMER SPECIFIC INFO @@ -697,6 +705,25 @@ is the Linux device node for your SPI controller. .sp Please note that the linux_spi driver only works on Linux. +.SH EXAMPLES +To back up and update your BIOS, run +.sp +.B flashrom -p internal -r backup.rom -o backuplog.txt +.br +.B flashrom -p internal -w newbios.rom -o writelog.txt +.sp +Please make sure to copy backup.rom to some external media before you try +to write. That makes offline recovery easier. +.br +If writing fails and flashrom complains about the chip being in an unknown +state, you can try to restore the backup by running +.sp +.B flashrom -p internal -w backup.rom -o restorelog.txt +.sp +If you encounter any problems, please contact us and supply +backuplog.txt, writelog.txt and restorelog.txt. See section +.B BUGS +for contact info. .SH EXIT STATUS flashrom exits with 0 on success, 1 on most failures but with 2 if /dev/mem (/dev/xsvc on Solaris) can not be opened and with 3 if a call to mmap() fails. -- http://www.hailfinger.org/

2 3

[commit] r1550 - trunk
by repository service 21 Jul '12

21 Jul '12

Author: hailfinger Date: Sat Jul 21 18:56:04 2012 New Revision: 1550 URL: http://flashrom.org/trac/flashrom/changeset/1550 Log: Document --output in the man page. Add an examples section to the man page. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Modified: trunk/flashrom.8 Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Fri Jul 20 22:35:14 2012 (r1549) +++ trunk/flashrom.8 Sat Jul 21 18:56:04 2012 (r1550) @@ -8,6 +8,7 @@ [\fB\-c\fR <chipname>] \ [\fB\-l\fR <file>] [\fB\-i\fR <image>] [\fB\-p\fR <programmername>[:<parameters>]] + [\fB-o\fR <logfile>] .SH DESCRIPTION .B flashrom is a utility for detecting, reading, writing, verifying and erasing flash @@ -220,6 +221,13 @@ .B "\-h, \-\-help" Show a help text and exit. .TP +.B "\-o, \-\-output <logfile>" +Save the full debug log to +.BR <logfile> . +If the file already exists, it will be overwritten. This is the recommended +way to gather logs from flashrom because they will be verbose even if the +on-screen messages are not verbose. +.TP .B "\-R, \-\-version" Show version information and exit. .SH PROGRAMMER SPECIFIC INFO @@ -697,6 +705,25 @@ is the Linux device node for your SPI controller. .sp Please note that the linux_spi driver only works on Linux. +.SH EXAMPLES +To back up and update your BIOS, run +.sp +.B flashrom -p internal -r backup.rom -o backuplog.txt +.br +.B flashrom -p internal -w newbios.rom -o writelog.txt +.sp +Please make sure to copy backup.rom to some external media before you try +to write. That makes offline recovery easier. +.br +If writing fails and flashrom complains about the chip being in an unknown +state, you can try to restore the backup by running +.sp +.B flashrom -p internal -w backup.rom -o restorelog.txt +.sp +If you encounter any problems, please contact us and supply +backuplog.txt, writelog.txt and restorelog.txt. See section +.B BUGS +for contact info. .SH EXIT STATUS flashrom exits with 0 on success, 1 on most failures but with 2 if /dev/mem (/dev/xsvc on Solaris) can not be opened and with 3 if a call to mmap() fails.

1 0

[PATCH]Hide hwaccess.h from public API
by Patrick Georgi 20 Jul '12

20 Jul '12

Hi, attached patch hides hwaccess.h (which is usually not necessary to use flashrom as library) from the public interface at flash.h. For the most part, this simply adds the header to driver .c files, but it also required a small workaround to handle libpci types used in a bunch of prototypes. Rationale: hwaccess.h at that place conflicts with libpayload which brings its own hardware access functions (which are wrapped properly to match flashrom's expectations in hwaccess.h already). They should also not matter in other contexts (and if someone requires them, they can still include hwaccess.h where needed). Librarification of flashrom requires some more patches, like pulling out some functions of the CLI code - even if doit() is by no means a pretty interface, it makes things simpler. But one step after the other... Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com>

2 1

[commit] r1549 - trunk
by repository service 20 Jul '12

20 Jul '12

Author: hailfinger Date: Fri Jul 20 22:35:14 2012 New Revision: 1549 URL: http://flashrom.org/trac/flashrom/changeset/1549 Log: Hide hwaccess.h from public API. Move hwaccess.h #include from flash.h to individual drivers. libflashrom users need flash.h, but they do not care about hwaccess.h and should not see its definitions because they may conflict with other hardware access functions and #defines used by the libflashrom user. Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/atahpt.c trunk/board_enable.c trunk/chipset_enable.c trunk/drkaiser.c trunk/flash.h trunk/gfxnvidia.c trunk/hwaccess.c trunk/ichspi.c trunk/internal.c trunk/it85spi.c trunk/it87spi.c trunk/mcp6x_spi.c trunk/nic3com.c trunk/nicintel.c trunk/nicintel_spi.c trunk/nicnatsemi.c trunk/nicrealtek.c trunk/ogp_spi.c trunk/pcidev.c trunk/physmap.c trunk/programmer.h trunk/rayer_spi.c trunk/satamv.c trunk/satasii.c trunk/sb600spi.c trunk/wbsio_spi.c Modified: trunk/atahpt.c ============================================================================== --- trunk/atahpt.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/atahpt.c Fri Jul 20 22:35:14 2012 (r1549) @@ -24,6 +24,7 @@ #include <string.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" #define BIOS_ROM_ADDR 0x90 #define BIOS_ROM_DATA 0x94 Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/board_enable.c Fri Jul 20 22:35:14 2012 (r1549) @@ -27,6 +27,7 @@ #include <string.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" #if defined(__i386__) || defined(__x86_64__) /* Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/chipset_enable.c Fri Jul 20 22:35:14 2012 (r1549) @@ -34,6 +34,7 @@ #include <errno.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" #define NOT_DONE_YET 1 Modified: trunk/drkaiser.c ============================================================================== --- trunk/drkaiser.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/drkaiser.c Fri Jul 20 22:35:14 2012 (r1549) @@ -21,6 +21,7 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" #define PCI_VENDOR_ID_DRKAISER 0x1803 Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/flash.h Fri Jul 20 22:35:14 2012 (r1549) @@ -26,7 +26,6 @@ #include <stdint.h> #include <stddef.h> -#include "hwaccess.h" #ifdef _WIN32 #include <windows.h> #undef min Modified: trunk/gfxnvidia.c ============================================================================== --- trunk/gfxnvidia.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/gfxnvidia.c Fri Jul 20 22:35:14 2012 (r1549) @@ -22,6 +22,7 @@ #include <string.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" #define PCI_VENDOR_ID_NVIDIA 0x10de Modified: trunk/hwaccess.c ============================================================================== --- trunk/hwaccess.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/hwaccess.c Fri Jul 20 22:35:14 2012 (r1549) @@ -30,6 +30,7 @@ #include <errno.h> #endif #include "flash.h" +#include "hwaccess.h" #if defined(__i386__) || defined(__x86_64__) Modified: trunk/ichspi.c ============================================================================== --- trunk/ichspi.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/ichspi.c Fri Jul 20 22:35:14 2012 (r1549) @@ -29,6 +29,7 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" #include "spi.h" #include "ich_descriptors.h" Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/internal.c Fri Jul 20 22:35:14 2012 (r1549) @@ -22,6 +22,7 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" #if NEED_PCI == 1 struct pci_dev *pci_dev_find_filter(struct pci_filter filter) Modified: trunk/it85spi.c ============================================================================== --- trunk/it85spi.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/it85spi.c Fri Jul 20 22:35:14 2012 (r1549) @@ -32,6 +32,7 @@ #include "flash.h" #include "spi.h" #include "programmer.h" +#include "hwaccess.h" #define MAX_TIMEOUT 100000 #define MAX_TRY 5 Modified: trunk/it87spi.c ============================================================================== --- trunk/it87spi.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/it87spi.c Fri Jul 20 22:35:14 2012 (r1549) @@ -30,6 +30,7 @@ #include "flash.h" #include "chipdrivers.h" #include "programmer.h" +#include "hwaccess.h" #include "spi.h" #define ITE_SUPERIO_PORT1 0x2e Modified: trunk/mcp6x_spi.c ============================================================================== --- trunk/mcp6x_spi.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/mcp6x_spi.c Fri Jul 20 22:35:14 2012 (r1549) @@ -29,6 +29,7 @@ #include <ctype.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" /* Bit positions for each pin. */ Modified: trunk/nic3com.c ============================================================================== --- trunk/nic3com.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/nic3com.c Fri Jul 20 22:35:14 2012 (r1549) @@ -23,6 +23,7 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" #define BIOS_ROM_ADDR 0x04 #define BIOS_ROM_DATA 0x08 Modified: trunk/nicintel.c ============================================================================== --- trunk/nicintel.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/nicintel.c Fri Jul 20 22:35:14 2012 (r1549) @@ -22,6 +22,7 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" uint8_t *nicintel_bar; uint8_t *nicintel_control_bar; Modified: trunk/nicintel_spi.c ============================================================================== --- trunk/nicintel_spi.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/nicintel_spi.c Fri Jul 20 22:35:14 2012 (r1549) @@ -28,6 +28,7 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" #define PCI_VENDOR_ID_INTEL 0x8086 Modified: trunk/nicnatsemi.c ============================================================================== --- trunk/nicnatsemi.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/nicnatsemi.c Fri Jul 20 22:35:14 2012 (r1549) @@ -23,6 +23,7 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" #define PCI_VENDOR_ID_NATSEMI 0x100b Modified: trunk/nicrealtek.c ============================================================================== --- trunk/nicrealtek.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/nicrealtek.c Fri Jul 20 22:35:14 2012 (r1549) @@ -23,6 +23,7 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" #define PCI_VENDOR_ID_REALTEK 0x10ec #define PCI_VENDOR_ID_SMC1211 0x1113 Modified: trunk/ogp_spi.c ============================================================================== --- trunk/ogp_spi.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/ogp_spi.c Fri Jul 20 22:35:14 2012 (r1549) @@ -21,6 +21,7 @@ #include <string.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" #define PCI_VENDOR_ID_OGP 0x1227 Modified: trunk/pcidev.c ============================================================================== --- trunk/pcidev.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/pcidev.c Fri Jul 20 22:35:14 2012 (r1549) @@ -23,6 +23,7 @@ #include <string.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" uint32_t io_base_addr; struct pci_access *pacc; Modified: trunk/physmap.c ============================================================================== --- trunk/physmap.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/physmap.c Fri Jul 20 22:35:14 2012 (r1549) @@ -25,6 +25,7 @@ #include <stdlib.h> #include <string.h> #include "flash.h" +#include "hwaccess.h" /* Do we need any file access or ioctl for physmap or MSR? */ #if !defined(__DJGPP__) && !defined(__LIBPAYLOAD__) Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/programmer.h Fri Jul 20 22:35:14 2012 (r1549) @@ -144,6 +144,7 @@ }; #if CONFIG_INTERNAL == 1 +struct pci_dev; struct penable { uint16_t vendor_id; uint16_t device_id; @@ -294,6 +295,7 @@ #define SUPERIO_VENDOR_WINBOND 0x2 #endif #if NEED_PCI == 1 +struct pci_filter; struct pci_dev *pci_dev_find_filter(struct pci_filter filter); struct pci_dev *pci_dev_find_vendorclass(uint16_t vendor, uint16_t devclass); struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device); Modified: trunk/rayer_spi.c ============================================================================== --- trunk/rayer_spi.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/rayer_spi.c Fri Jul 20 22:35:14 2012 (r1549) @@ -34,6 +34,7 @@ #include <string.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" enum rayer_type { TYPE_RAYER, Modified: trunk/satamv.c ============================================================================== --- trunk/satamv.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/satamv.c Fri Jul 20 22:35:14 2012 (r1549) @@ -24,6 +24,7 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" uint8_t *mv_bar; uint16_t mv_iobar; Modified: trunk/satasii.c ============================================================================== --- trunk/satasii.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/satasii.c Fri Jul 20 22:35:14 2012 (r1549) @@ -23,6 +23,7 @@ #include <stdlib.h> #include "flash.h" #include "programmer.h" +#include "hwaccess.h" #define PCI_VENDOR_ID_SII 0x1095 Modified: trunk/sb600spi.c ============================================================================== --- trunk/sb600spi.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/sb600spi.c Fri Jul 20 22:35:14 2012 (r1549) @@ -25,6 +25,7 @@ #include "flash.h" #include "programmer.h" +#include "hwaccess.h" #include "spi.h" /* This struct is unused, but helps visualize the SB600 SPI BAR layout. Modified: trunk/wbsio_spi.c ============================================================================== --- trunk/wbsio_spi.c Mon Jul 16 23:32:19 2012 (r1548) +++ trunk/wbsio_spi.c Fri Jul 20 22:35:14 2012 (r1549) @@ -23,6 +23,7 @@ #include "flash.h" #include "chipdrivers.h" #include "programmer.h" +#include "hwaccess.h" #include "spi.h" #define WBSIO_PORT1 0x2e

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom