flashrom March 2010

flashrom@flashrom.org

49 participants
211 discussions

[PATCH] fix a r943 missmerge, a duplicate printlock
by Sean Nelson 22 Mar '10

22 Mar '10

Clang complains loudly when there are duplicate printlock_sst_fwhub, gcc ignores them. Ack via IRC. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net>

2 3

[commit] r969 - trunk
by repository service 22 Mar '10

22 Mar '10

Author: snelson Date: Mon Mar 22 22:48:51 2010 New Revision: 969 URL: http://flashrom.org/trac/coreboot/changeset/969 Log: Clang complains loudly when there are duplicate printlock_sst_fwhub, gcc ignores them. Ack via IRC. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flashchips.c Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Mon Mar 22 13:29:45 2010 (r968) +++ trunk/flashchips.c Mon Mar 22 22:48:51 2010 (r969) @@ -4096,7 +4096,6 @@ } }, .printlock = printlock_sst_fwhub, - .printlock = printlock_sst_fwhub, .unlock = unlock_sst_fwhub, .write = write_jedec_1, .read = read_memmapped, @@ -4128,7 +4127,6 @@ } }, .printlock = printlock_sst_fwhub, - .printlock = printlock_sst_fwhub, .unlock = unlock_sst_fwhub, .write = write_jedec_1, .read = read_memmapped, @@ -4163,7 +4161,6 @@ }, }, .printlock = printlock_sst_fwhub, - .printlock = printlock_sst_fwhub, .unlock = unlock_sst_fwhub, .write = write_jedec_1, .read = read_memmapped, @@ -4226,7 +4223,6 @@ } }, .printlock = printlock_sst_fwhub, - .printlock = printlock_sst_fwhub, .unlock = unlock_sst_fwhub, .write = write_jedec_1, .read = read_memmapped,

1 0

[PATCH] More robust libpci detection
by Carl-Daniel Hailfinger 22 Mar '10

22 Mar '10

Idwer reported problems with the current libpci check on FreeBSD 8.0-RELEASE i386 This is caused by a strict linker. Parsing linker error messages is an exercise in futility, so I implemented fallback library detection with $CC --print-file-name. This fallback will fail on llvm-clang (llvm bug 5137), but such machines hopefully have a more permissive linker and will never hit that code path. The fallback will also fail on NetBSD where we should look for libpciutils instead, but that hopefully doesn't have a strict linker either. Side note: The configure checks in the Makefile are now so unwieldy that a separate configure script will definitely improve readability. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-libpci_robust_detection/Makefile =================================================================== --- flashrom-libpci_robust_detection/Makefile (Revision 916) +++ flashrom-libpci_robust_detection/Makefile (Arbeitskopie) @@ -251,21 +251,30 @@ echo "Please install libpci headers (package pciutils-devel)."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1) - @printf "Checking for libpci... " + @printf "Checking for libpci (method 1)... " @$(shell ( echo "#include <pci/pci.h>"; \ echo "int main(int argc, char **argv)"; \ echo "{ return 0; }"; ) > .test1.c ) - @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .test1.c -o .test1 -lpci $(LIBS) >/dev/null 2>&1 && \ - echo "found." || ( echo "not found."; echo; \ - echo "Please install libpci (package pciutils)."; \ - echo "See README for more information."; echo; \ - rm -f .test1.c .test1; exit 1) + @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .test1.c -o .test1 $(LIBS) >/dev/null 2>&1 && \ + echo "found." || ( echo "not found."; \ + $(CC) --print-file-name=libpci.so >/dev/null 2>&1 && ( \ + printf "Checking for dynamic libpci (method 2)... "; \ + $(CC) --print-file-name=libpci.so 2>/dev/null | grep -q / && \ + echo "found." || ( echo "not found."; \ + printf "Checking for static libpci (method 2)... " \ + $(CC) --print-file-name=libpci.a 2>/dev/null | grep -q / && \ + echo "found." || ( echo "not found."; echo; \ + echo "Please install libpci (package pciutils)."; \ + echo "See README for more information."; echo; \ + rm -f .test1.c .test1; exit 1) ) ) || ( echo "unavailable."; echo; \ + echo "Please install libpci (package pciutils)."; \ + echo "See README for more information."; echo; )) @printf "Checking if libpci is sufficient... " @printf "" > .libdeps - @$(CC) $(LDFLAGS) .test.o -o .test -lpci $(LIBS) >/dev/null 2>&1 && \ + @$(CC) $(LDFLAGS) .test.o -o .test $(LIBS) >/dev/null 2>&1 && \ echo "yes." || ( echo "no."; \ printf "Checking if libz is present and supplies all needed symbols..."; \ - $(CC) $(LDFLAGS) .test.o -o .test -lpci -lz $(LIBS) >/dev/null 2>&1 && \ + $(CC) $(LDFLAGS) .test.o -o .test $(LIBS) -lz >/dev/null 2>&1 && \ ( echo "yes."; echo "NEEDLIBZ := yes" > .libdeps ) || ( echo "no."; echo; \ echo "Please install libz."; \ echo "See README for more information."; echo; \ -- "I do consider assignment statements and pointer variables to be among computer science's most valuable treasures." -- Donald E. Knuth

3 7

[commit] r968 - trunk
by repository service 22 Mar '10

22 Mar '10

Author: hailfinger Date: Mon Mar 22 13:29:45 2010 New Revision: 968 URL: http://flashrom.org/trac/coreboot/changeset/968 Log: Idwer Vollering reported problems with the current libpci check on FreeBSD 8.0-RELEASE i386 This is caused by a strict linker. Parsing linker error messages is an exercise in futility, and library detection with $CC --print-file-name is totally useless for libraries outside the standard hardcoded builtin gcc search path (probably the same for other compilers as well). Look for libpciutils instead of libpci on NetBSD during the check. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Idwer Vollering <vidwer(a)gmail.com> Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Mon Mar 22 08:03:26 2010 (r967) +++ trunk/Makefile Mon Mar 22 13:29:45 2010 (r968) @@ -279,26 +279,17 @@ echo "Please install libpci headers (package pciutils-devel)."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o; exit 1) - @printf "Checking for libpci... " - @$(shell ( echo "#include <pci/pci.h>"; \ - echo "int main(int argc, char **argv)"; \ - echo "{ return 0; }"; ) > .test1.c ) - @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .test1.c -o .test1 -lpci $(LIBS) >/dev/null 2>&1 && \ - echo "found." || ( echo "not found."; echo; \ - echo "Please install libpci (package pciutils)."; \ - echo "See README for more information."; echo; \ - rm -f .test1.c .test1; exit 1) - @printf "Checking if libpci is sufficient... " + @printf "Checking if libpci is present and sufficient... " @printf "" > .libdeps - @$(CC) $(LDFLAGS) .test.o -o .test -lpci $(LIBS) >/dev/null 2>&1 && \ + @$(CC) $(LDFLAGS) .test.o -o .test $(LIBS) >/dev/null 2>&1 && \ echo "yes." || ( echo "no."; \ - printf "Checking if libz is present and supplies all needed symbols..."; \ - $(CC) $(LDFLAGS) .test.o -o .test -lpci -lz $(LIBS) >/dev/null 2>&1 && \ + printf "Checking if libz+libpci are present and sufficient..."; \ + $(CC) $(LDFLAGS) .test.o -o .test $(LIBS) -lz >/dev/null 2>&1 && \ ( echo "yes."; echo "NEEDLIBZ := yes" > .libdeps ) || ( echo "no."; echo; \ - echo "Please install libz."; \ + echo "Please install libpci (package pciutils) and/or libz."; \ echo "See README for more information."; echo; \ rm -f .test.c .test.o .test; exit 1) ) - @rm -f .test.c .test.o .test .test1.c .test1 + @rm -f .test.c .test.o .test else pciutils: compiler @printf "" > .libdeps

1 0

[commit] r967 - trunk
by repository service 22 Mar '10

22 Mar '10

Author: snelson Date: Mon Mar 22 08:03:26 2010 New Revision: 967 URL: http://flashrom.org/trac/coreboot/changeset/967 Log: in unlock_28f004s5, variable 'i' needs to be int... Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/82802ab.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Mon Mar 22 07:57:02 2010 (r966) +++ trunk/82802ab.c Mon Mar 22 08:03:26 2010 (r967) @@ -209,7 +209,8 @@ int unlock_28f004s5(struct flashchip *flash) { chipaddr bios = flash->virtual_memory; - uint8_t mcfg, bcfg, need_unlock = 0, can_unlock = 0, i; + uint8_t mcfg, bcfg, need_unlock = 0, can_unlock = 0; + int i; /* Clear status register */ chip_writeb(0x50, bios);

1 0

[PATCH] Intel 28F001BX fix
by Sean Nelson 22 Mar '10

22 Mar '10

see patch:

2 10

[commit] r966 - trunk
by repository service 22 Mar '10

22 Mar '10

Author: snelson Date: Mon Mar 22 07:57:02 2010 New Revision: 966 URL: http://flashrom.org/trac/coreboot/changeset/966 Log: fix a few typos from the last commit. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/82802ab.c trunk/chipdrivers.h Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Mon Mar 22 05:39:31 2010 (r965) +++ trunk/82802ab.c Mon Mar 22 07:57:02 2010 (r966) @@ -206,10 +206,10 @@ return 0; } -int unlock_28f004s5(struct flashrom *flash) +int unlock_28f004s5(struct flashchip *flash) { chipaddr bios = flash->virtual_memory; - uint8_t mcfg, bcfg, need_unlock = 0, can_unlock = 0; + uint8_t mcfg, bcfg, need_unlock = 0, can_unlock = 0, i; /* Clear status register */ chip_writeb(0x50, bios); Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Mon Mar 22 05:39:31 2010 (r965) +++ trunk/chipdrivers.h Mon Mar 22 07:57:02 2010 (r966) @@ -62,6 +62,7 @@ void print_status_82802ab(uint8_t status); void write_page_82802ab(chipaddr bios, uint8_t *src, chipaddr dst, int page_size); int unlock_82802ab(struct flashchip *flash); +int unlock_28f004s5(struct flashchip *flash); /* jedec.c */ uint8_t oddparity(uint8_t val);

1 0

[commit] r965 - trunk
by repository service 22 Mar '10

22 Mar '10

Author: snelson Date: Mon Mar 22 05:39:31 2010 New Revision: 965 URL: http://flashrom.org/trac/coreboot/changeset/965 Log: To access/read the lock bits, we use the same mode to read the chip id. This patch looks into the write situation for the Intel 28F001BX-{B,T}. Looks like they're just a 82802ab page write. Unlock_28f004s5 has been changed to read all the lock bits and if at least one of the block lock bits are set, clear them all. If the master lock bit is set, we can't do anything about it, so we return. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger<c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/82802ab.c trunk/flashchips.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Mon Mar 22 04:30:58 2010 (r964) +++ trunk/82802ab.c Mon Mar 22 05:39:31 2010 (r965) @@ -205,3 +205,52 @@ return 0; } + +int unlock_28f004s5(struct flashrom *flash) +{ + chipaddr bios = flash->virtual_memory; + uint8_t mcfg, bcfg, need_unlock = 0, can_unlock = 0; + + /* Clear status register */ + chip_writeb(0x50, bios); + + /* Read identifier codes */ + chip_writeb(0x90, bios); + + /* Read master lock-bit */ + mcfg = chip_readb(bios + 0x3); + msg_cinfo("master lock is "); + if (mcfg) { + msg_cdbg("locked!\n"); + } else { + 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 + msg_cdbg("block lock at %06x is %slocked!\n", i, bcfg ? "" : "un"); + if (bcfg) { + need_unlock = 1; + } + } + + /* Reset chip */ + chip_writeb(0xFF, bios); + + /* Unlock: clear block lock-bits, if needed */ + if (can_unlock && need_unlock) { + chip_writeb(0x60, bios); + chip_writeb(0xD0, bios); + chip_writeb(0xFF, bios); + } + + /* Error: master locked or a block is locked */ + if (!can_unlock && need_unlock) { + msg_cerr("At least one block is locked and lockdown is active!\n"); + return -1; + } + + return 0; +} Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Mon Mar 22 04:30:58 2010 (r964) +++ trunk/flashchips.c Mon Mar 22 05:39:31 2010 (r965) @@ -2316,7 +2316,7 @@ .model_id = P28F001BXB, .total_size = 128, .page_size = 128 * 1024, /* 8k + 2x4k + 112k */ - .tested = TEST_BAD_WRITE, + .tested = TEST_UNTESTED, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -2330,7 +2330,7 @@ .block_erase = erase_block_82802ab, }, }, - .write = NULL, + .write = write_82802ab, .read = read_memmapped, }, @@ -2342,7 +2342,7 @@ .model_id = P28F001BXT, .total_size = 128, .page_size = 128 * 1024, /* 112k + 2x4k + 8k */ - .tested = TEST_BAD_WRITE, + .tested = TEST_UNTESTED, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -2356,7 +2356,7 @@ .block_erase = erase_block_82802ab, }, }, - .write = NULL, + .write = write_82802ab, .read = read_memmapped, }, @@ -2368,7 +2368,6 @@ .model_id = E_28F004S5, .total_size = 512, .page_size = 256, - .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ @@ -2379,7 +2378,7 @@ .block_erase = erase_block_82802ab, }, }, - .unlock = unlock_82802ab, + .unlock = unlock_28f004s5, .write = write_82802ab, .read = read_memmapped, },

1 0

[PATCH] Multibyte SPI write for Bus Pirate
by Carl-Daniel Hailfinger 22 Mar '10

22 Mar '10

I found this in the Bus Pirate forum, apparently written by Patrick Georgi. Patrick, do you want to add a signoff? Index: flash.h =================================================================== --- flash.h (Revision 916) +++ flash.h (Arbeitskopie) @@ -502,6 +502,7 @@ int buspirate_spi_shutdown(void); int buspirate_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int buspirate_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); +int buspirate_spi_write_256(struct flashchip *flash, uint8_t *buf); /* dediprog.c */ int dediprog_init(void); Index: buspirate_spi.c =================================================================== --- buspirate_spi.c (Revision 916) +++ buspirate_spi.c (Arbeitskopie) @@ -316,4 +316,27 @@ return spi_read_chunked(flash, buf, start, len, 12); } -/* We could do 12-byte writes, but for now we use the generic 1-byte code. */ +int buspirate_spi_write_256(struct flashchip *flash, uint8_t *buf) +{ + int total_size = 1024 * flash->total_size; + int i; + + msg_pdbg("total_size is %d\n", total_size); + for (i = 0; i < total_size; i += 12) { + int l, r; + if (i + 12 <= total_size) + l = 12; + else + l = total_size - i; + + if ((r = spi_nbyte_program(i, &buf[i], l))) { + msg_perr("%s: write fail %d\n", __func__, r); + return 1; + } + + while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) + /* loop */; + } + + return 0; +} Index: spi.c =================================================================== --- spi.c (Revision 916) +++ spi.c (Arbeitskopie) @@ -108,7 +108,7 @@ .command = buspirate_spi_send_command, .multicommand = default_spi_send_multicommand, .read = buspirate_spi_read, - .write_256 = spi_chip_write_1, + .write_256 = buspirate_spi_write_256, }, #endif -- "I do consider assignment statements and pointer variables to be among computer science's most valuable treasures." -- Donald E. Knuth

2 3

[commit] r964 - trunk
by repository service 22 Mar '10

22 Mar '10

Author: hailfinger Date: Mon Mar 22 04:30:58 2010 New Revision: 964 URL: http://flashrom.org/trac/coreboot/changeset/964 Log: Multibyte SPI write for the Bus Pirate. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/buspirate_spi.c trunk/flash.h trunk/spi.c Modified: trunk/buspirate_spi.c ============================================================================== --- trunk/buspirate_spi.c Sun Mar 21 15:54:57 2010 (r963) +++ trunk/buspirate_spi.c Mon Mar 22 04:30:58 2010 (r964) @@ -316,4 +316,39 @@ return spi_read_chunked(flash, buf, start, len, 12); } -/* We could do 12-byte writes, but for now we use the generic 1-byte code. */ +int buspirate_spi_write_256(struct flashchip *flash, uint8_t *buf) +{ + int total_size = 1024 * flash->total_size; + int i; + + spi_disable_blockprotect(); + /* Erase first. */ + msg_pinfo("Erasing flash before programming... "); + if (erase_flash(flash)) { + msg_perr("ERASE FAILED!\n"); + return -1; + } + msg_pinfo("done.\n"); + + /* FIXME: We could do 12 byte writes, but then we'd have to make sure + * not to cross a 256 byte page boundary. This problem only applies to + * writes, reads can cross page boundaries just fine. + */ + for (i = 0; i < total_size; i += 8) { + int l, r; + if (i + 8 <= total_size) + l = 8; + else + l = total_size - i; + + if ((r = spi_nbyte_program(i, &buf[i], l))) { + msg_perr("%s: write fail %d\n", __func__, r); + return 1; + } + + while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) + /* loop */; + } + + return 0; +} Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sun Mar 21 15:54:57 2010 (r963) +++ trunk/flash.h Mon Mar 22 04:30:58 2010 (r964) @@ -504,6 +504,7 @@ int buspirate_spi_shutdown(void); int buspirate_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int buspirate_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); +int buspirate_spi_write_256(struct flashchip *flash, uint8_t *buf); /* dediprog.c */ int dediprog_init(void); Modified: trunk/spi.c ============================================================================== --- trunk/spi.c Sun Mar 21 15:54:57 2010 (r963) +++ trunk/spi.c Mon Mar 22 04:30:58 2010 (r964) @@ -108,7 +108,7 @@ .command = buspirate_spi_send_command, .multicommand = default_spi_send_multicommand, .read = buspirate_spi_read, - .write_256 = spi_chip_write_1, + .write_256 = buspirate_spi_write_256, }, #endif

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom March 2010