flashrom October 2013

flashrom@flashrom.org

22 participants
121 discussions

Re: [flashrom] [PATCH 2/6] layout: Add -i <region>[:<file>] support.
by Carl-Daniel Hailfinger 10 Oct '13

10 Oct '13

Am 24.09.2013 01:14 schrieb Stefan Tauner: > Add an optional sub-parameter to the -i parameter to allow building the > image to be written from multiple files. This will also allow regions to > be read from flash and written to separate image files in a later patch. > Existing function read_buf_from_file() is refined and reused to read the file. > > based on chromiumos' > d0ea9ed71e7f86bb8e8db2ca7c32a96de25343d8 > Signed-off-by: David Hendricks <dhendrix(a)chromium.org> > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Counter-proposal, slightly edited patch, comments below are addressed. > diff --git a/cli_classic.c b/cli_classic.c > index a0c2d64..ed6d6aa 100644 > --- a/cli_classic.c > +++ b/cli_classic.c > @@ -40,8 +40,8 @@ static void cli_classic_usage(const char *name) > #if CONFIG_PRINT_WIKI == 1 > "-z|" > #endif > - "-p <programmername>[:<parameters>] [-c <chipname>]\n" > - "[-E|(-r|-w|-v) <file>] [-l <layoutfile> [-i <imagename>]...] [-n] [-f]]\n" > + "-p <programmername>[:<parameter>[,<parameter>]...] [-c <chipname>]\n" > + "[-E|(-r|-w|-v) <imagefile>] [-l <layoutfile> [-i <region>[:<regionfile>]...] [-n] [-f]]\n" 80 col violation. Unclosed [. > "[-V[V[V]]] [-o <logfile>]\n\n", name); > > printf(" -h | --help print this help text\n" > diff --git a/layout.c b/layout.c > index 08cc776..7e2e904 100644 > --- a/layout.c > +++ b/layout.c > @@ -165,27 +161,61 @@ int process_include_args(void) > if (num_include_args == 0) > return 0; > > - /* User has specified an area, but no layout file is loaded. */ > + /* User has specified an include argument, but no layout file is loaded. */ > if (num_rom_entries == 0) { > - msg_gerr("Region requested (with -i \"%s\"), " > - "but no layout data is available.\n", > + msg_gerr("Region requested (with -i/--include \"%s\"),\n" > + "but no layout data is available. To include one use the -l/--layout syntax).\n", "To include one [layout data] ..." sounds odd. I rewrote it slightly. > include_args[0]); > return 1; > } > > for (i = 0; i < num_include_args; i++) { > - if (find_romentry(include_args[i]) < 0) { > - msg_gerr("Invalid region specified: \"%s\".\n", > - include_args[i]); > + char *file; > + char *name = include_args[i]; > + int ret = unquote_string(&name, &file, ":"); /* -i <region>[:<file>] */ I killed the unquote_string requirement here. Whitespace and colons have been outlawed in region names. > + if (ret != 0) { > + msg_gerr("Invalid include argument specified: \"%s\".\n", name); > return 1; > } > + int idx = find_romentry(name); > + if (idx < 0) { > + msg_gerr("Invalid region name specified: \"%s\".\n", name); > + return 1; > + } > + rom_entries[idx].included = 1; > found++; > + > + if (file[0] != '\0') { > + /* The remaining characters are interpreted as possible quoted filename. */ > + ret = unquote_string(&file, NULL, NULL); A file name on the command line should never require quote parsing in the application. Same for any other flashrom UI. > + if (ret != 0) { > + msg_gerr("Invalid region file name specified: \"%s\".\n", file); > + return 1; > + } > +#ifdef __LIBPAYLOAD__ > + msg_gerr("Error: No file I/O support in libpayload\n"); > + return 1; > +#else > + file = strdup(file); > + if (file == NULL) { > + msg_gerr("Out of memory!\n"); > + return 1; > + } > + rom_entries[idx].file = file; > +#endif > + } > } > > - msg_ginfo("Using region%s: \"%s\"", num_include_args > 1 ? "s" : "", > - include_args[0]); > - for (i = 1; i < num_include_args; i++) > - msg_ginfo(", \"%s\"", include_args[i]); > + msg_ginfo("Using region%s: ", num_rom_entries > 1 ? "s" : ""); Should be found, not num_rom_entries. > + bool first = true; > + for (i = 0; i < num_rom_entries; i++) > + if (rom_entries[i].included) { > + if (first) > + first = false; > + else > + msg_ginfo(", "); > + msg_ginfo("\"%s\"", rom_entries[i].name); > + } > msg_ginfo(".\n"); > return 0; > } There was another bug: register_include_arg() tried to detect duplicate include region arguments. It could only detect identical include strings, but not stuff like this: -i region1 -i region1:region1file.bin The duplicate --include detection has been moved to process_include_args(). Patch 1/6 is no longer a requirement for 2/6 and can thus be committed after 2/6. TODO: Move the relevant man page chunk from 3/6 to 2/6. Will do so in a followup mail. Add an optional sub-parameter to the -i parameter to allow building the image to be written from multiple files. This will also allow regions to be read from flash and written to separate image files in a later patch. Existing function read_buf_from_file() is refined and reused to read the file. Document criteria for valid region names. Based on chromiumos' d0ea9ed71e7f86bb8e8db2ca7c32a96de25343d8 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-layout_read_region_from_file/flash.h =================================================================== --- flashrom-layout_read_region_from_file/flash.h (Revision 1757) +++ flashrom-layout_read_region_from_file/flash.h (Arbeitskopie) @@ -261,7 +261,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren); int selfcheck(void); int doit(struct flashctx *flash, int force, const char *filename, int read_it, int write_it, int erase_it, int verify_it); -int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename); +int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename, const char *size_msg); int write_buf_to_file(unsigned char *buf, unsigned long size, const char *filename); enum test_state { Index: flashrom-layout_read_region_from_file/dummyflasher.c =================================================================== --- flashrom-layout_read_region_from_file/dummyflasher.c (Revision 1757) +++ flashrom-layout_read_region_from_file/dummyflasher.c (Arbeitskopie) @@ -389,7 +389,7 @@ msg_pdbg("matches.\n"); msg_pdbg("Reading %s\n", emu_persistent_image); read_buf_from_file(flashchip_contents, emu_chip_size, - emu_persistent_image); + emu_persistent_image, NULL); } else { msg_pdbg("doesn't match.\n"); } Index: flashrom-layout_read_region_from_file/cli_classic.c =================================================================== --- flashrom-layout_read_region_from_file/cli_classic.c (Revision 1757) +++ flashrom-layout_read_region_from_file/cli_classic.c (Arbeitskopie) @@ -34,15 +34,15 @@ static void cli_classic_usage(const char *name) { printf("Please note that the command line interface for flashrom has changed between\n" - "0.9.5 and 0.9.6 and will change again before flashrom 1.0.\n\n"); + "0.9.7 and 0.9.8 and will change again before flashrom 1.0.\n\n"); printf("Usage: %s [-h|-R|-L|" #if CONFIG_PRINT_WIKI == 1 "-z|" #endif - "-p <programmername>[:<parameters>] [-c <chipname>]\n" - "[-E|(-r|-w|-v) <file>] [-l <layoutfile> [-i <imagename>]...] [-n] [-f]]\n" - "[-V[V[V]]] [-o <logfile>]\n\n", name); + "-p <programmername>[:<parameter>[,<parameter>]...] [-c <chipname>]\n" + "[-E|(-r|-w|-v) <imagefile>] [-l <layoutfile> [-i <region>[:<regionfile>]...]]\n" + " [-n] [-f]] [-V[V[V]]] [-o <logfile>]\n\n", name); printf(" -h | --help print this help text\n" " -R | --version print version (release)\n" @@ -54,8 +54,9 @@ " -c | --chip <chipname> probe only for specified flash chip\n" " -f | --force force specific operations (see man page)\n" " -n | --noverify don't auto-verify\n" - " -l | --layout <layoutfile> read ROM layout from <layoutfile>\n" - " -i | --image <name> only flash image <name> from flash layout\n" + " -l | --layout <layoutfile> read layout from <layoutfile>\n" + " -i | --include <region>[<:file>] only flash image <region> from layout \n" + " (optionally with data from <file>)\n" " -o | --output <logfile> log output to <logfile>\n" " -L | --list-supported print supported devices\n" #if CONFIG_PRINT_WIKI == 1 Index: flashrom-layout_read_region_from_file/layout.c =================================================================== --- flashrom-layout_read_region_from_file/layout.c (Revision 1757) +++ flashrom-layout_read_region_from_file/layout.c (Arbeitskopie) @@ -33,6 +33,7 @@ chipoff_t end; unsigned int included; char name[256]; + char *file; } romentry_t; /* rom_entries store the entries specified in a layout file and associated run-time data */ @@ -54,7 +55,7 @@ romlayout = fopen(name, "r"); if (!romlayout) { - msg_gerr("ERROR: Could not open ROM layout (%s).\n", + msg_gerr("ERROR: Could not open layout file (%s).\n", name); return -1; } @@ -63,8 +64,7 @@ char *tstr1, *tstr2; if (num_rom_entries >= MAX_ROMLAYOUT) { - msg_gerr("Maximum number of ROM images (%i) in layout " - "file reached.\n", MAX_ROMLAYOUT); + msg_gerr("Maximum number of entries (%i) in layout file reached.\n", MAX_ROMLAYOUT); return 1; } if (2 != fscanf(romlayout, "%s %s\n", tempstr, rom_entries[num_rom_entries].name)) @@ -85,6 +85,7 @@ rom_entries[num_rom_entries].start = strtol(tstr1, (char **)NULL, 16); rom_entries[num_rom_entries].end = strtol(tstr2, (char **)NULL, 16); rom_entries[num_rom_entries].included = 0; + rom_entries[num_rom_entries].file = NULL; num_rom_entries++; } @@ -100,17 +101,6 @@ } #endif -/* returns the index of the entry (or a negative value if it is not found) */ -int find_include_arg(const char *const name) -{ - unsigned int i; - for (i = 0; i < num_include_args; i++) { - if (!strcmp(include_args[i], name)) - return i; - } - return -1; -} - /* register an include argument (-i) for later processing */ int register_include_arg(char *name) { @@ -124,11 +114,6 @@ return 1; } - if (find_include_arg(name) != -1) { - msg_gerr("Duplicate region name: \"%s\".\n", name); - return 1; - } - include_args[num_include_args] = name; num_include_args++; return 0; @@ -138,14 +123,9 @@ static int find_romentry(char *name) { int i; - - if (num_rom_entries == 0) - return -1; - msg_gspew("Looking for region \"%s\"... ", name); for (i = 0; i < num_rom_entries; i++) { - if (!strcmp(rom_entries[i].name, name)) { - rom_entries[i].included = 1; + if (strcmp(rom_entries[i].name, name) == 0) { msg_gspew("found.\n"); return i; } @@ -165,28 +145,69 @@ if (num_include_args == 0) return 0; - /* User has specified an area, but no layout file is loaded. */ + /* User has specified an include argument, but no layout file is loaded. */ if (num_rom_entries == 0) { - msg_gerr("Region requested (with -i \"%s\"), " - "but no layout data is available.\n", + msg_gerr("Region requested (with -i/--include \"%s\"),\n" + "but no layout data is available. Use the -l/--layout parameter to specify\n" + "a layout file.\n", include_args[0]); return 1; } for (i = 0; i < num_include_args; i++) { - if (find_romentry(include_args[i]) < 0) { - msg_gerr("Invalid region specified: \"%s\".\n", - include_args[i]); + char *name = include_args[i]; + char *file = strpbrk(name, ":"); /* -i <region>[:<file>] */ + if (file != NULL) { + *file = '\0'; + file++; + } + /* Quotes or whitespace are not allowed in region names. */ + if (strlen(name) == 0 || strpbrk(name, "\" \t\r\n")) { + msg_gerr("Invalid region name specified: \"%s\".\n", name); return 1; } - found++; + int idx = find_romentry(name); + if (idx < 0) { + msg_gerr("Nonexisting region name specified: \"%s\".\n", name); + return 1; + } + if (rom_entries[idx].included == 0) { + rom_entries[idx].included = 1; + found++; + } else { + msg_gerr("Duplicate region name specified: \"%s\".\n", name); + return 1; + } + + if (file) { + if (strlen(file) == 0) { + msg_gerr("Empty region file name specified for region \"%s\".\n", name); + return 1; + } +#ifdef __LIBPAYLOAD__ + msg_gerr("Error: No file I/O support in libpayload\n"); + return 1; +#else + file = strdup(file); + if (file == NULL) { + msg_gerr("Out of memory!\n"); + return 1; + } + rom_entries[idx].file = file; +#endif + } } - msg_ginfo("Using region%s: \"%s\"", num_include_args > 1 ? "s" : "", - include_args[0]); - for (i = 1; i < num_include_args; i++) - msg_ginfo(", \"%s\"", include_args[i]); - msg_ginfo(".\n"); + msg_gdbg("Using %i region%s: ", found, found > 1 ? "s" : ""); + for (i = 0; i < num_rom_entries; i++) + if (rom_entries[i].included) { + msg_gdbg("\"%s\"", rom_entries[i].name); + if (rom_entries[i].file) + msg_gdbg(":\"%s\"", rom_entries[i].file); + if (--found) + msg_gdbg(", "); + } + msg_gdbg(".\n"); return 0; } @@ -200,6 +221,8 @@ num_include_args = 0; for (i = 0; i < num_rom_entries; i++) { + free(rom_entries[i].file); + rom_entries[i].file = NULL; rom_entries[i].included = 0; } num_rom_entries = 0; @@ -283,6 +306,14 @@ if (entry->start > start) memcpy(newcontents + start, oldcontents + start, entry->start - start); + /* If a file name is specified for this region, read the file contents and + * overwrite @newcontents in the range specified by @entry. */ + if (entry->file != NULL) { + if (read_buf_from_file(newcontents + entry->start, entry->end - entry->start + 1, + entry->file, "the region's size") != 0) + return 1; + } + /* Skip to location after current romentry. */ start = entry->end + 1; /* Catch overflow. */ Index: flashrom-layout_read_region_from_file/flashrom.c =================================================================== --- flashrom-layout_read_region_from_file/flashrom.c (Revision 1757) +++ flashrom-layout_read_region_from_file/flashrom.c (Arbeitskopie) @@ -1165,8 +1165,7 @@ return chip - flashchips; } -int read_buf_from_file(unsigned char *buf, unsigned long size, - const char *filename) +int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename, const char *size_msg) { #ifdef __LIBPAYLOAD__ msg_gerr("Error: No file I/O support in libpayload\n"); @@ -1186,8 +1185,10 @@ return 1; } if (image_stat.st_size != size) { - msg_gerr("Error: Image size (%jd B) doesn't match the flash chip's size (%lu B)!\n", - (intmax_t)image_stat.st_size, size); + if (size_msg == NULL) + size_msg = "the expected size"; + msg_gerr("Error: Image size (%jd B) doesn't match %s (%lu B)!\n", + (intmax_t)image_stat.st_size, size_msg, size); fclose(image); return 1; } @@ -1968,7 +1969,7 @@ } if (write_it || verify_it) { - if (read_buf_from_file(newcontents, size, filename)) { + if (read_buf_from_file(newcontents, size, filename, "the flash chip's size")) { ret = 1; goto out; } @@ -2002,7 +2003,12 @@ msg_cinfo("done.\n"); /* Build a new image taking the given layout into account. */ - build_new_image(flash, oldcontents, newcontents); + if (build_new_image(flash, oldcontents, newcontents)) { + msg_gerr("Could not prepare the data to be written due to problems with the layout,\n" + "aborting.\n"); + ret = 1; + goto out; + } // //////////////////////////////////////////////////////////// -- http://www.hailfinger.org/

1 1

acer c7 can't read or write
by Johnny Bazookatone 09 Oct '13

09 Oct '13

So I managed to flash my chromebook with a Coreboot Seabios payload by following this tutorial https://docs.google.com/presentation/d/1eGPMu03vCxIO0a3oNX8Hmij_Qwwz6R6ViFC… I managed to install Ubuntu 12.04 using my flash drive.... and became very dissapointed that my touchpad didn't work.. So I tried to recompile stock firmware and tried to use flashrom within Ubuntu to go back...but I can't seem to get it to write... So am I going to have to buy a bus pirate to reflash??

1 0

Re: [flashrom] [not working] Abit IS7 (P4)
by san 03 Oct '13

03 Oct '13

Hi again! I tried to take off graphics and then disable all not needed devices. GPIO message persist. Tried acpi_enforce_resources=lax and acpi_enforce_resources=no kernel commands, but still nothing. Regards! 2013/10/3 san <san(a)plusnet.pl> > What name of module should i look for? > > I'm trying to manipulate gpios, but getting this message: > > =============== > root@flashrom:/sys/class/gpio# echo 3 > /sys/class/gpio/export > bash: echo: write error: Invalid argument > =============== > > Might it be releated to dmesg info: > > =============== > [ 7.508264] ACPI Warning: 0x00000430-0x00000433 SystemIO conflicts with > Regio > n \SPEN 1 (20120320/utaddress-251) > [ 7.508295] ACPI: If an ACPI driver is available for this device, you > should > use it instead of the native driver > [ 7.508302] lpc_ich: Resource conflict(s) found affecting iTCO_wdt > [ 7.508320] lpc_ich 0000:00:1f.0: I/O space for GPIO uninitialized > [ 7.548511] ppdev: user-space parallel port driver > =============== > > I have no idea what to do. > GPIO uninitialised is not for this machine only. > > Just wanted to inform, ill try to find some answers, but any help would be > aprecieted. > > Is it possible we can not do anything beacose of GPIO interface problems? > > Best regards! > > > 2013/10/2 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > >> On Tue, 1 Oct 2013 20:39:12 +0200 >> san <san(a)plusnet.pl> wrote: >> >> > Hi again! >> > >> > I'm trying to "Try & Error method on GPIO pins" but not sure what to do: >> > >> > ====================== >> > san@flashrom:~$ lspci | grep ISA >> > 00:1f.0 ISA bridge: Intel Corporation 82801EB/ER (ICH5/ICH5R) LPC >> Interface >> > Bridge (rev 02) >> > ====================== >> > >> > seems to be fine, but can not find anything usefull at: >> > >> > ====================== >> > san@flashrom:~$ cat /proc/ioports >> > 0000-001f : dma1 >> > 0020-0021 : pic1 >> > 0040-0043 : timer0 >> > 0050-0053 : timer1 >> > 0060-0060 : keyboard >> > 0064-0064 : keyboard >> > 0070-0073 : rtc0 >> > 0080-008f : dma page reg >> > 00a0-00a1 : pic2 >> > 00c0-00df : dma2 >> > 00f0-00ff : fpu >> > 0170-0177 : 0000:00:1f.1 >> > 0170-0177 : ata_piix >> > 01f0-01f7 : 0000:00:1f.1 >> > 01f0-01f7 : ata_piix >> > 0294-0297 : pnp 00:01 >> > 0376-0376 : 0000:00:1f.1 >> > 0376-0376 : ata_piix >> > 0378-037a : parport0 >> > 03f2-03f2 : floppy >> > 03f4-03f5 : floppy >> > 03f6-03f6 : 0000:00:1f.1 >> > 03f6-03f6 : ata_piix >> > 03f7-03f7 : floppy >> > 03f8-03ff : serial >> > 0400-04bf : pnp 00:0a >> > 0400-0403 : ACPI PM1a_EVT_BLK >> > 0404-0405 : ACPI PM1a_CNT_BLK >> > 0408-040b : ACPI PM_TMR >> > 0428-042f : ACPI GPE0_BLK >> > 04d0-04d1 : pnp 00:01 >> > 0500-051f : 0000:00:1f.3 >> > 0a78-0a7b : pnp 00:01 >> > 0b78-0b7b : pnp 00:01 >> > 0bbc-0bbf : pnp 00:01 >> > 0cf8-0cff : PCI conf1 >> > 0e78-0e7b : pnp 00:01 >> > 0f78-0f7b : pnp 00:01 >> > 0fbc-0fbf : pnp 00:01 >> > a000-afff : PCI Bus 0000:02 >> > a000-a0ff : 0000:02:02.0 >> > a000-a0ff : 8139too >> > b000-b01f : 0000:00:1d.1 >> > b000-b01f : uhci_hcd >> > b400-b41f : 0000:00:1d.2 >> > b400-b41f : uhci_hcd >> > b800-b81f : 0000:00:1d.3 >> > b800-b81f : uhci_hcd >> > bc00-bc1f : 0000:00:1d.0 >> > bc00-bc1f : uhci_hcd >> > c000-c007 : 0000:00:1f.2 >> > c000-c007 : ata_piix >> > c400-c403 : 0000:00:1f.2 >> > c400-c403 : ata_piix >> > c800-c807 : 0000:00:1f.2 >> > c800-c807 : ata_piix >> > cc00-cc03 : 0000:00:1f.2 >> > cc00-cc03 : ata_piix >> > d000-d00f : 0000:00:1f.2 >> > d000-d00f : ata_piix >> > d800-d8ff : 0000:00:1f.5 >> > d800-d8ff : Intel ICH5 >> > dc00-dc3f : 0000:00:1f.5 >> > dc00-dc3f : Intel ICH5 >> > f000-f00f : 0000:00:1f.1 >> > f000-f00f : ata_piix >> > >> > ====================== >> >> No idea why the GPIO function is not found in the ioports... probably >> you need to load a module for it that is not loaded automatically. >> >> >> The interesting part of your binary that (probably) disables the write >> protection is disassembled here: >> http://paste.flashrom.org/view.php?id=1772 >> >> The head of the function 5E1F is done by flashrom already (setting >> BIOS_CNTL). Starting with 5E2C it calculates the offset of the GPIO >> registers mapped on PMBASE (5E77 stores a part of PMBASE in dx). >> >> So you can either continue with the trial and error method or try to >> understand the code the vendor tool would execute. >> >> -- >> Kind regards/Mit freundlichen Grüßen, Stefan Tauner >> > > > > -- > [ e-San.info | San(a)plusnet.pl ] > -- [ e-San.info | San(a)plusnet.pl ]

1 0

Re: [flashrom] [not working] Abit IS7 (P4)
by Stefan Tauner 03 Oct '13

03 Oct '13

On Tue, 1 Oct 2013 20:39:12 +0200 san <san(a)plusnet.pl> wrote: > Hi again! > > I'm trying to "Try & Error method on GPIO pins" but not sure what to do: > > ====================== > san@flashrom:~$ lspci | grep ISA > 00:1f.0 ISA bridge: Intel Corporation 82801EB/ER (ICH5/ICH5R) LPC Interface > Bridge (rev 02) > ====================== > > seems to be fine, but can not find anything usefull at: > > ====================== > san@flashrom:~$ cat /proc/ioports > 0000-001f : dma1 > 0020-0021 : pic1 > 0040-0043 : timer0 > 0050-0053 : timer1 > 0060-0060 : keyboard > 0064-0064 : keyboard > 0070-0073 : rtc0 > 0080-008f : dma page reg > 00a0-00a1 : pic2 > 00c0-00df : dma2 > 00f0-00ff : fpu > 0170-0177 : 0000:00:1f.1 > 0170-0177 : ata_piix > 01f0-01f7 : 0000:00:1f.1 > 01f0-01f7 : ata_piix > 0294-0297 : pnp 00:01 > 0376-0376 : 0000:00:1f.1 > 0376-0376 : ata_piix > 0378-037a : parport0 > 03f2-03f2 : floppy > 03f4-03f5 : floppy > 03f6-03f6 : 0000:00:1f.1 > 03f6-03f6 : ata_piix > 03f7-03f7 : floppy > 03f8-03ff : serial > 0400-04bf : pnp 00:0a > 0400-0403 : ACPI PM1a_EVT_BLK > 0404-0405 : ACPI PM1a_CNT_BLK > 0408-040b : ACPI PM_TMR > 0428-042f : ACPI GPE0_BLK > 04d0-04d1 : pnp 00:01 > 0500-051f : 0000:00:1f.3 > 0a78-0a7b : pnp 00:01 > 0b78-0b7b : pnp 00:01 > 0bbc-0bbf : pnp 00:01 > 0cf8-0cff : PCI conf1 > 0e78-0e7b : pnp 00:01 > 0f78-0f7b : pnp 00:01 > 0fbc-0fbf : pnp 00:01 > a000-afff : PCI Bus 0000:02 > a000-a0ff : 0000:02:02.0 > a000-a0ff : 8139too > b000-b01f : 0000:00:1d.1 > b000-b01f : uhci_hcd > b400-b41f : 0000:00:1d.2 > b400-b41f : uhci_hcd > b800-b81f : 0000:00:1d.3 > b800-b81f : uhci_hcd > bc00-bc1f : 0000:00:1d.0 > bc00-bc1f : uhci_hcd > c000-c007 : 0000:00:1f.2 > c000-c007 : ata_piix > c400-c403 : 0000:00:1f.2 > c400-c403 : ata_piix > c800-c807 : 0000:00:1f.2 > c800-c807 : ata_piix > cc00-cc03 : 0000:00:1f.2 > cc00-cc03 : ata_piix > d000-d00f : 0000:00:1f.2 > d000-d00f : ata_piix > d800-d8ff : 0000:00:1f.5 > d800-d8ff : Intel ICH5 > dc00-dc3f : 0000:00:1f.5 > dc00-dc3f : Intel ICH5 > f000-f00f : 0000:00:1f.1 > f000-f00f : ata_piix > > ====================== No idea why the GPIO function is not found in the ioports... probably you need to load a module for it that is not loaded automatically. The interesting part of your binary that (probably) disables the write protection is disassembled here: http://paste.flashrom.org/view.php?id=1772 The head of the function 5E1F is done by flashrom already (setting BIOS_CNTL). Starting with 5E2C it calculates the offset of the GPIO registers mapped on PMBASE (5E77 stores a part of PMBASE in dx). So you can either continue with the trial and error method or try to understand the code the vendor tool would execute. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

[PATCH 1/5] rayer_spi: Improve support for different pinouts
by Kyösti Mälkki 02 Oct '13

02 Oct '13

Create a list of programmer types with names. This list could be listed with flashrom -L in follow-up patches. Handle a bit in status register that is inverted, this will be used in different future programmer types. I did trivial change after receiving the Tested-by. Local variable storage is declared static and bit offset in register is uint8_t. Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Tested-by: Maksim Kuleshov <mmcx(a)mail.ru> Acked-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- rayer_spi.c | 106 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 45 deletions(-) diff --git a/rayer_spi.c b/rayer_spi.c index b312610..cbbd5ce 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -37,21 +37,48 @@ #include "programmer.h" #include "hwaccess.h" -enum rayer_type { - TYPE_RAYER, - TYPE_XILINX_DLC5, -}; - /* We have two sets of pins, out and in. The numbers for both sets are * independent and are bitshift values, not real pin numbers. * Default settings are for the RayeR hardware. */ -/* Pins for master->slave direction */ -static int rayer_cs_bit = 5; -static int rayer_sck_bit = 6; -static int rayer_mosi_bit = 7; -/* Pins for slave->master direction */ -static int rayer_miso_bit = 6; + +struct rayer_programmer { + const char * type; + const enum test_state status; + const char * description; + const void * private; +}; + +struct rayer_pinout { + uint8_t cs_bit; + uint8_t sck_bit; + uint8_t mosi_bit; + uint8_t miso_bit; + void (*preinit)(void *); + int (*shutdown)(void *); +}; + +static struct rayer_pinout rayer_spipgm = { + .cs_bit = 5, + .sck_bit = 6, + .mosi_bit = 7, + .miso_bit = 6, +}; + +static struct rayer_pinout xilinx_dlc5 = { + .cs_bit = 2, + .sck_bit = 1, + .mosi_bit = 0, + .miso_bit = 4, +}; + +static struct rayer_programmer rayer_spi_types[] = { + {"rayer", NT, "RayeR SPIPGM", &rayer_spipgm}, + {"xilinx", NT, "Xilinx Parallel Cable III (DLC 5)", &xilinx_dlc5}, + {0}, +}; + +static struct rayer_pinout *pinout = NULL; static uint16_t lpt_iobase; @@ -60,22 +87,22 @@ static uint8_t lpt_outbyte; static void rayer_bitbang_set_cs(int val) { - lpt_outbyte &= ~(1 << rayer_cs_bit); - lpt_outbyte |= (val << rayer_cs_bit); + lpt_outbyte &= ~(1 << pinout->cs_bit); + lpt_outbyte |= (val << pinout->cs_bit); OUTB(lpt_outbyte, lpt_iobase); } static void rayer_bitbang_set_sck(int val) { - lpt_outbyte &= ~(1 << rayer_sck_bit); - lpt_outbyte |= (val << rayer_sck_bit); + lpt_outbyte &= ~(1 << pinout->sck_bit); + lpt_outbyte |= (val << pinout->sck_bit); OUTB(lpt_outbyte, lpt_iobase); } static void rayer_bitbang_set_mosi(int val) { - lpt_outbyte &= ~(1 << rayer_mosi_bit); - lpt_outbyte |= (val << rayer_mosi_bit); + lpt_outbyte &= ~(1 << pinout->mosi_bit); + lpt_outbyte |= (val << pinout->mosi_bit); OUTB(lpt_outbyte, lpt_iobase); } @@ -83,8 +110,8 @@ static int rayer_bitbang_get_miso(void) { uint8_t tmp; - tmp = INB(lpt_iobase + 1); - tmp = (tmp >> rayer_miso_bit) & 0x1; + tmp = INB(lpt_iobase + 1) ^ 0x80; // bit.7 inverted + tmp = (tmp >> pinout->miso_bit) & 0x1; return tmp; } @@ -99,8 +126,8 @@ static const struct bitbang_spi_master bitbang_spi_master_rayer = { int rayer_spi_init(void) { + struct rayer_programmer *prog = rayer_spi_types; char *arg = NULL; - enum rayer_type rayer_type = TYPE_RAYER; /* Non-default port requested? */ arg = extract_programmer_param("iobase"); @@ -138,36 +165,20 @@ int rayer_spi_init(void) arg = extract_programmer_param("type"); if (arg) { - if (!strcasecmp(arg, "rayer")) { - rayer_type = TYPE_RAYER; - } else if (!strcasecmp(arg, "xilinx")) { - rayer_type = TYPE_XILINX_DLC5; - } else { + for (; prog->type; ++prog) { + if (! strcasecmp (arg, prog->type)) { + break; + } + } + if(! prog->type) { msg_perr("Error: Invalid device type specified.\n"); free(arg); return 1; } + free(arg); } - free(arg); - switch (rayer_type) { - case TYPE_RAYER: - msg_pdbg("Using RayeR SPIPGM pinout.\n"); - /* Bits for master->slave direction */ - rayer_cs_bit = 5; - rayer_sck_bit = 6; - rayer_mosi_bit = 7; - /* Bits for slave->master direction */ - rayer_miso_bit = 6; - break; - case TYPE_XILINX_DLC5: - msg_pdbg("Using Xilinx Parallel Cable III (DLC 5) pinout.\n"); - /* Bits for master->slave direction */ - rayer_cs_bit = 2; - rayer_sck_bit = 1; - rayer_mosi_bit = 0; - /* Bits for slave->master direction */ - rayer_miso_bit = 4; - } + msg_pinfo("Using %s pinout.\n", prog->description); + pinout = (struct rayer_pinout *) prog->private; if (rget_io_perms()) return 1; @@ -175,6 +186,11 @@ int rayer_spi_init(void) /* Get the initial value before writing to any line. */ lpt_outbyte = INB(lpt_iobase); + if (pinout->shutdown) + register_shutdown(pinout->shutdown, (void*)pinout); + if (pinout->preinit) + pinout->preinit(pinout); + if (bitbang_spi_init(&bitbang_spi_master_rayer)) return 1; -- 1.8.1.1

4 12

[commit] r1757 - trunk
by repository service 02 Oct '13

02 Oct '13

Author: stefanct Date: Wed Oct 2 03:22:17 2013 New Revision: 1757 URL: http://flashrom.org/trac/flashrom/changeset/1757 Log: rayer_spi: Fix Xilinx DLC-5 cable. Pin 6 on LPT controls a pulldown on MISO/TDO signal. Whether there exists an unbuffered clone is unknown. The author of the original patch confirmed in private correspondence that the patch was incomplete. There has been no sign of an unbuffered version on the interwebs, hence just change the existing driver to disable the pulldown. Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/rayer_spi.c Modified: trunk/rayer_spi.c ============================================================================== --- trunk/rayer_spi.c Wed Oct 2 03:22:11 2013 (r1756) +++ trunk/rayer_spi.c Wed Oct 2 03:22:17 2013 (r1757) @@ -63,11 +63,16 @@ .miso_bit = 6, }; +static void dlc5_preinit(const void *); +static int dlc5_shutdown(void *); + static const struct rayer_pinout xilinx_dlc5 = { .cs_bit = 2, .sck_bit = 1, .mosi_bit = 0, .miso_bit = 4, + .preinit = dlc5_preinit, + .shutdown = dlc5_shutdown, }; static void byteblaster_preinit(const void *); @@ -256,6 +261,21 @@ OUTB(lpt_outbyte, lpt_iobase); return 0; } + +static void dlc5_preinit(const void *data) { + msg_pdbg("dlc5_preinit\n"); + /* Assert pin 6 to receive MISO. */ + lpt_outbyte |= (1<<4); + OUTB(lpt_outbyte, lpt_iobase); +} + +static int dlc5_shutdown(void *data) { + msg_pdbg("dlc5_shutdown\n"); + /* De-assert pin 6 to force MISO low. */ + lpt_outbyte &= ~(1<<4); + OUTB(lpt_outbyte, lpt_iobase); + return 0; +} #else #error PCI port I/O access is not supported on this architecture yet.

1 0

[commit] r1756 - trunk
by repository service 02 Oct '13

02 Oct '13

Author: stefanct Date: Wed Oct 2 03:22:11 2013 New Revision: 1756 URL: http://flashrom.org/trac/flashrom/changeset/1756 Log: rayer_spi: Add pinout for Wiggler LPT. Signed-off-by: Maksim Kuleshov <mmcx(a)mail.ru> Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Tested-by: Maksim Kuleshov <mmcx(a)mail.ru> Acked-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Modified: trunk/flashrom.8.tmpl trunk/rayer_spi.c Modified: trunk/flashrom.8.tmpl ============================================================================== --- trunk/flashrom.8.tmpl Wed Oct 2 03:22:02 2013 (r1755) +++ trunk/flashrom.8.tmpl Wed Oct 2 03:22:11 2013 (r1756) @@ -760,7 +760,7 @@ .B model can be .BR rayer " for the RayeR cable, " byteblastermv " for the Altera ByteBlasterMV, " stk200 " for the Atmel \ -STK200/300, or " xilinx " for the Xilinx Parallel Cable III (DLC 5)." +STK200/300, " wiggler " for the Macraigor Wiggler, or " xilinx " for the Xilinx Parallel Cable III (DLC 5)." .sp More information about the RayeR hardware is available at .nh @@ -768,6 +768,9 @@ The Altera ByteBlasterMV datasheet can be obtained from .nh .BR "http://www.altera.co.jp/literature/ds/dsbytemv.pdf " . +For more information about the Macraigor Wiggler see +.nh +.BR "http://www.macraigor.com/wiggler.htm " . The schematic of the Xilinx DLC 5 was published in .nh .BR "http://www.xilinx.com/support/documentation/user_guides/xtp029.pdf " . Modified: trunk/rayer_spi.c ============================================================================== --- trunk/rayer_spi.c Wed Oct 2 03:22:02 2013 (r1755) +++ trunk/rayer_spi.c Wed Oct 2 03:22:11 2013 (r1756) @@ -94,11 +94,19 @@ .shutdown = stk200_shutdown, }; +static const struct rayer_pinout wiggler_lpt = { + .cs_bit = 1, + .sck_bit = 2, + .mosi_bit = 3, + .miso_bit = 7, +}; + static const struct rayer_programmer rayer_spi_types[] = { {"rayer", NT, "RayeR SPIPGM", &rayer_spipgm}, {"xilinx", NT, "Xilinx Parallel Cable III (DLC 5)", &xilinx_dlc5}, {"byteblastermv", OK, "Altera ByteBlasterMV", &altera_byteblastermv}, {"stk200", NT, "Atmel STK200/300 adapter", &atmel_stk200}, + {"wiggler", OK, "Wiggler LPT", &wiggler_lpt}, {0}, };

1 0

[commit] r1755 - trunk
by repository service 02 Oct '13

02 Oct '13

Author: stefanct Date: Wed Oct 2 03:22:02 2013 New Revision: 1755 URL: http://flashrom.org/trac/flashrom/changeset/1755 Log: rayer_spi: Add pinout for Atmel STK200/300. Signed-off-by: Maksim Kuleshov <mmcx(a)mail.ru> Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Acked-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Modified: trunk/flashrom.8.tmpl trunk/rayer_spi.c Modified: trunk/flashrom.8.tmpl ============================================================================== --- trunk/flashrom.8.tmpl Wed Oct 2 03:21:57 2013 (r1754) +++ trunk/flashrom.8.tmpl Wed Oct 2 03:22:02 2013 (r1755) @@ -759,8 +759,8 @@ syntax where .B model can be -.BR rayer " for the RayeR cable, " byteblastermv " for the Altera ByteBlasterMV, or " xilinx \ -" for the Xilinx Parallel Cable III (DLC 5)." +.BR rayer " for the RayeR cable, " byteblastermv " for the Altera ByteBlasterMV, " stk200 " for the Atmel \ +STK200/300, or " xilinx " for the Xilinx Parallel Cable III (DLC 5)." .sp More information about the RayeR hardware is available at .nh Modified: trunk/rayer_spi.c ============================================================================== --- trunk/rayer_spi.c Wed Oct 2 03:21:57 2013 (r1754) +++ trunk/rayer_spi.c Wed Oct 2 03:22:02 2013 (r1755) @@ -82,10 +82,23 @@ .shutdown = byteblaster_shutdown, }; +static void stk200_preinit(const void *); +static int stk200_shutdown(void *); + +static const struct rayer_pinout atmel_stk200 = { + .cs_bit = 7, + .sck_bit = 4, + .mosi_bit = 5, + .miso_bit = 6, + .preinit = stk200_preinit, + .shutdown = stk200_shutdown, +}; + static const struct rayer_programmer rayer_spi_types[] = { {"rayer", NT, "RayeR SPIPGM", &rayer_spipgm}, {"xilinx", NT, "Xilinx Parallel Cable III (DLC 5)", &xilinx_dlc5}, {"byteblastermv", OK, "Altera ByteBlasterMV", &altera_byteblastermv}, + {"stk200", NT, "Atmel STK200/300 adapter", &atmel_stk200}, {0}, }; @@ -221,6 +234,21 @@ return 0; } +static void stk200_preinit(const void *data) { + msg_pdbg("stk200_init\n"); + /* Assert #EN signals, set LED signal. */ + lpt_outbyte = (1 << 6) ; + OUTB(lpt_outbyte, lpt_iobase); +} + +static int stk200_shutdown(void *data) { + msg_pdbg("stk200_shutdown\n"); + /* Assert #EN signals, clear LED signal. */ + lpt_outbyte = (1 << 2) | (1 << 3); + OUTB(lpt_outbyte, lpt_iobase); + return 0; +} + #else #error PCI port I/O access is not supported on this architecture yet. #endif

1 0

[commit] r1754 - trunk
by repository service 02 Oct '13

02 Oct '13

Author: stefanct Date: Wed Oct 2 03:21:57 2013 New Revision: 1754 URL: http://flashrom.org/trac/flashrom/changeset/1754 Log: rayer_spi: Add pinout for Altera ByteBlasterMV. There is a ByteBlasterII product that is only almost compatible. Signed-off-by: Maksim Kuleshov <mmcx(a)mail.ru> Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Tested-by: Maksim Kuleshov <mmcx(a)mail.ru> Acked-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/flashrom.8.tmpl trunk/rayer_spi.c Modified: trunk/flashrom.8.tmpl ============================================================================== --- trunk/flashrom.8.tmpl Wed Oct 2 03:21:45 2013 (r1753) +++ trunk/flashrom.8.tmpl Wed Oct 2 03:21:57 2013 (r1754) @@ -759,12 +759,15 @@ syntax where .B model can be -.BR rayer " for the RayeR cable or " xilinx " for the Xilinx Parallel Cable III -(DLC 5). +.BR rayer " for the RayeR cable, " byteblastermv " for the Altera ByteBlasterMV, or " xilinx \ +" for the Xilinx Parallel Cable III (DLC 5)." .sp More information about the RayeR hardware is available at .nh .BR "http://rayer.ic.cz/elektro/spipgm.htm " . +The Altera ByteBlasterMV datasheet can be obtained from +.nh +.BR "http://www.altera.co.jp/literature/ds/dsbytemv.pdf " . The schematic of the Xilinx DLC 5 was published in .nh .BR "http://www.xilinx.com/support/documentation/user_guides/xtp029.pdf " . Modified: trunk/rayer_spi.c ============================================================================== --- trunk/rayer_spi.c Wed Oct 2 03:21:45 2013 (r1753) +++ trunk/rayer_spi.c Wed Oct 2 03:21:57 2013 (r1754) @@ -70,9 +70,22 @@ .miso_bit = 4, }; +static void byteblaster_preinit(const void *); +static int byteblaster_shutdown(void *); + +static const struct rayer_pinout altera_byteblastermv = { + .cs_bit = 1, + .sck_bit = 0, + .mosi_bit = 6, + .miso_bit = 7, + .preinit = byteblaster_preinit, + .shutdown = byteblaster_shutdown, +}; + static const struct rayer_programmer rayer_spi_types[] = { {"rayer", NT, "RayeR SPIPGM", &rayer_spipgm}, {"xilinx", NT, "Xilinx Parallel Cable III (DLC 5)", &xilinx_dlc5}, + {"byteblastermv", OK, "Altera ByteBlasterMV", &altera_byteblastermv}, {0}, }; @@ -195,6 +208,19 @@ return 0; } +static void byteblaster_preinit(const void *data){ + msg_pdbg("byteblaster_preinit\n"); + /* Assert #EN signal. */ + OUTB(2, lpt_iobase + 2 ); +} + +static int byteblaster_shutdown(void *data){ + msg_pdbg("byteblaster_shutdown\n"); + /* De-Assert #EN signal. */ + OUTB(0, lpt_iobase + 2 ); + return 0; +} + #else #error PCI port I/O access is not supported on this architecture yet. #endif

1 0

[commit] r1753 - trunk
by repository service 02 Oct '13

02 Oct '13

Author: stefanct Date: Wed Oct 2 03:21:45 2013 New Revision: 1753 URL: http://flashrom.org/trac/flashrom/changeset/1753 Log: rayer_spi: Improve support for different pinouts. Create a list of programmer types with names, test state and linked layouts. This list could be listed with flashrom -L in follow-up patches. Handle a bit in status register that is inverted, this will be used in different future programmer types. Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Tested-by: Maksim Kuleshov <mmcx(a)mail.ru> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/flashrom.8.tmpl trunk/rayer_spi.c Modified: trunk/flashrom.8.tmpl ============================================================================== --- trunk/flashrom.8.tmpl Mon Sep 23 17:32:25 2013 (r1752) +++ trunk/flashrom.8.tmpl Wed Oct 2 03:21:45 2013 (r1753) @@ -208,8 +208,7 @@ .sp .BR "* dediprog" " (for SPI flash ROMs attached to a Dediprog SF100)" .sp -.BR "* rayer_spi" " (for SPI flash ROMs attached to a RayeR parport " -or Xilinx DLC5 compatible cable) +.BR "* rayer_spi" " (for SPI flash ROMs attached to a parallel port by one of various cable types)" .sp .BR "* pony_spi" " (for SPI flash ROMs attached to a SI-Prog serial port " bitbanging adapter) @@ -766,9 +765,9 @@ More information about the RayeR hardware is available at .nh .BR "http://rayer.ic.cz/elektro/spipgm.htm " . -The schematic of the Xilinx DLC 5 was published at +The schematic of the Xilinx DLC 5 was published in .nh -.BR "http://www.xilinx.com/itp/xilinx4/data/docs/pac/appendixb.html " . +.BR "http://www.xilinx.com/support/documentation/user_guides/xtp029.pdf " . .SS .BR "pony_spi " programmer The serial port (like /dev/ttyS0, /dev/ttyUSB0 on Linux or COM3 on windows) is Modified: trunk/rayer_spi.c ============================================================================== --- trunk/rayer_spi.c Mon Sep 23 17:32:25 2013 (r1752) +++ trunk/rayer_spi.c Wed Oct 2 03:21:45 2013 (r1753) @@ -17,11 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/* Driver for the SPIPGM hardware by "RayeR" Martin Rehak. - * See http://rayer.ic.cz/elektro/spipgm.htm for schematics and instructions. - */ - -/* This driver uses non-portable direct I/O port accesses which won't work on +/* Driver for various LPT adapters. + * + * This driver uses non-portable direct I/O port accesses which won't work on * any non-x86 platform, and even on x86 there is a high chance there will be * collisions with any loaded parallel port drivers. * The big advantage of direct port I/O is OS independence and speed because @@ -37,21 +35,48 @@ #include "programmer.h" #include "hwaccess.h" -enum rayer_type { - TYPE_RAYER, - TYPE_XILINX_DLC5, -}; - /* We have two sets of pins, out and in. The numbers for both sets are * independent and are bitshift values, not real pin numbers. * Default settings are for the RayeR hardware. */ -/* Pins for master->slave direction */ -static int rayer_cs_bit = 5; -static int rayer_sck_bit = 6; -static int rayer_mosi_bit = 7; -/* Pins for slave->master direction */ -static int rayer_miso_bit = 6; + +struct rayer_programmer { + const char *type; + const enum test_state status; + const char *description; + const void *dev_data; +}; + +struct rayer_pinout { + uint8_t cs_bit; + uint8_t sck_bit; + uint8_t mosi_bit; + uint8_t miso_bit; + void (*preinit)(const void *); + int (*shutdown)(void *); +}; + +static const struct rayer_pinout rayer_spipgm = { + .cs_bit = 5, + .sck_bit = 6, + .mosi_bit = 7, + .miso_bit = 6, +}; + +static const struct rayer_pinout xilinx_dlc5 = { + .cs_bit = 2, + .sck_bit = 1, + .mosi_bit = 0, + .miso_bit = 4, +}; + +static const struct rayer_programmer rayer_spi_types[] = { + {"rayer", NT, "RayeR SPIPGM", &rayer_spipgm}, + {"xilinx", NT, "Xilinx Parallel Cable III (DLC 5)", &xilinx_dlc5}, + {0}, +}; + +static const struct rayer_pinout *pinout = NULL; static uint16_t lpt_iobase; @@ -60,22 +85,22 @@ static void rayer_bitbang_set_cs(int val) { - lpt_outbyte &= ~(1 << rayer_cs_bit); - lpt_outbyte |= (val << rayer_cs_bit); + lpt_outbyte &= ~(1 << pinout->cs_bit); + lpt_outbyte |= (val << pinout->cs_bit); OUTB(lpt_outbyte, lpt_iobase); } static void rayer_bitbang_set_sck(int val) { - lpt_outbyte &= ~(1 << rayer_sck_bit); - lpt_outbyte |= (val << rayer_sck_bit); + lpt_outbyte &= ~(1 << pinout->sck_bit); + lpt_outbyte |= (val << pinout->sck_bit); OUTB(lpt_outbyte, lpt_iobase); } static void rayer_bitbang_set_mosi(int val) { - lpt_outbyte &= ~(1 << rayer_mosi_bit); - lpt_outbyte |= (val << rayer_mosi_bit); + lpt_outbyte &= ~(1 << pinout->mosi_bit); + lpt_outbyte |= (val << pinout->mosi_bit); OUTB(lpt_outbyte, lpt_iobase); } @@ -83,8 +108,8 @@ { uint8_t tmp; - tmp = INB(lpt_iobase + 1); - tmp = (tmp >> rayer_miso_bit) & 0x1; + tmp = INB(lpt_iobase + 1) ^ 0x80; // bit.7 inverted + tmp = (tmp >> pinout->miso_bit) & 0x1; return tmp; } @@ -99,8 +124,8 @@ int rayer_spi_init(void) { + const struct rayer_programmer *prog = rayer_spi_types; char *arg = NULL; - enum rayer_type rayer_type = TYPE_RAYER; /* Non-default port requested? */ arg = extract_programmer_param("iobase"); @@ -138,36 +163,20 @@ arg = extract_programmer_param("type"); if (arg) { - if (!strcasecmp(arg, "rayer")) { - rayer_type = TYPE_RAYER; - } else if (!strcasecmp(arg, "xilinx")) { - rayer_type = TYPE_XILINX_DLC5; - } else { + for (; prog->type != NULL; prog++) { + if (strcasecmp(arg, prog->type) == 0) { + break; + } + } + if (prog->type == NULL) { msg_perr("Error: Invalid device type specified.\n"); free(arg); return 1; } + free(arg); } - free(arg); - switch (rayer_type) { - case TYPE_RAYER: - msg_pdbg("Using RayeR SPIPGM pinout.\n"); - /* Bits for master->slave direction */ - rayer_cs_bit = 5; - rayer_sck_bit = 6; - rayer_mosi_bit = 7; - /* Bits for slave->master direction */ - rayer_miso_bit = 6; - break; - case TYPE_XILINX_DLC5: - msg_pdbg("Using Xilinx Parallel Cable III (DLC 5) pinout.\n"); - /* Bits for master->slave direction */ - rayer_cs_bit = 2; - rayer_sck_bit = 1; - rayer_mosi_bit = 0; - /* Bits for slave->master direction */ - rayer_miso_bit = 4; - } + msg_pinfo("Using %s pinout.\n", prog->description); + pinout = (struct rayer_pinout *)prog->dev_data; if (rget_io_perms()) return 1; @@ -175,6 +184,11 @@ /* Get the initial value before writing to any line. */ lpt_outbyte = INB(lpt_iobase); + if (pinout->shutdown) + register_shutdown(pinout->shutdown, (void*)pinout); + if (pinout->preinit) + pinout->preinit(pinout); + if (bitbang_spi_init(&bitbang_spi_master_rayer)) return 1;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom October 2013