flashrom February 2011

flashrom@flashrom.org

37 participants
119 discussions

Start a nNew thread

ck804 enable improvement
by Jonathan A. Kollasch 07 Aug '11

07 Aug '11

Hi, Attached is a proposed patch for improving the ck804 chipset enable. Comments? Jonathan Kollasch

3 3

[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

[PATCH] flashrom: fix sparse warning: Using plain integer as NULL pointer
by Peter Hüwe 25 Jul '11

25 Jul '11

flashrom: fix sparse warning: Using plain integer as NULL pointer This patch fixes the "using plain integer as NULL pointer" warnings generated by running sparse on the flashrom source. Flashrom-Version: r1254 Signed-off-by: Peter Huewe <peterhuewe(a)gmx.de> --- cbtable.c | 2 +- chipset_enable.c | 2 +- cli_classic.c | 34 +++++++++++++++++----------------- physmap.c | 4 ++-- programmer.c | 2 +- serprog.c | 2 +- udelay.c | 8 ++++---- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cbtable.c b/cbtable.c index dbb2cff..f30a3ae 100644 --- a/cbtable.c +++ b/cbtable.c @@ -141,7 +141,7 @@ static struct lb_header *find_lb_table(void *base, unsigned long start, }; - return 0; + return NULL; } static void find_mainboard(struct lb_record *ptr, unsigned long addr) diff --git a/chipset_enable.c b/chipset_enable.c index 6d6008e..0896bce 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -1173,7 +1173,7 @@ const struct penable chipset_enables[] = { int chipset_flash_enable(void) { - struct pci_dev *dev = 0; + struct pci_dev *dev = NULL; int ret = -2; /* Nothing! */ int i; diff --git a/cli_classic.c b/cli_classic.c index 1211989..88b70db 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -116,23 +116,23 @@ int cli_classic(int argc, char *argv[]) static const char optstring[] = "r:Rw:v:nVEfc:m:l:i:p:Lzh"; static const struct option long_options[] = { - {"read", 1, 0, 'r'}, - {"write", 1, 0, 'w'}, - {"erase", 0, 0, 'E'}, - {"verify", 1, 0, 'v'}, - {"noverify", 0, 0, 'n'}, - {"chip", 1, 0, 'c'}, - {"mainboard", 1, 0, 'm'}, - {"verbose", 0, 0, 'V'}, - {"force", 0, 0, 'f'}, - {"layout", 1, 0, 'l'}, - {"image", 1, 0, 'i'}, - {"list-supported", 0, 0, 'L'}, - {"list-supported-wiki", 0, 0, 'z'}, - {"programmer", 1, 0, 'p'}, - {"help", 0, 0, 'h'}, - {"version", 0, 0, 'R'}, - {0, 0, 0, 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; diff --git a/physmap.c b/physmap.c index 4641e8e..70156a6 100644 --- a/physmap.c +++ b/physmap.c @@ -180,7 +180,7 @@ static void *sys_physmap_rw_uncached(unsigned long phys_addr, size_t len) } } - virt_addr = mmap(0, len, PROT_WRITE | PROT_READ, MAP_SHARED, + virt_addr = mmap(NULL, len, PROT_WRITE | PROT_READ, MAP_SHARED, fd_mem, (off_t)phys_addr); return MAP_FAILED == virt_addr ? ERROR_PTR : virt_addr; } @@ -200,7 +200,7 @@ static void *sys_physmap_ro_cached(unsigned long phys_addr, size_t len) } } - virt_addr = mmap(0, len, PROT_READ, MAP_SHARED, + virt_addr = mmap(NULL, len, PROT_READ, MAP_SHARED, fd_mem_cached, (off_t)phys_addr); return MAP_FAILED == virt_addr ? ERROR_PTR : virt_addr; } diff --git a/programmer.c b/programmer.c index 0160867..5c1f963 100644 --- a/programmer.c +++ b/programmer.c @@ -30,7 +30,7 @@ int noop_shutdown(void) void *fallback_map(const char *descr, unsigned long phys_addr, size_t len) { /* FIXME: Should return phys_addr. */ - return 0; + return NULL; } /* No-op/fallback unmap() for programmers which don't need special handling */ diff --git a/serprog.c b/serprog.c index 2cdfea6..f869b07 100644 --- a/serprog.c +++ b/serprog.c @@ -541,7 +541,7 @@ static void sp_execute_opbuf_noflush(void) { if ((sp_max_write_n) && (sp_write_n_bytes)) sp_pass_writen(); - sp_stream_buffer_op(S_CMD_O_EXEC, 0, 0); + sp_stream_buffer_op(S_CMD_O_EXEC, 0, NULL); msg_pspew(MSGHEADER "Executed operation buffer of %d bytes\n", sp_opbuf_usage); sp_opbuf_usage = 0; diff --git a/udelay.c b/udelay.c index 153f510..feae827 100644 --- a/udelay.c +++ b/udelay.c @@ -45,11 +45,11 @@ static unsigned long measure_os_delay_resolution(void) struct timeval start, end; unsigned long counter = 0; - gettimeofday(&start, 0); + gettimeofday(&start, NULL); timeusec = 0; while (!timeusec && (++counter < 1000000000)) { - gettimeofday(&end, 0); + gettimeofday(&end, NULL); timeusec = 1000000 * (end.tv_sec - start.tv_sec) + (end.tv_usec - start.tv_usec); /* Protect against time going forward too much. */ @@ -68,9 +68,9 @@ static unsigned long measure_delay(int usecs) unsigned long timeusec; struct timeval start, end; - gettimeofday(&start, 0); + gettimeofday(&start, NULL); myusec_delay(usecs); - gettimeofday(&end, 0); + gettimeofday(&end, NULL); timeusec = 1000000 * (end.tv_sec - start.tv_sec) + (end.tv_usec - start.tv_usec); /* Protect against time going forward too much. */ -- 1.7.2.2

3 2

Re: [flashrom] [PATCH] Fix NULL pointer reference in board_flash_enable.
by Maciej Pijanka 25 Jul '11

25 Jul '11

On Fri, 12 Mar 2010, Michael Karcher wrote: > Was introduced in r926. Found by Henrik Kretzschmar <henne(a)nachtwindheim.de>. > > Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Imo looks sane and should be commited. Acked-by: Maciej Pijanka <maciej.pijanka(a)gmail.com> > --- > board_enable.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/board_enable.c b/board_enable.c > index aa463bc..0e89137 100644 > --- a/board_enable.c > +++ b/board_enable.c > @@ -1445,7 +1445,7 @@ int board_flash_enable(const char *vendor, const char *part) > if (!board) > board = board_match_pci_card_ids(); > > - if (board->status == NT) { > + if (board && board->status == NT) { > if (!force_boardenable) > { > printf("WARNING: Your mainboard is %s %s, but the mainboard-specific\n" > -- -- Maciej Pijanka I don't fear computers, I fear lack of them -- Isaac Asimov

2 1

MSI K9A2 Platinum OK
by Sylvain BERTRAND 12 Jul '11

12 Jul '11

Hi, Successfully flashed BIOS v1.9 on this motherboard. Cheers, Sylvain BERTRAND

2 2

[PATCH] Move erase checks out of chip drivers
by Carl-Daniel Hailfinger 26 Jun '11

26 Jun '11

Erase functions are no longer called from chip drivers and thus their internal erase verification can be moved to generic code. This also makes it easier to skip the verify step if desired. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-generic_check_erased_range/jedec.c =================================================================== --- flashrom-generic_check_erased_range/jedec.c (revision 1216) +++ flashrom-generic_check_erased_range/jedec.c (working copy) @@ -261,10 +261,7 @@ /* wait for Toggle bit ready */ toggle_ready_jedec_slow(bios); - if (check_erased_range(flash, page, pagesize)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -291,16 +288,12 @@ /* wait for Toggle bit ready */ toggle_ready_jedec_slow(bios); - if (check_erased_range(flash, block, blocksize)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } static int erase_chip_jedec_common(struct flashchip *flash, unsigned int mask) { - int total_size = flash->total_size * 1024; chipaddr bios = flash->virtual_memory; /* Issue the JEDEC Chip Erase command */ @@ -320,10 +313,7 @@ toggle_ready_jedec_slow(bios); - if (check_erased_range(flash, 0, total_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Index: flashrom-generic_check_erased_range/sst49lfxxxc.c =================================================================== --- flashrom-generic_check_erased_range/sst49lfxxxc.c (revision 1216) +++ flashrom-generic_check_erased_range/sst49lfxxxc.c (working copy) @@ -69,9 +69,6 @@ status = wait_82802ab(flash); - if (check_erased_range(flash, address, sector_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Index: flashrom-generic_check_erased_range/sharplhf00l04.c =================================================================== --- flashrom-generic_check_erased_range/sharplhf00l04.c (revision 1216) +++ flashrom-generic_check_erased_range/sharplhf00l04.c (working copy) @@ -50,9 +50,6 @@ status = wait_82802ab(flash); print_status_82802ab(status); - if (check_erased_range(flash, blockaddr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Index: flashrom-generic_check_erased_range/82802ab.c =================================================================== --- flashrom-generic_check_erased_range/82802ab.c (revision 1216) +++ flashrom-generic_check_erased_range/82802ab.c (working copy) @@ -136,11 +136,7 @@ status = wait_82802ab(flash); print_status_82802ab(status); - if (check_erased_range(flash, page, pagesize)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - + /* FIXME: Check the status register for errors. */ return 0; } Index: flashrom-generic_check_erased_range/spi25.c =================================================================== --- flashrom-generic_check_erased_range/spi25.c (revision 1216) +++ flashrom-generic_check_erased_range/spi25.c (working copy) @@ -584,10 +584,7 @@ /* FIXME: We assume spi_read_status_register will never fail. */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(1000 * 1000); - if (check_erased_range(flash, 0, flash->total_size * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -623,10 +620,7 @@ /* FIXME: We assume spi_read_status_register will never fail. */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(1000 * 1000); - if (check_erased_range(flash, 0, flash->total_size * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -667,10 +661,7 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -716,10 +707,7 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -763,10 +751,7 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(100 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -808,10 +793,7 @@ */ while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) programmer_delay(10 * 1000); - if (check_erased_range(flash, addr, blocklen)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Index: flashrom-generic_check_erased_range/sst28sf040.c =================================================================== --- flashrom-generic_check_erased_range/sst28sf040.c (revision 1216) +++ flashrom-generic_check_erased_range/sst28sf040.c (working copy) @@ -71,10 +71,7 @@ /* wait for Toggle bit ready */ toggle_ready_jedec(bios); - if (check_erased_range(flash, address, sector_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -113,10 +110,7 @@ programmer_delay(10); toggle_ready_jedec(bios); - if (check_erased_range(flash, 0, flash->total_size * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } Index: flashrom-generic_check_erased_range/stm50flw0x0x.c =================================================================== --- flashrom-generic_check_erased_range/stm50flw0x0x.c (revision 1216) +++ flashrom-generic_check_erased_range/stm50flw0x0x.c (working copy) @@ -107,11 +107,7 @@ wait_82802ab(flash); - if (check_erased_range(flash, sector, sectorsize)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - + /* FIXME: Check the status register for errors. */ return 0; } @@ -139,5 +135,6 @@ } } + /* FIXME: Check the status register for errors. */ return 0; } Index: flashrom-generic_check_erased_range/flashrom.c =================================================================== --- flashrom-generic_check_erased_range/flashrom.c (revision 1216) +++ flashrom-generic_check_erased_range/flashrom.c (working copy) @@ -1290,6 +1290,10 @@ start + len - 1); if (do_something(flash, start, len)) return 1; + if (check_erased_range(flash, start, len)) { + msg_cerr("ERASE FAILED!\n"); + return -1; + } start += len; } } Index: flashrom-generic_check_erased_range/m29f400bt.c =================================================================== --- flashrom-generic_check_erased_range/m29f400bt.c (revision 1216) +++ flashrom-generic_check_erased_range/m29f400bt.c (working copy) @@ -101,10 +101,7 @@ programmer_delay(10); toggle_ready_jedec(bios); - if (check_erased_range(flash, 0, flash->total_size * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } @@ -124,10 +121,7 @@ programmer_delay(10); toggle_ready_jedec(bios); - if (check_erased_range(flash, start, len)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } + /* FIXME: Check the status register for errors. */ return 0; } -- http://www.hailfinger.org/

2 5

[PATCH] Use strlen for const strings
by Carl-Daniel Hailfinger 26 Jun '11

26 Jun '11

Replace sizeof("string")-1 with strlen("string") We want to avoid calls to strlen at runtime if the string is already known at compile time. Turns out that gcc and clang will recognize constant strings and compute the strlen result already at compile time, so trickery with sizeof only reduces readability but does not improve the code. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-const_strlen/processor_enable.c =================================================================== --- flashrom-const_strlen/processor_enable.c (Revision 1183) +++ flashrom-const_strlen/processor_enable.c (Arbeitskopie) @@ -56,13 +56,13 @@ while (*ptr && isspace(*ptr)) ptr++; /* "cpu" part appears only with some Linux versions. */ - if (strncmp(ptr, "cpu", sizeof("cpu") - 1) == 0) - ptr += sizeof("cpu") - 1; + if (strncmp(ptr, "cpu", strlen("cpu")) == 0) + ptr += strlen("cpu"); while (*ptr && isspace(*ptr)) ptr++; - if (strncmp(ptr, "model", sizeof("model") - 1) != 0) + if (strncmp(ptr, "model", strlen("model")) != 0) continue; - ptr += sizeof("model") - 1; + ptr += strlen("model"); while (*ptr && isspace(*ptr)) ptr++; if (*ptr != ':') @@ -72,9 +72,9 @@ ptr++; fclose(cpuinfo); return (strncmp(ptr, "ICT Loongson-2 V0.3", - sizeof("ICT Loongson-2 V0.3") - 1) == 0) + strlen("ICT Loongson-2 V0.3")) == 0) || (strncmp(ptr, "Godson2 V0.3 FPU V0.1", - sizeof("Godson2 V0.3 FPU V0.1") - 1) == 0); + strlen("Godson2 V0.3 FPU V0.1")) == 0); } fclose(cpuinfo); return 0; -- http://www.hailfinger.org/

4 5

[PATCH] Flush stdout after each message
by Ed Swierk 19 Jun '11

19 Jun '11

Currently messages like "Writing flash chip..." that don't end with a newline are buffered until the operation is complete, unless the particular write function generates status output in the meantime. Flushing stdout after each message ensures that the message appears immediately. Signed-off-by: Ed Swierk <eswierk(a)aristanetworks.com> --- Index: flashrom-0.9.2-r1057/cli_output.c =================================================================== --- flashrom-0.9.2-r1057.orig/cli_output.c +++ flashrom-0.9.2-r1057/cli_output.c @@ -47,5 +47,6 @@ int print(int type, const char *fmt, ... va_start(ap, fmt); ret = vfprintf(output_type, fmt, ap); va_end(ap); + fflush(output_type); return ret; }

4 4

[PATCH] Support for K7S41GX.
by Paweł Różański 19 Jun '11

19 Jun '11

Hello. During discussion on IRC channel found out, that K7S41GX uses the same bios chip and the same super I/O chip as K7S41. Tested reading, writing and verification, all worked fine. Signed-off-by: Pawel Rozanski <rozie(a)poczta.onet.pl> BTW for K7S41 match string is "^K7S41 $", probably should be "^K7S41$", but cannot test it. Regards, Pawel Rozanski

2 2

Re: [flashrom] [PATCH] Don't ignore wait_82802ab() return value
by Stefan Reinauer 19 Jun '11

19 Jun '11

On 5/14/10 3:06 PM, Michael Karcher wrote: > Am Freitag, den 14.05.2010, 14:48 +0200 schrieb Stefan Reinauer: > >> On 4/16/10 6:21 PM, Stefan Reinauer wrote: >> >>> Look at the return value of wait_82802ab() >>> Index: sst49lfxxxc.c >>> =================================================================== >>> --- sst49lfxxxc.c (revision 993) >>> +++ sst49lfxxxc.c (working copy) >>> @@ -84,6 +84,7 @@ >>> chip_writeb(0xD0, bios + address); >>> >>> status = wait_82802ab(bios); >>> + print_status_82802ab(status); >>> > [...] > basically a good idea, but printing one status dump per erased block > seems a bit excessive, even in verbose mode, as there are some chips > with 4K sector size. Could you limit status printing to "status != > 0x80", as this is "ready, no error bits"? > That's what the 82802ab and sharp lhf00l04 do, too. So if you think the behavior should be changed, you should change it in all three places. Stefan

4 4

← Newer
1
2
3
4
5
6
7
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom February 2011