flashrom March 2014

flashrom@flashrom.org

41 participants
124 discussions

[PATCH] Add support for Intel 82574L ethernet card
by Bill Paul 13 Mar '14

13 Mar '14

I recently found a need to re-flash the option ROM on an Intel 82574L gigabit ethernet card. These are a bit more common these days than the 82571 and 82572 and relatively cheap. It turns out this works with flashrom, but it doesn't detect the PCI ID for the device out of the box. Attached is a patch add it to nicintel_spi.c. Note that there are probably other devices in the PRO/1000 family that would work too. Here's an example run with the latest code from svn: [...] flashrom v0.9.7-unknown on FreeBSD 10.0-RELEASE (amd64) flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found Winbond flash chip "W25X40" (512 kB, SPI) on nicintel_spi. Reading old flash chip contents... done. Erasing and writing flash chip... Erase/write done. Verifying flash... VERIFIED. [...] FreeBSD detects the device as follows: em1@pci0:2:0:0: class=0x020000 card=0xa01f8086 chip=0x10d38086 rev=0x00 hdr=0x00 vendor = 'Intel Corporation' device = '82574L Gigabit Network Connection' class = network subclass = ethernet I also added links to the Intel PCIe ethernet controllers programming manual and the 82574 datasheet. Incidentally, thanks to everyone involved for their work in this project. It helped me out of a bit of a jam. -Bill -- ============================================================================= -Bill Paul (510) 749-2329 | Senior Member of Technical Staff, wpaul(a)windriver.com | Master of Unix-Fu - Wind River Systems ============================================================================= "I put a dollar in a change machine. Nothing changed." - George Carlin =============================================================================

1 0

[PATCH] Refactor spi_read_status_register usage
by Carl-Daniel Hailfinger 08 Mar '14

08 Mar '14

spi_read_status_register() is used in open-coded loops everywhere just to check if SPI_SR_WIP bit cleared. The logic is missing a timeout detection, and we can save quite a lot of code by introducing a function which waits until SPI_SR_WIP is cleared or a timeout is reached. Untested. May explode. Unfinished. More functions need to be converted to the new style. Will change behaviour if the chip is too slow or hangs. Should prevent flashrom from hanging without any visible output. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-spi_rdsr_refactor/spi25.c =================================================================== --- flashrom-spi_rdsr_refactor/spi25.c (Revision 1653) +++ flashrom-spi_rdsr_refactor/spi25.c (Arbeitskopie) @@ -328,14 +328,9 @@ __func__); return result; } - /* Wait until the Write-In-Progress bit is cleared. - * This usually takes 1-85 s, so wait in 1 s steps. - */ - /* FIXME: We assume spi_read_status_register will never fail. */ - while (spi_read_status_register(flash) & SPI_SR_WIP) - programmer_delay(1000 * 1000); /* FIXME: Check the status register for errors. */ - return 0; + result = spi_wait_status_register_ready(flash, 120 * 1000 * 1000, JEDEC_CE_60); + return result; } int spi_chip_erase_62(struct flashctx *flash) @@ -365,14 +360,9 @@ __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(flash) & SPI_SR_WIP) - programmer_delay(100 * 1000); /* FIXME: Check the status register for errors. */ - return 0; + result = spi_wait_status_register_ready(flash, 120 * 1000 * 1000, JEDEC_CE_62); + return result; } int spi_chip_erase_c7(struct flashctx *flash) @@ -401,14 +391,9 @@ msg_cerr("%s failed during command execution\n", __func__); return result; } - /* Wait until the Write-In-Progress bit is cleared. - * This usually takes 1-85 s, so wait in 1 s steps. - */ - /* FIXME: We assume spi_read_status_register will never fail. */ - while (spi_read_status_register(flash) & SPI_SR_WIP) - programmer_delay(1000 * 1000); /* FIXME: Check the status register for errors. */ - return 0; + result = spi_wait_status_register_ready(flash, 120 * 1000 * 1000, JEDEC_CE_C7); + return result; } int spi_block_erase_52(struct flashctx *flash, unsigned int addr, @@ -444,13 +429,9 @@ __func__, addr); return result; } - /* Wait until the Write-In-Progress bit is cleared. - * This usually takes 100-4000 ms, so wait in 100 ms steps. - */ - while (spi_read_status_register(flash) & SPI_SR_WIP) - programmer_delay(100 * 1000); /* FIXME: Check the status register for errors. */ - return 0; + result = spi_wait_status_register_ready(flash, 10 * 1000 * 1000, JEDEC_BE_52); + return result; } /* Block size is usually @@ -491,13 +472,9 @@ __func__, addr); return result; } - /* Wait until the Write-In-Progress bit is cleared. - * This usually takes 100-4000 ms, so wait in 100 ms steps. - */ - while (spi_read_status_register(flash) & SPI_SR_WIP) - programmer_delay(100 * 1000); /* FIXME: Check the status register for errors. */ - return 0; + result = spi_wait_status_register_ready(flash, 10 * 1000 * 1000, JEDEC_BE_D8); + return result; } /* Block size is usually @@ -536,13 +513,9 @@ __func__, addr); return result; } - /* Wait until the Write-In-Progress bit is cleared. - * This usually takes 100-4000 ms, so wait in 100 ms steps. - */ - while (spi_read_status_register(flash) & SPI_SR_WIP) - programmer_delay(100 * 1000); /* FIXME: Check the status register for errors. */ - return 0; + result = spi_wait_status_register_ready(flash, 10 * 1000 * 1000, JEDEC_BE_D7); + return result; } /* Sector size is usually 4k, though Macronix eliteflash has 64k */ @@ -579,13 +552,9 @@ __func__, addr); return result; } - /* Wait until the Write-In-Progress bit is cleared. - * This usually takes 15-800 ms, so wait in 10 ms steps. - */ - while (spi_read_status_register(flash) & SPI_SR_WIP) - programmer_delay(10 * 1000); /* FIXME: Check the status register for errors. */ - return 0; + result = spi_wait_status_register_ready(flash, 10 * 1000 * 1000, JEDEC_SE); + return result; } int spi_block_erase_50(struct flashctx *flash, unsigned int addr, unsigned int blocklen) @@ -619,13 +588,9 @@ msg_cerr("%s failed during command execution at address 0x%x\n", __func__, addr); return result; } - /* Wait until the Write-In-Progress bit is cleared. - * This usually takes 10 ms, so wait in 1 ms steps. - */ - while (spi_read_status_register(flash) & SPI_SR_WIP) - programmer_delay(1 * 1000); /* FIXME: Check the status register for errors. */ - return 0; + result = spi_wait_status_register_ready(flash, 10 * 1000 * 1000, JEDEC_BE_50); + return result; } int spi_block_erase_81(struct flashctx *flash, unsigned int addr, unsigned int blocklen) @@ -659,13 +624,9 @@ msg_cerr("%s failed during command execution at address 0x%x\n", __func__, addr); return result; } - /* Wait until the Write-In-Progress bit is cleared. - * This usually takes 8 ms, so wait in 1 ms steps. - */ - while (spi_read_status_register(flash) & SPI_SR_WIP) - programmer_delay(1 * 1000); /* FIXME: Check the status register for errors. */ - return 0; + result = spi_wait_status_register_ready(flash, 10 * 1000 * 1000, JEDEC_BE_81); + return result; } int spi_block_erase_60(struct flashctx *flash, unsigned int addr, Index: flashrom-spi_rdsr_refactor/spi25_statusreg.c =================================================================== --- flashrom-spi_rdsr_refactor/spi25_statusreg.c (Revision 1653) +++ flashrom-spi_rdsr_refactor/spi25_statusreg.c (Arbeitskopie) @@ -43,7 +43,6 @@ static int spi_write_status_register_flag(struct flashctx *flash, int status, const unsigned char enable_opcode) { int result; - int i = 0; /* * WRSR requires either EWSR or WREN depending on chip type. * The code below relies on the fact hat EWSR and WREN have the same @@ -78,17 +77,10 @@ /* WRSR performs a self-timed erase before the changes take effect. * This may take 50-85 ms in most cases, and some chips apparently * allow running RDSR only once. Therefore pick an initial delay of - * 100 ms, then wait in 10 ms steps until a total of 5 s have elapsed. + * 100 ms, then wait until a total of 5 s have elapsed. */ programmer_delay(100 * 1000); - while (spi_read_status_register(flash) & SPI_SR_WIP) { - if (++i > 490) { - msg_cerr("Error: WIP bit after WRSR never cleared\n"); - return TIMEOUT_ERROR; - } - programmer_delay(10 * 1000); - } - return 0; + return spi_wait_status_register_ready(flash, 4900 * 1000, JEDEC_WRSR); } int spi_write_status_register(struct flashctx *flash, int status) @@ -108,6 +100,28 @@ return ret; } +/* timeout is specified in usecs. */ +int spi_wait_status_register_ready(struct flashctx *flash, int timeout, uint8_t opcode) +{ + /* At least 1 usec between iterations. */ + int single_delay = (timeout / 100) ? : 1; + int elapsed = 0; + int halftime = 0; + + while (spi_read_status_register(flash) & SPI_SR_WIP) { + elapsed += single_delay; + if ((elapsed > timeout / 2) && !halftime) { + msg_cdbg("Debug: WIP bit after %02x didn't clear within %i us.\n", opcode, timeout/2); + } + if (elapsed >= timeout) { + msg_cerr("Error: WIP bit after %02x didn't clear within %i us.\n", opcode, timeout); + return TIMEOUT_ERROR; + } + programmer_delay(single_delay); + } + return 0; +} + uint8_t spi_read_status_register(struct flashctx *flash) { static const unsigned char cmd[JEDEC_RDSR_OUTSIZE] = { JEDEC_RDSR }; Index: flashrom-spi_rdsr_refactor/chipdrivers.h =================================================================== --- flashrom-spi_rdsr_refactor/chipdrivers.h (Revision 1653) +++ flashrom-spi_rdsr_refactor/chipdrivers.h (Arbeitskopie) @@ -60,6 +60,7 @@ /* spi25_statusreg.c */ uint8_t spi_read_status_register(struct flashctx *flash); +int spi_wait_status_register_ready(struct flashctx *flash, int timeout, uint8_t opcode); int spi_write_status_register(struct flashctx *flash, int status); int spi_prettyprint_status_register_plain(struct flashctx *flash); int spi_prettyprint_status_register_default_bp1(struct flashctx *flash); -- http://www.hailfinger.org/

1 1

Flashrom work with motherboard ASUS M3N-H/HDMI
by Franc SERRES 05 Mar '14

05 Mar '14

Hi I'm correctly flashing my motherboard ASUS M3N-H/HDMI for upgrading to a new official ASUS BIOS under Kubuntu 13.10. I join a tar.gz file with all results of manipulations how it's ask by this software. Thank's for your great Jobs guy Sincerely Franc SERRES -- Que l'Open source soit avec toi. Utilise l'Open source Luc... A non-text attachment has been stripped: FlashBIOS_ASUS_M3N-H⁄HDMI.tar.gz It is available at http://paste.flashrom.org/view.php?id=2039

1 0

Re: [flashrom] [Ubuntu] Dediprog SF100 support with Winbond W25Q64FW
by Kurt Qiao 05 Mar '14

05 Mar '14

Hi Carl, i found dediprog_spi_send_command in dediprog.c, after below action: ret = usb_control_msg(dediprog_handle, 0xc2, 0x01, 0xbb8, 0x0000, (char *)readarr, readcnt, DEFAULT_TIMEOUT); readarr will become 0x534631 ("SF1"), even i didn't put a ROM on my SF100. i have no idea about this usb device request, the meaning of wValue 0xbb8 to dediprog device hope this info help for debug, thanks. BR, Kurt 2014-03-05 8:35 GMT+08:00 Kurt Qiao <kurtqqh(a)gmail.com>: > resent loop flashrom.org > > Hi Carl, > > Thanks for reply. > 1. i update SF100 fm to v5.5.0, need to support windows8 > 2. here's my libusb dpkg info > ii libusb-0.1-4 2:0.1.12-20 userspace USB programming library > ii libusb-1.0-0 2:1.0.9~rc3-2u userspace USB programming library > ii libusb-dev 2:0.1.12-20 userspace USB programming library > developmen > > BR, > Kurt > > > 2014-03-05 8:33 GMT+08:00 Kurt Qiao <kurtqqh(a)gmail.com>: > > Hi Carl, >> >> Thanks for reply. >> 1. i update SF100 fm to v5.5.0, need to support windows8 >> 2. here's my libusb dpkg info >> ii libusb-0.1-4 2:0.1.12-20 userspace USB programming library >> ii libusb-1.0-0 2:1.0.9~rc3-2u userspace USB programming library >> ii libusb-dev 2:0.1.12-20 userspace USB programming library >> developmen >> >> BR, >> Kurt >> >> >> 2014-03-05 8:14 GMT+08:00 Carl-Daniel Hailfinger < >> c-d.hailfinger.devel.2006(a)gmx.net>: >> >> Hi Kurt, >>> >>> Am 24.02.2014 09:29 schrieb Kurt Qiao: >>> > hope anyone can help me out, i try to implement flashrom to support >>> > dediprog SF100 on my Ubuntu. config as below: >>> > OS: Ubuntu12.04 X64 >>> > Dediprog: SF100, fm ver: 5.5.0 >>> >>> We only have tested flashrom support with SF100 firmware versions from >>> 2.0 to 5.2. It should work with firmware version 5.5, but we have not >>> tested it. >>> >>> >>> > SPI ROM: winbond W25Q64FW, id 0xef 6017 >>> > >>> > plugging my SF100, and use below cmd >>> > flashrom -p dediprog -V >>> > i can see the program detect my sf100 but fail to detect the SPI >>> ROM. log >>> > as attached file. >>> > ---log---- >>> > Probing for Winbond W25Q64.V, 8192 kB: RDID byte 0 parity violation. >>> > probe_spi_rdid_generic: id1 0x53, id2 0x4631 >>> > ----log--- >>> > >>> > as the log shows, seems flashrom read SPI ROM id is 0x53, 0x4631, >>> but >>> > actually my SPI ROM on board is winbond with id 0xef, 0x6017(i confirm >>> this >>> > with windows dediprog). >>> > so i have no idea why flashrom detect wrong id, and the flashchips.h >>> > already have WINBOND_NEX_W25Q64_W 0x6017 support. >>> >>> 0x53 0x46 0x31 is the string "SF1". This string is returned by the SF100 >>> if we query the firmware version. >>> I think we have a bug in the dediprog firmware or in the dediprog driver >>> or in libusb. Which version of libusb are you using? >>> >>> Regards, >>> Carl-Daniel >>> >>> -- >>> http://www.hailfinger.org/ >>> >>> >> >

1 0

Re: [flashrom] [Ubuntu] Dediprog SF100 support with Winbond W25Q64FW
by Kurt Qiao 05 Mar '14

05 Mar '14

resent loop flashrom.org Hi Carl, Thanks for reply. 1. i update SF100 fm to v5.5.0, need to support windows8 2. here's my libusb dpkg info ii libusb-0.1-4 2:0.1.12-20 userspace USB programming library ii libusb-1.0-0 2:1.0.9~rc3-2u userspace USB programming library ii libusb-dev 2:0.1.12-20 userspace USB programming library developmen BR, Kurt 2014-03-05 8:33 GMT+08:00 Kurt Qiao <kurtqqh(a)gmail.com>: > Hi Carl, > > Thanks for reply. > 1. i update SF100 fm to v5.5.0, need to support windows8 > 2. here's my libusb dpkg info > ii libusb-0.1-4 2:0.1.12-20 userspace USB programming library > ii libusb-1.0-0 2:1.0.9~rc3-2u userspace USB programming library > ii libusb-dev 2:0.1.12-20 userspace USB programming library > developmen > > BR, > Kurt > > > 2014-03-05 8:14 GMT+08:00 Carl-Daniel Hailfinger < > c-d.hailfinger.devel.2006(a)gmx.net>: > > Hi Kurt, >> >> Am 24.02.2014 09:29 schrieb Kurt Qiao: >> > hope anyone can help me out, i try to implement flashrom to support >> > dediprog SF100 on my Ubuntu. config as below: >> > OS: Ubuntu12.04 X64 >> > Dediprog: SF100, fm ver: 5.5.0 >> >> We only have tested flashrom support with SF100 firmware versions from >> 2.0 to 5.2. It should work with firmware version 5.5, but we have not >> tested it. >> >> >> > SPI ROM: winbond W25Q64FW, id 0xef 6017 >> > >> > plugging my SF100, and use below cmd >> > flashrom -p dediprog -V >> > i can see the program detect my sf100 but fail to detect the SPI ROM. >> log >> > as attached file. >> > ---log---- >> > Probing for Winbond W25Q64.V, 8192 kB: RDID byte 0 parity violation. >> > probe_spi_rdid_generic: id1 0x53, id2 0x4631 >> > ----log--- >> > >> > as the log shows, seems flashrom read SPI ROM id is 0x53, 0x4631, but >> > actually my SPI ROM on board is winbond with id 0xef, 0x6017(i confirm >> this >> > with windows dediprog). >> > so i have no idea why flashrom detect wrong id, and the flashchips.h >> > already have WINBOND_NEX_W25Q64_W 0x6017 support. >> >> 0x53 0x46 0x31 is the string "SF1". This string is returned by the SF100 >> if we query the firmware version. >> I think we have a bug in the dediprog firmware or in the dediprog driver >> or in libusb. Which version of libusb are you using? >> >> Regards, >> Carl-Daniel >> >> -- >> http://www.hailfinger.org/ >> >> >

1 0

[PATCH] clean up physmap, fix unaligned mapping problems
by Carl-Daniel Hailfinger 05 Mar '14

05 Mar '14

Convert all physmaps in the internal DMI code to use aligned readonly maps. Convert all physmaps in the cbtable code to use unaligned readonly maps. Make physunmap() a generic architecture-independent wrapper. Add physunmap_unaligned() to complement physmap*_unaligned(). Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-physmap_ro_rw_aligned_unaligned_cleanup/dmi.c =================================================================== --- flashrom-physmap_ro_rw_aligned_unaligned_cleanup/dmi.c (Revision 1764) +++ flashrom-physmap_ro_rw_aligned_unaligned_cleanup/dmi.c (Arbeitskopie) @@ -153,7 +153,7 @@ { int i = 0, j = 0; - uint8_t *dmi_table_mem = physmap_round("DMI Table", base, len); + uint8_t *dmi_table_mem = physmap_ro("DMI Table", base, len); if (dmi_table_mem == NULL) { msg_perr("Unable to access DMI Table\n"); return; Index: flashrom-physmap_ro_rw_aligned_unaligned_cleanup/cbtable.c =================================================================== --- flashrom-physmap_ro_rw_aligned_unaligned_cleanup/cbtable.c (Revision 1764) +++ flashrom-physmap_ro_rw_aligned_unaligned_cleanup/cbtable.c (Arbeitskopie) @@ -261,7 +261,7 @@ #else start = 0x0; #endif - table_area = physmap_ro("low megabyte", start, BYTES_TO_MAP - start); + table_area = physmap_ro_unaligned("low megabyte", start, BYTES_TO_MAP - start); if (ERROR_PTR == table_area) { msg_perr("Failed getting access to coreboot low tables.\n"); return -1; @@ -276,8 +276,9 @@ if (forward->tag == LB_TAG_FORWARD) { start = forward->forward; start &= ~(getpagesize() - 1); - physunmap(table_area, BYTES_TO_MAP); - table_area = physmap_ro("high tables", start, BYTES_TO_MAP); + physunmap_unaligned(table_area, BYTES_TO_MAP); + // FIXME: table_area is never unmapped below, nor is it unmapped above in the no-forward case + table_area = physmap_ro_unaligned("high tables", start, BYTES_TO_MAP); if (ERROR_PTR == table_area) { msg_perr("Failed getting access to coreboot high tables.\n"); return -1; Index: flashrom-physmap_ro_rw_aligned_unaligned_cleanup/physmap.c =================================================================== --- flashrom-physmap_ro_rw_aligned_unaligned_cleanup/physmap.c (Revision 1764) +++ flashrom-physmap_ro_rw_aligned_unaligned_cleanup/physmap.c (Arbeitskopie) @@ -27,6 +27,7 @@ #include <string.h> #include <errno.h> #include "flash.h" +#include "programmer.h" #include "hwaccess.h" #if !defined(__DJGPP__) && !defined(__LIBPAYLOAD__) @@ -89,7 +90,7 @@ #define sys_physmap_rw_uncached sys_physmap #define sys_physmap_ro_cached sys_physmap -void physunmap(void *virt_addr, size_t len) +void sys_physunmap_unaligned(void *virt_addr, size_t len) { __dpmi_meminfo mi; @@ -118,7 +119,7 @@ #define sys_physmap_rw_uncached sys_physmap #define sys_physmap_ro_cached sys_physmap -void physunmap(void *virt_addr, size_t len) +void sys_physunmap_unaligned(void *virt_addr, size_t len) { } #elif defined(__MACH__) && defined(__APPLE__) @@ -139,7 +140,7 @@ #define sys_physmap_rw_uncached sys_physmap #define sys_physmap_ro_cached sys_physmap -void physunmap(void *virt_addr, size_t len) +void sys_physunmap_unaligned(void *virt_addr, size_t len) { unmap_physical(virt_addr, len); } @@ -192,13 +193,8 @@ return MAP_FAILED == virt_addr ? ERROR_PTR : virt_addr; } -void physunmap(void *virt_addr, size_t len) +void sys_physunmap_unaligned(void *virt_addr, size_t len) { - if (len == 0) { - msg_pspew("Not unmapping zero size at %p\n", virt_addr); - return; - } - munmap(virt_addr, len); } #endif @@ -242,7 +238,7 @@ return 1; } struct undo_physmap_data *d = data; - physunmap(d->virt_addr, d->len); + physunmap_unaligned(d->virt_addr, d->len); free(data); return 0; } @@ -292,7 +288,7 @@ struct undo_physmap_data *d = malloc(sizeof(struct undo_physmap_data)); if (d == NULL) { msg_perr("%s: Out of memory!\n", __func__); - physunmap(virt_addr, len); + physunmap_unaligned(virt_addr, len); return ERROR_PTR; } @@ -300,7 +296,7 @@ d->len = len; if (register_shutdown(undo_physmap, d) != 0) { msg_perr("%s: Could not register shutdown function!\n", __func__); - physunmap(virt_addr, len); + physunmap_unaligned(virt_addr, len); return ERROR_PTR; } } @@ -308,9 +304,41 @@ return virt_addr + offset; } +void physunmap_unaligned(void *virt_addr, size_t len) +{ + /* No need to check for zero size, such mappings would have yielded ERROR_PTR. */ + if (virt_addr == ERROR_PTR) { + msg_perr("Trying to unmap a nonexisting mapping!\n" + "Please report a bug at flashrom(a)flashrom.org\n"); + return; + } + + sys_physunmap_unaligned(virt_addr, len); +} + +void physunmap(void *virt_addr, size_t len) +{ + uintptr_t tmp; + + /* No need to check for zero size, such mappings would have yielded ERROR_PTR. */ + if (virt_addr == ERROR_PTR) { + msg_perr("Trying to unmap a nonexisting mapping!\n" + "Please report a bug at flashrom(a)flashrom.org\n"); + return; + } + tmp = (uintptr_t)virt_addr; + /* We assume that the virtual address of a page-aligned physical address is page-aligned as well. By + * extension, rounding a virtual unaligned address as returned by physmap should yield the same offset + * between rounded and original virtual address as between rounded and original physical address. + */ + round_to_page_boundaries(&tmp, &len); + virt_addr = (void *)tmp; + physunmap_unaligned(virt_addr, len); +} + void *physmap(const char *descr, uintptr_t phys_addr, size_t len) { - return physmap_common(descr, phys_addr, len, PHYSM_RW, PHYSM_NOCLEANUP, PHYSM_EXACT); + return physmap_common(descr, phys_addr, len, PHYSM_RW, PHYSM_NOCLEANUP, PHYSM_ROUND); } void *rphysmap(const char *descr, uintptr_t phys_addr, size_t len) @@ -318,12 +346,12 @@ return physmap_common(descr, phys_addr, len, PHYSM_RW, PHYSM_CLEANUP, PHYSM_ROUND); } -void *physmap_round(const char *descr, uintptr_t phys_addr, size_t len) +void *physmap_ro(const char *descr, uintptr_t phys_addr, size_t len) { - return physmap_common(descr, phys_addr, len, PHYSM_RW, PHYSM_NOCLEANUP, PHYSM_ROUND); + return physmap_common(descr, phys_addr, len, PHYSM_RO, PHYSM_NOCLEANUP, PHYSM_ROUND); } -void *physmap_ro(const char *descr, uintptr_t phys_addr, size_t len) +void *physmap_ro_unaligned(const char *descr, uintptr_t phys_addr, size_t len) { return physmap_common(descr, phys_addr, len, PHYSM_RO, PHYSM_NOCLEANUP, PHYSM_EXACT); } Index: flashrom-physmap_ro_rw_aligned_unaligned_cleanup/programmer.h =================================================================== --- flashrom-physmap_ro_rw_aligned_unaligned_cleanup/programmer.h (Revision 1764) +++ flashrom-physmap_ro_rw_aligned_unaligned_cleanup/programmer.h (Arbeitskopie) @@ -277,9 +277,10 @@ /* physmap.c */ void *physmap(const char *descr, uintptr_t phys_addr, size_t len); void *rphysmap(const char *descr, uintptr_t phys_addr, size_t len); -void *physmap_round(const char *descr, uintptr_t phys_addr, size_t len); void *physmap_ro(const char *descr, uintptr_t phys_addr, size_t len); +void *physmap_ro_unaligned(const char *descr, uintptr_t phys_addr, size_t len); void physunmap(void *virt_addr, size_t len); +void physunmap_unaligned(void *virt_addr, size_t len); #if CONFIG_INTERNAL == 1 int setup_cpu_msr(int cpu); void cleanup_cpu_msr(void); -- http://www.hailfinger.org/

2 2

[commit] r1765 - trunk
by repository service 05 Mar '14

05 Mar '14

Author: hailfinger Date: Wed Mar 5 01:16:16 2014 New Revision: 1765 URL: http://flashrom.org/trac/flashrom/changeset/1765 Log: Clean up physmap, fix unaligned mapping problems Convert all physmaps in dmi.c to use aligned readonly maps. Convert all physmaps in cbtable.c to use unaligned readonly maps. Make physunmap() a generic architecture-independent wrapper. Add physunmap_unaligned() to complement physmap*_unaligned(). 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/cbtable.c trunk/dmi.c trunk/physmap.c trunk/programmer.h Modified: trunk/cbtable.c ============================================================================== --- trunk/cbtable.c Thu Nov 21 16:59:52 2013 (r1764) +++ trunk/cbtable.c Wed Mar 5 01:16:16 2014 (r1765) @@ -261,7 +261,7 @@ #else start = 0x0; #endif - table_area = physmap_ro("low megabyte", start, BYTES_TO_MAP - start); + table_area = physmap_ro_unaligned("low megabyte", start, BYTES_TO_MAP - start); if (ERROR_PTR == table_area) { msg_perr("Failed getting access to coreboot low tables.\n"); return -1; @@ -276,8 +276,9 @@ if (forward->tag == LB_TAG_FORWARD) { start = forward->forward; start &= ~(getpagesize() - 1); - physunmap(table_area, BYTES_TO_MAP); - table_area = physmap_ro("high tables", start, BYTES_TO_MAP); + physunmap_unaligned(table_area, BYTES_TO_MAP); + // FIXME: table_area is never unmapped below, nor is it unmapped above in the no-forward case + table_area = physmap_ro_unaligned("high tables", start, BYTES_TO_MAP); if (ERROR_PTR == table_area) { msg_perr("Failed getting access to coreboot high tables.\n"); return -1; Modified: trunk/dmi.c ============================================================================== --- trunk/dmi.c Thu Nov 21 16:59:52 2013 (r1764) +++ trunk/dmi.c Wed Mar 5 01:16:16 2014 (r1765) @@ -153,7 +153,7 @@ { int i = 0, j = 0; - uint8_t *dmi_table_mem = physmap_round("DMI Table", base, len); + uint8_t *dmi_table_mem = physmap_ro("DMI Table", base, len); if (dmi_table_mem == NULL) { msg_perr("Unable to access DMI Table\n"); return; Modified: trunk/physmap.c ============================================================================== --- trunk/physmap.c Thu Nov 21 16:59:52 2013 (r1764) +++ trunk/physmap.c Wed Mar 5 01:16:16 2014 (r1765) @@ -27,6 +27,7 @@ #include <string.h> #include <errno.h> #include "flash.h" +#include "programmer.h" #include "hwaccess.h" #if !defined(__DJGPP__) && !defined(__LIBPAYLOAD__) @@ -89,7 +90,7 @@ #define sys_physmap_rw_uncached sys_physmap #define sys_physmap_ro_cached sys_physmap -void physunmap(void *virt_addr, size_t len) +void sys_physunmap_unaligned(void *virt_addr, size_t len) { __dpmi_meminfo mi; @@ -118,7 +119,7 @@ #define sys_physmap_rw_uncached sys_physmap #define sys_physmap_ro_cached sys_physmap -void physunmap(void *virt_addr, size_t len) +void sys_physunmap_unaligned(void *virt_addr, size_t len) { } #elif defined(__MACH__) && defined(__APPLE__) @@ -139,7 +140,7 @@ #define sys_physmap_rw_uncached sys_physmap #define sys_physmap_ro_cached sys_physmap -void physunmap(void *virt_addr, size_t len) +void sys_physunmap_unaligned(void *virt_addr, size_t len) { unmap_physical(virt_addr, len); } @@ -192,13 +193,8 @@ return MAP_FAILED == virt_addr ? ERROR_PTR : virt_addr; } -void physunmap(void *virt_addr, size_t len) +void sys_physunmap_unaligned(void *virt_addr, size_t len) { - if (len == 0) { - msg_pspew("Not unmapping zero size at %p\n", virt_addr); - return; - } - munmap(virt_addr, len); } #endif @@ -242,7 +238,7 @@ return 1; } struct undo_physmap_data *d = data; - physunmap(d->virt_addr, d->len); + physunmap_unaligned(d->virt_addr, d->len); free(data); return 0; } @@ -292,7 +288,7 @@ struct undo_physmap_data *d = malloc(sizeof(struct undo_physmap_data)); if (d == NULL) { msg_perr("%s: Out of memory!\n", __func__); - physunmap(virt_addr, len); + physunmap_unaligned(virt_addr, len); return ERROR_PTR; } @@ -300,7 +296,7 @@ d->len = len; if (register_shutdown(undo_physmap, d) != 0) { msg_perr("%s: Could not register shutdown function!\n", __func__); - physunmap(virt_addr, len); + physunmap_unaligned(virt_addr, len); return ERROR_PTR; } } @@ -308,9 +304,41 @@ return virt_addr + offset; } +void physunmap_unaligned(void *virt_addr, size_t len) +{ + /* No need to check for zero size, such mappings would have yielded ERROR_PTR. */ + if (virt_addr == ERROR_PTR) { + msg_perr("Trying to unmap a nonexisting mapping!\n" + "Please report a bug at flashrom(a)flashrom.org\n"); + return; + } + + sys_physunmap_unaligned(virt_addr, len); +} + +void physunmap(void *virt_addr, size_t len) +{ + uintptr_t tmp; + + /* No need to check for zero size, such mappings would have yielded ERROR_PTR. */ + if (virt_addr == ERROR_PTR) { + msg_perr("Trying to unmap a nonexisting mapping!\n" + "Please report a bug at flashrom(a)flashrom.org\n"); + return; + } + tmp = (uintptr_t)virt_addr; + /* We assume that the virtual address of a page-aligned physical address is page-aligned as well. By + * extension, rounding a virtual unaligned address as returned by physmap should yield the same offset + * between rounded and original virtual address as between rounded and original physical address. + */ + round_to_page_boundaries(&tmp, &len); + virt_addr = (void *)tmp; + physunmap_unaligned(virt_addr, len); +} + void *physmap(const char *descr, uintptr_t phys_addr, size_t len) { - return physmap_common(descr, phys_addr, len, PHYSM_RW, PHYSM_NOCLEANUP, PHYSM_EXACT); + return physmap_common(descr, phys_addr, len, PHYSM_RW, PHYSM_NOCLEANUP, PHYSM_ROUND); } void *rphysmap(const char *descr, uintptr_t phys_addr, size_t len) @@ -318,12 +346,12 @@ return physmap_common(descr, phys_addr, len, PHYSM_RW, PHYSM_CLEANUP, PHYSM_ROUND); } -void *physmap_round(const char *descr, uintptr_t phys_addr, size_t len) +void *physmap_ro(const char *descr, uintptr_t phys_addr, size_t len) { - return physmap_common(descr, phys_addr, len, PHYSM_RW, PHYSM_NOCLEANUP, PHYSM_ROUND); + return physmap_common(descr, phys_addr, len, PHYSM_RO, PHYSM_NOCLEANUP, PHYSM_ROUND); } -void *physmap_ro(const char *descr, uintptr_t phys_addr, size_t len) +void *physmap_ro_unaligned(const char *descr, uintptr_t phys_addr, size_t len) { return physmap_common(descr, phys_addr, len, PHYSM_RO, PHYSM_NOCLEANUP, PHYSM_EXACT); } Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Thu Nov 21 16:59:52 2013 (r1764) +++ trunk/programmer.h Wed Mar 5 01:16:16 2014 (r1765) @@ -277,9 +277,10 @@ /* physmap.c */ void *physmap(const char *descr, uintptr_t phys_addr, size_t len); void *rphysmap(const char *descr, uintptr_t phys_addr, size_t len); -void *physmap_round(const char *descr, uintptr_t phys_addr, size_t len); void *physmap_ro(const char *descr, uintptr_t phys_addr, size_t len); +void *physmap_ro_unaligned(const char *descr, uintptr_t phys_addr, size_t len); void physunmap(void *virt_addr, size_t len); +void physunmap_unaligned(void *virt_addr, size_t len); #if CONFIG_INTERNAL == 1 int setup_cpu_msr(int cpu); void cleanup_cpu_msr(void);

1 0

Re: [flashrom] [Ubuntu] Dediprog SF100 support with Winbond W25Q64FW
by Carl-Daniel Hailfinger 05 Mar '14

05 Mar '14

Hi Kurt, Am 24.02.2014 09:29 schrieb Kurt Qiao: > hope anyone can help me out, i try to implement flashrom to support > dediprog SF100 on my Ubuntu. config as below: > OS: Ubuntu12.04 X64 > Dediprog: SF100, fm ver: 5.5.0 We only have tested flashrom support with SF100 firmware versions from 2.0 to 5.2. It should work with firmware version 5.5, but we have not tested it. > SPI ROM: winbond W25Q64FW, id 0xef 6017 > > plugging my SF100, and use below cmd > flashrom -p dediprog -V > i can see the program detect my sf100 but fail to detect the SPI ROM. log > as attached file. > ---log---- > Probing for Winbond W25Q64.V, 8192 kB: RDID byte 0 parity violation. > probe_spi_rdid_generic: id1 0x53, id2 0x4631 > ----log--- > > as the log shows, seems flashrom read SPI ROM id is 0x53, 0x4631, but > actually my SPI ROM on board is winbond with id 0xef, 0x6017(i confirm this > with windows dediprog). > so i have no idea why flashrom detect wrong id, and the flashchips.h > already have WINBOND_NEX_W25Q64_W 0x6017 support. 0x53 0x46 0x31 is the string "SF1". This string is returned by the SF100 if we query the firmware version. I think we have a bug in the dediprog firmware or in the dediprog driver or in libusb. Which version of libusb are you using? Regards, Carl-Daniel -- http://www.hailfinger.org/

1 0

HM87 test report
by Vasiliy Vylegzhanin 04 Mar '14

04 Mar '14

read and write look ok

1 0

[PATCH] internal programmer: handle failed chip mapping
by Carl-Daniel Hailfinger 04 Mar '14

04 Mar '14

Mapping a chip with the internal programmer on x86 will fail if the chip is larger than 16 MByte due to traditional x86 architecture constraints. No LPC/FWH chips of sizes bigger than 4 MByte are known, and Parallel chips are limited to older x86 chipsets and way smaller sizes because of address line shortage. We do see quite large SPI chips (even >16 MByte) and flashrom shouldn't fail probing or accessing them. Given that we have no chance to map those chips into the address space completely, make sure they are handled properly with indirect accesses Caveat: The code is proof-of-concept quality and litters the codebase with exit(1). We need to discuss what do do in that case. Testing should be done on a x86 machine which has SPI flash, and with r1702 reverted to have the 32 MByte chips again in flashchips.c (ignore the incorrect r1701 changelog which speaks of 32 MByte chip removal, that only happens in r1702). If flashrom successfully finishes probing without an abort in between, the patch does what it should. Or not. Read on. Without this patch and a reverted r1702, flashrom may successfully finish probing anyway due to the earlier physmap cleanups by Niklas Söderlund (r1744 and r1745). That's just the result from missing error checks, though. Applying this patch against a r1701 checkout (all files being r1701) should result in a fixed probe vs. a failing probe for plain r1701. A backported version of the patch against r1701 can be found at http://paste.flashrom.org/view.php?id=2027 Thanks for reading. Regards, Carl-Daniel Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-internal_no_chip_mapping_larger_16mbyte/flash.h =================================================================== --- flashrom-internal_no_chip_mapping_larger_16mbyte/flash.h (Revision 1764) +++ flashrom-internal_no_chip_mapping_larger_16mbyte/flash.h (Arbeitskopie) @@ -186,6 +186,7 @@ struct flashctx { struct flashchip *chip; + bool virtual_memory_is_usable; chipaddr virtual_memory; /* Some flash devices have an additional register space. */ chipaddr virtual_registers; Index: flashrom-internal_no_chip_mapping_larger_16mbyte/it87spi.c =================================================================== --- flashrom-internal_no_chip_mapping_larger_16mbyte/it87spi.c (Revision 1764) +++ flashrom-internal_no_chip_mapping_larger_16mbyte/it87spi.c (Arbeitskopie) @@ -385,7 +385,7 @@ * the mainboard does not use IT87 SPI translation. This should be done * via a programmer parameter for the internal programmer. */ - if ((flash->chip->total_size * 1024 > 512 * 1024)) { + if (!flash->virtual_memory_is_usable || (flash->chip->total_size * 1024 > 512 * 1024)) { spi_read_chunked(flash, buf, start, len, 3); } else { mmio_readn((void *)(flash->virtual_memory + start), buf, len); Index: flashrom-internal_no_chip_mapping_larger_16mbyte/internal.c =================================================================== --- flashrom-internal_no_chip_mapping_larger_16mbyte/internal.c (Revision 1764) +++ flashrom-internal_no_chip_mapping_larger_16mbyte/internal.c (Arbeitskopie) @@ -365,45 +365,69 @@ } #endif +void *internal_map(const char *descr, uintptr_t phys_addr, size_t len) +{ + return physmap(descr, phys_addr, len); +} + +void internal_unmap(void *virt_addr, size_t len) +{ + physunmap(virt_addr, len); +} + static void internal_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr) { + if (!flash->virtual_memory_is_usable) + exit(1); mmio_writeb(val, (void *) addr); } static void internal_chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr) { + if (!flash->virtual_memory_is_usable) + exit(1); mmio_writew(val, (void *) addr); } static void internal_chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr) { + if (!flash->virtual_memory_is_usable) + exit(1); mmio_writel(val, (void *) addr); } static uint8_t internal_chip_readb(const struct flashctx *flash, const chipaddr addr) { + if (!flash->virtual_memory_is_usable) + exit(1); return mmio_readb((void *) addr); } static uint16_t internal_chip_readw(const struct flashctx *flash, const chipaddr addr) { + if (!flash->virtual_memory_is_usable) + exit(1); return mmio_readw((void *) addr); } static uint32_t internal_chip_readl(const struct flashctx *flash, const chipaddr addr) { + if (!flash->virtual_memory_is_usable) + exit(1); return mmio_readl((void *) addr); } static void internal_chip_readn(const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len) { + if (!flash->virtual_memory_is_usable) + exit(1); mmio_readn((void *)addr, buf, len); return; } Index: flashrom-internal_no_chip_mapping_larger_16mbyte/wbsio_spi.c =================================================================== --- flashrom-internal_no_chip_mapping_larger_16mbyte/wbsio_spi.c (Revision 1764) +++ flashrom-internal_no_chip_mapping_larger_16mbyte/wbsio_spi.c (Arbeitskopie) @@ -20,6 +20,7 @@ #if defined(__i386__) || defined(__x86_64__) +#include <stdlib.h> #include "flash.h" #include "chipdrivers.h" #include "programmer.h" @@ -204,6 +205,8 @@ static int wbsio_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { + if (!flash->virtual_memory_is_usable) + exit(1); mmio_readn((void *)(flash->virtual_memory + start), buf, len); return 0; } Index: flashrom-internal_no_chip_mapping_larger_16mbyte/flashrom.c =================================================================== --- flashrom-internal_no_chip_mapping_larger_16mbyte/flashrom.c (Revision 1764) +++ flashrom-internal_no_chip_mapping_larger_16mbyte/flashrom.c (Arbeitskopie) @@ -68,8 +68,8 @@ .type = OTHER, .devs.note = NULL, .init = internal_init, - .map_flash_region = physmap, - .unmap_flash_region = physunmap, + .map_flash_region = internal_map, + .unmap_flash_region = internal_unmap, .delay = internal_delay, }, #endif @@ -1086,6 +1086,10 @@ base = flashbase ? flashbase : (0xffffffff - size + 1); flash->virtual_memory = (chipaddr)programmer_map_flash_region("flash chip", base, size); + if (flash->virtual_memory == (chipaddr)ERROR_PTR) + flash->virtual_memory_is_usable = false; + else + flash->virtual_memory_is_usable = true; /* We handle a forced match like a real match, we just avoid probing. Note that probe_flash() * is only called with force=1 after normal probing failed. Index: flashrom-internal_no_chip_mapping_larger_16mbyte/programmer.h =================================================================== --- flashrom-internal_no_chip_mapping_larger_16mbyte/programmer.h (Revision 1764) +++ flashrom-internal_no_chip_mapping_larger_16mbyte/programmer.h (Arbeitskopie) @@ -325,6 +325,8 @@ int register_superio(struct superio s); extern enum chipbustype internal_buses_supported; int internal_init(void); +void *internal_map(const char *descr, uintptr_t phys_addr, size_t len); +void internal_unmap(void *virt_addr, size_t len); #endif /* hwaccess.c */ -- http://www.hailfinger.org/

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom March 2014