flashrom August 2012

flashrom@flashrom.org

31 participants
160 discussions

Re: [flashrom] [PATCH 3/5] Rename AT25F512B-specific code.
by Stefan Tauner 02 Aug '12

02 Aug '12

On Wed, 15 Feb 2012 02:10:22 +0100 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > 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 i'd like to get in the remaining patches of this set rather sooner than later. imho they are pretty ready (i have at least added the voltage fields while rebasing and incorporated your earlier comments iirc), but maybe there are some small bits missing/wrong. but what i really would like to know is if you agree on the naming and code placement (especially spi_block_erase_62). if there is a general agreement on that i can self-review the details. i cant remember what i have done back then anyway :P -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH 2/5] Refine messages of SPI block protection disables.
by Stefan Tauner 02 Aug '12

02 Aug '12

On Wed, 15 Feb 2012 02:10:21 +0100 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > Make them real progress indicators with a final "done" message on success. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> self-acked and committed in r1561 (please see previous mail for a rationale). -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1561 - trunk
by repository service 02 Aug '12

02 Aug '12

Author: stefanct Date: Fri Aug 3 01:56:49 2012 New Revision: 1561 URL: http://flashrom.org/trac/flashrom/changeset/1561 Log: Refine messages of SPI block protection disables. Make them real progress indicators with a final "done" message on success. 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/at25.c trunk/spi25.c Modified: trunk/at25.c ============================================================================== --- trunk/at25.c Fri Aug 3 01:51:28 2012 (r1560) +++ trunk/at25.c Fri Aug 3 01:56:49 2012 (r1561) @@ -164,7 +164,7 @@ if ((status & (3 << 2)) == 0) return 0; - msg_cdbg("Some block protection in effect, disabling\n"); + msg_cdbg("Some block protection in effect, disabling... "); if (status & (1 << 7)) { msg_cdbg("Need to disable Sector Protection Register Lock\n"); if ((status & (1 << 4)) == 0) { @@ -175,7 +175,7 @@ /* All bits except bit 7 (SPRL) are readonly. */ result = spi_write_status_register(flash, status & ~(1 << 7)); if (result) { - msg_cerr("spi_write_status_register failed\n"); + msg_cerr("spi_write_status_register failed.\n"); return result; } @@ -183,7 +183,7 @@ /* Global unprotect. Make sure to mask SPRL as well. */ result = spi_write_status_register(flash, status & ~0xbc); if (result) { - msg_cerr("spi_write_status_register failed\n"); + msg_cerr("spi_write_status_register failed.\n"); return result; } status = spi_read_status_register(flash); @@ -191,6 +191,7 @@ msg_cerr("Block protection could not be disabled!\n"); return 1; } + msg_cdbg("done.\n"); return 0; } @@ -219,20 +220,20 @@ if ((status & 0x6c) == 0) return 0; - msg_cdbg("Some block protection in effect, disabling\n"); + msg_cdbg("Some block protection in effect, disabling... "); if (status & (1 << 7)) { msg_cdbg("Need to disable Status Register Write Protect\n"); /* Clear bit 7 (WPEN). */ result = spi_write_status_register(flash, status & ~(1 << 7)); if (result) { - msg_cerr("spi_write_status_register failed\n"); + msg_cerr("spi_write_status_register failed.\n"); return result; } } /* Global unprotect. Make sure to mask WPEN as well. */ result = spi_write_status_register(flash, status & ~0xec); if (result) { - msg_cerr("spi_write_status_register failed\n"); + msg_cerr("spi_write_status_register failed.\n"); return result; } status = spi_read_status_register(flash); @@ -240,6 +241,7 @@ msg_cerr("Block protection could not be disabled!\n"); return 1; } + msg_cdbg("done.\n"); return 0; } @@ -253,20 +255,20 @@ if ((status & 0x7c) == 0) return 0; - msg_cdbg("Some block protection in effect, disabling\n"); + msg_cdbg("Some block protection in effect, disabling... "); if (status & (1 << 7)) { msg_cdbg("Need to disable Status Register Write Protect\n"); /* Clear bit 7 (WPEN). */ result = spi_write_status_register(flash, status & ~(1 << 7)); if (result) { - msg_cerr("spi_write_status_register failed\n"); + msg_cerr("spi_write_status_register failed.\n"); return result; } } /* Global unprotect. Make sure to mask WPEN as well. */ result = spi_write_status_register(flash, status & ~0xfc); if (result) { - msg_cerr("spi_write_status_register failed\n"); + msg_cerr("spi_write_status_register failed.\n"); return result; } status = spi_read_status_register(flash); @@ -274,5 +276,6 @@ msg_cerr("Block protection could not be disabled!\n"); return 1; } + msg_cdbg("done.\n"); return 0; } Modified: trunk/spi25.c ============================================================================== --- trunk/spi25.c Fri Aug 3 01:51:28 2012 (r1560) +++ trunk/spi25.c Fri Aug 3 01:56:49 2012 (r1561) @@ -933,10 +933,10 @@ if ((status & 0x3c) == 0) return 0; - msg_cdbg("Some block protection in effect, disabling\n"); + msg_cdbg("Some block protection in effect, disabling... "); result = spi_write_status_register(flash, status & ~0x3c); if (result) { - msg_cerr("spi_write_status_register failed\n"); + msg_cerr("spi_write_status_register failed.\n"); return result; } status = spi_read_status_register(flash); @@ -944,6 +944,7 @@ msg_cerr("Block protection could not be disabled!\n"); return 1; } + msg_cdbg("done.\n"); return 0; }

1 0

[commit] r1560 - trunk
by repository service 02 Aug '12

02 Aug '12

Author: stefanct Date: Fri Aug 3 01:51:28 2012 New Revision: 1560 URL: http://flashrom.org/trac/flashrom/changeset/1560 Log: Clean up a25.c, at25.c, spi25.c. - 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> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/a25.c trunk/at25.c trunk/chipdrivers.h trunk/spi25.c Modified: trunk/a25.c ============================================================================== --- trunk/a25.c Fri Aug 3 00:06:14 2012 (r1559) +++ trunk/a25.c Fri Aug 3 01:51:28 2012 (r1560) @@ -40,7 +40,7 @@ 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 @@ 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 @@ "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 @@ "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; Modified: trunk/at25.c ============================================================================== --- trunk/at25.c Fri Aug 3 00:06:14 2012 (r1559) +++ trunk/at25.c Fri Aug 3 01:51:28 2012 (r1560) @@ -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 @@ 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 @@ status = spi_read_status_register(flash); 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 @@ status = spi_read_status_register(flash); 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; Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Fri Aug 3 00:06:14 2012 (r1559) +++ trunk/chipdrivers.h Fri Aug 3 01:51:28 2012 (r1560) @@ -48,7 +48,7 @@ uint8_t spi_read_status_register(struct flashctx *flash); int spi_write_status_register(struct flashctx *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 flashctx *flash); int spi_disable_blockprotect(struct flashctx *flash); Modified: trunk/spi25.c ============================================================================== --- trunk/spi25.c Fri Aug 3 00:06:14 2012 (r1559) +++ trunk/spi25.c Fri Aug 3 01:51:28 2012 (r1560) @@ -327,21 +327,24 @@ } /* 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 @@ 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 0

Re: [flashrom] [PATCH 1/5] Clean up a25.c, at25.c, spi25.c.
by Stefan Tauner 02 Aug '12

02 Aug '12

On Wed, 15 Feb 2012 02:10:20 +0100 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > - 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> self-acked and committed in r1560. it has been hanging there long enough and is trivial enough anyway imho. :) i would have committed it in any case after 0.9.6 because of that (i.e. it is not related to any previous discussion about changing the review process). -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[PATCH] flashrom 0.9.6
by Carl-Daniel Hailfinger 02 Aug '12

02 Aug '12

Increase release number to 0.9.6 Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-0.9.6-release/Makefile =================================================================== --- flashrom-0.9.6-release/Makefile (Revision 1557) +++ flashrom-0.9.6-release/Makefile (Arbeitskopie) @@ -282,7 +282,7 @@ # will not require subversion. The downloadable snapshots are already exported. SVNVERSION := $(shell LC_ALL=C svnversion -cn . 2>/dev/null | sed -e "s/.*://" -e "s/$[0-9]*$.*/\1/" | grep "[0-9]" || LC_ALL=C svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || LC_ALL=C git svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || echo unknown) -RELEASE := 0.9.5.2 +RELEASE := 0.9.6 VERSION := $(RELEASE)-r$(SVNVERSION) RELEASENAME ?= $(VERSION) -- http://www.hailfinger.org/

1 1

[commit] r1559 - tags/flashrom-0.9.6
by repository service 02 Aug '12

02 Aug '12

Author: hailfinger Date: Fri Aug 3 00:06:14 2012 New Revision: 1559 URL: http://flashrom.org/trac/flashrom/changeset/1559 Log: Tag flashrom 0.9.6 Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Added: tags/flashrom-0.9.6/ - copied from r1558, trunk/

1 0

[commit] r1558 - trunk
by repository service 02 Aug '12

02 Aug '12

Author: hailfinger Date: Fri Aug 3 00:00:05 2012 New Revision: 1558 URL: http://flashrom.org/trac/flashrom/changeset/1558 Log: Increase flashrom release number to 0.9.6 Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Mon Jul 30 21:42:33 2012 (r1557) +++ trunk/Makefile Fri Aug 3 00:00:05 2012 (r1558) @@ -282,7 +282,7 @@ # will not require subversion. The downloadable snapshots are already exported. SVNVERSION := $(shell LC_ALL=C svnversion -cn . 2>/dev/null | sed -e "s/.*://" -e "s/$[0-9]*$.*/\1/" | grep "[0-9]" || LC_ALL=C svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || LC_ALL=C git svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || echo unknown) -RELEASE := 0.9.5.2 +RELEASE := 0.9.6 VERSION := $(RELEASE)-r$(SVNVERSION) RELEASENAME ?= $(VERSION)

1 0

Re: [flashrom] Intel C602 support
by Stefan Tauner 02 Aug '12

02 Aug '12

On Thu, 28 Jun 2012 07:03:34 -0700 Greg Schardt <gschardt(a)ddn.com> wrote: > I apologize for the delay. likewise ;) > Here is the output: > > 00:1f.0 ISA bridge [0601]: Intel Corporation Patsburg LPC Controller [8086:1d41] (rev 06) > > Let me know if you need more information or would like me to test it. that one actually is already supported since september 2011, so the latest stable version should detect it and work correctly (as long as there are no locked regions). -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 2

Re: [flashrom] [PATCH 2/3] Not for merge: Warn if we skipped all blocks
by Idwer Vollering 02 Aug '12

02 Aug '12

2012/7/23 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at>: > Quick hack to print a warning if we skip all blocks because they are already > equal to the requested image. We want something like this to make users > aware... and some developers that regularly fall for this too *coughcough*. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > flashrom.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/flashrom.c b/flashrom.c > index 70687ff..ebc3118 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -1218,6 +1218,7 @@ static int selfcheck_eraseblocks(const struct flashchip *flash) > return ret; > } > > +static int all_skipped = 1; > static int erase_and_write_block_helper(struct flashctx *flash, > unsigned int start, unsigned int len, > uint8_t *curcontents, > @@ -1266,6 +1267,8 @@ static int erase_and_write_block_helper(struct flashctx *flash, > } > if (skip) > msg_cdbg("S"); > + else > + all_skipped = 0; > return ret; > } > > @@ -1391,6 +1394,8 @@ int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, > if (ret) { > msg_cerr("FAILED!\n"); > } else { > + if(all_skipped) > + msg_cinfo("\nWarning: Chip contents were already identical to the requested image.\n"); I would change "were already identical" to "are identical". Let's not (right now) digress about calling it chip contents or content. > msg_cinfo("Erase/write done.\n"); > } > return ret; > -- > Kind regards, Stefan Tauner After considering the above comment: Acked-by: Idwer Vollering <vidwer(a)gmail.com>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom August 2012