- flashrom - mail.coreboot.org

[commit] r1403 - trunk
by repository service 04 Aug '11

04 Aug '11

Author: stefanct Date: Thu Aug 4 19:37:58 2011 New Revision: 1403 URL: http://flashrom.org/trac/flashrom/changeset/1403 Log: Rephrase warnings in chipset_enable.c 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/chipset_enable.c Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Mon Aug 1 20:39:28 2011 (r1402) +++ trunk/chipset_enable.c Thu Aug 4 19:37:58 2011 (r1403) @@ -77,8 +77,8 @@ rpci_write_byte(dev, 0x40, new); newer = pci_read_byte(dev, 0x40); if (newer != new) { - msg_pinfo("tried to set register 0x%x to 0x%x on %s " - "failed (WARNING ONLY)\n", 0x40, new, name); + msg_pinfo("Setting register 0x%x to 0x%x on %s failed " + "(WARNING ONLY).\n", 0x40, new, name); msg_pinfo("Stuck at 0x%x\n", newer); return -1; } @@ -166,8 +166,8 @@ rpci_write_byte(sbdev, 0x45, new); newer = pci_read_byte(sbdev, 0x45); if (newer != new) { - msg_pinfo("tried to set register 0x%x to 0x%x on %s failed " - "(WARNING ONLY)\n", 0x45, new, name); + msg_pinfo("Setting register 0x%x to 0x%x on %s failed " + "(WARNING ONLY).\n", 0x45, new, name); msg_pinfo("Stuck at 0x%x\n", newer); ret = -1; } @@ -193,8 +193,8 @@ rpci_write_byte(sbdev, 0x45, new); newer = pci_read_byte(sbdev, 0x45); if (newer != new) { - msg_pinfo("tried to set register 0x%x to 0x%x on %s failed " - "(WARNING ONLY)\n", 0x45, new, name); + msg_pinfo("Setting register 0x%x to 0x%x on %s failed " + "(WARNING ONLY).\n", 0x45, new, name); msg_pinfo("Stuck at 0x%x\n", newer); ret = -1; } @@ -241,8 +241,8 @@ rpci_write_word(dev, xbcs, new); if (pci_read_word(dev, xbcs) != new) { - msg_pinfo("tried to set 0x%x to 0x%x on %s failed " - "(WARNING ONLY)\n", xbcs, new, name); + msg_pinfo("Setting register 0x%x to 0x%x on %s failed " + "(WARNING ONLY).\n", xbcs, new, name); return -1; } @@ -287,8 +287,8 @@ rpci_write_byte(dev, bios_cntl, new); if (pci_read_byte(dev, bios_cntl) != new) { - msg_pinfo("tried to set 0x%x to 0x%x on %s failed " - "(WARNING ONLY)\n", bios_cntl, new, name); + msg_pinfo("Setting register 0x%x to 0x%x on %s failed " + "(WARNING ONLY).\n", bios_cntl, new, name); return -1; } @@ -674,8 +674,8 @@ new = pci_read_byte(dev, 0x52); if (new != 0xee) { - msg_pinfo("tried to set register 0x%x to 0x%x on %s failed " - "(WARNING ONLY)\n", 0x52, new, name); + msg_pinfo("Setting register 0x%x to 0x%x on %s failed " + "(WARNING ONLY).\n", 0x52, new, name); return -1; } @@ -693,8 +693,8 @@ if (new != old) { rpci_write_byte(dev, 0x43, new); if (pci_read_byte(dev, 0x43) != new) { - msg_pinfo("tried to set 0x%x to 0x%x on %s failed " - "(WARNING ONLY)\n", 0x43, new, name); + msg_pinfo("Setting register 0x%x to 0x%x on %s failed " + "(WARNING ONLY).\n", 0x43, new, name); } } @@ -706,8 +706,8 @@ rpci_write_byte(dev, 0x40, new); if (pci_read_byte(dev, 0x40) != new) { - msg_pinfo("tried to set 0x%x to 0x%x on %s failed " - "(WARNING ONLY)\n", 0x40, new, name); + msg_pinfo("Setting register 0x%x to 0x%x on %s failed " + "(WARNING ONLY).\n", 0x40, new, name); return -1; } @@ -806,8 +806,8 @@ if (new != old) { rpci_write_byte(dev, 0x88, new); if (pci_read_byte(dev, 0x88) != new) { - msg_pinfo("tried to set 0x%x to 0x%x on %s failed " - "(WARNING ONLY)\n", 0x88, new, name); + msg_pinfo("Setting register to set 0x%x to 0x%x on %s " + "failed (WARNING ONLY).\n", 0x88, new, name); } } @@ -818,8 +818,8 @@ rpci_write_byte(dev, 0x6d, new); if (pci_read_byte(dev, 0x6d) != new) { - msg_pinfo("tried to set 0x%x to 0x%x on %s failed " - "(WARNING ONLY)\n", 0x6d, new, name); + msg_pinfo("Setting register 0x%x to 0x%x on %s failed " + "(WARNING ONLY).\n", 0x6d, new, name); return -1; } @@ -902,8 +902,8 @@ rpci_write_byte(dev, 0x6d, new); if (pci_read_byte(dev, 0x6d) != new) { - msg_pinfo("tried to set 0x%x to 0x%x on %s failed " - "(WARNING ONLY)\n", 0x6d, new, name); + msg_pinfo("Setting register 0x%x to 0x%x on %s failed " + "(WARNING ONLY).\n", 0x6d, new, name); return -1; }

1 0

A8M2N-LA flash fail fail
by Márton Miklós 03 Aug '11

03 Aug '11

Hello all, I have just tried to flash my BIOS using the flashrom, and I have ran into the following situation: lucifer@lucifer-desktop:~/Letöltések/flashrom-0.9.4$ sudo ./flashrom -w /tmp/sp35111/3.10 flashrom v0.9.4-r1395 on Linux 2.6.35-28-generic (i686), built with libpci 3.1.7, GCC 4.4.5, little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found chipset "NVIDIA MCP51". This chipset is marked as untested. If you are using an up-to-date version of flashrom please email a report to flashrom(a)flashrom.org including a verbose (-V) log. Thank you! Enabling flash write... OK. This chipset supports the following protocols: Non-SPI. Found PMC flash chip "Pm49FL004" (512 kB, LPC, FWH) at physical address 0xfff80000. Flash image seems to be a legacy BIOS. Disabling coreboot-related checks. Reading old flash chip contents... done. Erasing and writing flash chip... ERASE FAILED at 0x00000000! Expected=0xff, Read=0x23, failed byte count from 0x00000000-0x00000fff: 0xfec ERASE FAILED! Reading current flash chip contents... done. ERASE FAILED at 0x00000000! Expected=0xff, Read=0x23, failed byte count from 0x00000000-0x0000ffff: 0xfef9 ERASE FAILED! Reading current flash chip contents... done. ERASE FAILED at 0x00000000! Expected=0xff, Read=0x23, failed byte count from 0x00000000-0x0007ffff: 0x6494b ERASE FAILED! FAILED! Uh oh. Erase/write failed. Checking if anything changed. Good. It seems nothing was changed. Writing to the flash chip apparently didn't do anything. This means we have to add special support for your board, programmer or flash chip. Please report this on IRC at irc.freenode.net (channel #flashrom) or mail flashrom(a)flashrom.org! ------------------------------------------------------------------------------- You may now reboot or simply leave the machine running. Flashrom info: lucifer@lucifer-desktop:~/Letöltések/flashrom-0.9.4$ sudo ./flashrom flashrom v0.9.4-r1395 on Linux 2.6.35-28-generic (i686), built with libpci 3.1.7, GCC 4.4.5, little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found chipset "NVIDIA MCP51". This chipset is marked as untested. If you are using an up-to-date version of flashrom please email a report to flashrom(a)flashrom.org including a verbose (-V) log. Thank you! Enabling flash write... OK. This chipset supports the following protocols: Non-SPI. Found PMC flash chip "Pm49FL004" (512 kB, LPC, FWH) at physical address 0xfff80000. No operations were specified. I have tried the latest revision (1402) but it did not works too. Let me know if I should provide any additional information. Regards, Miklós Márton

1 0

Re: [flashrom] [PATCH] Add deferred -i processing
by Stefan Tauner 02 Aug '11

02 Aug '11

On Tue, 2 Aug 2011 14:48:15 -0700 David Hendricks <dhendrix(a)google.com> wrote: > The patch is mostly ack-able, save for a few nits. > > On Mon, Aug 1, 2011 at 6:05 PM, Stefan Tauner < > stefan.tauner(a)student.tuwien.ac.at> wrote: > > > My implementation does not defer the processing until doit(), but after the > > argument parsing loop only (doit() should not contain argument checks). > > > > Just FYI -- The reason we deferred processing until doit() was because our > usage case calls for reading the ROM content to find pre-existing mappings > (e.g. fmap) which exist in the ROM image. It might be useful to eventually > do the same thing for cbfs and Intel's flash descriptor. jup i am aware of that. but i dont like to inflate doit() with even more stuff, that does not belong there. we need to think about refactoring the whole processing... we need something like pre-doit() before doit() but after init and unlocking. a bit like the shutdown process with the registration of some callbacks... i hope work on libflashrom will enforce us to move forward with that. > On Mon, Aug 1, 2011 at 6:05 PM, Stefan Tauner < > stefan.tauner(a)student.tuwien.ac.at> wrote: > > > This allows to specify -i and -l parameters in any order. > > > > I don't like the output in error cases much, any ideas? > > example of a good run: > > flashrom -p dummy:emulate=SST25VF032B -i normal -w > > ../testimages/4096kB.rand.img -l test.layout -i gfxrom -i fallback > > flashrom v0.9.4-r1396 on Linux 2.6.35-30-generic (x86_64), built with > > libpci 3.1.7, GCC 4.4.5, little endian > > flashrom is free software, get the source code at http://www.flashrom.org > > > > Using region(s): "normal", "gfxrom", "fallback". > > Calibrating delay loop... OK. > > Found SST flash chip "SST25VF032B" (4096 kB, SPI) on dummy. > > Reading old flash chip contents... done. > > Erasing and writing flash chip... Erase/write done. > > Verifying flash... VERIFIED. > > > > Looks okay to me. And IIRC -V will list all ROM layout entries found even if > they are not included, which is nice for debugging. that was printed at default verbosity before, and is now spew-verbose (which is now at -VVV level). but yes i wanted to keep something for debugging. > > On Mon, Aug 1, 2011 at 6:05 PM, Stefan Tauner < > stefan.tauner(a)student.tuwien.ac.at> wrote: > > > example of a semi-good run: > > flashrom -p dummy:emulate=SST25VF032B -i normal -w > > ../testimages/4096kB.rand.img -l test.layout -i gfxrom -i fallback > > flashrom v0.9.4-r1396 on Linux 2.6.35-30-generic (x86_64), built with > > libpci 3.1.7, GCC 4.4.5, little endian > > flashrom is free software, get the source code at http://www.flashrom.org > > > > Maximum number of ROM images (4) in layout file reached before end of > > layout file. > > Ignoring the rest of the layout file. > > > > I think that if the user accidentally specifies an invalid layout or number > of included regions, then Flashrom should quit. Otherwise Flashrom might not > flash everything the user intends, leaving the content in an inconsistent > (probably bricked) state. This has become problematic due to complicated ROM > layouts in systems where multiple masters use a shared SPI flash (e.g. an EC > or Intel's ME insanity). yes, that's certainly a well argued proposal imo. carl-daniel? > On Mon, Aug 1, 2011 at 6:05 PM, Stefan Tauner < > stefan.tauner(a)student.tuwien.ac.at> wrote: > > > example of a faulty run: > > flashrom -p dummy:emulate=SST25VF032B -i normal -w > > ../testimages/4096kB.rand.img -l test.layout -i gfxrom -i fallback -i bios > > flashrom v0.9.4-r1396 on Linux 2.6.35-30-generic (x86_64), built with > > libpci 3.1.7, GCC 4.4.5, little endian > > flashrom is free software, get the source code at http://www.flashrom.org > > > > Maximum number of ROM images (4) in layout file reached before end of > > layout file. > > Ignoring the rest of the layout file. > > Using region(s): "normal", "gfxrom", "fallback"Invalid region specified: > > "bios" > > > > If you split that last line so that the "Invalid region" part shows up on a > newline, it looks okay. that is one option yes. but i tend to think we may defer the output of the used regions and push it into its own loop at the end of process_include_args. this was there would be no "using region..." output in case of errors at all. and it may even be more readable(?) > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > > --- > > cli_classic.c | 11 ++++----- > > flash.h | 2 + > > layout.c | 68 > > ++++++++++++++++++++++++++++++++++++++++++++++++++------ > > 3 files changed, 67 insertions(+), 14 deletions(-) > > > > diff --git a/cli_classic.c b/cli_classic.c > > index 36fe9ad..e44ea86 100644 > > --- a/cli_classic.c > > +++ b/cli_classic.c > > @@ -233,14 +233,9 @@ int cli_classic(int argc, char *argv[]) > > cli_classic_abort_usage(); > > break; > > case 'i': > > - /* FIXME: -l has to be specified before -i. */ > > tempstr = strdup(optarg); > > - if (find_romentry(tempstr) < 0) { > > - fprintf(stderr, "Error: image %s not found > > in " > > - "layout file or -i specified before > > " > > - "-l\n", tempstr); > > + if (register_include_arg(tempstr) < 0) > > cli_classic_abort_usage(); > > - } > > break; > > case 'L': > > if (++operation_specified > 1) { > > @@ -325,6 +320,10 @@ int cli_classic(int argc, char *argv[]) > > cli_classic_abort_usage(); > > } > > > > + if (process_include_args() < 0) { > > + cli_classic_abort_usage(); > > + } > > + > > /* FIXME: Print the actions flashrom will take. */ > > > > if (list_supported) { > > diff --git a/flash.h b/flash.h > > index 5b49e9d..0848255 100644 > > --- a/flash.h > > +++ b/flash.h > > @@ -251,6 +251,8 @@ int print(int type, const char *fmt, ...) > > __attribute__((format(printf, 2, 3))); > > int cli_classic(int argc, char *argv[]); > > > > /* layout.c */ > > +int register_include_arg(char *name); > > +int process_include_args(void); > > int read_romlayout(char *name); > > int find_romentry(char *name); > > int handle_romentries(struct flashchip *flash, uint8_t *oldcontents, > > uint8_t *newcontents); > > diff --git a/layout.c b/layout.c > > index d719a05..936e316 100644 > > --- a/layout.c > > +++ b/layout.c > > @@ -41,6 +41,12 @@ typedef struct { > > char name[256]; > > } romlayout_t; > > > > +/* include_args lists arguments specified at the command line with -i. > > They > > + * must be processed at some point so that desired regions are marked as > > + * "included" in the rom_entries list. > > + */ > > +static char *include_args[MAX_ROMLAYOUT]; > > +static int num_include_args = 0; /* the number of valid entries. */ > > static romlayout_t rom_entries[MAX_ROMLAYOUT]; > > > > #if CONFIG_INTERNAL == 1 /* FIXME: Move the whole block to cbtable.c? */ > > @@ -194,6 +200,20 @@ int read_romlayout(char *name) > > } > > #endif > > > > +/* register an include argument (-i) for later processing */ > > +int register_include_arg(char *name) > > +{ > > + if (num_include_args >= MAX_ROMLAYOUT) { > > + msg_gerr("Too many regions included (%i).\n", > > num_include_args); > > + return -1; > > + } > > + > > + include_args[num_include_args] = name; > > + num_include_args++; > > + return num_include_args; > > +} > > + > > +/* returns the index of the entry (or a negative value if it is not found) > > */ > > int find_romentry(char *name) > > { > > int i; > > @@ -201,20 +221,49 @@ int find_romentry(char *name) > > if (!romimages) > > return -1; > > > > - msg_ginfo("Looking for \"%s\"... ", name); > > - > > + msg_gspew("Looking for region \"%s\"... ", name); > > for (i = 0; i < romimages; i++) { > > if (!strcmp(rom_entries[i].name, name)) { > > rom_entries[i].included = 1; > > - msg_ginfo("found.\n"); > > + msg_gspew("found.\n"); > > return i; > > } > > } > > - msg_ginfo("not found.\n"); // Not found. Error. > > - > > + msg_gspew("not found.\n"); > > return -1; > > } > > > > +/* process -i arguments > > + * returns 0 to indicate success, <0 to indicate failure > > > > I think the usual Flashrom convention is to return 1 to indicate failure. I > used <0 out of habit. Let's go ahead and fix that coding convention for > upstream if desired, and update the call sites to do error checking > correctly. well -1 is also used very often, but that's no argument to introduce more inconsistencies :) i'll fix this, thanks. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH] Add deferred -i processing
by David Hendricks 02 Aug '11

02 Aug '11

The patch is mostly ack-able, save for a few nits. On Mon, Aug 1, 2011 at 6:05 PM, Stefan Tauner < stefan.tauner(a)student.tuwien.ac.at> wrote: > My implementation does not defer the processing until doit(), but after the > argument parsing loop only (doit() should not contain argument checks). > Just FYI -- The reason we deferred processing until doit() was because our usage case calls for reading the ROM content to find pre-existing mappings (e.g. fmap) which exist in the ROM image. It might be useful to eventually do the same thing for cbfs and Intel's flash descriptor. On Mon, Aug 1, 2011 at 6:05 PM, Stefan Tauner < stefan.tauner(a)student.tuwien.ac.at> wrote: > This allows to specify -i and -l parameters in any order. > > I don't like the output in error cases much, any ideas? > example of a good run: > flashrom -p dummy:emulate=SST25VF032B -i normal -w > ../testimages/4096kB.rand.img -l test.layout -i gfxrom -i fallback > flashrom v0.9.4-r1396 on Linux 2.6.35-30-generic (x86_64), built with > libpci 3.1.7, GCC 4.4.5, little endian > flashrom is free software, get the source code at http://www.flashrom.org > > Using region(s): "normal", "gfxrom", "fallback". > Calibrating delay loop... OK. > Found SST flash chip "SST25VF032B" (4096 kB, SPI) on dummy. > Reading old flash chip contents... done. > Erasing and writing flash chip... Erase/write done. > Verifying flash... VERIFIED. > Looks okay to me. And IIRC -V will list all ROM layout entries found even if they are not included, which is nice for debugging. On Mon, Aug 1, 2011 at 6:05 PM, Stefan Tauner < stefan.tauner(a)student.tuwien.ac.at> wrote: > example of a semi-good run: > flashrom -p dummy:emulate=SST25VF032B -i normal -w > ../testimages/4096kB.rand.img -l test.layout -i gfxrom -i fallback > flashrom v0.9.4-r1396 on Linux 2.6.35-30-generic (x86_64), built with > libpci 3.1.7, GCC 4.4.5, little endian > flashrom is free software, get the source code at http://www.flashrom.org > > Maximum number of ROM images (4) in layout file reached before end of > layout file. > Ignoring the rest of the layout file. > I think that if the user accidentally specifies an invalid layout or number of included regions, then Flashrom should quit. Otherwise Flashrom might not flash everything the user intends, leaving the content in an inconsistent (probably bricked) state. This has become problematic due to complicated ROM layouts in systems where multiple masters use a shared SPI flash (e.g. an EC or Intel's ME insanity). We can apply this fix in a follow-up patch if you'd prefer: Index: layout.c =================================================================== --- layout.c (revision 1402) +++ layout.c (working copy) @@ -159,7 +159,7 @@ "file reached before end of layout file.\n", MAX_ROMLAYOUT); msg_gerr("Ignoring the rest of the layout file.\n"); - break; + return 1; } if (2 != fscanf(romlayout, "%s %s\n", tempstr, rom_entries[romimages].name)) continue; On Mon, Aug 1, 2011 at 6:05 PM, Stefan Tauner < stefan.tauner(a)student.tuwien.ac.at> wrote: > example of a faulty run: > flashrom -p dummy:emulate=SST25VF032B -i normal -w > ../testimages/4096kB.rand.img -l test.layout -i gfxrom -i fallback -i bios > flashrom v0.9.4-r1396 on Linux 2.6.35-30-generic (x86_64), built with > libpci 3.1.7, GCC 4.4.5, little endian > flashrom is free software, get the source code at http://www.flashrom.org > > Maximum number of ROM images (4) in layout file reached before end of > layout file. > Ignoring the rest of the layout file. > Using region(s): "normal", "gfxrom", "fallback"Invalid region specified: > "bios" > If you split that last line so that the "Invalid region" part shows up on a newline, it looks okay. Please run "flashrom --help" for usage info. > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > cli_classic.c | 11 ++++----- > flash.h | 2 + > layout.c | 68 > ++++++++++++++++++++++++++++++++++++++++++++++++++------ > 3 files changed, 67 insertions(+), 14 deletions(-) > > diff --git a/cli_classic.c b/cli_classic.c > index 36fe9ad..e44ea86 100644 > --- a/cli_classic.c > +++ b/cli_classic.c > @@ -233,14 +233,9 @@ int cli_classic(int argc, char *argv[]) > cli_classic_abort_usage(); > break; > case 'i': > - /* FIXME: -l has to be specified before -i. */ > tempstr = strdup(optarg); > - if (find_romentry(tempstr) < 0) { > - fprintf(stderr, "Error: image %s not found > in " > - "layout file or -i specified before > " > - "-l\n", tempstr); > + if (register_include_arg(tempstr) < 0) > cli_classic_abort_usage(); > - } > break; > case 'L': > if (++operation_specified > 1) { > @@ -325,6 +320,10 @@ int cli_classic(int argc, char *argv[]) > cli_classic_abort_usage(); > } > > + if (process_include_args() < 0) { > + cli_classic_abort_usage(); > + } > + > /* FIXME: Print the actions flashrom will take. */ > > if (list_supported) { > diff --git a/flash.h b/flash.h > index 5b49e9d..0848255 100644 > --- a/flash.h > +++ b/flash.h > @@ -251,6 +251,8 @@ int print(int type, const char *fmt, ...) > __attribute__((format(printf, 2, 3))); > int cli_classic(int argc, char *argv[]); > > /* layout.c */ > +int register_include_arg(char *name); > +int process_include_args(void); > int read_romlayout(char *name); > int find_romentry(char *name); > int handle_romentries(struct flashchip *flash, uint8_t *oldcontents, > uint8_t *newcontents); > diff --git a/layout.c b/layout.c > index d719a05..936e316 100644 > --- a/layout.c > +++ b/layout.c > @@ -41,6 +41,12 @@ typedef struct { > char name[256]; > } romlayout_t; > > +/* include_args lists arguments specified at the command line with -i. > They > + * must be processed at some point so that desired regions are marked as > + * "included" in the rom_entries list. > + */ > +static char *include_args[MAX_ROMLAYOUT]; > +static int num_include_args = 0; /* the number of valid entries. */ > static romlayout_t rom_entries[MAX_ROMLAYOUT]; > > #if CONFIG_INTERNAL == 1 /* FIXME: Move the whole block to cbtable.c? */ > @@ -194,6 +200,20 @@ int read_romlayout(char *name) > } > #endif > > +/* register an include argument (-i) for later processing */ > +int register_include_arg(char *name) > +{ > + if (num_include_args >= MAX_ROMLAYOUT) { > + msg_gerr("Too many regions included (%i).\n", > num_include_args); > + return -1; > + } > + > + include_args[num_include_args] = name; > + num_include_args++; > + return num_include_args; > +} > + > +/* returns the index of the entry (or a negative value if it is not found) > */ > int find_romentry(char *name) > { > int i; > @@ -201,20 +221,49 @@ int find_romentry(char *name) > if (!romimages) > return -1; > > - msg_ginfo("Looking for \"%s\"... ", name); > - > + msg_gspew("Looking for region \"%s\"... ", name); > for (i = 0; i < romimages; i++) { > if (!strcmp(rom_entries[i].name, name)) { > rom_entries[i].included = 1; > - msg_ginfo("found.\n"); > + msg_gspew("found.\n"); > return i; > } > } > - msg_ginfo("not found.\n"); // Not found. Error. > - > + msg_gspew("not found.\n"); > return -1; > } > > +/* process -i arguments > + * returns 0 to indicate success, <0 to indicate failure > I think the usual Flashrom convention is to return 1 to indicate failure. I used <0 out of habit. Let's go ahead and fix that coding convention for upstream if desired, and update the call sites to do error checking correctly. > + */ > +int process_include_args(void) > +{ > + int i; > + unsigned int found = 0; > + for (i = 0; i < num_include_args && include_args[i] != NULL; i++) { > + /* User has specified an area, but no layout file is > loaded. */ > + if (!romimages) { > + msg_gerr("Region requested (with -i \"%s\"), " > + "but no layout data is available.\n", > + include_args[i]); > + return -1; > return 1 + } > + > + if (find_romentry(include_args[i]) < 0) { > + msg_gerr("Invalid region specified: \"%s\"\n", > + include_args[i]); > + return -1; > return 1 > + } > + if (found == 0) > + msg_ginfo("Using region(s): \"%s\"", > include_args[i]); > + else > + msg_ginfo(", \"%s\"", include_args[i]); > + found++; > + } > + msg_ginfo(".\n"); > + return 0; > +} > + > int find_next_included_romentry(unsigned int start) > { > int i; > @@ -246,11 +295,12 @@ int handle_romentries(struct flashchip *flash, > uint8_t *oldcontents, uint8_t *ne > int entry; > unsigned int size = flash->total_size * 1024; > > - /* If no layout file was specified or the layout file was empty, > assume > - * that the user wants to flash the complete new image. > + /* If no regions were specified for inclusion, assume > + * that the user wants to write the complete new image. > */ > - if (!romimages) > + if (num_include_args == 0) > return 0; > + > /* Non-included romentries are ignored. > * The union of all included romentries is used from the new image. > */ > @@ -262,6 +312,8 @@ int handle_romentries(struct flashchip *flash, uint8_t > *oldcontents, uint8_t *ne > size - start); > break; > } > + > + /* For non-included region, copy from old content. */ > if (rom_entries[entry].start > start) > memcpy(newcontents + start, oldcontents + start, > rom_entries[entry].start - start); > -- > 1.7.1 > > -- David Hendricks (dhendrix) Systems Software Engineer, Google Inc.

1 0

[PATCH] Confirm EN29LV800 bus, timing, and page size
by TJ 02 Aug '11

02 Aug '11

Uncertain values now confirmed. If you're happy with the new EN29LV800 code I'll submit a combined patch with a Signed-off-by tag. --- flashchips.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flashchips.c b/flashchips.c index b5be180..10b8dea 100644 --- a/flashchips.c +++ b/flashchips.c @@ -2166,15 +2166,15 @@ struct flashchip flashchips[] = { { .vendor = "EON", .name = "EN29LV800(B)(C)B", - .bustype = CHIP_BUSTYPE_UNKNOWN, + .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = EON_ID, .model_id = EN_29LV800B, .total_size = 1024, - .page_size = 1024, // TODO: check this + .page_size = 1024, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_ZERO, /* TODO: check Datasheet has no timing info specified */ + .probe_timing = TIMING_ZERO, .erase = NULL, .block_erasers = { @@ -2198,15 +2198,15 @@ struct flashchip flashchips[] = { { .vendor = "EON", .name = "EN29LV800(B)(C)T", - .bustype = CHIP_BUSTYPE_UNKNOWN, + .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = EON_ID, .model_id = EN_29LV800T, .total_size = 1024, - .page_size = 1024, // TODO: check this + .page_size = 1024, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_ZERO, /* TODO: check Datasheet has no timing info specified */ + .probe_timing = TIMING_ZERO, .erase = NULL, .block_erasers = { -- 1.6.3.3

4 5

Report back
by Pulp and Paper Automation 01 Aug '11

01 Aug '11

Hi First thanks for a great service. I successfully tested a Intel NIC card Model Intel PRO/100 S desktop adapter Chipset Intel 82550EY Atmel flash chip "AT49BV512" There is also an onboard Atmel 93C46 that could not be read with –p nicintel_spi? Here is the edited results pupa@pupa-IMBA-9454ISA:~$ sudo flashrom -R test.bin -p nicintel Mapping Intel NIC control/status reg at 0xff8ff000, unaligned size 0x10. Found Atmel flash chip "AT49BV512" (64 kB, Parallel) on nicintel. Reading old flash chip contents... done. Verifying flash... VERIFIED. pupa@pupa-IMBA-9454ISA:~$ sudo flashrom -E -p nicintel Calibrating delay loop... OK. Found "Intel 82557/8/9/0/1 Ethernet Pro 100" (8086:1229, BDF 03:0d.0). Mapping Intel NIC control/status reg at 0xff8ff000, unaligned size 0x10. Found Atmel flash chip "AT49BV512" (64 kB, Parallel) on nicintel. Erasing and writing flash chip... Erase/write done. pupa@pupa-IMBA-9454ISA:~$ sudo flashrom -v test.bin -p nicintel Calibrating delay loop... OK. Mapping Intel NIC control/status reg at 0xff8ff000, unaligned size 0x10. Found Atmel flash chip "AT49BV512" (64 kB, Parallel) on nicintel. Reading old flash chip contents... done. Verifying flash... VERIFY FAILED at 0x00000000! Expected=0x55, Read=0xff, failed byte count from 0x00000000-0x0000ffff: 0xd0cf pupa@pupa-IMBA-9454ISA:~$ sudo flashrom -w test.bin -p nicintel Calibrating delay loop... OK. Mapping Intel NIC control/status reg at 0xff8ff000, unaligned size 0x10. Found Atmel flash chip "AT49BV512" (64 kB, Parallel) on nicintel. Reading old flash chip contents... done. Erasing and writing flash chip... Erase/write done. Verifying flash... VERIFIED. pupa@pupa-IMBA-9454ISA:~$ sudo flashrom -v test.bin -p nicintel Calibrating delay loop... OK. Found "Intel 82557/8/9/0/1 Ethernet Pro 100" (8086:1229, BDF 03:0d.0). Mapping Intel NIC control/status reg at 0xff8ff000, unaligned size 0x10. Found Atmel flash chip "AT49BV512" (64 kB, Parallel) on nicintel. Reading old flash chip contents... done. Verifying flash... VERIFIED.

2 1

AAI on SST25VF016B
by Noé Rubinstein 01 Aug '11

01 Aug '11

Hi, I was looking for some way to decrease the flashing time with Flashrom for a 2MB SST SST25VF016B chip with a Dediprog SF100 programmer. After taking a look at the datasheet, stefanct suggested to try to change the write function for SST25VF016B to spi_aai_write, instead of spi_chip_write_1. (I had tried changing it to spi_chip_write_256 some time ago. Unsurprisingly, the results were not so good) I did some benchmark by writing random data on a chip already filled with random data. I attached the results. I've run the benchmark two times and got similar results on the two runs. In short: - with spi_aai_write, writing takes 56 minutes and seems to work reliably - with spi_chip_write_1, writing takes 143 minutes I also ran the test with -VV but the log is so big I can't possibly send it to the mailing list. Here it is: http://neetwork.net/up/misc/bench_vv I also attached the patch I applied to Flashrom's trunk. -- Noé Rubinstein Proformatique (groupe Avencall) - XiVO IPBX OpenHardware 10 bis, rue Lucien VOILIN - 92800 Puteaux

4 5

[commit] r1402 - trunk
by repository service 01 Aug '11

01 Aug '11

Author: stefanct Date: Mon Aug 1 20:39:28 2011 New Revision: 1402 URL: http://flashrom.org/trac/flashrom/changeset/1402 Log: Switch to AAI for some more SST chips Enable AAI for: SST25VF016B SST25VF040B{,.REMS} SST25VF080B Chips that support AAI via a different opcode are annotated with a comment: SST25VF040.REMS SST25LF040A.RES SST25VF080B Tested-by: Joshua Roys <roysjosh(a)gmail.com> Write time (w/erase) went from 46 s to 21 s. SST25VF016B Tested-by: Noé Rubinstein <nrubinstein(a)avencall.com> Write time (w/erase) on a dediprog went from 143 mins to 56 mins. Signed-off-by: Joshua Roys <roysjosh(a)gmail.com> Rebased and Acked-by: Noé Rubinstein <nrubinstein(a)avencall.com> Modified: trunk/flashchips.c Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Fri Jul 29 22:13:45 2011 (r1401) +++ trunk/flashchips.c Mon Aug 1 20:39:28 2011 (r1402) @@ -5606,7 +5606,7 @@ }, }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_1, + .write = spi_aai_write, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5708,7 +5708,7 @@ }, }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_1, + .write = spi_chip_write_1, /* AAI supported, but opcode is 0xAF */ .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5744,7 +5744,7 @@ }, }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_1, + .write = spi_aai_write, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5774,7 +5774,7 @@ }, }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_1, + .write = spi_chip_write_1, /* AAI supported, but opcode is 0xAF */ .read = spi_chip_read, .voltage = {3000, 3600}, }, @@ -5810,7 +5810,7 @@ }, }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_1, + .write = spi_aai_write, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5846,7 +5846,7 @@ }, }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_1, + .write = spi_aai_write, .read = spi_chip_read, .voltage = {2700, 3600}, },

1 0

Re: [flashrom] AMD - SP5100 - take SPI ownership (1/2)
by Stefan Tauner 01 Aug '11

01 Aug '11

hello frederic, thanks for your patches. i have not looked at it in detail yet (i'll leave that to those who are more familiar with the IMC problem), but i have spotted quite some coding style issues. it would be great if you could fix those. i'll explain what i noticed inline. On Mon, 1 Aug 2011 10:45:24 +0200 frederic.temporelli(a)bull.net wrote: > diff -ur ../flashrom-0.9.4-r1394/sb600spi.c ./sb600spi.c > --- ../flashrom-0.9.4-r1394/sb600spi.c 2011-05-11 13:07:07.000000000 -0400 > +++ ./sb600spi.c 2011-07-29 22:45:48.693159918 -0400 > @@ -5,6 +5,8 @@ > * Copyright (C) 2008 Joe Bao <Zheng.Bao(a)amd.com> > * Copyright (C) 2008 Advanced Micro Devices, Inc. > * Copyright (C) 2009, 2010 Carl-Daniel Hailfinger > + * Copyright (C) 2011 Bull SAS > + * (Written by Frederic Temporelli <frederic.temporelli(a)bull.net> for Bull SAS ) space before the closing parenthesis > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by > @@ -43,6 +45,63 @@ > > static uint8_t *sb600_spibar = NULL; > > +/* reference to LPC/SPI PCI device, > + * requested for requesting/releasing > + * device access, shared with IMC > + */ > +struct pci_dev *lpc_isa_bridge = NULL; > + > + > +/* > + * avoid interaction from IMC while we are working with LPC/SPI > + * this is done by requesting HostOwnLPC register (LPC_ISA_BRIDGE, write 1 in register 0x98) line too long, please split (and some punctuation would increase readability then) > + * then we have to read this register. > + * Loop until we have the ownership > + * see doc AMD 44413 - AMD SP5100 Register Reference Guide > + */ > +static int resquest_lpc_ownership (void) > +{ > + uint8_t tmp; > + int i = 0; > + > + if (lpc_isa_bridge == NULL) > + return 1; > + > + pci_write_byte(lpc_isa_bridge, 0x98, 0x01); > + > + while ( (tmp = pci_read_byte (lpc_isa_bridge, 0x98)) == 0 ){ we don't use inner space around clauses like here '( (' and '0 )' usually. also there is a space missing between ')' and '{' > + pci_write_byte(lpc_isa_bridge, 0x98, 0x01); > + if (++i > 1024) { > + msg_perr("IMC did not release flash.\n"); > + return 1; > + } > + > + } > + msg_pspew("flash ownership after %i cycles.\n", i); > + i = 0; please drop the line above completely > + return 0; > +} > + > + one line break between functions please > +/* > + * release LPC/SPI ownership (IMC can access to these resources) > + * this is done by releasing HostOwnLPC register > + * (write 0 in register 0x98) > + */ > +static int release_lpc_ownership (void) > +{ > + > + if (lpc_isa_bridge == NULL) > + return 1; > + spaces instead of tabs in the following lines: > + pci_write_byte(lpc_isa_bridge, 0x98, 0x00); > + > + msg_pspew("flash ownership is released.\n"); > + return 0; > +} > + > + > + one line break between functions please > static void reset_internal_fifo_pointer(void) > { > mmio_writeb(mmio_readb(sb600_spibar + 2) | 0x10, sb600_spibar + 2); > @@ -93,6 +152,8 @@ > const unsigned char *writearr, unsigned char *readarr) > { > int count; spaces instead of tabs > + int result = 0; > + > /* First byte is cmd which can not being sent through FIFO. */ > unsigned char cmd = *writearr++; > unsigned int readoffby1; > @@ -103,16 +164,26 @@ > msg_pspew("%s, cmd=%x, writecnt=%x, readcnt=%x\n", > __func__, cmd, writecnt, readcnt); > > + if (resquest_lpc_ownership() != 0){ space missing between ')' and '{' > + result = SPI_PROGRAMMER_ERROR; > + msg_pinfo("can't take ownership of LPC/SPI"); > + goto return_status; > + } > + > + > if (readcnt > 8) { > msg_pinfo("%s, SB600 SPI controller can not receive %d bytes, " > "it is limited to 8 bytes\n", __func__, readcnt); > - return SPI_INVALID_LENGTH; > + > + result = SPI_INVALID_LENGTH; > + goto return_status; > } > > if (writecnt > 8) { > msg_pinfo("%s, SB600 SPI controller can not send %d bytes, " > "it is limited to 8 bytes\n", __func__, writecnt); > - return SPI_INVALID_LENGTH; > + result = SPI_INVALID_LENGTH; > + goto return_status; > } > > /* This is a workaround for a bug in SB600 and SB700. If we only send > @@ -142,7 +213,10 @@ > * the FIFO pointer to the first byte we want to send. > */ > if (reset_compare_internal_fifo_pointer(writecnt)) > - return SPI_PROGRAMMER_ERROR; > + { the '{' should be in the same line as the 'if' > + result = SPI_PROGRAMMER_ERROR; > + goto return_status; > + } > > msg_pspew("Executing: \n"); > execute_command(); > @@ -159,7 +233,10 @@ > * Usually, the chip will respond with 0x00 or 0xff. > */ > if (reset_compare_internal_fifo_pointer(writecnt + readcnt)) > - return SPI_PROGRAMMER_ERROR; > + { here too > + result = SPI_PROGRAMMER_ERROR; > + goto return_status; > + } > > /* Skip the bytes we sent. */ > msg_pspew("Skipping: "); > @@ -168,8 +245,11 @@ > msg_pspew("[%02x]", cmd); > } > msg_pspew("\n"); > - if (compare_internal_fifo_pointer(writecnt)) > - return SPI_PROGRAMMER_ERROR; > + if (compare_internal_fifo_pointer(writecnt)){ missing space > + > + result = SPI_PROGRAMMER_ERROR; > + goto return_status; > + } > > msg_pspew("Reading: "); > for (count = 0; count < readcnt; count++, readarr++) { > @@ -177,8 +257,11 @@ > msg_pspew("[%02x]", *readarr); > } > msg_pspew("\n"); > - if (reset_compare_internal_fifo_pointer(readcnt + writecnt)) > - return SPI_PROGRAMMER_ERROR; > + if (reset_compare_internal_fifo_pointer(readcnt + writecnt)) { > + > + result = SPI_PROGRAMMER_ERROR; > + goto return_status; > + } > > if (mmio_readb(sb600_spibar + 1) != readwrite) { > msg_perr("Unexpected change in SB600 read/write count!\n"); > @@ -186,10 +269,12 @@ > "causes random corruption.\nPlease stop all " > "applications and drivers and IPMI which access the " > "flash chip.\n"); > - return SPI_PROGRAMMER_ERROR; > + result = SPI_PROGRAMMER_ERROR; > } > > - return 0; > +return_status: > + release_lpc_ownership(); > + return result; > } > > static const struct spi_programmer spi_programmer_sb600 = { > @@ -211,6 +296,9 @@ > "Reserved", "33", "22", "16.5" > }; > > + > + lpc_isa_bridge = dev; > + > /* Read SPI_BaseAddr */ > tmp = pci_read_long(dev, 0xa0); > tmp &= 0xffffffe0; /* remove bits 4-0 (reserved) */ -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

3 2

adding support for 82545GM (et al).
by Stefan Tauner 01 Aug '11

01 Aug '11

friend of mine allowed me to play with his dual fiber nic remotely. it is an Intel PRO/1000 MF PCI-X card based on the 82545GM controller: http://geizhals.at/119043 http://download.intel.com/design/network/datashts/82545gm_ds.pdf http://download.intel.com/design/network/manuals/8254x_GBe_SDM.pdf i was able to probe the attached chip (SST39VF020) after adding the PCI ID, but reads returned all 0xFF. i need to verify that this is not correct, but i am quite certain that there is a working bootrom in there. i have not looked too much at the code, commit log, ml archive or the datasheet yet, maybe there is something obvious for you...? why does flashrom detect the card twice although there is only one in there? should we add a maximum size field to the pcidev_status arrays that hold pci programmers? i wanted to do something like that ever since i discovered that the 3com nic have a 128 kB limit (after borrowing a bunch of them to access a 256 kB chip...). PS: i have also tried to add the other nic's PCI ID (82562EZ-based) to no avail. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 1

AMD - SP5100 - take SPI ownership (2/2)
by frederic.temporelli＠bull.net 01 Aug '11

01 Aug '11

Hello, Here's the second patch that will remove the write protection. If this patch isn't applied, even if SPI owenrship is ok, flashrom won't be able to write BIOS Best regards -- Fred

1 0

AMD - SP5100 - take SPI ownership (1/2)
by frederic.temporelli＠bull.net 01 Aug '11

01 Aug '11

Hello, Here's a patch for using SPI from AMD SouthBridge (SB700, SP5100, ...) without having issue with Integrated MicroControler (IMC) . This issue has been reported by Carl-Daniel Hailfinger in ChangeSet 1173 http://flashrom.org/trac/flashrom/changeset/1173 AMD is now providing details about SP5100 register in document 44413: http://support.amd.com/us/Embedded_TechDocs/44413.pdf In this document (rev 3.02), we can see that a register is in charge of managing access to LPC (p 271 and 283) => with this patch, we take LPC ownership before each set of commands to SPI. Ownership is released when command is done. I did a test by reading BIOS in flash, and this is working nicely (without this patch, I wasn't able to read the BIOS). Now, I don't have components to restore the BIOS in case of failure, so write test hasn't been done (yet)... Note: this patch doesn't remove the write protection, I'll sent a second patch which will remove this protection Best regards -- Fred

1 0

Re: [flashrom] My BIOS is unsupported/untested
by Stefan Tauner 31 Jul '11

31 Jul '11

On Thu, 28 Jul 2011 23:27:02 +0300 "Amr H. El-Sharnoby" <amr.el.sharnoby(a)gmail.com> wrote: > Hi, > Yes, I've done BIOS upgrade using flashrom ... It said that update was > "verified" so I've rebooted. I've that the system booted successfully, I'm > running ubuntu. > But the Ethernet nic was not working. It reported a strange MAC address, and > always reported "cable connected no" to ethtool .. > To recover the problem, I've tried to redo the upgrade using ASUS EZ FLASH > utility, but it didn't solve the problem. So I tried to downgrade the BIOS > using ASUS utility, but again it didn't help. > Finally, I used flashrom itself again and restored the BIOS backup I've > taken using flashrom itself, the problem was solved and network worked fine > again with the same normal MAC. > Then I performed the BIOS upgrade using ASUS utility and it worked fine. > > By the way, I've tried some different Linux distros as LiveCD when the > network was not working to make sure that it is not an OS problem. And it > was a BIOS problem indeed. > thanks amr for the explanation. flashrom has worked correctly on your board. the problem is probably that the PCI rom or some settings for the realtek network chip is stored together with the BIOS code in the flash and the vendor image does not contain meaningful defaults for the MAC address. the asus utility probably reads out the MAC address of the NIC before writing the new image. after you have written the vendor image with flashrom the information was lost until you wrote the backup again. that's also the reason why the asus tool did not work for recovery. some forum posts (http://ubuntuforums.org/showthread.php?t=1534389) indicate that resetting the CMOS RAM may have solved the issue without all the flashing. i have marked the chipset as supported, because obviously writing and reading works correctly. i have also added the board as unsupported and added a note explaining everything. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

[commit] r1397 - trunk
by repository service 31 Jul '11

31 Jul '11

Author: uwe Date: Thu Jul 28 10:13:25 2011 New Revision: 1397 URL: http://flashrom.org/trac/flashrom/changeset/1397 Log: Random whitespace and coding-style fixes. Also, indentation fixes, e.g. due to conversion to msg_*, use ARRAY_SIZE where possible, wrap overly long line, etc. Compile-tested. There should be no functional changes. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/82802ab.c trunk/a25.c trunk/bitbang_spi.c trunk/board_enable.c trunk/buspirate_spi.c trunk/chipset_enable.c trunk/cli_classic.c trunk/dediprog.c trunk/dmi.c trunk/drkaiser.c trunk/dummyflasher.c trunk/flashrom.c trunk/ft2232_spi.c trunk/gfxnvidia.c trunk/hwaccess.h trunk/ichspi.c trunk/it85spi.c trunk/it87spi.c trunk/pcidev.c trunk/physmap.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/82802ab.c Thu Jul 28 10:13:25 2011 (r1397) @@ -29,7 +29,6 @@ #include "flash.h" #include "chipdrivers.h" -// I need that Berkeley bit-map printer void print_status_82802ab(uint8_t status) { msg_cdbg("%s", status & 0x80 ? "Ready:" : "Busy:"); @@ -44,8 +43,7 @@ int probe_82802ab(struct flashchip *flash) { chipaddr bios = flash->virtual_memory; - uint8_t id1, id2; - uint8_t flashcontent1, flashcontent2; + uint8_t id1, id2, flashcontent1, flashcontent2; int shifted = (flash->feature_bits & FEATURE_ADDR_SHIFTED) != 0; /* Reset to get a clean state */ @@ -69,7 +67,10 @@ if (!oddparity(id1)) msg_cdbg(", id1 parity violation"); - /* Read the product ID location again. We should now see normal flash contents. */ + /* + * Read the product ID location again. We should now see normal + * flash contents. + */ flashcontent1 = chip_readb(bios + (0x00 << shifted)); flashcontent2 = chip_readb(bios + (0x01 << shifted)); @@ -112,14 +113,13 @@ //chipaddr wrprotect = flash->virtual_registers + page + 2; for (i = 0; i < flash->total_size * 1024; i+= flash->page_size) - { chip_writeb(0, flash->virtual_registers + i + 2); - } return 0; } -int erase_block_82802ab(struct flashchip *flash, unsigned int page, unsigned int pagesize) +int erase_block_82802ab(struct flashchip *flash, unsigned int page, + unsigned int pagesize) { chipaddr bios = flash->virtual_memory; uint8_t status; @@ -178,7 +178,7 @@ msg_cdbg("unlocked!\n"); can_unlock = 1; } - + /* Read block lock-bits */ for (i = 0; i < flash->total_size * 1024; i+= (64 * 1024)) { bcfg = chip_readb(bios + i + 2); // read block lock config Modified: trunk/a25.c ============================================================================== --- trunk/a25.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/a25.c Thu Jul 28 10:13:25 2011 (r1397) @@ -31,7 +31,7 @@ msg_cdbg("Chip status register is %02x\n", status); msg_cdbg("Chip status register: Status Register Write Disable " - "(SRWD) is %sset\n", (status & (1 << 7)) ? "" : "not "); + "(SRWD) is %sset\n", (status & (1 << 7)) ? "" : "not "); spi_prettyprint_status_register_bit(status, 6); spi_prettyprint_status_register_bit(status, 5); spi_prettyprint_status_register_bit(status, 4); @@ -48,7 +48,7 @@ msg_cdbg("Chip status register is %02x\n", status); msg_cdbg("Chip status register: Status Register Write Disable " - "(SRWD) is %sset\n", (status & (1 << 7)) ? "" : "not "); + "(SRWD) is %sset\n", (status & (1 << 7)) ? "" : "not "); spi_prettyprint_status_register_bit(status, 6); spi_prettyprint_status_register_bit(status, 5); spi_prettyprint_status_register_bp3210(status, 2); @@ -64,7 +64,7 @@ msg_cdbg("Chip status register is %02x\n", status); msg_cdbg("Chip status register: Status Register Write Disable " - "(SRWD) is %sset\n", (status & (1 << 7)) ? "" : "not "); + "(SRWD) is %sset\n", (status & (1 << 7)) ? "" : "not "); msg_cdbg("Chip status register: Sector Protect Size (SEC) " "is %i KB\n", (status & (1 << 6)) ? 4 : 64); msg_cdbg("Chip status register: Top/Bottom (TB) " @@ -83,7 +83,7 @@ msg_cdbg("Chip status register is %02x\n", status); msg_cdbg("Chip status register: Status Register Write Disable " - "(SRWD) is %sset\n", (status & (1 << 7)) ? "" : "not "); + "(SRWD) is %sset\n", (status & (1 << 7)) ? "" : "not "); msg_cdbg("Chip status register: Sector Protect Size (SEC) " "is %i KB\n", (status & (1 << 6)) ? 4 : 64); msg_cdbg("Chip status register: Top/Bottom (TB) " Modified: trunk/bitbang_spi.c ============================================================================== --- trunk/bitbang_spi.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/bitbang_spi.c Thu Jul 28 10:13:25 2011 (r1397) @@ -68,13 +68,13 @@ const unsigned char *writearr, unsigned char *readarr); static const struct spi_programmer spi_programmer_bitbang = { - .type = SPI_CONTROLLER_BITBANG, - .max_data_read = MAX_DATA_READ_UNLIMITED, - .max_data_write = MAX_DATA_WRITE_UNLIMITED, - .command = bitbang_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, + .type = SPI_CONTROLLER_BITBANG, + .max_data_read = MAX_DATA_READ_UNLIMITED, + .max_data_write = MAX_DATA_WRITE_UNLIMITED, + .command = bitbang_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, }; int bitbang_spi_init(const struct bitbang_spi_master *master, int halfperiod) Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/board_enable.c Thu Jul 28 10:13:25 2011 (r1397) @@ -179,7 +179,7 @@ static const struct winbond_port w83627hf[3] = { UNIMPLEMENTED_PORT, {w83627hf_port2_mux, 0x08, 0, 0xF0}, - UNIMPLEMENTED_PORT + UNIMPLEMENTED_PORT, }; static const struct winbond_mux w83627ehf_port2_mux[8] = { @@ -190,7 +190,7 @@ {0x2A, 0x01, 0x01}, /* or keyboard/mouse interface */ {0x2A, 0x01, 0x01}, {0x2A, 0x01, 0x01}, - {0x2A, 0x01, 0x01} + {0x2A, 0x01, 0x01}, }; static const struct winbond_port w83627ehf[6] = { @@ -199,7 +199,7 @@ UNIMPLEMENTED_PORT, UNIMPLEMENTED_PORT, UNIMPLEMENTED_PORT, - UNIMPLEMENTED_PORT + UNIMPLEMENTED_PORT, }; static const struct winbond_mux w83627thf_port4_mux[8] = { @@ -210,7 +210,7 @@ {0x2D, 0x10, 0x10}, /* or PWROK */ {0x2D, 0x20, 0x20}, /* or suspend LED */ {0x2D, 0x40, 0x40}, /* or panel switch input */ - {0x2D, 0x80, 0x80} /* or panel switch output */ + {0x2D, 0x80, 0x80}, /* or panel switch output */ }; static const struct winbond_port w83627thf[5] = { @@ -218,7 +218,7 @@ UNIMPLEMENTED_PORT, /* GPIO2 */ UNIMPLEMENTED_PORT, /* GPIO3 */ {w83627thf_port4_mux, 0x09, 1, 0xF4}, - UNIMPLEMENTED_PORT /* GPIO5 */ + UNIMPLEMENTED_PORT, /* GPIO5 */ }; static const struct winbond_chip winbond_chips[] = { @@ -561,7 +561,8 @@ id = sio_read(0x2E, 0x20); if (id != chipid) { - msg_perr("PC8736x: unexpected ID %02x (expected %02x)\n", id, chipid); + msg_perr("PC8736x: unexpected ID %02x (expected %02x)\n", + id, chipid); return -1; } @@ -811,13 +812,13 @@ { struct pci_dev *dev; - dev = pci_dev_find(0x10DE, 0x0050); /* NVIDIA CK804 ISA Bridge. */ + dev = pci_dev_find(0x10DE, 0x0050); /* NVIDIA CK804 ISA bridge. */ if (!dev) { msg_perr("\nERROR: NVIDIA nForce4 ISA bridge not found.\n"); return -1; } - /* one of those bits seems to be connected to TBL#, but -ENOINFO. */ + /* One of those bits seems to be connected to TBL#, but -ENOINFO. */ pci_write_byte(dev, 0x92, 0); return 0; @@ -851,8 +852,7 @@ static int nvidia_mcp_gpio_set(int gpio, int raise) { struct pci_dev *dev; - uint16_t base; - uint16_t devclass; + uint16_t base, devclass; uint8_t tmp; if ((gpio < 0) || (gpio >= 0x40)) { @@ -860,7 +860,7 @@ return -1; } - /* First, check the ISA Bridge */ + /* First, check the ISA bridge */ dev = pci_dev_find_vendorclass(0x10DE, 0x0601); switch (dev->device_id) { case 0x0030: /* CK804 */ @@ -1092,7 +1092,7 @@ /* * Suited for: - * - Asus A8AE-LE (Codename AmberineM; used in Compaq Presario 061) + * - ASUS A8AE-LE (Codename AmberineM; used in Compaq Presario 061) * Datasheet(s) used: * - AMD document 43009 "AMD SB700/710/750 Register Reference Guide" rev. 1.00 */ @@ -1101,7 +1101,7 @@ struct pci_dev *dev; uint32_t reg; - dev = pci_dev_find(0x1002, 0x4372); /* AMD SMBus Controller */ + dev = pci_dev_find(0x1002, 0x4372); /* AMD SMBus controller */ if (!dev) { msg_perr("\nERROR: AMD SMBus Controller (0x4372) not found.\n"); return -1; @@ -1128,43 +1128,43 @@ struct pci_dev *dev; uint32_t tmp, base; - static const uint32_t nonmuxed_gpos = 0x58000101; /* GPPO {0,8,27,28,30} are always available */ + /* GPPO {0,8,27,28,30} are always available */ + static const uint32_t nonmuxed_gpos = 0x58000101; static const struct {unsigned int reg, mask, value; } piix4_gpo[] = { - {0}, - {0xB0, 0x0001, 0x0000}, /* GPO1... */ - {0xB0, 0x0001, 0x0000}, - {0xB0, 0x0001, 0x0000}, - {0xB0, 0x0001, 0x0000}, - {0xB0, 0x0001, 0x0000}, - {0xB0, 0x0001, 0x0000}, - {0xB0, 0x0001, 0x0000}, /* ...GPO7: GENCFG bit 0 */ - {0}, - {0xB0, 0x0100, 0x0000}, /* GPO9: GENCFG bit 8 */ - {0xB0, 0x0200, 0x0000}, /* GPO10: GENCFG bit 9 */ - {0xB0, 0x0400, 0x0000}, /* GPO11: GENCFG bit 10 */ - {0x4E, 0x0100, 0x0000}, /* GPO12... */ - {0x4E, 0x0100, 0x0000}, - {0x4E, 0x0100, 0x0000}, /* ...GPO14: XBCS bit 8 */ - {0xB2, 0x0002, 0x0002}, /* GPO15... */ - {0xB2, 0x0002, 0x0002}, /* ...GPO16: GENCFG bit 17 */ - {0xB2, 0x0004, 0x0004}, /* GPO17: GENCFG bit 18 */ - {0xB2, 0x0008, 0x0008}, /* GPO18: GENCFG bit 19 */ - {0xB2, 0x0010, 0x0010}, /* GPO19: GENCFG bit 20 */ - {0xB2, 0x0020, 0x0020}, /* GPO20: GENCFG bit 21 */ - {0xB2, 0x0040, 0x0040}, /* GPO21: GENCFG bit 22 */ - {0xB2, 0x1000, 0x1000}, /* GPO22... */ - {0xB2, 0x1000, 0x1000}, /* ...GPO23: GENCFG bit 28 */ - {0xB2, 0x2000, 0x2000}, /* GPO24: GENCFG bit 29 */ - {0xB2, 0x4000, 0x4000}, /* GPO25: GENCFG bit 30 */ - {0xB2, 0x8000, 0x8000}, /* GPO26: GENCFG bit 31 */ - {0}, - {0}, - {0x4E, 0x0100, 0x0000}, /* ...GPO29: XBCS bit 8 */ - {0} + {0}, + {0xB0, 0x0001, 0x0000}, /* GPO1... */ + {0xB0, 0x0001, 0x0000}, + {0xB0, 0x0001, 0x0000}, + {0xB0, 0x0001, 0x0000}, + {0xB0, 0x0001, 0x0000}, + {0xB0, 0x0001, 0x0000}, + {0xB0, 0x0001, 0x0000}, /* ...GPO7: GENCFG bit 0 */ + {0}, + {0xB0, 0x0100, 0x0000}, /* GPO9: GENCFG bit 8 */ + {0xB0, 0x0200, 0x0000}, /* GPO10: GENCFG bit 9 */ + {0xB0, 0x0400, 0x0000}, /* GPO11: GENCFG bit 10 */ + {0x4E, 0x0100, 0x0000}, /* GPO12... */ + {0x4E, 0x0100, 0x0000}, + {0x4E, 0x0100, 0x0000}, /* ...GPO14: XBCS bit 8 */ + {0xB2, 0x0002, 0x0002}, /* GPO15... */ + {0xB2, 0x0002, 0x0002}, /* ...GPO16: GENCFG bit 17 */ + {0xB2, 0x0004, 0x0004}, /* GPO17: GENCFG bit 18 */ + {0xB2, 0x0008, 0x0008}, /* GPO18: GENCFG bit 19 */ + {0xB2, 0x0010, 0x0010}, /* GPO19: GENCFG bit 20 */ + {0xB2, 0x0020, 0x0020}, /* GPO20: GENCFG bit 21 */ + {0xB2, 0x0040, 0x0040}, /* GPO21: GENCFG bit 22 */ + {0xB2, 0x1000, 0x1000}, /* GPO22... */ + {0xB2, 0x1000, 0x1000}, /* ...GPO23: GENCFG bit 28 */ + {0xB2, 0x2000, 0x2000}, /* GPO24: GENCFG bit 29 */ + {0xB2, 0x4000, 0x4000}, /* GPO25: GENCFG bit 30 */ + {0xB2, 0x8000, 0x8000}, /* GPO26: GENCFG bit 31 */ + {0}, + {0}, + {0x4E, 0x0100, 0x0000}, /* ...GPO29: XBCS bit 8 */ + {0} }; - dev = pci_dev_find(0x8086, 0x7110); /* Intel PIIX4 ISA bridge */ if (!dev) { msg_perr("\nERROR: Intel PIIX4 ISA bridge not found.\n"); @@ -1177,10 +1177,12 @@ return -1; } - if ( (((1 << gpo) & nonmuxed_gpos) == 0) && - (pci_read_word(dev, piix4_gpo[gpo].reg) & piix4_gpo[gpo].mask) != piix4_gpo[gpo].value ) { - msg_perr("\nERROR: PIIX4 GPO%d not programmed for output.\n", gpo); - return -1; + if ((((1 << gpo) & nonmuxed_gpos) == 0) && + (pci_read_word(dev, piix4_gpo[gpo].reg) + & piix4_gpo[gpo].mask) != piix4_gpo[gpo].value) { + msg_perr("\nERROR: PIIX4 GPO%d not programmed for output.\n", + gpo); + return -1; } dev = pci_dev_find(0x8086, 0x7113); /* Intel PIIX4 PM */ @@ -1315,7 +1317,7 @@ /* libpci before version 2.2.4 does not store class info. */ device_class = pci_read_word(dev, PCI_CLASS_DEVICE); if ((dev->vendor_id == 0x8086) && - (device_class == 0x0601)) { /* ISA Bridge */ + (device_class == 0x0601)) { /* ISA bridge */ /* Is this device in our list? */ for (i = 0; intel_ich_gpio_table[i].id; i++) if (dev->device_id == intel_ich_gpio_table[i].id) @@ -1327,7 +1329,7 @@ } if (!dev) { - msg_perr("\nERROR: No Known Intel LPC Bridge found.\n"); + msg_perr("\nERROR: No known Intel LPC bridge found.\n"); return -1; } @@ -1347,13 +1349,13 @@ allowed = (intel_ich_gpio_table[i].bank2 >> (gpio - 64)) & 0x01; if (!allowed) { - msg_perr("\nERROR: This Intel LPC Bridge does not allow" - " setting GPIO%02d\n", gpio); + msg_perr("\nERROR: This Intel LPC bridge does not allow" + " setting GPIO%02d\n", gpio); return -1; } - msg_pdbg("\nIntel ICH LPC Bridge: %sing GPIO%02d.\n", - raise ? "Rais" : "Dropp", gpio); + msg_pdbg("\nIntel ICH LPC bridge: %sing GPIO%02d.\n", + raise ? "Rais" : "Dropp", gpio); if (gpio < 32) { /* Set line to GPIO. */ @@ -1371,7 +1373,7 @@ if (dev->device_id > 0x2800) { tmp = INL(base); if (!(tmp & (1 << gpio))) { - msg_perr("\nERROR: This Intel LPC Bridge" + msg_perr("\nERROR: This Intel LPC bridge" " does not allow setting GPIO%02d\n", gpio); return -1; @@ -1403,7 +1405,7 @@ if (dev->device_id > 0x2800) { tmp = INL(base + 30); if (!(tmp & (1 << gpio))) { - msg_perr("\nERROR: This Intel LPC Bridge" + msg_perr("\nERROR: This Intel LPC bridge" " does not allow setting GPIO%02d\n", gpio + 32); return -1; @@ -1432,7 +1434,7 @@ tmp = INL(base + 40); if (!(tmp & (1 << gpio))) { - msg_perr("\nERROR: This Intel LPC Bridge does " + msg_perr("\nERROR: This Intel LPC bridge does " "not allow setting GPIO%02d\n", gpio + 64); return -1; } @@ -1607,10 +1609,10 @@ { int ret; - /* vendor BIOS ends up in LDN6... maybe the board enable is wrong, + /* Vendor BIOS ends up in LDN6... maybe the board enable is wrong, * or perhaps it's not needed at all? - * the regs it tries to touch are 0xF0, 0xF1, 0xF2 which means if it - * were in the right LDN, it would have to be GPIO1 or GPIO3 + * The regs it tries to touch are 0xF0, 0xF1, 0xF2 which means if it + * were in the right LDN, it would have to be GPIO1 or GPIO3. */ /* ret = winbond_gpio_set(0x2e, WINBOND_W83627EHF_ID, x, 0) @@ -1659,10 +1661,9 @@ static int via_apollo_gpo_set(int gpio, int raise) { struct pci_dev *dev; - uint32_t base; - uint32_t tmp; + uint32_t base, tmp; - /* VT82C686 Power management */ + /* VT82C686 power management */ dev = pci_dev_find(0x1106, 0x3057); if (!dev) { msg_perr("\nERROR: VT82C686 PM device not found.\n"); @@ -1670,24 +1671,23 @@ } msg_pdbg("\nVIA Apollo ACPI: %sing GPIO%02d.\n", - raise ? "Rais" : "Dropp", gpio); + raise ? "Rais" : "Dropp", gpio); - /* select GPO function on multiplexed pins */ + /* Select GPO function on multiplexed pins. */ tmp = pci_read_byte(dev, 0x54); - switch(gpio) - { - case 0: - tmp &= ~0x03; - break; - case 1: - tmp |= 0x04; - break; - case 2: - tmp |= 0x08; - break; - case 3: - tmp |= 0x10; - break; + switch (gpio) { + case 0: + tmp &= ~0x03; + break; + case 1: + tmp |= 0x04; + break; + case 2: + tmp |= 0x08; + break; + case 3: + tmp |= 0x10; + break; } pci_write_byte(dev, 0x54, tmp); @@ -1880,8 +1880,8 @@ /* Check line */ if ((port > 4) || /* also catches unsigned -1 */ ((port < 4) && (line > 7)) || ((port == 4) && (line > 5))) { - msg_perr("\nERROR: Unsupported IT8712F GPIO line %02d.\n", line); - return -1; + msg_perr("\nERROR: Unsupported IT8712F GPIO line %02d.\n", line); + return -1; } /* Find the IT8712F. */ @@ -1906,7 +1906,7 @@ return -1; } - /* set GPIO. */ + /* Set GPIO. */ tmp = INB(base + port); if (raise) tmp |= 1 << line; @@ -2091,8 +2091,8 @@ * Match boards on coreboot table gathered vendor and part name. * Require main PCI IDs to match too as extra safety. */ -static const struct board_pciid_enable *board_match_coreboot_name(const char *vendor, - const char *part) +static const struct board_pciid_enable *board_match_coreboot_name( + const char *vendor, const char *part) { const struct board_pciid_enable *board = board_pciid_enables; const struct board_pciid_enable *partmatch = NULL; @@ -2119,7 +2119,7 @@ /* a second entry has a matching part name */ msg_pinfo("AMBIGUOUS BOARD NAME: %s\n", part); msg_pinfo("At least vendors '%s' and '%s' match.\n", - partmatch->lb_vendor, board->lb_vendor); + partmatch->lb_vendor, board->lb_vendor); msg_perr("Please use the full -m vendor:part syntax.\n"); return NULL; } @@ -2135,7 +2135,7 @@ * expected to fix flashrom, too. */ msg_perr("\nUnknown vendor:board from -m option: %s:%s\n\n", - vendor, part); + vendor, part); } return NULL; } @@ -2144,7 +2144,8 @@ * Match boards on PCI IDs and subsystem IDs. * Second set of IDs can be main only or missing completely. */ -const static struct board_pciid_enable *board_match_pci_card_ids(enum board_match_phase phase) +const static struct board_pciid_enable *board_match_pci_card_ids( + enum board_match_phase phase) { const struct board_pciid_enable *board = board_pciid_enables; @@ -2177,8 +2178,8 @@ if (board->dmi_pattern) { if (!has_dmi_support) { msg_perr("WARNING: Can't autodetect %s %s," - " DMI info unavailable.\n", - board->vendor_name, board->board_name); + " DMI info unavailable.\n", + board->vendor_name, board->board_name); continue; } else { if (!dmi_match(board->dmi_pattern)) @@ -2202,12 +2203,12 @@ if (!force_boardenable) { msg_pinfo("WARNING: Your mainboard is %s %s, but the mainboard-specific\n" - "code has not been tested, and thus will not be executed by default.\n" - "Depending on your hardware environment, erasing, writing or even probing\n" - "can fail without running the board specific code.\n\n" - "Please see the man page (section PROGRAMMER SPECIFIC INFO, subsection\n" - "\"internal programmer\") for details.\n", - board->vendor_name, board->board_name); + "code has not been tested, and thus will not be executed by default.\n" + "Depending on your hardware environment, erasing, writing or even probing\n" + "can fail without running the board specific code.\n\n" + "Please see the man page (section PROGRAMMER SPECIFIC INFO, subsection\n" + "\"internal programmer\") for details.\n", + board->vendor_name, board->board_name); return 1; } msg_pinfo("NOTE: Running an untested board enable procedure.\n" Modified: trunk/buspirate_spi.c ============================================================================== --- trunk/buspirate_spi.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/buspirate_spi.c Thu Jul 28 10:13:25 2011 (r1397) @@ -50,7 +50,8 @@ #define sp_flush_incoming(...) 0 #endif -static int buspirate_sendrecv(unsigned char *buf, unsigned int writecnt, unsigned int readcnt) +static int buspirate_sendrecv(unsigned char *buf, unsigned int writecnt, + unsigned int readcnt) { int i, ret = 0; @@ -90,13 +91,13 @@ const unsigned char *writearr, unsigned char *readarr); static const struct spi_programmer spi_programmer_buspirate = { - .type = SPI_CONTROLLER_BUSPIRATE, - .max_data_read = 12, - .max_data_write = 12, - .command = buspirate_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, + .type = SPI_CONTROLLER_BUSPIRATE, + .max_data_read = 12, + .max_data_write = 12, + .command = buspirate_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, }; static const struct buspirate_spispeeds spispeeds[] = { @@ -108,7 +109,7 @@ {"2.6M", 0x5}, {"4M", 0x6}, {"8M", 0x7}, - {NULL, 0x0} + {NULL, 0x0}, }; static int buspirate_spi_shutdown(void *data) @@ -149,11 +150,9 @@ int buspirate_spi_init(void) { unsigned char buf[512]; - int ret = 0; - int i; + int ret = 0, i, spispeed = 0x7; char *dev = NULL; char *speed = NULL; - int spispeed = 0x7; dev = extract_programmer_param("dev"); if (!dev || !strlen(dev)) { Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/chipset_enable.c Thu Jul 28 10:13:25 2011 (r1397) @@ -77,7 +77,8 @@ rpci_write_byte(dev, 0x40, new); newer = pci_read_byte(dev, 0x40); if (newer != new) { - msg_pinfo("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x40, new, name); + msg_pinfo("tried to set register 0x%x to 0x%x on %s " + "failed (WARNING ONLY)\n", 0x40, new, name); msg_pinfo("Stuck at 0x%x\n", newer); return -1; } @@ -87,7 +88,7 @@ static struct pci_dev *find_southbridge(uint16_t vendor, const char *name) { struct pci_dev *sbdev; - + sbdev = pci_dev_find_vendorclass(vendor, 0x0601); if (!sbdev) sbdev = pci_dev_find_vendorclass(vendor, 0x0680); @@ -97,8 +98,8 @@ msg_perr("No southbridge found for %s!\n", name); if (sbdev) msg_pdbg("Found southbridge %04x:%04x at %02x:%02x:%01x\n", - sbdev->vendor_id, sbdev->device_id, - sbdev->bus, sbdev->dev, sbdev->func); + sbdev->vendor_id, sbdev->device_id, + sbdev->bus, sbdev->dev, sbdev->func); return sbdev; } @@ -165,7 +166,8 @@ rpci_write_byte(sbdev, 0x45, new); newer = pci_read_byte(sbdev, 0x45); if (newer != new) { - msg_pinfo("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x45, new, name); + msg_pinfo("tried to set register 0x%x to 0x%x on %s failed " + "(WARNING ONLY)\n", 0x45, new, name); msg_pinfo("Stuck at 0x%x\n", newer); ret = -1; } @@ -191,7 +193,8 @@ rpci_write_byte(sbdev, 0x45, new); newer = pci_read_byte(sbdev, 0x45); if (newer != new) { - msg_pinfo("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x45, new, name); + msg_pinfo("tried to set register 0x%x to 0x%x on %s failed " + "(WARNING ONLY)\n", 0x45, new, name); msg_pinfo("Stuck at 0x%x\n", newer); ret = -1; } @@ -238,7 +241,8 @@ rpci_write_word(dev, xbcs, new); if (pci_read_word(dev, xbcs) != new) { - msg_pinfo("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", xbcs, new, name); + msg_pinfo("tried to set 0x%x to 0x%x on %s failed " + "(WARNING ONLY)\n", xbcs, new, name); return -1; } @@ -261,9 +265,9 @@ old = pci_read_byte(dev, bios_cntl); msg_pdbg("\nBIOS Lock Enable: %sabled, ", - (old & (1 << 1)) ? "en" : "dis"); + (old & (1 << 1)) ? "en" : "dis"); msg_pdbg("BIOS Write Enable: %sabled, ", - (old & (1 << 0)) ? "en" : "dis"); + (old & (1 << 0)) ? "en" : "dis"); msg_pdbg("BIOS_CNTL is 0x%x\n", old); /* @@ -271,10 +275,10 @@ * "Bit 5: SMM BIOS Write Protect Disable (SMM_BWP) * 1 = BIOS region SMM protection is enabled. * The BIOS Region is not writable unless all processors are in SMM." - * In earlier chipsets this bit is reserved. */ - if (old & (1 << 5)) { + * In earlier chipsets this bit is reserved. + */ + if (old & (1 << 5)) msg_pinfo("WARNING: BIOS region SMM protection is enabled!\n"); - } new = old | 1; if (new == old) @@ -283,7 +287,8 @@ rpci_write_byte(dev, bios_cntl, new); if (pci_read_byte(dev, bios_cntl) != new) { - msg_pinfo("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", bios_cntl, new, name); + msg_pinfo("tried to set 0x%x to 0x%x on %s failed " + "(WARNING ONLY)\n", bios_cntl, new, name); return -1; } @@ -304,17 +309,13 @@ static int enable_flash_ich_dc(struct pci_dev *dev, const char *name) { uint32_t fwh_conf; - int i; char *idsel = NULL; - int tmp; - int max_decode_fwh_idsel = 0; - int max_decode_fwh_decode = 0; + int i, tmp, max_decode_fwh_idsel = 0, max_decode_fwh_decode = 0; int contiguous = 1; idsel = extract_programmer_param("fwh_idsel"); if (idsel && strlen(idsel)) { - uint64_t fwh_idsel_old; - uint64_t fwh_idsel; + uint64_t fwh_idsel_old, fwh_idsel; errno = 0; /* Base 16, nothing else makes sense. */ fwh_idsel = (uint64_t)strtoull(idsel, NULL, 16); @@ -358,9 +359,9 @@ for (i = 7; i >= 0; i--) { tmp = (fwh_conf >> (i * 4)) & 0xf; msg_pdbg("\n0x%08x/0x%08x FWH IDSEL: 0x%x", - (0x1ff8 + i) * 0x80000, - (0x1ff0 + i) * 0x80000, - tmp); + (0x1ff8 + i) * 0x80000, + (0x1ff0 + i) * 0x80000, + tmp); if ((tmp == 0) && contiguous) { max_decode_fwh_idsel = (8 - i) * 0x80000; } else { @@ -372,9 +373,9 @@ for (i = 3; i >= 0; i--) { tmp = (fwh_conf >> (i * 4)) & 0xf; msg_pdbg("\n0x%08x/0x%08x FWH IDSEL: 0x%x", - (0xff4 + i) * 0x100000, - (0xff0 + i) * 0x100000, - tmp); + (0xff4 + i) * 0x100000, + (0xff0 + i) * 0x100000, + tmp); if ((tmp == 0) && contiguous) { max_decode_fwh_idsel = (8 - i) * 0x100000; } else { @@ -387,9 +388,9 @@ for (i = 7; i >= 0; i--) { tmp = (fwh_conf >> (i + 0x8)) & 0x1; msg_pdbg("\n0x%08x/0x%08x FWH decode %sabled", - (0x1ff8 + i) * 0x80000, - (0x1ff0 + i) * 0x80000, - tmp ? "en" : "dis"); + (0x1ff8 + i) * 0x80000, + (0x1ff0 + i) * 0x80000, + tmp ? "en" : "dis"); if ((tmp == 1) && contiguous) { max_decode_fwh_decode = (8 - i) * 0x80000; } else { @@ -399,9 +400,9 @@ for (i = 3; i >= 0; i--) { tmp = (fwh_conf >> i) & 0x1; msg_pdbg("\n0x%08x/0x%08x FWH decode %sabled", - (0xff4 + i) * 0x100000, - (0xff0 + i) * 0x100000, - tmp ? "en" : "dis"); + (0xff4 + i) * 0x100000, + (0xff0 + i) * 0x100000, + tmp ? "en" : "dis"); if ((tmp == 1) && contiguous) { max_decode_fwh_decode = (8 - i) * 0x100000; } else { @@ -420,25 +421,24 @@ static int enable_flash_poulsbo(struct pci_dev *dev, const char *name) { - uint16_t old, new; - int err; + uint16_t old, new; + int err; - if ((err = enable_flash_ich(dev, name, 0xd8)) != 0) - return err; + if ((err = enable_flash_ich(dev, name, 0xd8)) != 0) + return err; - old = pci_read_byte(dev, 0xd9); - msg_pdbg("BIOS Prefetch Enable: %sabled, ", - (old & 1) ? "en" : "dis"); - new = old & ~1; + old = pci_read_byte(dev, 0xd9); + msg_pdbg("BIOS Prefetch Enable: %sabled, ", + (old & 1) ? "en" : "dis"); + new = old & ~1; - if (new != old) - rpci_write_byte(dev, 0xd9, new); + if (new != old) + rpci_write_byte(dev, 0xd9, new); buses_supported = BUS_FWH; - return 0; + return 0; } - #define ICH_STRAP_RSVD 0x00 #define ICH_STRAP_SPI 0x01 #define ICH_STRAP_PCI 0x02 @@ -457,8 +457,12 @@ uint8_t bbs, buc; uint32_t tmp, gcs; void *rcrb; - //TODO: These names are incorrect for EP80579. For that, the solution would look like the commented line - //static const char *straps_names[] = {"SPI", "reserved", "reserved", "LPC" }; + + /* + * TODO: These names are incorrect for EP80579. For that, the solution + * would look like the commented line below. + */ + // static const char *straps_names[] = {"SPI", "reserved", "reserved", "LPC" }; static const char *straps_names[] = { "reserved", "SPI", "PCI", "LPC" }; /* Enable Flash Writes */ @@ -474,13 +478,13 @@ gcs = mmio_readl(rcrb + 0x3410); msg_pdbg("GCS = 0x%x: ", gcs); msg_pdbg("BIOS Interface Lock-Down: %sabled, ", - (gcs & 0x1) ? "en" : "dis"); + (gcs & 0x1) ? "en" : "dis"); bbs = (gcs >> 10) & 0x3; msg_pdbg("BOOT BIOS Straps: 0x%x (%s)\n", bbs, straps_names[bbs]); buc = mmio_readb(rcrb + 0x3414); msg_pdbg("Top Swap : %s\n", - (buc & 1) ? "enabled (A16 inverted)" : "not enabled"); + (buc & 1) ? "enabled (A16 inverted)" : "not enabled"); /* It seems the ICH7 does not support SPI and LPC chips at the same * time. At least not with our current code. So we prevent searching @@ -489,20 +493,20 @@ buses_supported = BUS_FWH; if (ich_generation == 7) { - if(bbs == ICH_STRAP_LPC) { + if (bbs == ICH_STRAP_LPC) { /* No further SPI initialization required */ return ret; - } - else + } else { /* Disable LPC/FWH if strapped to PCI or SPI */ buses_supported = 0; + } } - /* this adds BUS_SPI */ + /* This adds BUS_SPI */ if (ich_init_spi(dev, tmp, rcrb, ich_generation) != 0) { - if (!ret) - ret = ERROR_NONFATAL; - } + if (!ret) + ret = ERROR_NONFATAL; + } return ret; } @@ -532,8 +536,7 @@ uint8_t val; val = pci_read_byte(dev, 0x71); - if (val & 0x40) - { + if (val & 0x40) { msg_pdbg("Disabling byte merging\n"); val &= ~0x40; rpci_write_byte(dev, 0x71, val); @@ -545,7 +548,7 @@ { uint8_t val; - /* enable ROM decode range (1MB) FFC00000 - FFFFFFFF */ + /* Enable ROM decode range (1MB) FFC00000 - FFFFFFFF. */ rpci_write_byte(dev, 0x41, 0x7f); /* ROM write enable */ @@ -555,15 +558,15 @@ if (pci_read_byte(dev, 0x40) != val) { msg_pinfo("\nWARNING: Failed to enable flash write on \"%s\"\n", - name); + name); return -1; } if (dev->device_id == 0x3227) { /* VT8237R */ - /* All memory cycles, not just ROM ones, go to LPC. */ - val = pci_read_byte(dev, 0x59); - val &= ~0x80; - rpci_write_byte(dev, 0x59, val); + /* All memory cycles, not just ROM ones, go to LPC. */ + val = pci_read_byte(dev, 0x59); + val &= ~0x80; + rpci_write_byte(dev, 0x59, val); } return 0; @@ -671,7 +674,8 @@ new = pci_read_byte(dev, 0x52); if (new != 0xee) { - msg_pinfo("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x52, new, name); + msg_pinfo("tried to set register 0x%x to 0x%x on %s failed " + "(WARNING ONLY)\n", 0x52, new, name); return -1; } @@ -689,7 +693,8 @@ if (new != old) { rpci_write_byte(dev, 0x43, new); if (pci_read_byte(dev, 0x43) != new) { - msg_pinfo("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x43, new, name); + msg_pinfo("tried to set 0x%x to 0x%x on %s failed " + "(WARNING ONLY)\n", 0x43, new, name); } } @@ -701,7 +706,8 @@ rpci_write_byte(dev, 0x40, new); if (pci_read_byte(dev, 0x40) != new) { - msg_pinfo("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x40, new, name); + msg_pinfo("tried to set 0x%x to 0x%x on %s failed " + "(WARNING ONLY)\n", 0x40, new, name); return -1; } @@ -721,19 +727,19 @@ if ((prot & 0x3) == 0) continue; msg_pinfo("SB600 %s%sprotected from 0x%08x to 0x%08x\n", - (prot & 0x1) ? "write " : "", - (prot & 0x2) ? "read " : "", - (prot & 0xfffff800), - (prot & 0xfffff800) + (((prot & 0x7fc) << 8) | 0x3ff)); + (prot & 0x1) ? "write " : "", + (prot & 0x2) ? "read " : "", + (prot & 0xfffff800), + (prot & 0xfffff800) + (((prot & 0x7fc) << 8) | 0x3ff)); prot &= 0xfffffffc; rpci_write_byte(dev, reg, prot); prot = pci_read_long(dev, reg); if (prot & 0x3) msg_perr("SB600 %s%sunprotect failed from 0x%08x to 0x%08x\n", - (prot & 0x1) ? "write " : "", - (prot & 0x2) ? "read " : "", - (prot & 0xfffff800), - (prot & 0xfffff800) + (((prot & 0x7fc) << 8) | 0x3ff)); + (prot & 0x1) ? "write " : "", + (prot & 0x2) ? "read " : "", + (prot & 0xfffff800), + (prot & 0xfffff800) + (((prot & 0x7fc) << 8) | 0x3ff)); } buses_supported = BUS_LPC | BUS_FWH; @@ -800,7 +806,8 @@ if (new != old) { rpci_write_byte(dev, 0x88, new); if (pci_read_byte(dev, 0x88) != new) { - msg_pinfo("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x88, new, name); + msg_pinfo("tried to set 0x%x to 0x%x on %s failed " + "(WARNING ONLY)\n", 0x88, new, name); } } @@ -811,7 +818,8 @@ rpci_write_byte(dev, 0x6d, new); if (pci_read_byte(dev, 0x6d) != new) { - msg_pinfo("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x6d, new, name); + msg_pinfo("tried to set 0x%x to 0x%x on %s failed " + "(WARNING ONLY)\n", 0x6d, new, name); return -1; } @@ -894,7 +902,8 @@ rpci_write_byte(dev, 0x6d, new); if (pci_read_byte(dev, 0x6d) != new) { - msg_pinfo("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x6d, new, name); + msg_pinfo("tried to set 0x%x to 0x%x on %s failed " + "(WARNING ONLY)\n", 0x6d, new, name); return -1; } @@ -908,8 +917,7 @@ */ static int enable_flash_mcp6x_7x(struct pci_dev *dev, const char *name) { - int ret = 0; - int want_spi = 0; + int ret = 0, want_spi = 0; uint8_t val; msg_pinfo("This chipset is not really supported yet. Guesswork...\n"); @@ -952,9 +960,9 @@ rpci_write_byte(dev, 0x8a, val); #endif - if (mcp6x_spi_init(want_spi)) { + if (mcp6x_spi_init(want_spi)) ret = 1; - } + out_msg: msg_pinfo("Please send the output of \"flashrom -V\" to " "flashrom(a)flashrom.org with\n" @@ -1020,7 +1028,8 @@ flashbase = parx << 12; } } else { - msg_pinfo("AMD Elan SC520 detected, but no BOOTCS. Assuming flash at 4G\n"); + msg_pinfo("AMD Elan SC520 detected, but no BOOTCS. " + "Assuming flash at 4G\n"); } /* 4. Clean up */ @@ -1269,9 +1278,9 @@ msg_pinfo("OK - searching further chips.\n"); } else if (ret < 0) msg_pinfo("FAILED!\n"); - else if(ret == 0) + else if (ret == 0) msg_pinfo("OK.\n"); - else if(ret == ERROR_NONFATAL) + else if (ret == ERROR_NONFATAL) msg_pinfo("PROBLEMS, continuing anyway\n"); } Modified: trunk/cli_classic.c ============================================================================== --- trunk/cli_classic.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/cli_classic.c Thu Jul 28 10:13:25 2011 (r1397) @@ -103,45 +103,37 @@ const struct flashchip *flash; struct flashchip flashes[3]; struct flashchip *fill_flash; - int startchip = 0; - int chipcount = 0; const char *name; - int namelen; - int opt; - int option_index = 0; - int force = 0; + int startchip = 0, chipcount = 0, namelen, opt, option_index = 0; int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0; - int dont_verify_it = 0, list_supported = 0; + int dont_verify_it = 0, list_supported = 0, force = 0; #if CONFIG_PRINT_WIKI == 1 int list_supported_wiki = 0; #endif - int operation_specified = 0; - int i; - int ret = 0; + int operation_specified = 0, i, ret = 0; static const char optstring[] = "r:Rw:v:nVEfc:m:l:i:p:Lzh"; static const struct option long_options[] = { - {"read", 1, NULL, 'r'}, - {"write", 1, NULL, 'w'}, - {"erase", 0, NULL, 'E'}, - {"verify", 1, NULL, 'v'}, - {"noverify", 0, NULL, 'n'}, - {"chip", 1, NULL, 'c'}, - {"mainboard", 1, NULL, 'm'}, - {"verbose", 0, NULL, 'V'}, - {"force", 0, NULL, 'f'}, - {"layout", 1, NULL, 'l'}, - {"image", 1, NULL, 'i'}, - {"list-supported", 0, NULL, 'L'}, - {"list-supported-wiki", 0, NULL, 'z'}, - {"programmer", 1, NULL, 'p'}, - {"help", 0, NULL, 'h'}, - {"version", 0, NULL, 'R'}, - {NULL, 0, NULL, 0} + {"read", 1, NULL, 'r'}, + {"write", 1, NULL, 'w'}, + {"erase", 0, NULL, 'E'}, + {"verify", 1, NULL, 'v'}, + {"noverify", 0, NULL, 'n'}, + {"chip", 1, NULL, 'c'}, + {"mainboard", 1, NULL, 'm'}, + {"verbose", 0, NULL, 'V'}, + {"force", 0, NULL, 'f'}, + {"layout", 1, NULL, 'l'}, + {"image", 1, NULL, 'i'}, + {"list-supported", 0, NULL, 'L'}, + {"list-supported-wiki", 0, NULL, 'z'}, + {"programmer", 1, NULL, 'p'}, + {"help", 0, NULL, 'h'}, + {"version", 0, NULL, 'R'}, + {NULL, 0, NULL, 0}, }; char *filename = NULL; - char *tempstr = NULL; char *pparam = NULL; @@ -355,7 +347,7 @@ fprintf(stderr, "Error: Unknown chip '%s' specified.\n", chip_to_probe); printf("Run flashrom -L to view the hardware supported " - "in this flashrom version.\n"); + "in this flashrom version.\n"); exit(1); } /* Clean up after the check. */ @@ -384,23 +376,28 @@ flashes[0].name); for (i = 1; i < chipcount; i++) printf(", \"%s\"", flashes[i].name); - printf("\nPlease specify which chip to use with the -c <chipname> option.\n"); + printf("\nPlease specify which chip to use with the " + "-c <chipname> option.\n"); ret = 1; goto out_shutdown; } else if (!chipcount) { printf("No EEPROM/flash device found.\n"); if (!force || !chip_to_probe) { - printf("Note: flashrom can never write if the flash chip isn't found automatically.\n"); + printf("Note: flashrom can never write if the flash " + "chip isn't found automatically.\n"); } if (force && read_it && chip_to_probe) { - printf("Force read (-f -r -c) requested, pretending the chip is there:\n"); + printf("Force read (-f -r -c) requested, pretending " + "the chip is there:\n"); startchip = probe_flash(0, &flashes[0], 1); if (startchip == -1) { - printf("Probing for flash chip '%s' failed.\n", chip_to_probe); + printf("Probing for flash chip '%s' failed.\n", + chip_to_probe); ret = 1; goto out_shutdown; } - printf("Please note that forced reads most likely contain garbage.\n"); + printf("Please note that forced reads most likely " + "contain garbage.\n"); return read_flash_to_file(&flashes[0], filename); } ret = 1; Modified: trunk/dediprog.c ============================================================================== --- trunk/dediprog.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/dediprog.c Thu Jul 28 10:13:25 2011 (r1397) @@ -71,7 +71,7 @@ static int dediprog_set_leds(int leds) { int ret, target_leds; - + if (leds < 0 || leds > 7) leds = 0; // Bogus value, enable all LEDs @@ -92,9 +92,11 @@ target_leds = leds; } - ret = usb_control_msg(dediprog_handle, 0x42, 0x07, 0x09, target_leds, NULL, 0x0, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, 0x42, 0x07, 0x09, target_leds, + NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { - msg_perr("Command Set LED 0x%x failed (%s)!\n", leds, usb_strerror()); + msg_perr("Command Set LED 0x%x failed (%s)!\n", + leds, usb_strerror()); return 1; } @@ -129,9 +131,11 @@ msg_pdbg("Setting SPI voltage to %u.%03u V\n", millivolt / 1000, millivolt % 1000); - ret = usb_control_msg(dediprog_handle, 0x42, 0x9, voltage_selector, 0xff, NULL, 0x0, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, 0x42, 0x9, voltage_selector, + 0xff, NULL, 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { - msg_perr("Command Set SPI Voltage 0x%x failed!\n", voltage_selector); + msg_perr("Command Set SPI Voltage 0x%x failed!\n", + voltage_selector); return 1; } return 0; @@ -186,7 +190,8 @@ } msg_pdbg("Setting SPI speed to %u kHz\n", khz); - ret = usb_control_msg(dediprog_handle, 0x42, 0x61, speed, 0xff, NULL, 0x0, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, 0x42, 0x61, speed, 0xff, NULL, + 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { msg_perr("Command Set SPI Speed 0x%x failed!\n", speed); return 1; @@ -248,7 +253,8 @@ return 0; } -static int dediprog_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len) +static int dediprog_spi_read(struct flashchip *flash, uint8_t *buf, int start, + int len) { int ret; /* chunksize must be 512, other sizes will NOT work at all. */ @@ -293,7 +299,8 @@ return 0; } -static int dediprog_spi_write_256(struct flashchip *flash, uint8_t *buf, int start, int len) +static int dediprog_spi_write_256(struct flashchip *flash, uint8_t *buf, + int start, int len) { int ret; @@ -327,7 +334,9 @@ return 1; } - ret = usb_control_msg(dediprog_handle, 0x42, 0x1, 0xff, readcnt ? 0x1 : 0x0, (char *)writearr, writecnt, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, 0x42, 0x1, 0xff, + readcnt ? 0x1 : 0x0, (char *)writearr, writecnt, + DEFAULT_TIMEOUT); if (ret != writecnt) { msg_perr("Send SPI failed, expected %i, got %i %s!\n", writecnt, ret, usb_strerror()); @@ -336,7 +345,8 @@ if (!readcnt) return 0; memset(readarr, 0, readcnt); - ret = usb_control_msg(dediprog_handle, 0xc2, 0x01, 0xbb8, 0x0000, (char *)readarr, readcnt, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, 0xc2, 0x01, 0xbb8, 0x0000, + (char *)readarr, readcnt, DEFAULT_TIMEOUT); if (ret != readcnt) { msg_perr("Receive SPI failed, expected %i, got %i %s!\n", readcnt, ret, usb_strerror()); @@ -353,7 +363,8 @@ /* Command Prepare Receive Device String. */ memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc3, 0x7, 0x0, 0xef03, buf, 0x1, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, 0xc3, 0x7, 0x0, 0xef03, buf, + 0x1, DEFAULT_TIMEOUT); /* The char casting is needed to stop gcc complaining about an always true comparison. */ if ((ret != 0x1) || (buf[0] != (char)0xff)) { msg_perr("Unexpected response to Command Prepare Receive Device" @@ -362,7 +373,8 @@ } /* Command Receive Device String. */ memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc2, 0x8, 0xff, 0xff, buf, 0x10, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, 0xc2, 0x8, 0xff, 0xff, buf, + 0x10, DEFAULT_TIMEOUT); if (ret != 0x10) { msg_perr("Incomplete/failed Command Receive Device String!\n"); return 1; @@ -397,7 +409,8 @@ char buf[0x1]; memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc3, 0xb, 0x0, 0x0, buf, 0x1, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, 0xc3, 0xb, 0x0, 0x0, buf, + 0x1, DEFAULT_TIMEOUT); if (ret < 0) { msg_perr("Command A failed (%s)!\n", usb_strerror()); return 1; @@ -420,7 +433,8 @@ char buf[0x3]; memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc3, 0x7, 0x0, 0xef00, buf, 0x3, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, 0xc3, 0x7, 0x0, 0xef00, buf, + 0x3, DEFAULT_TIMEOUT); if (ret < 0) { msg_perr("Command B failed (%s)!\n", usb_strerror()); return 1; @@ -444,7 +458,8 @@ { int ret; - ret = usb_control_msg(dediprog_handle, 0x42, 0x4, 0x0, 0x0, NULL, 0x0, DEFAULT_TIMEOUT); + ret = usb_control_msg(dediprog_handle, 0x42, 0x4, 0x0, 0x0, NULL, + 0x0, DEFAULT_TIMEOUT); if (ret != 0x0) { msg_perr("Command C failed (%s)!\n", usb_strerror()); return 1; @@ -464,7 +479,8 @@ char buf[0x1]; memset(buf, 0, sizeof(buf)); - ret = usb_control_msg(dediprog_handle, 0xc2, 0x11, 0xff, 0xff, buf, 0x1, timeout); + ret = usb_control_msg(dediprog_handle, 0xc2, 0x11, 0xff, 0xff, buf, + 0x1, timeout); /* This check is most probably wrong. Command F always causes a timeout * in the logs, so we should check for timeout instead of checking for * success. @@ -480,9 +496,7 @@ static int parse_voltage(char *voltage) { char *tmp = NULL; - int i; - int millivolt; - int fraction = 0; + int i, millivolt, fraction = 0; if (!voltage || !strlen(voltage)) { msg_perr("Empty voltage= specified.\n"); @@ -527,13 +541,13 @@ } static const struct spi_programmer spi_programmer_dediprog = { - .type = SPI_CONTROLLER_DEDIPROG, - .max_data_read = MAX_DATA_UNSPECIFIED, - .max_data_write = MAX_DATA_UNSPECIFIED, - .command = dediprog_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = dediprog_spi_read, - .write_256 = dediprog_spi_write_256, + .type = SPI_CONTROLLER_DEDIPROG, + .max_data_read = MAX_DATA_UNSPECIFIED, + .max_data_write = MAX_DATA_UNSPECIFIED, + .command = dediprog_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = dediprog_spi_read, + .write_256 = dediprog_spi_write_256, }; static int dediprog_shutdown(void *data) @@ -560,8 +574,7 @@ { struct usb_device *dev; char *voltage; - int millivolt = 3500; - int ret; + int millivolt = 3500, ret; msg_pspew("%s\n", __func__); @@ -569,9 +582,8 @@ if (voltage) { millivolt = parse_voltage(voltage); free(voltage); - if (millivolt < 0) { + if (millivolt < 0) return 1; - } msg_pinfo("Setting voltage to %i mV\n", millivolt); } @@ -585,8 +597,7 @@ return 1; } msg_pdbg("Found USB device (%04x:%04x).\n", - dev->descriptor.idVendor, - dev->descriptor.idProduct); + dev->descriptor.idVendor, dev->descriptor.idProduct); dediprog_handle = usb_open(dev); ret = usb_set_configuration(dediprog_handle, 1); if (ret < 0) { @@ -666,7 +677,8 @@ /* JEDEC RDID */ msg_pdbg("Sending RDID\n"); buf[0] = JEDEC_RDID; - if (dediprog_spi_send_command(JEDEC_RDID_OUTSIZE, JEDEC_RDID_INSIZE, (unsigned char *)buf, (unsigned char *)buf)) + if (dediprog_spi_send_command(JEDEC_RDID_OUTSIZE, JEDEC_RDID_INSIZE, + (unsigned char *)buf, (unsigned char *)buf)) return 1; msg_pdbg("Receiving response: "); print_hex(buf, JEDEC_RDID_INSIZE); Modified: trunk/dmi.c ============================================================================== --- trunk/dmi.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/dmi.c Thu Jul 28 10:13:25 2011 (r1397) @@ -107,13 +107,14 @@ } /* Kill lines starting with '#', as recent dmidecode versions - have the quirk to emit a "# SMBIOS implementations newer..." - message even on "-s" if the SMBIOS declares a - newer-than-supported version number, while it *should* only print - the requested string. */ + * have the quirk to emit a "# SMBIOS implementations newer..." + * message even on "-s" if the SMBIOS declares a + * newer-than-supported version number, while it *should* only print + * the requested string. + */ do { if (!fgets(answerbuf, DMI_MAX_ANSWER_LEN, dmidecode_pipe)) { - if(ferror(dmidecode_pipe)) { + if (ferror(dmidecode_pipe)) { msg_perr("DMI pipe read error\n"); pclose(dmidecode_pipe); return NULL; @@ -121,7 +122,7 @@ answerbuf[0] = 0; /* Hit EOF */ } } - } while(answerbuf[0] == '#'); + } while (answerbuf[0] == '#'); /* Toss all output above DMI_MAX_ANSWER_LEN away to prevent deadlock on pclose. */ @@ -129,13 +130,12 @@ getc(dmidecode_pipe); if (pclose(dmidecode_pipe) != 0) { msg_pinfo("dmidecode execution unsuccessful - continuing " - "without DMI info\n"); + "without DMI info\n"); return NULL; } /* Chomp trailing newline. */ - if (answerbuf[0] != 0 && - answerbuf[strlen(answerbuf) - 1] == '\n') + if (answerbuf[0] != 0 && answerbuf[strlen(answerbuf) - 1] == '\n') answerbuf[strlen(answerbuf) - 1] = 0; msg_pdbg("DMI string %s: \"%s\"\n", string_name, answerbuf); @@ -196,8 +196,7 @@ */ static int dmi_compare(const char *value, const char *pattern) { - int anchored = 0; - int patternlen; + int anchored = 0, patternlen; msg_pspew("matching %s against %s\n", value, pattern); /* The empty string is part of all strings! */ Modified: trunk/drkaiser.c ============================================================================== --- trunk/drkaiser.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/drkaiser.c Thu Jul 28 10:13:25 2011 (r1397) @@ -58,7 +58,7 @@ /* Write magic register to enable flash write. */ rpci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, - PCI_MAGIC_DRKAISER_VALUE); + PCI_MAGIC_DRKAISER_VALUE); /* Map 128kB flash memory window. */ drkaiser_bar = physmap("Dr. Kaiser PC-Waechter flash memory", Modified: trunk/dummyflasher.c ============================================================================== --- trunk/dummyflasher.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/dummyflasher.c Thu Jul 28 10:13:25 2011 (r1397) @@ -62,16 +62,17 @@ static int dummy_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); -static int dummy_spi_write_256(struct flashchip *flash, uint8_t *buf, int start, int len); +static int dummy_spi_write_256(struct flashchip *flash, uint8_t *buf, + int start, int len); static const struct spi_programmer spi_programmer_dummyflasher = { - .type = SPI_CONTROLLER_DUMMY, - .max_data_read = MAX_DATA_READ_UNLIMITED, - .max_data_write = MAX_DATA_UNSPECIFIED, - .command = dummy_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = default_spi_read, - .write_256 = dummy_spi_write_256, + .type = SPI_CONTROLLER_DUMMY, + .max_data_read = MAX_DATA_READ_UNLIMITED, + .max_data_write = MAX_DATA_UNSPECIFIED, + .command = dummy_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = dummy_spi_write_256, }; static int dummy_shutdown(void *data) @@ -520,14 +521,14 @@ } #endif msg_pspew(" reading %u bytes:", readcnt); - for (i = 0; i < readcnt; i++) { + for (i = 0; i < readcnt; i++) msg_pspew(" 0x%02x", readarr[i]); - } msg_pspew("\n"); return 0; } -static int dummy_spi_write_256(struct flashchip *flash, uint8_t *buf, int start, int len) +static int dummy_spi_write_256(struct flashchip *flash, uint8_t *buf, + int start, int len) { return spi_write_chunked(flash, buf, start, len, spi_write_256_chunksize); Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/flashrom.c Thu Jul 28 10:13:25 2011 (r1397) @@ -182,38 +182,38 @@ #if CONFIG_NICREALTEK == 1 { /* This programmer works for Realtek RTL8139 and SMC 1211. */ - .name = "nicrealtek", - //.name = "nicsmc1211", - .init = nicrealtek_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .chip_readb = nicrealtek_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = nicrealtek_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, - .delay = internal_delay, + .name = "nicrealtek", + //.name = "nicsmc1211", + .init = nicrealtek_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .chip_readb = nicrealtek_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = nicrealtek_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, + .delay = internal_delay, }, #endif #if CONFIG_NICNATSEMI == 1 { - .name = "nicnatsemi", - .init = nicnatsemi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .chip_readb = nicnatsemi_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = nicnatsemi_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, - .delay = internal_delay, + .name = "nicnatsemi", + .init = nicnatsemi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .chip_readb = nicnatsemi_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = nicnatsemi_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, + .delay = internal_delay, }, #endif @@ -399,37 +399,37 @@ #if CONFIG_NICINTEL_SPI == 1 { - .name = "nicintel_spi", - .init = nicintel_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .chip_readb = noop_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = noop_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, - .delay = internal_delay, + .name = "nicintel_spi", + .init = nicintel_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .chip_readb = noop_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = noop_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, + .delay = internal_delay, }, #endif #if CONFIG_OGP_SPI == 1 { - .name = "ogp_spi", - .init = ogp_spi_init, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .chip_readb = noop_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = noop_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, - .delay = internal_delay, + .name = "ogp_spi", + .init = ogp_spi_init, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .chip_readb = noop_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = noop_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, + .delay = internal_delay, }, #endif @@ -503,7 +503,7 @@ .parallel = 0xffffffff, .lpc = 0xffffffff, .fwh = 0xffffffff, - .spi = 0xffffffff + .spi = 0xffffffff, }; buses_supported = BUS_NONE; /* Default to top aligned flash at 4 GB. */ @@ -600,13 +600,14 @@ size_t size = flash->total_size * 1024; /* Flash registers live 4 MByte below the flash. */ /* FIXME: This is incorrect for nonstandard flashbase. */ - flash->virtual_registers = (chipaddr)programmer_map_flash_region("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); + flash->virtual_registers = (chipaddr)programmer_map_flash_region( + "flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); } int read_memmapped(struct flashchip *flash, uint8_t *buf, int start, int len) { chip_readn(buf, flash->virtual_memory + start, len); - + return 0; } @@ -685,7 +686,7 @@ param_pos++; param_pos = strstr(param_pos, needle); } while (1); - + if (param_pos) { /* Get the string after needle and '='. */ opt_pos = param_pos + needlelen + 1; @@ -743,17 +744,17 @@ /* * @cmpbuf buffer to compare against, cmpbuf[0] is expected to match the - flash content at location start + * flash content at location start * @start offset to the base address of the flash chip * @len length of the verified area * @message string to print in the "FAILED" message * @return 0 for success, -1 for failure */ -int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, const char *message) +int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, + const char *message) { - int i, ret = 0; + int i, ret = 0, failcount = 0; uint8_t *readbuf = malloc(len); - int failcount = 0; if (!len) goto out_free; @@ -776,7 +777,7 @@ } if (!message) message = "VERIFY"; - + ret = flash->read(flash, readbuf, start, len); if (ret) { msg_gerr("Verification impossible because read failed " @@ -796,7 +797,7 @@ } if (failcount) { msg_cerr(" failed byte count from 0x%08x-0x%08x: 0x%x\n", - start, start + len - 1, failcount); + start, start + len - 1, failcount); ret = -1; } @@ -831,8 +832,7 @@ */ int need_erase(uint8_t *have, uint8_t *want, int len, enum write_granularity gran) { - int result = 0; - int i, j, limit; + int result = 0, i, j, limit; switch (gran) { case write_gran_1bit: @@ -898,8 +898,7 @@ static int get_next_write(uint8_t *have, uint8_t *want, int len, int *first_start, enum write_granularity gran) { - int need_write = 0, rel_start = 0, first_len = 0; - int i, limit, stride; + int need_write = 0, rel_start = 0, first_len = 0, i, limit, stride; switch (gran) { case write_gran_1bit: @@ -1080,38 +1079,38 @@ int check_max_decode(enum chipbustype buses, uint32_t size) { int limitexceeded = 0; - if ((buses & BUS_PARALLEL) && - (max_rom_decode.parallel < size)) { + + if ((buses & BUS_PARALLEL) && (max_rom_decode.parallel < size)) { limitexceeded++; msg_pdbg("Chip size %u kB is bigger than supported " - "size %u kB of chipset/board/programmer " - "for %s interface, " - "probe/read/erase/write may fail. ", size / 1024, - max_rom_decode.parallel / 1024, "Parallel"); + "size %u kB of chipset/board/programmer " + "for %s interface, " + "probe/read/erase/write may fail. ", size / 1024, + max_rom_decode.parallel / 1024, "Parallel"); } if ((buses & BUS_LPC) && (max_rom_decode.lpc < size)) { limitexceeded++; msg_pdbg("Chip size %u kB is bigger than supported " - "size %u kB of chipset/board/programmer " - "for %s interface, " - "probe/read/erase/write may fail. ", size / 1024, - max_rom_decode.lpc / 1024, "LPC"); + "size %u kB of chipset/board/programmer " + "for %s interface, " + "probe/read/erase/write may fail. ", size / 1024, + max_rom_decode.lpc / 1024, "LPC"); } if ((buses & BUS_FWH) && (max_rom_decode.fwh < size)) { limitexceeded++; msg_pdbg("Chip size %u kB is bigger than supported " - "size %u kB of chipset/board/programmer " - "for %s interface, " - "probe/read/erase/write may fail. ", size / 1024, - max_rom_decode.fwh / 1024, "FWH"); + "size %u kB of chipset/board/programmer " + "for %s interface, " + "probe/read/erase/write may fail. ", size / 1024, + max_rom_decode.fwh / 1024, "FWH"); } if ((buses & BUS_SPI) && (max_rom_decode.spi < size)) { limitexceeded++; msg_pdbg("Chip size %u kB is bigger than supported " - "size %u kB of chipset/board/programmer " - "for %s interface, " - "probe/read/erase/write may fail. ", size / 1024, - max_rom_decode.spi / 1024, "SPI"); + "size %u kB of chipset/board/programmer " + "for %s interface, " + "probe/read/erase/write may fail. ", size / 1024, + max_rom_decode.spi / 1024, "SPI"); } if (!limitexceeded) return 0; @@ -1121,8 +1120,8 @@ if (bitcount(buses) > limitexceeded) /* FIXME: This message is designed towards CLI users. */ msg_pdbg("There is at least one common chip/programmer " - "interface which can support a chip of this size. " - "You can try --force at your own risk.\n"); + "interface which can support a chip of this size. " + "You can try --force at your own risk.\n"); return 1; } @@ -1232,7 +1231,8 @@ return ret; } -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) { unsigned long numbytes; FILE *image; @@ -1265,7 +1265,8 @@ return 0; } -int write_buf_to_file(unsigned char *buf, unsigned long size, const char *filename) +int write_buf_to_file(unsigned char *buf, unsigned long size, + const char *filename) { unsigned long numbytes; FILE *image; @@ -1325,8 +1326,7 @@ */ static int selfcheck_eraseblocks(const struct flashchip *flash) { - int i, j, k; - int ret = 0; + int i, j, k, ret = 0; for (k = 0; k < NUM_ERASEFUNCTIONS; k++) { unsigned int done = 0; @@ -1357,7 +1357,7 @@ /* Empty eraseblock definition with erase function. */ if (!done && eraser.block_erase) msg_gspew("Strange: Empty eraseblock definition with " - "non-empty erase function. Not an error.\n"); + "non-empty erase function. Not an error.\n"); if (!done) continue; if (done != flash->total_size * 1024) { @@ -1396,11 +1396,7 @@ unsigned int addr, unsigned int len)) { - int starthere = 0; - int lenhere = 0; - int ret = 0; - int skip = 1; - int writecount = 0; + int starthere = 0, lenhere = 0, ret = 0, skip = 1, writecount = 0; enum write_granularity gran = write_gran_256bytes; /* FIXME */ /* curcontents and newcontents are opaque to walk_eraseregions, and @@ -1455,9 +1451,9 @@ void *param1, void *param2) { int i, j; - unsigned int start = 0; - unsigned int len; + unsigned int start = 0, len; struct block_eraser eraser = flash->block_erasers[erasefunction]; + for (i = 0; i < NUM_ERASEREGIONS; i++) { /* count==0 for all automatically initialized array * members so the loop below won't be executed for them. @@ -1504,7 +1500,8 @@ return 0; } -int erase_and_write_flash(struct flashchip *flash, uint8_t *oldcontents, uint8_t *newcontents) +int erase_and_write_flash(struct flashchip *flash, uint8_t *oldcontents, + uint8_t *newcontents) { int k, ret = 1; uint8_t *curcontents; @@ -1591,7 +1588,7 @@ "DO NOT REBOOT OR POWEROFF!\n"); } -/* The way to go if you want a delimited list of programmers*/ +/* The way to go if you want a delimited list of programmers */ void list_programmers(const char *delim) { enum programmer p; @@ -1606,11 +1603,8 @@ void list_programmers_linebreak(int startcol, int cols, int paren) { const char *pname; - int pnamelen; - int remaining = 0; - int firstline = 1; + int pnamelen, remaining = 0, firstline = 1, i; enum programmer p; - int i; for (p = 0; p < PROGRAMMER_INVALID; p++) { pname = programmer_table[p].name; @@ -1697,7 +1691,7 @@ void print_banner(void) { msg_ginfo("flashrom is free software, get the source code at " - "http://www.flashrom.org\n"); + "http://www.flashrom.org\n"); msg_ginfo("\n"); } @@ -1743,7 +1737,7 @@ msg_gerr("Known laptops table does not exist!\n"); ret = 1; } -#endif // CONFIG_INTERNAL == 1 +#endif return ret; } Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/ft2232_spi.c Thu Jul 28 10:13:25 2011 (r1397) @@ -141,13 +141,13 @@ const unsigned char *writearr, unsigned char *readarr); static const struct spi_programmer spi_programmer_ft2232 = { - .type = SPI_CONTROLLER_FT2232, - .max_data_read = 64 * 1024, - .max_data_write = 256, - .command = ft2232_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, + .type = SPI_CONTROLLER_FT2232, + .max_data_read = 64 * 1024, + .max_data_write = 256, + .command = ft2232_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, }; /* Returns 0 upon success, a negative number upon errors. */ @@ -246,21 +246,17 @@ ftdic->error_str); } - if (ftdi_usb_reset(ftdic) < 0) { + if (ftdi_usb_reset(ftdic) < 0) msg_perr("Unable to reset FTDI device\n"); - } - if (ftdi_set_latency_timer(ftdic, 2) < 0) { + if (ftdi_set_latency_timer(ftdic, 2) < 0) msg_perr("Unable to set latency timer\n"); - } - if (ftdi_write_data_set_chunksize(ftdic, 256)) { + if (ftdi_write_data_set_chunksize(ftdic, 256)) msg_perr("Unable to set chunk size\n"); - } - if (ftdi_set_bitmode(ftdic, 0x00, BITMODE_BITBANG_SPI) < 0) { + if (ftdi_set_bitmode(ftdic, 0x00, BITMODE_BITBANG_SPI) < 0) msg_perr("Unable to set bitmode to SPI\n"); - } if (clock_5x) { msg_pdbg("Disable divide-by-5 front stage\n"); @@ -285,8 +281,7 @@ } msg_pdbg("MPSSE clock: %f MHz divisor: %d " - "SPI clock: %f MHz\n", - mpsse_clk, DIVIDE_BY, + "SPI clock: %f MHz\n", mpsse_clk, DIVIDE_BY, (double)(mpsse_clk / (((DIVIDE_BY - 1) + 1) * 2))); /* Disconnect TDI/DO to TDO/DI for loopback. */ @@ -328,8 +323,7 @@ struct ftdi_context *ftdic = &ftdic_context; static unsigned char *buf = NULL; /* failed is special. We use bitwise ops, but it is essentially bool. */ - int i = 0, ret = 0, failed = 0; - int bufsize; + int i = 0, ret = 0, failed = 0, bufsize; static int oldbufsize = 0; if (writecnt > 65536 || readcnt > 65536) @@ -379,8 +373,7 @@ failed = ret; /* We can't abort here, we still have to deassert CS#. */ if (ret) - msg_perr("send_buf failed before read: %i\n", - ret); + msg_perr("send_buf failed before read: %i\n", ret); i = 0; if (ret == 0) { /* Modified: trunk/gfxnvidia.c ============================================================================== --- trunk/gfxnvidia.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/gfxnvidia.c Thu Jul 28 10:13:25 2011 (r1397) @@ -85,7 +85,7 @@ nvidia_bar = physmap("NVIDIA", io_base_addr, GFXNVIDIA_MEMMAP_SIZE); - /* must be done before rpci calls */ + /* Must be done before rpci calls. */ if (register_shutdown(gfxnvidia_shutdown, NULL)) return 1; Modified: trunk/hwaccess.h ============================================================================== --- trunk/hwaccess.h Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/hwaccess.h Thu Jul 28 10:13:25 2011 (r1397) @@ -220,7 +220,7 @@ #define INW inportw #define INL inportl -#else +#else #define OUTB outb #define OUTW outw Modified: trunk/ichspi.c ============================================================================== --- trunk/ichspi.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/ichspi.c Thu Jul 28 10:13:25 2011 (r1397) @@ -362,7 +362,7 @@ { int a; - for (a = 0; a < sizeof(POSSIBLE_OPCODES)/sizeof(POSSIBLE_OPCODES[0]); a++) { + for (a = 0; a < ARRAY_SIZE(POSSIBLE_OPCODES); a++) { if (POSSIBLE_OPCODES[a].opcode == opcode) return POSSIBLE_OPCODES[a].spi_type; } Modified: trunk/it85spi.c ============================================================================== --- trunk/it85spi.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/it85spi.c Thu Jul 28 10:13:25 2011 (r1397) @@ -90,14 +90,10 @@ * Returns: 0 -- the expected value has shown. * 1 -- timeout reached. */ -static int wait_for( - const unsigned int mask, - const unsigned int expected_value, - const int timeout, /* in usec */ - const char* error_message, - const char* function_name, - const int lineno -) { +static int wait_for(const unsigned int mask, const unsigned int expected_value, + const int timeout /* in usec */, const char *error_message, + const char *function_name, const int lineno) +{ int time_passed; for (time_passed = 0;; ++time_passed) { @@ -112,24 +108,23 @@ return 1; } -/* IT8502 employs a scratch ram when flash is being updated. Call the following +/* IT8502 employs a scratch RAM when flash is being updated. Call the following * two functions before/after flash erase/program. */ -void it85xx_enter_scratch_rom() +void it85xx_enter_scratch_rom(void) { - int ret; - int tries; + int ret, tries; msg_pdbg("%s():%d was called ...\n", __FUNCTION__, __LINE__); - if (it85xx_scratch_rom_reenter > 0) return; + if (it85xx_scratch_rom_reenter > 0) + return; #if 0 /* FIXME: this a workaround for the bug that SMBus signal would * interfere the EC firmware update. Should be removed if * we find out the root cause. */ ret = system("stop powerd >&2"); - if (ret) { + if (ret) msg_perr("Cannot stop powerd.\n"); - } #endif for (tries = 0; tries < MAX_TRY; ++tries) { @@ -173,7 +168,7 @@ } } -void it85xx_exit_scratch_rom() +void it85xx_exit_scratch_rom(void) { #if 0 int ret; @@ -181,7 +176,8 @@ int tries; msg_pdbg("%s():%d was called ...\n", __FUNCTION__, __LINE__); - if (it85xx_scratch_rom_reenter <= 0) return; + if (it85xx_scratch_rom_reenter <= 0) + return; for (tries = 0; tries < MAX_TRY; ++tries) { /* Wait until IBF (input buffer) is not full. */ @@ -220,9 +216,8 @@ * interfere the EC firmware update. Should be removed if * we find out the root cause. */ ret = system("start powerd >&2"); - if (ret) { + if (ret) msg_perr("Cannot start powerd again.\n"); - } #endif } @@ -245,7 +240,7 @@ return 1; #ifdef LPC_IO - /* Get LPCPNP of SHM. That's big-endian */ + /* Get LPCPNP of SHM. That's big-endian. */ sio_write(s.port, LDNSEL, 0x0F); /* Set LDN to SHM (0x0F) */ shm_io_base = (sio_read(s.port, SHM_IO_BAR0) << 8) + sio_read(s.port, SHM_IO_BAR1); @@ -255,8 +250,8 @@ /* These pointers are not used directly. They will be send to EC's * register for indirect access. */ base = 0xFFFFF000; - ce_high = ((unsigned char*)base) + 0xE00; /* 0xFFFFFE00 */ - ce_low = ((unsigned char*)base) + 0xD00; /* 0xFFFFFD00 */ + ce_high = ((unsigned char *)base) + 0xE00; /* 0xFFFFFE00 */ + ce_low = ((unsigned char *)base) + 0xD00; /* 0xFFFFFD00 */ /* pre-set indirect-access registers since in most of cases they are * 0xFFFFxx00. */ @@ -269,8 +264,8 @@ 0xFFFFF000, 0x1000); msg_pdbg("%s():%d base=0x%08x\n", __func__, __LINE__, (unsigned int)base); - ce_high = (unsigned char*)(base + 0xE00); /* 0xFFFFFE00 */ - ce_low = (unsigned char*)(base + 0xD00); /* 0xFFFFFD00 */ + ce_high = (unsigned char *)(base + 0xE00); /* 0xFFFFFE00 */ + ce_low = (unsigned char *)(base + 0xD00); /* 0xFFFFFD00 */ #endif return 0; @@ -280,13 +275,13 @@ const unsigned char *writearr, unsigned char *readarr); static const struct spi_programmer spi_programmer_it85xx = { - .type = SPI_CONTROLLER_IT85XX, - .max_data_read = 64, - .max_data_write = 64, - .command = it85xx_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, + .type = SPI_CONTROLLER_IT85XX, + .max_data_read = 64, + .max_data_write = 64, + .command = it85xx_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, }; int it85xx_spi_init(struct superio s) @@ -305,7 +300,7 @@ if (buses_supported & BUS_FWH) msg_pdbg("Overriding chipset SPI with IT85 FWH|SPI.\n"); /* Really leave FWH enabled? */ - /* Set this as spi controller. */ + /* Set this as SPI controller. */ register_spi_programmer(&spi_programmer_it85xx); } return ret; @@ -324,7 +319,7 @@ int i; it85xx_enter_scratch_rom(); - /* exit scratch rom ONLY when programmer shuts down. Otherwise, the + /* exit scratch ROM ONLY when programmer shuts down. Otherwise, the * temporary flash state may halt EC. */ #ifdef LPC_IO Modified: trunk/it87spi.c ============================================================================== --- trunk/it87spi.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/it87spi.c Thu Jul 28 10:13:25 2011 (r1397) @@ -93,8 +93,7 @@ case 0x85: msg_pdbg("Found ITE EC, ID 0x%04hx," "Rev 0x%02x on port 0x%x.\n", - s.model, - sio_read(s.port, CHIP_VER_REG), + s.model, sio_read(s.port, CHIP_VER_REG), s.port); register_superio(s); break; @@ -106,17 +105,19 @@ static int it8716f_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); -static int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len); -static int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf, int start, int len); +static int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf, + int start, int len); +static int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf, + int start, int len); static const struct spi_programmer spi_programmer_it87xx = { - .type = SPI_CONTROLLER_IT87XX, - .max_data_read = MAX_DATA_UNSPECIFIED, - .max_data_write = MAX_DATA_UNSPECIFIED, - .command = it8716f_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = it8716f_spi_chip_read, - .write_256 = it8716f_spi_chip_write_256, + .type = SPI_CONTROLLER_IT87XX, + .max_data_read = MAX_DATA_UNSPECIFIED, + .max_data_write = MAX_DATA_UNSPECIFIED, + .command = it8716f_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = it8716f_spi_chip_read, + .write_256 = it8716f_spi_chip_write_256, }; static uint16_t it87spi_probe(uint16_t port) @@ -202,8 +203,7 @@ int init_superio_ite(void) { - int i; - int ret = 0; + int i, ret = 0; for (i = 0; i < superio_count; i++) { if (superios[i].vendor != SUPERIO_VENDOR_ITE) @@ -259,7 +259,7 @@ } while (busy); if (readcnt > 3) { msg_pinfo("%s called with unsupported readcnt %i.\n", - __func__, readcnt); + __func__, readcnt); return SPI_INVALID_LENGTH; } switch (writecnt) { @@ -289,7 +289,7 @@ break; default: msg_pinfo("%s called with unsupported writecnt %i.\n", - __func__, writecnt); + __func__, writecnt); return SPI_INVALID_LENGTH; } /* @@ -313,10 +313,10 @@ } /* Page size is usually 256 bytes */ -static int it8716f_spi_page_program(struct flashchip *flash, uint8_t *buf, int start) +static int it8716f_spi_page_program(struct flashchip *flash, uint8_t *buf, + int start) { - int i; - int result; + int i, result; chipaddr bios = flash->virtual_memory; result = spi_write_enable(); @@ -325,9 +325,8 @@ /* FIXME: The command below seems to be redundant or wrong. */ OUTB(0x06, it8716f_flashport + 1); OUTB(((2 + (fast_spi ? 1 : 0)) << 4), it8716f_flashport); - for (i = 0; i < flash->page_size; i++) { + for (i = 0; i < flash->page_size; i++) chip_writeb(buf[i], bios + start + i); - } OUTB(0, it8716f_flashport); /* Wait until the Write-In-Progress bit is cleared. * This usually takes 1-10 ms, so wait in 1 ms steps. @@ -341,7 +340,8 @@ * IT8716F only allows maximum of 512 kb SPI mapped to LPC memory cycles * Need to read this big flash using firmware cycles 3 byte at a time. */ -static int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len) +static int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf, + int start, int len) { fast_spi = 0; @@ -358,7 +358,8 @@ return 0; } -static int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf, int start, int len) +static int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf, + int start, int len) { /* * IT8716F only allows maximum of 512 kb SPI chip size for memory Modified: trunk/pcidev.c ============================================================================== --- trunk/pcidev.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/pcidev.c Thu Jul 28 10:13:25 2011 (r1397) @@ -247,9 +247,9 @@ msg_pinfo("PCI devices:\n"); for (i = 0; devs[i].vendor_name != NULL; i++) { msg_pinfo("%s %s [%04x:%04x]%s\n", devs[i].vendor_name, - devs[i].device_name, devs[i].vendor_id, - devs[i].device_id, - (devs[i].status == NT) ? " (untested)" : ""); + devs[i].device_name, devs[i].vendor_id, + devs[i].device_id, + (devs[i].status == NT) ? " (untested)" : ""); } } Modified: trunk/physmap.c ============================================================================== --- trunk/physmap.c Wed Jul 27 09:13:06 2011 (r1396) +++ trunk/physmap.c Thu Jul 28 10:13:25 2011 (r1397) @@ -43,16 +43,13 @@ static void *map_first_meg(unsigned long phys_addr, size_t len) { - - if (realmem_map) { + if (realmem_map) return realmem_map + phys_addr; - } realmem_map = valloc(1024 * 1024); - if (!realmem_map) { + if (!realmem_map) return ERROR_PTR; - } if (__djgpp_map_physical_memory(realmem_map, (1024 * 1024), 0)) { free(realmem_map); @@ -68,23 +65,21 @@ int ret; __dpmi_meminfo mi; - /* enable 4GB limit on DS descriptor */ - if (!__djgpp_nearptr_enable()) { + /* Enable 4GB limit on DS descriptor. */ + if (!__djgpp_nearptr_enable()) return ERROR_PTR; - } if ((phys_addr + len - 1) < (1024 * 1024)) { - /* we need to use another method to map first 1MB */ + /* We need to use another method to map first 1MB. */ return map_first_meg(phys_addr, len); } mi.address = phys_addr; mi.size = len; - ret = __dpmi_physical_address_mapping (&mi); + ret = __dpmi_physical_address_mapping (&mi); - if (ret != 0) { + if (ret != 0) return ERROR_PTR; - } return (void *) mi.address + __djgpp_conventional_base; } @@ -99,7 +94,8 @@ /* There is no known way to unmap the first 1 MB. The DPMI server will * do this for us on exit. */ - if ((virt_addr >= realmem_map) && ((virt_addr + len) <= (realmem_map + (1024 * 1024)))) { + if ((virt_addr >= realmem_map) && + ((virt_addr + len) <= (realmem_map + (1024 * 1024)))) { return; } @@ -114,7 +110,7 @@ void *sys_physmap(unsigned long phys_addr, size_t len) { - return (void*)phys_to_virt(phys_addr); + return (void *)phys_to_virt(phys_addr); } #define sys_physmap_rw_uncached sys_physmap @@ -195,7 +191,8 @@ if (-1 == fd_mem_cached) { /* Open the memory device CACHED. */ if (-1 == (fd_mem_cached = open(MEM_DEV, O_RDWR))) { - msg_perr("Critical error: open(" MEM_DEV "): %s", strerror(errno)); + msg_perr("Critical error: open(" MEM_DEV "): %s", + strerror(errno)); exit(2); } } @@ -221,36 +218,37 @@ #define PHYSMAP_RW 0 #define PHYSMAP_RO 1 -static void *physmap_common(const char *descr, unsigned long phys_addr, size_t len, int mayfail, int readonly) +static void *physmap_common(const char *descr, unsigned long phys_addr, + size_t len, int mayfail, int readonly) { void *virt_addr; if (len == 0) { msg_pspew("Not mapping %s, zero size at 0x%08lx.\n", - descr, phys_addr); + descr, phys_addr); return ERROR_PTR; } - + if ((getpagesize() - 1) & len) { msg_perr("Mapping %s at 0x%08lx, unaligned size 0x%lx.\n", - descr, phys_addr, (unsigned long)len); + descr, phys_addr, (unsigned long)len); } if ((getpagesize() - 1) & phys_addr) { msg_perr("Mapping %s, 0x%lx bytes at unaligned 0x%08lx.\n", - descr, (unsigned long)len, phys_addr); + descr, (unsigned long)len, phys_addr); } - if (readonly) { + if (readonly) virt_addr = sys_physmap_ro_cached(phys_addr, len); - } else { + else virt_addr = sys_physmap_rw_uncached(phys_addr, len); - } if (ERROR_PTR == virt_addr) { if (NULL == descr) descr = "memory"; - msg_perr("Error accessing %s, 0x%lx bytes at 0x%08lx\n", descr, (unsigned long)len, phys_addr); + msg_perr("Error accessing %s, 0x%lx bytes at 0x%08lx\n", descr, + (unsigned long)len, phys_addr); perror(MEM_DEV " mmap failed"); #ifdef __linux__ if (EINVAL == errno) { @@ -262,8 +260,8 @@ } #elif defined (__OpenBSD__) msg_perr("Please set securelevel=-1 in /etc/rc.securelevel " - "and reboot, or reboot into \n"); - msg_perr("single user mode.\n"); + "and reboot, or reboot into\n" + "single user mode.\n"); #endif if (!mayfail) exit(3); @@ -274,12 +272,14 @@ void *physmap(const char *descr, unsigned long phys_addr, size_t len) { - return physmap_common(descr, phys_addr, len, PHYSMAP_NOFAIL, PHYSMAP_RW); + return physmap_common(descr, phys_addr, len, PHYSMAP_NOFAIL, + PHYSMAP_RW); } void *physmap_try_ro(const char *descr, unsigned long phys_addr, size_t len) { - return physmap_common(descr, phys_addr, len, PHYSMAP_MAYFAIL, PHYSMAP_RO); + return physmap_common(descr, phys_addr, len, PHYSMAP_MAYFAIL, + PHYSMAP_RO); } #if defined(__i386__) || defined(__x86_64__) @@ -288,7 +288,7 @@ /* * Reading and writing to MSRs, however requires instructions rdmsr/wrmsr, * which are ring0 privileged instructions so only the kernel can do the - * read/write. This function, therefore, requires that the msr kernel module + * read/write. This function, therefore, requires that the msr kernel module * be loaded to access these instructions from user space using device * /dev/cpu/0/msr. */ @@ -309,7 +309,6 @@ if (read(fd_msr, buf, 8) == 8) { msr.lo = buf[0]; msr.hi = buf[1]; - return msr; } @@ -341,7 +340,7 @@ exit(1); } - /* some MSRs must not be written */ + /* Some MSRs must not be written. */ if (errno == EIO) return -1; @@ -379,7 +378,7 @@ close(fd_msr); - /* Clear MSR file descriptor */ + /* Clear MSR file descriptor. */ fd_msr = -1; } #else @@ -462,7 +461,7 @@ close(fd_msr); - /* Clear MSR file descriptor */ + /* Clear MSR file descriptor. */ fd_msr = -1; }

2 1

Report for Chip "Intel 28F001BN/BX-T" attached to programmer 3com NIC 3C905B
by Florian Boelstler 31 Jul '11

31 Jul '11

READ and VERIFY works. ERASE does not erase at all (content completely intact) WRITE does not write at all (content completely intact, probably due to non-working ERASE) Output: # ./flashrom -p nic3com flashrom v0.9.3-r1372 on Linux 2.6.26-2-486 (i586), built with libpci 3.0.0, GCC 4.3.2, little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found "3COM 3C90xB: PCI 10/100 Mbps; shared 10BASE-T/100BASE-TX" (10b7:9055, BDF 00:0a.0). Found chip "Intel 28F001BN/BX-T" (128 kB, Parallel) on nic3com. === This flash part has status UNTESTED for operations: PROBE READ ERASE WRITE [...] Detailled output in attachments for commands -Vr, -VE and -Vw and verify against dump of content provided by other means. Cheers Florian

2 1

[PATCH] Cleanup flashrom.c, move functions, part 1
by Uwe Hermann 30 Jul '11

30 Jul '11

See patch. Uwe. -- http://hermann-uwe.de | http://sigrok.org http://randomprojects.org | http://unmaintained-free-software.org

2 2

[commit] r1401 - trunk
by repository service 29 Jul '11

29 Jul '11

Author: uwe Date: Fri Jul 29 22:13:45 2011 New Revision: 1401 URL: http://flashrom.org/trac/flashrom/changeset/1401 Log: Use __func__ instead of __FUNCTION__ as we do elsewhere. The __func__ variant is standardized in C99 and recommended to be used instead of __FUNCTION__ in the gcc info page. See also r711 where we did the same change. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/it85spi.c Modified: trunk/it85spi.c ============================================================================== --- trunk/it85spi.c Fri Jul 29 14:13:01 2011 (r1400) +++ trunk/it85spi.c Fri Jul 29 22:13:45 2011 (r1401) @@ -114,7 +114,7 @@ { int ret, tries; - msg_pdbg("%s():%d was called ...\n", __FUNCTION__, __LINE__); + msg_pdbg("%s():%d was called ...\n", __func__, __LINE__); if (it85xx_scratch_rom_reenter > 0) return; @@ -131,7 +131,7 @@ /* Wait until IBF (input buffer) is not full. */ if (wait_for(KB_IBF, 0, MAX_TIMEOUT, "* timeout at waiting for IBF==0.\n", - __FUNCTION__, __LINE__)) + __func__, __LINE__)) continue; /* Copy EC firmware to SRAM. */ @@ -140,7 +140,7 @@ /* Confirm EC has taken away the command. */ if (wait_for(KB_IBF, 0, MAX_TIMEOUT, "* timeout at taking command.\n", - __FUNCTION__, __LINE__)) + __func__, __LINE__)) continue; /* Waiting for OBF (output buffer) has data. @@ -148,12 +148,12 @@ * ISR so that it is okay as long as the command is 0xFA. */ if (wait_for(KB_OBF, KB_OBF, MAX_TIMEOUT, NULL, NULL, 0)) msg_pdbg("%s():%d * timeout at waiting for OBF.\n", - __FUNCTION__, __LINE__); + __func__, __LINE__); if ((ret = INB(LEGACY_KBC_PORT_DATA)) == 0xFA) { break; } else { msg_perr("%s():%d * not run on SRAM ret=%d\n", - __FUNCTION__, __LINE__, ret); + __func__, __LINE__, ret); continue; } } @@ -161,10 +161,9 @@ if (tries < MAX_TRY) { /* EC already runs on SRAM */ it85xx_scratch_rom_reenter++; - msg_pdbg("%s():%d * SUCCESS.\n", __FUNCTION__, __LINE__); + msg_pdbg("%s():%d * SUCCESS.\n", __func__, __LINE__); } else { - msg_perr("%s():%d * Max try reached.\n", - __FUNCTION__, __LINE__); + msg_perr("%s():%d * Max try reached.\n", __func__, __LINE__); } } @@ -175,7 +174,7 @@ #endif int tries; - msg_pdbg("%s():%d was called ...\n", __FUNCTION__, __LINE__); + msg_pdbg("%s():%d was called ...\n", __func__, __LINE__); if (it85xx_scratch_rom_reenter <= 0) return; @@ -183,7 +182,7 @@ /* Wait until IBF (input buffer) is not full. */ if (wait_for(KB_IBF, 0, MAX_TIMEOUT, "* timeout at waiting for IBF==0.\n", - __FUNCTION__, __LINE__)) + __func__, __LINE__)) continue; /* Exit SRAM. Run on flash. */ @@ -192,7 +191,7 @@ /* Confirm EC has taken away the command. */ if (wait_for(KB_IBF, 0, MAX_TIMEOUT, "* timeout at taking command.\n", - __FUNCTION__, __LINE__)) { + __func__, __LINE__)) { /* We cannot ensure if EC has exited update mode. * If EC is in normal mode already, a further 0xFE * command will reboot system. So, exit loop here. */ @@ -205,10 +204,9 @@ if (tries < MAX_TRY) { it85xx_scratch_rom_reenter = 0; - msg_pdbg("%s():%d * SUCCESS.\n", __FUNCTION__, __LINE__); + msg_pdbg("%s():%d * SUCCESS.\n", __func__, __LINE__); } else { - msg_perr("%s():%d * Max try reached.\n", - __FUNCTION__, __LINE__); + msg_perr("%s():%d * Max try reached.\n", __func__, __LINE__); } #if 0

1 0

asus m2n-mx se
by yarpr＠pochta.ru 29 Jul '11

29 Jul '11

flashrom v0.9.2-r1028 on Linux 2.6.35-30-generic (i686), built with libpci 3.0.0, GCC 4.4.4, little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OS timer resolution is 1 usecs, 186M loops per second, delay more than 10% too short (got 20% of expected delay), recalculating... 172M loops per second, delay more than 10% too short (got 19% of expected delay), recalculating... 184M loops per second, delay more than 10% too short (got 20% of expected delay), recalculating... 184M loops per second, delay more than 10% too short (got 20% of expected delay), recalculating... 151M loops per second, delay loop is unreliable, trying to continue 10 myus = 2 us, 100 myus = 17 us, 1000 myus = 151 us, 10000 myus = 2433 us, 4 myus = 2 us, OK. Initializing internal programmer No coreboot table found. DMI string system-manufacturer: "System manufacturer" DMI string system-product-name: "System Product Name" DMI string system-version: "System Version" DMI string baseboard-manufacturer: "ASUSTeK Computer INC." DMI string baseboard-product-name: "M2N-MX SE" DMI string baseboard-version: "Rev x.xx" DMI string chassis-type: "Desktop" Found ITE Super I/O, id 8712 Found chipset "NVIDIA MCP61", enabling flash write... chipset PCI ID is 10de:03e0, This chipset is not really supported yet. Guesswork... ISA/LPC bridge reg 0x8a contents: 0x00, bit 6 is 0, bit 5 is 0 Guessed flash bus type is LPC Found SMBus device 10de:03eb at 00:01:1 SPI BAR is at 0x00000000, after clearing low bits BAR is at 0x00000000 MCP SPI is not used. Please send the output of "flashrom -V" to flashrom(a)flashrom.org to help us finish support for your chipset. Thanks. OK. This chipset supports the following protocols: LPC. SuperI/O ID 8712 is not on the controller list. Probing for AMD Am29F010A/B, 128 KB: skipped. Probing for AMD Am29F002(N)BB, 256 KB: skipped. Probing for AMD Am29F002(N)BT, 256 KB: skipped. Probing for AMD Am29F016D, 2048 KB: skipped. Probing for AMD Am29F040B, 512 KB: skipped. Probing for AMD Am29F080B, 1024 KB: skipped. Probing for AMD Am29LV040B, 512 KB: skipped. Probing for AMD Am29LV081B, 1024 KB: skipped. Probing for ASD AE49F2008, 256 KB: skipped. Probing for Atmel AT25DF021, 256 KB: skipped. Probing for Atmel AT25DF041A, 512 KB: skipped. Probing for Atmel AT25DF081, 1024 KB: skipped. Probing for Atmel AT25DF161, 2048 KB: skipped. Probing for Atmel AT25DF321, 4096 KB: skipped. Probing for Atmel AT25DF321A, 4096 KB: skipped. Probing for Atmel AT25DF641, 8192 KB: skipped. Probing for Atmel AT25F512B, 64 KB: skipped. Probing for Atmel AT25FS010, 128 KB: skipped. Probing for Atmel AT25FS040, 512 KB: skipped. Probing for Atmel AT26DF041, 512 KB: skipped. Probing for Atmel AT26DF081A, 1024 KB: skipped. Probing for Atmel AT26DF161, 2048 KB: skipped. Probing for Atmel AT26DF161A, 2048 KB: skipped. Probing for Atmel AT26F004, 512 KB: skipped. Probing for Atmel AT29C512, 64 KB: skipped. Probing for Atmel AT29C010A, 128 KB: skipped. Probing for Atmel AT29C020, 256 KB: skipped. Probing for Atmel AT29C040A, 512 KB: skipped. Probing for Atmel AT45CS1282, 16896 KB: skipped. Probing for Atmel AT45DB011D, 128 KB: skipped. Probing for Atmel AT45DB021D, 256 KB: skipped. Probing for Atmel AT45DB041D, 512 KB: skipped. Probing for Atmel AT45DB081D, 1024 KB: skipped. Probing for Atmel AT45DB161D, 2048 KB: skipped. Probing for Atmel AT45DB321C, 4224 KB: skipped. Probing for Atmel AT45DB321D, 4096 KB: skipped. Probing for Atmel AT45DB642D, 8192 KB: skipped. Probing for Atmel AT49BV512, 64 KB: skipped. Probing for Atmel AT49F002(N), 256 KB: skipped. Probing for Atmel AT49F002(N)T, 256 KB: skipped. Probing for AMIC A25L40PT, 512 KB: skipped. Probing for AMIC A25L40PU, 512 KB: skipped. Probing for AMIC A29002B, 256 KB: skipped. Probing for AMIC A29002T, 256 KB: skipped. Probing for AMIC A29040B, 512 KB: skipped. Probing for AMIC A49LF040A, 512 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for EMST F49B002UA, 256 KB: skipped. Probing for Eon EN25B05, 64 KB: skipped. Probing for Eon EN25B05T, 64 KB: skipped. Probing for Eon EN25B10, 128 KB: skipped. Probing for Eon EN25B10T, 128 KB: skipped. Probing for Eon EN25B20, 256 KB: skipped. Probing for Eon EN25B20T, 256 KB: skipped. Probing for Eon EN25B40, 512 KB: skipped. Probing for Eon EN25B40T, 512 KB: skipped. Probing for Eon EN25B80, 1024 KB: skipped. Probing for Eon EN25B80T, 1024 KB: skipped. Probing for Eon EN25B16, 2048 KB: skipped. Probing for Eon EN25B16T, 2048 KB: skipped. Probing for Eon EN25B32, 4096 KB: skipped. Probing for Eon EN25B32T, 4096 KB: skipped. Probing for Eon EN25B64, 8192 KB: skipped. Probing for Eon EN25B64T, 8192 KB: skipped. Probing for Eon EN25D16, 2048 KB: skipped. Probing for Eon EN25F05, 64 KB: skipped. Probing for Eon EN25F10, 128 KB: skipped. Probing for Eon EN25F20, 256 KB: skipped. Probing for Eon EN25F40, 512 KB: skipped. Probing for Eon EN25F80, 1024 KB: skipped. Probing for Eon EN25F16, 2048 KB: skipped. Probing for Eon EN25F32, 4096 KB: skipped. Probing for Eon EN29F010, 128 KB: skipped. Probing for EON EN29F002(A)(N)B, 256 KB: skipped. Probing for EON EN29F002(A)(N)T, 256 KB: skipped. Probing for Fujitsu MBM29F004BC, 512 KB: skipped. Probing for Fujitsu MBM29F004TC, 512 KB: skipped. Probing for Fujitsu MBM29F400BC, 512 KB: skipped. Probing for Fujitsu MBM29F400TC, 512 KB: skipped. Probing for Intel 28F001BX-B, 128 KB: skipped. Probing for Intel 28F001BX-T, 128 KB: skipped. Probing for Intel 28F004S5, 512 KB: skipped. Probing for Intel 28F004BV/BE-B, 512 KB: skipped. Probing for Intel 28F004BV/BE-T, 512 KB: skipped. Probing for Intel 28F400BV/CV/CE-B, 512 KB: skipped. Probing for Intel 28F400BV/CV/CE-T, 512 KB: skipped. Probing for Intel 82802AB, 512 KB: skipped. Probing for Intel 82802AC, 1024 KB: skipped. Probing for Macronix MX25L512, 64 KB: skipped. Probing for Macronix MX25L1005, 128 KB: skipped. Probing for Macronix MX25L2005, 256 KB: skipped. Probing for Macronix MX25L4005, 512 KB: skipped. Probing for Macronix MX25L8005, 1024 KB: skipped. Probing for Macronix MX25L1605, 2048 KB: skipped. Probing for Macronix MX25L1635D, 2048 KB: skipped. Probing for Macronix MX25L3205, 4096 KB: skipped. Probing for Macronix MX25L3235D, 4096 KB: skipped. Probing for Macronix MX25L6405, 8192 KB: skipped. Probing for Macronix MX25L12805, 16384 KB: skipped. Probing for Macronix MX29F001B, 128 KB: skipped. Probing for Macronix MX29F001T, 128 KB: skipped. Probing for Macronix MX29F002B, 256 KB: skipped. Probing for Macronix MX29F002T, 256 KB: skipped. Probing for Macronix MX29LV040, 512 KB: skipped. Probing for Numonyx M25PE10, 128 KB: skipped. Probing for Numonyx M25PE20, 256 KB: skipped. Probing for Numonyx M25PE40, 512 KB: skipped. Probing for Numonyx M25PE80, 1024 KB: skipped. Probing for Numonyx M25PE16, 2048 KB: skipped. Probing for PMC Pm25LV010, 128 KB: skipped. Probing for PMC Pm25LV016B, 2048 KB: skipped. Probing for PMC Pm25LV020, 256 KB: skipped. Probing for PMC Pm25LV040, 512 KB: skipped. Probing for PMC Pm25LV080B, 1024 KB: skipped. Probing for PMC Pm25LV512, 64 KB: skipped. Probing for PMC Pm29F002T, 256 KB: skipped. Probing for PMC Pm29F002B, 256 KB: skipped. Probing for PMC Pm39LV010, 128 KB: skipped. Probing for PMC Pm39LV020, 256 KB: skipped. Probing for PMC Pm39LV040, 512 KB: skipped. Probing for PMC Pm49FL002, 256 KB: probe_jedec_common: id1 0x54, id2 0x1d, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm49FL004, 512 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Sanyo LF25FW203A, 2048 KB: skipped. Probing for Sharp LHF00L04, 1024 KB: skipped. Probing for Spansion S25FL008A, 1024 KB: skipped. Probing for Spansion S25FL016A, 2048 KB: skipped. Probing for SST SST25VF016B, 2048 KB: skipped. Probing for SST SST25VF032B, 4096 KB: skipped. Probing for SST SST25VF040.REMS, 512 KB: skipped. Probing for SST SST25VF040B, 512 KB: skipped. Probing for SST SST25VF040B.REMS, 512 KB: skipped. Probing for SST SST25VF080B, 1024 KB: skipped. Probing for SST SST28SF040A, 512 KB: skipped. Probing for SST SST29EE010, 128 KB: skipped. Probing for SST SST29LE010, 128 KB: skipped. Probing for SST SST29EE020A, 256 KB: skipped. Probing for SST SST29LE020, 256 KB: skipped. Probing for SST SST39SF512, 64 KB: skipped. Probing for SST SST39SF010A, 128 KB: skipped. Probing for SST SST39SF020A, 256 KB: skipped. Probing for SST SST39SF040, 512 KB: skipped. Probing for SST SST39VF512, 64 KB: skipped. Probing for SST SST39VF010, 128 KB: skipped. Probing for SST SST39VF020, 256 KB: skipped. Probing for SST SST39VF040, 512 KB: skipped. Probing for SST SST39VF080, 1024 KB: skipped. Probing for SST SST49LF002A/B, 256 KB: skipped. Probing for SST SST49LF003A/B, 384 KB: skipped. Probing for SST SST49LF004A/B, 512 KB: skipped. Probing for SST SST49LF004C, 512 KB: skipped. Probing for SST SST49LF008A, 1024 KB: skipped. Probing for SST SST49LF008C, 1024 KB: skipped. Probing for SST SST49LF016C, 2048 KB: skipped. Probing for SST SST49LF020, 256 KB: probe_jedec_common: id1 0x54, id2 0x1d, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF020A, 256 KB: probe_jedec_common: id1 0x54, id2 0x1d, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF040, 512 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF040B, 512 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF080A, 1024 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF160C, 2048 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M25P05-A, 64 KB: skipped. Probing for ST M25P05.RES, 64 KB: skipped. Probing for ST M25P10-A, 128 KB: skipped. Probing for ST M25P10.RES, 128 KB: skipped. Probing for ST M25P20, 256 KB: skipped. Probing for ST M25P40, 512 KB: skipped. Probing for ST M25P40-old, 512 KB: skipped. Probing for ST M25P80, 1024 KB: skipped. Probing for ST M25P16, 2048 KB: skipped. Probing for ST M25P32, 4096 KB: skipped. Probing for ST M25P64, 8192 KB: skipped. Probing for ST M25P128, 16384 KB: skipped. Probing for ST M29F002B, 256 KB: skipped. Probing for ST M29F002T/NT, 256 KB: skipped. Probing for ST M29F040B, 512 KB: skipped. Probing for ST M29F400BT, 512 KB: skipped. Probing for ST M29W010B, 128 KB: skipped. Probing for ST M29W040B, 512 KB: skipped. Probing for ST M29W512B, 64 KB: skipped. Probing for ST M50FLW040A, 512 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040B, 512 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080A, 1024 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080B, 1024 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW002, 256 KB: skipped. Probing for ST M50FW016, 2048 KB: skipped. Probing for ST M50FW040, 512 KB: skipped. Probing for ST M50FW080, 1024 KB: skipped. Probing for ST M50LPW116, 2048 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS S29C31004T, 512 KB: skipped. Probing for SyncMOS S29C51001T, 128 KB: skipped. Probing for SyncMOS S29C51002T, 256 KB: skipped. Probing for SyncMOS S29C51004T, 512 KB: skipped. Probing for TI TMS29F002RB, 256 KB: skipped. Probing for TI TMS29F002RT, 256 KB: skipped. Probing for Winbond W25Q80, 1024 KB: skipped. Probing for Winbond W25Q16, 2048 KB: skipped. Probing for Winbond W25Q32, 4096 KB: skipped. Probing for Winbond W25x10, 128 KB: skipped. Probing for Winbond W25x20, 256 KB: skipped. Probing for Winbond W25x40, 512 KB: skipped. Probing for Winbond W25x80, 1024 KB: skipped. Probing for Winbond W25x16, 2048 KB: skipped. Probing for Winbond W25x32, 4096 KB: skipped. Probing for Winbond W25x64, 8192 KB: skipped. Probing for Winbond W29C011, 128 KB: skipped. Probing for Winbond W29C020C, 256 KB: skipped. Probing for Winbond W29C040P, 512 KB: skipped. Probing for Winbond W29EE011, 128 KB: skipped. Probing for Winbond W39V040A, 512 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040B, 512 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040C, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040FA, 512 KB: skipped. Probing for Winbond W39V080A, 1024 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49F002U, 256 KB: skipped. Probing for Winbond W49V002A, 256 KB: probe_jedec_common: id1 0x54, id2 0x1d, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49V002FA, 256 KB: skipped. Probing for Winbond W39V080FA, 1024 KB: skipped. Probing for Winbond W39V080FA (dual mode), 512 KB: skipped. Probing for Atmel unknown Atmel SPI chip, 0 KB: skipped. Probing for EON unknown EON SPI chip, 0 KB: skipped. Probing for Macronix unknown Macronix SPI chip, 0 KB: skipped. Probing for PMC unknown PMC SPI chip, 0 KB: skipped. Probing for SST unknown SST SPI chip, 0 KB: skipped. Probing for ST unknown ST SPI chip, 0 KB: skipped. Probing for Sanyo unknown Sanyo SPI chip, 0 KB: skipped. Probing for Generic unknown SPI chip (RDID), 0 KB: skipped. Probing for Generic unknown SPI chip (REMS), 0 KB: skipped. No EEPROM/flash device found. Note: flashrom can never write if the flash chip isn't found automatically.

1 0

[PATCH 4/4] Add support for Atmel's AT25F series of SPI flash chips.
by Stefan Tauner 29 Jul '11

29 Jul '11

Besides the definitions of the the chips in flashchips.c this includes - a probing method (probe_spi_at25f) - a pretty printing method (spi_prettyprint_status_register_at25f), and - an unlocking method (spi_disable_blockprotect_at25f) Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- at25.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ chipdrivers.h | 3 ++ flashchips.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++ flashchips.h | 10 ++--- spi.h | 9 +++-- 5 files changed, 199 insertions(+), 10 deletions(-) diff --git a/at25.c b/at25.c index e4bd729..de2a9b7 100644 --- a/at25.c +++ b/at25.c @@ -63,6 +63,24 @@ static void spi_prettyprint_status_register_atmel_at25_swp(uint8_t status) } } +/* used for AT25F512(A), AT25F1024(A) */ +int spi_prettyprint_status_register_at25f(struct flashchip *flash) +{ + uint8_t status; + + status = spi_read_status_register(); + msg_cdbg("Chip status register is %02x\n", status); + + spi_prettyprint_status_register_atmel_at25_wpen(status); + spi_prettyprint_status_register_bit(status, 6); + spi_prettyprint_status_register_bit(status, 5); + spi_prettyprint_status_register_bit(status, 4); + /* FIXME: Bit 3 is undefined on AT25F512A */ + spi_prettyprint_status_register_bp(status, 1); + spi_prettyprint_status_register_welwip(status); + return 0; +} + int spi_prettyprint_status_register_at25df(struct flashchip *flash) { uint8_t status; @@ -154,6 +172,57 @@ int spi_prettyprint_status_register_atmel_at26df081a(struct flashchip *flash) return 0; } +int spi_disable_blockprotect_at25f(struct flashchip *flash) +{ + uint8_t status; + int result; + + status = spi_read_status_register(); + /* If block protection is disabled (BP0 and BP1 are 0), stop here. */ + if ((status & (3 << 2)) == 0) + return 0; + + msg_cdbg("Some block protection in effect, disabling\n"); + if (status & (1 << 7)) { + msg_cdbg("Need to disable Write Protect Enable (WPEN)\n"); + /* The following is used in spi_disable_blockprotect_at25df + * to check the state of the hardware lock pin. This is not + * possible with this chip, so we have to try. + if ((status & (1 << 4)) == 0) { + msg_cerr("WP# pin is active, disabling " + "write protection is impossible.\n"); + return 1; + } + */ + /* All bits except bit 7 (WPEN) are readonly. If the WP pin is + * low, WPEN is readonly and this will fail. */ + result = spi_write_status_register(flash, status & ~(1 << 7)); + if (result) { + msg_cerr("spi_write_status_register failed\n"); + return result; + } + status = spi_read_status_register(); + if (status & (1 << 7)) { + msg_cerr("WP# pin is probably active, disabling " + "write protection is impossible.\n"); + return 1; + } + + } + /* Global unprotect. Make sure to mask WPEN as well. */ + result = spi_write_status_register(flash, status & ~0x8c); + if (result) { + msg_cerr("spi_write_status_register failed\n"); + return result; + } + status = spi_read_status_register(); + if ((status & (3 << 2)) != 0) { + msg_cerr("Block protection could not be disabled!\n"); + return 1; + } + return 0; +} + int spi_disable_blockprotect_at25df(struct flashchip *flash) { uint8_t status; @@ -276,3 +345,31 @@ int spi_disable_blockprotect_at25fs040(struct flashchip *flash) } return 0; } + +int probe_spi_at25f(struct flashchip *flash) +{ + static const unsigned char cmd[AT25F_RDID_OUTSIZE] = { AT25F_RDID }; + unsigned char readarr[AT25F_RDID_INSIZE]; + uint32_t id1; + uint32_t id2; + + if (spi_send_command(sizeof(cmd), sizeof(readarr), cmd, readarr)) { + msg_cdbg("\n"); + return 0; + } + id1 = readarr[0]; + id2 = readarr[1]; + + msg_cdbg("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); + + if (id1 == flash->manufacture_id && id2 == flash->model_id) { + /* Print the status register to tell the + * user about possible write protection. + */ + spi_prettyprint_status_register_at25f(flash); + + return 1; + } + + return 0; +} diff --git a/chipdrivers.h b/chipdrivers.h index 7918308..7de17a4 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -66,6 +66,7 @@ int spi_prettyprint_status_register_amic_a25lq032(struct flashchip *flash); /* at25.c */ int spi_prettyprint_status_register_at25df(struct flashchip *flash); int spi_prettyprint_status_register_at25df_sec(struct flashchip *flash); +int spi_prettyprint_status_register_at25f(struct flashchip *flash); int spi_prettyprint_status_register_at25f512b(struct flashchip *flash); int spi_prettyprint_status_register_at25fs010(struct flashchip *flash); int spi_prettyprint_status_register_at25fs040(struct flashchip *flash); @@ -73,8 +74,10 @@ int spi_prettyprint_status_register_atmel_at26df081a(struct flashchip *flash); int spi_disable_blockprotect_at25df(struct flashchip *flash); int spi_disable_blockprotect_at25df_sec(struct flashchip *flash); int spi_disable_blockprotect_at25f512b(struct flashchip *flash); +int spi_disable_blockprotect_at25f(struct flashchip *flash); int spi_disable_blockprotect_at25fs010(struct flashchip *flash); int spi_disable_blockprotect_at25fs040(struct flashchip *flash); +int probe_spi_at25f(struct flashchip *flash); /* 82802ab.c */ uint8_t wait_82802ab(struct flashchip *flash); diff --git a/flashchips.c b/flashchips.c index e021cbc..b3813a0 100644 --- a/flashchips.c +++ b/flashchips.c @@ -1651,6 +1651,65 @@ const struct flashchip flashchips[] = { { .vendor = "Atmel", + .name = "AT25F512", + .bustype = BUS_SPI, + .manufacture_id = ATMEL_ID, + .model_id = ATMEL_AT25F512, + .total_size = 64, + .page_size = 256, + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_at25f, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {32 * 1024, 2} }, + .block_erase = spi_block_erase_52, + }, { + .eraseblocks = { {64 * 1024, 1} }, + .block_erase = spi_block_erase_62, + } + }, + .printlock = spi_prettyprint_status_register_at25f, + .unlock = spi_disable_blockprotect_at25f, + .write = spi_chip_write_256, + .read = spi_chip_read, + .voltage = {2700, 3600}, + }, + + { + .vendor = "Atmel", + .name = "AT25F512A", + .bustype = BUS_SPI, + .manufacture_id = ATMEL_ID, + .model_id = ATMEL_AT25F512A, + .total_size = 64, + .page_size = 128, + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_at25f, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {32 * 1024, 2} }, + .block_erase = spi_block_erase_52, + }, { + .eraseblocks = { {64 * 1024, 1} }, + .block_erase = spi_block_erase_62, + } + }, + .printlock = spi_prettyprint_status_register_at25f, + /* Not correct to use this one, because the BP1 bit is N/A. */ + .unlock = spi_disable_blockprotect_at25f, + .write = spi_chip_write_256, + .read = spi_chip_read, + .voltage = {2700, 3600}, + }, + + { + .vendor = "Atmel", .name = "AT25F512B", .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, @@ -1693,6 +1752,37 @@ const struct flashchip flashchips[] = { { .vendor = "Atmel", + /* The A suffix indicates 33MHz instead of 20MHz clock rate. + * All other properties seem to be the same.*/ + .name = "AT25F1024(A)", + .bustype = BUS_SPI, + .manufacture_id = ATMEL_ID, + .model_id = ATMEL_AT25F1024, + .total_size = 128, + .page_size = 256, + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_OK_PREW, + .probe = probe_spi_at25f, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {32 * 1024, 4} }, + .block_erase = spi_block_erase_52, + }, { + .eraseblocks = { {128 * 1024, 1} }, + .block_erase = spi_block_erase_62, + } + }, + .printlock = spi_prettyprint_status_register_at25f, + .unlock = spi_disable_blockprotect_at25f, + .write = spi_chip_write_256, + .read = spi_chip_read, + .voltage = {2700, 3600}, + }, + + { + .vendor = "Atmel", .name = "AT25FS010", .bustype = BUS_SPI, .manufacture_id = ATMEL_ID, diff --git a/flashchips.h b/flashchips.h index ff49d31..6470614 100644 --- a/flashchips.h +++ b/flashchips.h @@ -134,13 +134,11 @@ #define ATMEL_AT25DF321A 0x4701 #define ATMEL_AT25DF641 0x4800 #define ATMEL_AT25DQ161 0x8600 -#define ATMEL_AT25F512 /* No device ID found in datasheet. Vendor ID - * can be read with AT25F512A_RDID */ -#define ATMEL_AT25F512A 0x65 /* Needs AT25F512A_RDID */ +#define ATMEL_AT25F512 0x65 /* guessed, no device ID in datasheet. + * Vendor ID can be read with AT25F_RDID */ +#define ATMEL_AT25F512A 0x65 /* Needs AT25F_RDID */ #define ATMEL_AT25F512B 0x6500 -#define ATMEL_AT25F1024 /* No device ID found in datasheet. Vendor ID - * can be read with AT25F512A_RDID */ -#define ATMEL_AT25F1024A 0x60 /* Needs AT25F512A_RDID */ +#define ATMEL_AT25F1024 0x60 /* Needs AT25F_RDID */ #define ATMEL_AT25FS010 0x6601 #define ATMEL_AT25FS040 0x6604 #define ATMEL_AT26DF041 0x4400 diff --git a/spi.h b/spi.h index adb9109..a5c3406 100644 --- a/spi.h +++ b/spi.h @@ -30,10 +30,11 @@ /* INSIZE may be 0x04 for some chips*/ #define JEDEC_RDID_INSIZE 0x03 -/* AT25F512A has bit 3 as don't care bit in commands */ -#define AT25F512A_RDID 0x15 /* 0x15 or 0x1d */ -#define AT25F512A_RDID_OUTSIZE 0x01 -#define AT25F512A_RDID_INSIZE 0x02 +/* Some Atmel AT25F* models have bit 3 as don't care bit in commands */ +/* 0x15 or 0x1d */ +#define AT25F_RDID 0x15 +#define AT25F_RDID_OUTSIZE 0x01 +#define AT25F_RDID_INSIZE 0x02 /* Read Electronic Manufacturer Signature */ #define JEDEC_REMS 0x90 -- 1.7.1

1 0

[PATCH 3/4] add spi_block_erase_62
by Stefan Tauner 29 Jul '11

29 Jul '11

this is used by the AT25F series (only?), but is generic enough to reside in spi25.c. the only currently supported chip is the AT25F512B. other members of that series need some additional infrastructure code, hence we add the erase function to the AT25F512B only. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- chipdrivers.h | 1 + flashchips.c | 3 +++ spi.h | 5 +++++ spi25.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 0 deletions(-) diff --git a/chipdrivers.h b/chipdrivers.h index ccbd86b..7918308 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -38,6 +38,7 @@ int spi_block_erase_52(struct flashchip *flash, unsigned int addr, unsigned int int spi_block_erase_d7(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_d8(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_60(struct flashchip *flash, unsigned int addr, unsigned int blocklen); +int spi_block_erase_62(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_c7(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int spi_chip_write_1(struct flashchip *flash, uint8_t *buf, int start, int len); int spi_chip_write_256(struct flashchip *flash, uint8_t *buf, int start, int len); diff --git a/flashchips.c b/flashchips.c index 0020f6f..e021cbc 100644 --- a/flashchips.c +++ b/flashchips.c @@ -1679,6 +1679,9 @@ const struct flashchip flashchips[] = { }, { .eraseblocks = { {64 * 1024, 1} }, .block_erase = spi_block_erase_c7, + }, { + .eraseblocks = { {64 * 1024, 1} }, + .block_erase = spi_block_erase_62, } }, .printlock = spi_prettyprint_status_register_at25f512b, diff --git a/spi.h b/spi.h index b908603..adb9109 100644 --- a/spi.h +++ b/spi.h @@ -61,6 +61,11 @@ #define JEDEC_CE_60_OUTSIZE 0x01 #define JEDEC_CE_60_INSIZE 0x00 +/* Chip Erase 0x62 is supported by Atmel AT25F chips. */ +#define JEDEC_CE_62 0x62 +#define JEDEC_CE_62_OUTSIZE 0x01 +#define JEDEC_CE_62_INSIZE 0x00 + /* Chip Erase 0xc7 is supported by SST/ST/EON/Macronix chips. */ #define JEDEC_CE_C7 0xc7 #define JEDEC_CE_C7_OUTSIZE 0x01 diff --git a/spi25.c b/spi25.c index 8db9539..a21e75b 100644 --- a/spi25.c +++ b/spi25.c @@ -488,6 +488,43 @@ int spi_chip_erase_60(struct flashchip *flash) return 0; } +int spi_chip_erase_62(struct flashchip *flash) +{ + int result; + struct spi_command cmds[] = { + { + .writecnt = JEDEC_WREN_OUTSIZE, + .writearr = (const unsigned char[]){ JEDEC_WREN }, + .readcnt = 0, + .readarr = NULL, + }, { + .writecnt = JEDEC_CE_62_OUTSIZE, + .writearr = (const unsigned char[]){ JEDEC_CE_62 }, + .readcnt = 0, + .readarr = NULL, + }, { + .writecnt = 0, + .writearr = NULL, + .readcnt = 0, + .readarr = NULL, + }}; + + result = spi_send_multicommand(cmds); + if (result) { + msg_cerr("%s failed during command execution\n", + __func__); + return result; + } + /* Wait until the Write-In-Progress bit is cleared. + * This usually takes 2-5 s, so wait in 100 ms steps. + */ + /* FIXME: We assume spi_read_status_register will never fail. */ + while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) + programmer_delay(100 * 1000); + /* FIXME: Check the status register for errors. */ + return 0; +} + int spi_chip_erase_c7(struct flashchip *flash) { int result; @@ -707,6 +744,16 @@ int spi_block_erase_60(struct flashchip *flash, unsigned int addr, unsigned int return spi_chip_erase_60(flash); } +int spi_block_erase_62(struct flashchip *flash, unsigned int addr, unsigned int blocklen) +{ + if ((addr != 0) || (blocklen != flash->total_size * 1024)) { + msg_cerr("%s called with incorrect arguments\n", + __func__); + return -1; + } + return spi_chip_erase_62(flash); +} + int spi_block_erase_c7(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { if ((addr != 0) || (blocklen != flash->total_size * 1024)) { -- 1.7.1

1 0

[PATCH 2/4] rename AT25F512B-specific code
by Stefan Tauner 29 Jul '11

29 Jul '11

The AT25F512B is quite different from the other (older and yet unsupported) chips in the AT25F* familiy, hence rename 512B-specific stuff to make room for the generic AT25F* code Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- at25.c | 4 ++-- chipdrivers.h | 4 ++-- flashchips.c | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/at25.c b/at25.c index d6b46ca..e4bd729 100644 --- a/at25.c +++ b/at25.c @@ -86,7 +86,7 @@ int spi_prettyprint_status_register_at25df_sec(struct flashchip *flash) return spi_prettyprint_status_register_at25df(flash); } -int spi_prettyprint_status_register_at25f(struct flashchip *flash) +int spi_prettyprint_status_register_at25f512b(struct flashchip *flash) { uint8_t status; @@ -201,7 +201,7 @@ int spi_disable_blockprotect_at25df_sec(struct flashchip *flash) return spi_disable_blockprotect_at25df(flash); } -int spi_disable_blockprotect_at25f(struct flashchip *flash) +int spi_disable_blockprotect_at25f512b(struct flashchip *flash) { /* spi_disable_blockprotect_at25df is not really the right way to do * this, but the side effects of said function work here as well. diff --git a/chipdrivers.h b/chipdrivers.h index a0b0387..ccbd86b 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -65,13 +65,13 @@ int spi_prettyprint_status_register_amic_a25lq032(struct flashchip *flash); /* at25.c */ int spi_prettyprint_status_register_at25df(struct flashchip *flash); int spi_prettyprint_status_register_at25df_sec(struct flashchip *flash); -int spi_prettyprint_status_register_at25f(struct flashchip *flash); +int spi_prettyprint_status_register_at25f512b(struct flashchip *flash); int spi_prettyprint_status_register_at25fs010(struct flashchip *flash); int spi_prettyprint_status_register_at25fs040(struct flashchip *flash); int spi_prettyprint_status_register_atmel_at26df081a(struct flashchip *flash); int spi_disable_blockprotect_at25df(struct flashchip *flash); int spi_disable_blockprotect_at25df_sec(struct flashchip *flash); -int spi_disable_blockprotect_at25f(struct flashchip *flash); +int spi_disable_blockprotect_at25f512b(struct flashchip *flash); int spi_disable_blockprotect_at25fs010(struct flashchip *flash); int spi_disable_blockprotect_at25fs040(struct flashchip *flash); diff --git a/flashchips.c b/flashchips.c index a040e8c..0020f6f 100644 --- a/flashchips.c +++ b/flashchips.c @@ -1657,6 +1657,7 @@ const struct flashchip flashchips[] = { .model_id = ATMEL_AT25F512B, .total_size = 64, .page_size = 256, + /* TODO: chip features 128-byte one-time programmable region */ .feature_bits = FEATURE_WRSR_WREN, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, @@ -1680,8 +1681,8 @@ const struct flashchip flashchips[] = { .block_erase = spi_block_erase_c7, } }, - .printlock = spi_prettyprint_status_register_at25f, - .unlock = spi_disable_blockprotect_at25f, + .printlock = spi_prettyprint_status_register_at25f512b, + .unlock = spi_disable_blockprotect_at25f512b, .write = spi_chip_write_256, .read = spi_chip_read, .voltage = {2700, 3600}, -- 1.7.1

1 0

[PATCH 1/4] clean up a25.c, at25.c, spi25.c
by Stefan Tauner 29 Jul '11

29 Jul '11

- introduce spi_prettyprint_status_register_atmel_at25_wpen - use spi_prettyprint_status_register_bit where possible - generify spi_prettyprint_status_register_bp3210 and use it in at25.c too Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- a25.c | 8 ++++---- at25.c | 31 +++++++++++-------------------- chipdrivers.h | 2 +- spi25.c | 15 +++++++++------ 4 files changed, 25 insertions(+), 31 deletions(-) diff --git a/a25.c b/a25.c index 5791c46..5c7cadc 100644 --- a/a25.c +++ b/a25.c @@ -40,7 +40,7 @@ int spi_prettyprint_status_register_amic_a25l05p(struct flashchip *flash) spi_prettyprint_status_register_bit(status, 6); spi_prettyprint_status_register_bit(status, 5); spi_prettyprint_status_register_bit(status, 4); - spi_prettyprint_status_register_bp3210(status, 1); + spi_prettyprint_status_register_bp(status, 1); spi_prettyprint_status_register_welwip(status); return 0; } @@ -55,7 +55,7 @@ int spi_prettyprint_status_register_amic_a25l40p(struct flashchip *flash) spi_prettyprint_status_register_amic_a25_srwd(status); spi_prettyprint_status_register_bit(status, 6); spi_prettyprint_status_register_bit(status, 5); - spi_prettyprint_status_register_bp3210(status, 2); + spi_prettyprint_status_register_bp(status, 2); spi_prettyprint_status_register_welwip(status); return 0; } @@ -72,7 +72,7 @@ int spi_prettyprint_status_register_amic_a25l032(struct flashchip *flash) "is %i KB\n", (status & (1 << 6)) ? 4 : 64); msg_cdbg("Chip status register: Top/Bottom (TB) " "is %s\n", (status & (1 << 5)) ? "bottom" : "top"); - spi_prettyprint_status_register_bp3210(status, 2); + spi_prettyprint_status_register_bp(status, 2); spi_prettyprint_status_register_welwip(status); msg_cdbg("Chip status register 2 is NOT decoded!\n"); return 0; @@ -90,7 +90,7 @@ int spi_prettyprint_status_register_amic_a25lq032(struct flashchip *flash) "is %i KB\n", (status & (1 << 6)) ? 4 : 64); msg_cdbg("Chip status register: Top/Bottom (TB) " "is %s\n", (status & (1 << 5)) ? "bottom" : "top"); - spi_prettyprint_status_register_bp3210(status, 2); + spi_prettyprint_status_register_bp(status, 2); spi_prettyprint_status_register_welwip(status); msg_cdbg("Chip status register 2 is NOT decoded!\n"); return 0; diff --git a/at25.c b/at25.c index e55b007..d6b46ca 100644 --- a/at25.c +++ b/at25.c @@ -23,6 +23,12 @@ /* Prettyprint the status register. Works for Atmel A25/A26 series. */ +static void spi_prettyprint_status_register_atmel_at25_wpen(uint8_t status) +{ + msg_cdbg("Chip status register: Write Protect Enable (WPEN) " + "is %sset\n", (status & (1 << 7)) ? "" : "not "); +} + static void spi_prettyprint_status_register_atmel_at25_srpl(uint8_t status) { msg_cdbg("Chip status register: Sector Protection Register Lock (SRPL) " @@ -91,10 +97,7 @@ int spi_prettyprint_status_register_at25f(struct flashchip *flash) spi_prettyprint_status_register_bit(status, 6); spi_prettyprint_status_register_atmel_at25_epewpp(status); spi_prettyprint_status_register_bit(status, 3); - msg_cdbg("Chip status register: Block Protect 0 (BP0) is " - "%sset, %s sectors are protected\n", - (status & (1 << 2)) ? "" : "not ", - (status & (1 << 2)) ? "all" : "no"); + spi_prettyprint_status_register_bp(status, 0); spi_prettyprint_status_register_welwip(status); return 0; } @@ -106,14 +109,12 @@ int spi_prettyprint_status_register_at25fs010(struct flashchip *flash) status = spi_read_status_register(); msg_cdbg("Chip status register is %02x\n", status); - msg_cdbg("Chip status register: Status Register Write Protect (WPEN) " - "is %sset\n", (status & (1 << 7)) ? "" : "not "); + spi_prettyprint_status_register_atmel_at25_wpen(status); msg_cdbg("Chip status register: Bit 6 / Block Protect 4 (BP4) is " "%sset\n", (status & (1 << 6)) ? "" : "not "); msg_cdbg("Chip status register: Bit 5 / Block Protect 3 (BP3) is " "%sset\n", (status & (1 << 5)) ? "" : "not "); - msg_cdbg("Chip status register: Bit 4 is " - "%sset\n", (status & (1 << 4)) ? "" : "not "); + spi_prettyprint_status_register_bit(status, 4); msg_cdbg("Chip status register: Bit 3 / Block Protect 1 (BP1) is " "%sset\n", (status & (1 << 3)) ? "" : "not "); msg_cdbg("Chip status register: Bit 2 / Block Protect 0 (BP0) is " @@ -130,18 +131,8 @@ int spi_prettyprint_status_register_at25fs040(struct flashchip *flash) status = spi_read_status_register(); msg_cdbg("Chip status register is %02x\n", status); - msg_cdbg("Chip status register: Status Register Write Protect (WPEN) " - "is %sset\n", (status & (1 << 7)) ? "" : "not "); - msg_cdbg("Chip status register: Bit 6 / Block Protect 4 (BP4) is " - "%sset\n", (status & (1 << 6)) ? "" : "not "); - msg_cdbg("Chip status register: Bit 5 / Block Protect 3 (BP3) is " - "%sset\n", (status & (1 << 5)) ? "" : "not "); - msg_cdbg("Chip status register: Bit 4 / Block Protect 2 (BP2) is " - "%sset\n", (status & (1 << 4)) ? "" : "not "); - msg_cdbg("Chip status register: Bit 3 / Block Protect 1 (BP1) is " - "%sset\n", (status & (1 << 3)) ? "" : "not "); - msg_cdbg("Chip status register: Bit 2 / Block Protect 0 (BP0) is " - "%sset\n", (status & (1 << 2)) ? "" : "not "); + spi_prettyprint_status_register_atmel_at25_wpen(status); + spi_prettyprint_status_register_bp(status, 4); /* FIXME: Pretty-print detailed sector protection status. */ spi_prettyprint_status_register_welwip(status); return 0; diff --git a/chipdrivers.h b/chipdrivers.h index 92ddbea..a0b0387 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -45,7 +45,7 @@ int spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len); uint8_t spi_read_status_register(void); int spi_write_status_register(struct flashchip *flash, int status); void spi_prettyprint_status_register_bit(uint8_t status, int bit); -void spi_prettyprint_status_register_bp3210(uint8_t status, int bp); +void spi_prettyprint_status_register_bp(uint8_t status, int bp); void spi_prettyprint_status_register_welwip(uint8_t status); int spi_prettyprint_status_register(struct flashchip *flash); int spi_disable_blockprotect(struct flashchip *flash); diff --git a/spi25.c b/spi25.c index 937ee5d..8db9539 100644 --- a/spi25.c +++ b/spi25.c @@ -327,21 +327,24 @@ void spi_prettyprint_status_register_welwip(uint8_t status) } /* Prettyprint the status register. Common definitions. */ -void spi_prettyprint_status_register_bp3210(uint8_t status, int bp) +void spi_prettyprint_status_register_bp(uint8_t status, int bp) { switch (bp) { /* Fall through. */ + case 4: + msg_cdbg("Chip status register: Block Protect 4 (BP4) " + "is %sset\n", (status & (1 << 5)) ? "" : "not "); case 3: - msg_cdbg("Chip status register: Bit 5 / Block Protect 3 (BP3) " + msg_cdbg("Chip status register: Block Protect 3 (BP3) " "is %sset\n", (status & (1 << 5)) ? "" : "not "); case 2: - msg_cdbg("Chip status register: Bit 4 / Block Protect 2 (BP2) " + msg_cdbg("Chip status register: Block Protect 2 (BP2) " "is %sset\n", (status & (1 << 4)) ? "" : "not "); case 1: - msg_cdbg("Chip status register: Bit 3 / Block Protect 1 (BP1) " + msg_cdbg("Chip status register: Block Protect 1 (BP1) " "is %sset\n", (status & (1 << 3)) ? "" : "not "); case 0: - msg_cdbg("Chip status register: Bit 2 / Block Protect 0 (BP0) " + msg_cdbg("Chip status register: Block Protect 0 (BP0) " "is %sset\n", (status & (1 << 2)) ? "" : "not "); } } @@ -355,7 +358,7 @@ void spi_prettyprint_status_register_bit(uint8_t status, int bit) static void spi_prettyprint_status_register_common(uint8_t status) { - spi_prettyprint_status_register_bp3210(status, 3); + spi_prettyprint_status_register_bp(status, 3); spi_prettyprint_status_register_welwip(status); } -- 1.7.1

1 0

[PATCH 0/4] AT25F* 2.0
by Stefan Tauner 29 Jul '11

29 Jul '11

I have rebased and improved my previous patch set according to the review from carl-daniel. debatable and/or remarkable bits: 1/4 changes the output and name of spi_prettyprint_status_register_bp3210 2/4 none, i hope 3/4 location of the code. could be moved to at25.c, but i don't see a reason to do so. 4/4 - handling of ATMEL_AT25F512 and ATMEL_AT25F512A: they are evil twins with different page sizes but same id (guessed id, none in datasheet). the current implementation will ask the user which version he has. dunno if that's necessary... also page_size will die soon-ish... - location and naming of AT25F_RDID macros Stefan Tauner (4): clean up a25.c, at25.c, spi25.c rename AT25F512B-specific code add spi_block_erase_62 Add support for Atmel's AT25F series of SPI flash chips. a25.c | 8 ++-- at25.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++--------- chipdrivers.h | 6 ++- flashchips.c | 94 ++++++++++++++++++++++++++++++++++++++++ flashchips.h | 10 ++--- spi.h | 14 ++++-- spi25.c | 62 ++++++++++++++++++++++++--- 7 files changed, 283 insertions(+), 43 deletions(-)

1 0

Re: [flashrom] [PATCH 3/8] generify spi_rdid to allow passing different opcodes. This is needed to add support for Atmel's AT25F series.
by Carl-Daniel Hailfinger 29 Jul '11

29 Jul '11

Am 15.03.2011 16:29 schrieb Stefan Tauner: > Signed-off-by: Stefan Tauner<stefan.tauner(a)student.tuwien.ac.at> > Not sure about this one. We also have separate functions for each erase command. I'll let others comment. Regards, Carl-Daniel > --- > spi25.c | 24 ++++++++++++------------ > 1 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/spi25.c b/spi25.c > index 5d73411..c4cd6b2 100644 > --- a/spi25.c > +++ b/spi25.c > @@ -31,17 +31,17 @@ > > void spi_prettyprint_status_register(struct flashchip *flash); > > -static int spi_rdid(unsigned char *readarr, int bytes) > +static int spi_rdid(unsigned char *readarr, int bytes_in, unsigned char rdid_opcode) > { > - static const unsigned char cmd[JEDEC_RDID_OUTSIZE] = { JEDEC_RDID }; > + unsigned char cmd[] = { rdid_opcode }; > int ret; > int i; > > - ret = spi_send_command(sizeof(cmd), bytes, cmd, readarr); > + ret = spi_send_command(sizeof(cmd), bytes_in, cmd, readarr); > if (ret) > return ret; > msg_cspew("RDID returned"); > - for (i = 0; i< bytes; i++) > + for (i = 0; i< bytes_in; i++) > msg_cspew(" 0x%02x", readarr[i]); > msg_cspew(". "); > return 0; > @@ -115,13 +115,13 @@ int spi_write_disable(void) > return spi_send_command(sizeof(cmd), 0, cmd, NULL); > } > > -static int probe_spi_rdid_generic(struct flashchip *flash, int bytes) > +static int probe_spi_rdid_generic(struct flashchip *flash, int bytes_in, unsigned char rdid_opcode) > { > - unsigned char readarr[4]; > + unsigned char readarr[bytes_in]; > uint32_t id1; > uint32_t id2; > > - if (spi_rdid(readarr, bytes)) > + if (spi_rdid(readarr, bytes_in, rdid_opcode)) > return 0; > > if (!oddparity(readarr[0])) > @@ -135,7 +135,7 @@ static int probe_spi_rdid_generic(struct flashchip *flash, int bytes) > msg_cdbg("RDID byte 1 parity violation. "); > id1 = (readarr[0]<< 8) | readarr[1]; > id2 = readarr[2]; > - if (bytes> 3) { > + if (bytes_in> 3) { > id2<<= 8; > id2 |= readarr[3]; > } > @@ -170,7 +170,7 @@ static int probe_spi_rdid_generic(struct flashchip *flash, int bytes) > > int probe_spi_rdid(struct flashchip *flash) > { > - return probe_spi_rdid_generic(flash, 3); > + return probe_spi_rdid_generic(flash, JEDEC_RDID_INSIZE, JEDEC_RDID); > } > > int probe_spi_rdid4(struct flashchip *flash) > @@ -189,7 +189,7 @@ int probe_spi_rdid4(struct flashchip *flash) > #endif > #endif > default: > - return probe_spi_rdid_generic(flash, 4); > + return probe_spi_rdid_generic(flash, 4, JEDEC_RDID); > } > > return 0; > @@ -242,8 +242,8 @@ int probe_spi_res1(struct flashchip *flash) > /* Check if RDID is usable and does not return 0xff 0xff 0xff or > * 0x00 0x00 0x00. In that case, RES is pointless. > */ > - if (!spi_rdid(readarr, 3)&& memcmp(readarr, allff, 3)&& > - memcmp(readarr, all00, 3)) { > + if (!spi_rdid(readarr, JEDEC_RDID_INSIZE, JEDEC_RDID)&& memcmp(readarr, allff, 3)&& > + memcmp(readarr, all00, JEDEC_RDID_INSIZE)) { > msg_cdbg("Ignoring RES in favour of RDID.\n"); > return 0; > } > -- http://www.hailfinger.org/

2 1

[PATCH] Make flashrom build on PPC/PowerPC with just "make"
by Uwe Hermann 29 Jul '11

29 Jul '11

Hi, see patch. This complements the recent ppc patch to make builds simpler. Uwe. -- http://hermann-uwe.de | http://sigrok.org http://randomprojects.org | http://unmaintained-free-software.org

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom