flashrom

flashrom@flashrom.org

1 participants
9182 discussions

[commit] r947 - trunk
by repository service 17 Mar '10

17 Mar '10

Author: mkarcher Date: Wed Mar 17 07:19:23 2010 New Revision: 947 URL: http://flashrom.org/trac/coreboot/changeset/947 Log: Add board enable for P4C800-E lspci/flashrom/superiotool at http://www.coreboot.org/pipermail/flashrom/2010-March/002579.html Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/board_enable.c trunk/print_wiki.c Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Wed Mar 17 01:47:56 2010 (r946) +++ trunk/board_enable.c Wed Mar 17 07:19:23 2010 (r947) @@ -914,6 +914,7 @@ /** * Suited for: * - Asus P4B266LM (Sony Vaio PCV-RX650): socket478 + 845D + ICH2. + * - Asus P4C800-E Deluxe: socket478 + 875P + ICH5. * - Asus P4P800-E Deluxe: Intel socket478 + 865PE + ICH5R. */ static int intel_ich_gpio21_raise(const char *name) @@ -1277,6 +1278,7 @@ {0x1106, 0x1336, 0x1043, 0x80ed, 0x1106, 0x3288, 0x1043, 0x8249, NULL, NULL, NULL, "ASUS", "M2V-MX", 0, OK, via_vt823x_gpio5_raise}, {0x8086, 0x1a30, 0x1043, 0x8070, 0x8086, 0x244b, 0x1043, 0x8028, NULL, NULL, NULL, "ASUS", "P4B266", 0, OK, intel_ich_gpio22_raise}, {0x8086, 0x1A30, 0x1043, 0x8025, 0x8086, 0x244B, 0x104D, 0x80F0, NULL, NULL, NULL, "ASUS", "P4B266-LM", 0, OK, intel_ich_gpio21_raise}, + {0x8086, 0x24D3, 0x1043, 0x80A6, 0x8086, 0x2578, 0x1043, 0x80F6, NULL, NULL, NULL, "ASUS", "P4C800-E Deluxe", 0, OK, intel_ich_gpio21_raise}, {0x8086, 0x2570, 0x1043, 0x80F2, 0x105A, 0x3373, 0x1043, 0x80F5, NULL, NULL, NULL, "ASUS", "P4P800-E Deluxe", 0, OK, intel_ich_gpio21_raise}, {0x10B9, 0x1541, 0, 0, 0x10B9, 0x1533, 0, 0, "^P5A$", "asus", "p5a", "ASUS", "P5A", 0, OK, board_asus_p5a}, {0x10DE, 0x0030, 0x1043, 0x818a, 0x8086, 0x100E, 0x1043, 0x80EE, NULL, NULL, NULL, "ASUS", "P5ND2-SLI Deluxe", 0, OK, nvidia_mcp_gpio10_raise}, Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Wed Mar 17 01:47:56 2010 (r946) +++ trunk/print_wiki.c Wed Mar 17 07:19:23 2010 (r947) @@ -213,6 +213,7 @@ { "ASUS", "A7V8X-MX SE", "http://www.asus.com/product.aspx?P_ID=1guVBT1qV5oqhHyZ" }, { "ASUS", "A7V8X-X", "http://www.asus.com/product.aspx?P_ID=YcXfRrWHZ9RKoVmw" }, { "ASUS", "P4B266", "http://www.ciao.co.uk/ASUS_Intel_845D_Chipset_P4B266__5409807#productdetail" }, + { "ASUS", "P4C800-E Deluxe", "http://www.asus.com/product.aspx?P_ID=cFuVCr9bXXCckmcK" }, { "ASUS", "P4P800-E Deluxe", "http://www.asus.com/product.aspx?P_ID=INIJUvLlif7LHp3g" }, { "ASUS", "P5ND2-SLI Deluxe", "http://www.asus.com/product.aspx?P_ID=WY7XroDuUImVbgp5" }, { "ASUS", "P5A", "ftp://ftp.asus.com.tw/pub/ASUS/mb/sock7/ali/p5a/" },

1 0

[PATCH] Mask the correct number of bits for BARs
by Carl-Daniel Hailfinger 16 Mar '10

16 Mar '10

PCI device BARs of all types had only bits 1:0 cleared while reading the address. That was correct for IO BARs, but failed to mask bit 3:2 for MEM BARs, resulting in odd offsets for prefetchable MEM BARs and for 64-bit capable MEM BARs. Mask the correct number of bits for all types of BARs and add some debug printing about BAR type. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-pci_bar_masking/pcidev.c =================================================================== --- flashrom-pci_bar_masking/pcidev.c (Revision 920) +++ flashrom-pci_bar_masking/pcidev.c (Arbeitskopie) @@ -32,6 +32,7 @@ struct pcidev_status *devs) { int i; + /* FIXME: 64 bit memory BARs need a 64 bit addr. */ uint32_t addr; for (i = 0; devs[i].device_name != NULL; i++) { @@ -42,12 +43,27 @@ * Don't use dev->base_addr[x] (as value for 'bar'), won't * work on older libpci. */ - addr = pci_read_long(dev, bar) & ~0x03; + addr = pci_read_long(dev, bar); printf("Found \"%s %s\" (%04x:%04x, BDF %02x:%02x.%x).\n", devs[i].vendor_name, devs[i].device_name, dev->vendor_id, dev->device_id, dev->bus, dev->dev, dev->func); + msg_pdbg("Requested BAR is %s", (addr & 0x1) ? "IO" : "MEM"); + if (addr & 0x1) { + /* Mask off IO space indicator and reserved bit. */ + msg_pdbg("\n"); + addr &= ~0x3; + } else { + msg_pdbg(", %sbit, %sprefetchable\n", + ((addr & 0x6) == 0x0) ? "32" : + (((addr & 0x6) == 0x4) ? "64" : "reserved"), + (addr & 0x8) ? "" : "not "); + /* Mask off Mem space indicator, 32/64bit type indicator + * and Prefetchable indicator. + */ + addr &= ~0xf; + } if (devs[i].status == NT) { printf("===\nThis PCI device is UNTESTED. Please " -- "I do consider assignment statements and pointer variables to be among computer science's most valuable treasures." -- Donald E. Knuth

2 2

[commit] r946 - trunk
by repository service 16 Mar '10

16 Mar '10

Author: hailfinger Date: Wed Mar 17 01:47:56 2010 New Revision: 946 URL: http://flashrom.org/trac/coreboot/changeset/946 Log: PCI device BARs of all types had only bits 1:0 cleared while reading the address. That was correct for IO BARs, but failed to mask bit 3:2 for MEM BARs, resulting in odd offsets for prefetchable MEM BARs and for 64-bit capable MEM BARs. Mask the correct number of bits for all types of BARs and add some debug printing about BAR type. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/pcidev.c Modified: trunk/pcidev.c ============================================================================== --- trunk/pcidev.c Wed Mar 17 01:05:59 2010 (r945) +++ trunk/pcidev.c Wed Mar 17 01:47:56 2010 (r946) @@ -32,6 +32,7 @@ struct pcidev_status *devs) { int i; + /* FIXME: 64 bit memory BARs need a 64 bit addr. */ uint32_t addr; for (i = 0; devs[i].device_name != NULL; i++) { @@ -42,12 +43,27 @@ * Don't use dev->base_addr[x] (as value for 'bar'), won't * work on older libpci. */ - addr = pci_read_long(dev, bar) & ~0x03; + addr = pci_read_long(dev, bar); printf("Found \"%s %s\" (%04x:%04x, BDF %02x:%02x.%x).\n", devs[i].vendor_name, devs[i].device_name, dev->vendor_id, dev->device_id, dev->bus, dev->dev, dev->func); + msg_pdbg("Requested BAR is %s", (addr & 0x1) ? "IO" : "MEM"); + if (addr & 0x1) { + /* Mask off IO space indicator and reserved bit. */ + msg_pdbg("\n"); + addr &= ~0x3; + } else { + msg_pdbg(", %sbit, %sprefetchable\n", + ((addr & 0x6) == 0x0) ? "32" : + (((addr & 0x6) == 0x4) ? "64" : "reserved"), + (addr & 0x8) ? "" : "not "); + /* Mask off Mem space indicator, 32/64bit type indicator + * and Prefetchable indicator. + */ + addr &= ~0xf; + } if (devs[i].status == NT) { printf("===\nThis PCI device is UNTESTED. Please "

1 0

[PATCH] Mark a bunch of parallel chips I tested as TEST_OK_PREW
by Uwe Hermann 16 Mar '10

16 Mar '10

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

3 4

[commit] r945 - trunk
by repository service 16 Mar '10

16 Mar '10

Author: uwe Date: Wed Mar 17 01:05:59 2010 New Revision: 945 URL: http://flashrom.org/trac/coreboot/changeset/945 Log: Mark a bunch of parallel chips I tested as TEST_OK_PRW. All operations for these chips were tested on hardware. ERASE is not marked as working yet, as there are multiple erase functions per chip and only one was (successfully) tested. I'll redo the ERASE test when the respective infrastructure in flashrom is there. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flashchips.c Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Wed Mar 17 00:59:19 2010 (r944) +++ trunk/flashchips.c Wed Mar 17 01:05:59 2010 (r945) @@ -852,7 +852,7 @@ .total_size = 128, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = 10000, /* 10mS, Enter=Exec */ .block_erasers = @@ -1110,7 +1110,7 @@ .total_size = 256, .page_size = 256, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -1236,7 +1236,7 @@ .total_size = 256, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (mx29f002.c) */ .block_erasers = @@ -2161,7 +2161,7 @@ .total_size = 256, .page_size = 256, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -2890,7 +2890,7 @@ .total_size = 256, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (mx29f002.c) */ .block_erasers = @@ -3748,7 +3748,7 @@ .total_size = 128, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -3866,7 +3866,7 @@ .total_size = 128, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -3892,7 +3892,7 @@ .total_size = 256, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5308,7 +5308,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -5636,7 +5636,7 @@ .total_size = 128, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = 10, /* used datasheet for the W29C011A */ .block_erasers = @@ -5659,7 +5659,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -5862,7 +5862,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PRW, .probe = probe_jedec, .probe_timing = 10, .block_erasers =

1 0

[PATCH] flashrom DOS support take2 (plus patch for pciutils)
by Rudolf Marek 16 Mar '10

16 Mar '10

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello all, I reworked the physmem mapping and also did a hack to allow RO mapping of first 1MB which is not allowed under DPMI ;) I simply copy the memory and return a pointer to a copied data. This is used for the coreboot tables and there is no need for RW. The dmidecode could be also DOS recompiled but executing that if quite complicated. Therefore maybe own parser for DMI would be nice. Attached patches are for the flashrom and pciutils. To make it work try following: 1) get RPMs of the cross compiler from DJGPP site djcross-binutils-2.19.1-10ap.i386.rpm djcross-gcc-tools-4.4.1-1ap.i686.rpm djcross-gcc-4.3.2-8ap.i686.rpm Somehow install them on your system. I used alien on 32bit machine to make debs and I forced them to install on amd64 ;) 2) Download all stuff from: http://assembler.cz/flashrom 3) patch flashrom source and pciutils source 4) compile the libgetopt in its dir 5) compile the pciutils, use the README.DJGPP 6) flashrom patch expects that the ../libpci contains the stuff what is installed from pciutils and ../libgetopt contains compiled getopt.a compile it too ;) I put there also the binary image and cwsdpmi zip which exe files are needed to run the flashrom.exe (I think only cwdpmi.exe) Have fun and please test ;) The dos.patch contains some flashrom NULL ptr fix and also Carl-Daniels changes for Makefile. Rudolf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkudHrIACgkQ3J9wPJqZRNXgtQCgk+mYKzbmeYnuVoaMgfKoOLG2 nj8AoIXJv0tIo51Wktq/GYPDj8RhIzWs =v0AX -----END PGP SIGNATURE-----

2 4

[commit] r944 - trunk
by repository service 16 Mar '10

16 Mar '10

Author: hailfinger Date: Wed Mar 17 00:59:19 2010 New Revision: 944 URL: http://flashrom.org/trac/coreboot/changeset/944 Log: Add MS-DOS crosscompilation support to flashrom. Tested, works fine. Part 1: Code changes. Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/hwaccess.c trunk/hwaccess.h trunk/physmap.c Modified: trunk/hwaccess.c ============================================================================== --- trunk/hwaccess.c Tue Mar 16 04:09:10 2010 (r943) +++ trunk/hwaccess.c Wed Mar 17 00:59:19 2010 (r944) @@ -36,7 +36,9 @@ if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) != 0) { #elif defined(__FreeBSD__) || defined (__DragonFly__) if ((io_fd = open("/dev/io", O_RDWR)) < 0) { -#else +#elif __DJGPP__ + if (0) { +#else if (iopl(3) != 0) { #endif fprintf(stderr, "ERROR: Could not get I/O privileges (%s).\n" @@ -52,6 +54,44 @@ #endif } +#ifdef __DJGPP__ + +extern unsigned short segFS; + +#include <sys/farptr.h> + +void mmio_writeb(uint8_t val, void *addr) +{ + _farpokeb(segFS, (unsigned long) addr, val); +} + +void mmio_writew(uint16_t val, void *addr) +{ + _farpokew(segFS, (unsigned long) addr, val); +} + +void mmio_writel(uint32_t val, void *addr) +{ + _farpokel(segFS, (unsigned long) addr, val); +} + +uint8_t mmio_readb(void *addr) +{ + return _farpeekb(segFS, (unsigned long) addr); +} + +uint16_t mmio_readw(void *addr) +{ + return _farpeekw(segFS, (unsigned long) addr); +} + +uint32_t mmio_readl(void *addr) +{ + return _farpeekl(segFS, (unsigned long) addr); +} + +#else + void mmio_writeb(uint8_t val, void *addr) { *(volatile uint8_t *) addr = val; @@ -81,3 +121,4 @@ { return *(volatile uint32_t *) addr; } +#endif Modified: trunk/hwaccess.h ============================================================================== --- trunk/hwaccess.h Tue Mar 16 04:09:10 2010 (r943) +++ trunk/hwaccess.h Wed Mar 17 00:59:19 2010 (r944) @@ -68,12 +68,30 @@ #define INW inw #define INL inl #else + +#ifdef __DJGPP__ + +#include <pc.h> + + #define OUTB(x,y) outportb(y, x) + #define OUTW(x,y) outportw(y, x) + #define OUTL(x,y) outportl(y, x) + + #define INB inportb + #define INW inportw + #define INL inportl + +#else + #define OUTB outb #define OUTW outw #define OUTL outl #define INB inb #define INW inw #define INL inl + +#endif + #endif #endif Modified: trunk/physmap.c ============================================================================== --- trunk/physmap.c Tue Mar 16 04:09:10 2010 (r943) +++ trunk/physmap.c Wed Mar 17 00:59:19 2010 (r944) @@ -4,6 +4,7 @@ * Copyright (C) 2009 Peter Stuge <peter(a)stuge.se> * Copyright (C) 2009 coresystems GmbH * Copyright (C) 2010 Carl-Daniel Hailfinger + * Copyright (C) 2010 Rudolf Marek <r.marek(a)assembler.cz> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,7 +28,77 @@ #include <errno.h> #include "flash.h" -#ifdef __DARWIN__ +#ifdef __DJGPP__ +#include <dpmi.h> + +#define MEM_DEV "dpmi" + +unsigned short segFS = 0; + +void *sys_physmap(unsigned long phys_addr, size_t len) +{ + int ret; + __dpmi_meminfo mi; + + if (segFS == 0) { + segFS = __dpmi_allocate_ldt_descriptors (1); + __dpmi_set_segment_base_address (segFS, 0x0); + __dpmi_set_segment_limit (segFS, 0xffffffff); + } + + mi.address = phys_addr; + mi.size = len; + ret = __dpmi_physical_address_mapping (&mi); + + if (ret != 0) { + return NULL; + } + + return (void *) mi.address; +} + +#define sys_physmap_rw_uncached sys_physmap + +#include <sys/movedata.h> +#include <sys/segments.h> +#include <go32.h> + +static void *realmem_cpy; + +void *sys_physmap_ro_cached(unsigned long phys_addr, size_t len) +{ + /* no support for not a 1MB of mem */ + if ((phys_addr + len) > 1024*1024) + return NULL; + + if (realmem_cpy) + return realmem_cpy + phys_addr; + + realmem_cpy = valloc(1024*1024); + + if (!realmem_cpy) + return NULL; + + movedata(_dos_ds, 0, _my_ds(), (unsigned long) realmem_cpy, 1024*1024); + return realmem_cpy + phys_addr; +} + + +void physunmap(void *virt_addr, size_t len) +{ + __dpmi_meminfo mi; + + /* we ignore unmaps for our cheat 1MB copy */ + if ((virt_addr >= realmem_cpy) && ((virt_addr + len) <= (realmem_cpy + 1024*1024))) { + return; + } + + mi.address = (unsigned long) virt_addr; + __dpmi_free_physical_address_mapping(&mi); +} + +#elif defined(__DARWIN__) + #include <DirectIO/darwinio.h> #define MEM_DEV "DirectIO"

1 0

[PATCH 1/8] kill dead pm49fl00x.c functions
by Sean Nelson 16 Mar '10

16 Mar '10

Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> --- pm49fl00x.c | 69 ----------------------------------------------------------- 1 files changed, 0 insertions(+), 69 deletions(-) diff --git a/pm49fl00x.c b/pm49fl00x.c index 5e5eec8..fd93ef6 100644 --- a/pm49fl00x.c +++ b/pm49fl00x.c @@ -38,82 +38,13 @@ void write_lockbits_49fl00x(chipaddr bios, int size, } int unlock_49fl00x(struct flashchip *flash) { write_lockbits_49fl00x(flash->virtual_registers, flash->total_size * 1024, 0, flash->page_size); return 0; } int lock_49fl00x(struct flashchip *flash) { write_lockbits_49fl00x(flash->virtual_registers, flash->total_size * 1024, 1, flash->page_size); return 0; } - -int erase_49fl00x(struct flashchip *flash) -{ - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - - /* unprotected */ - write_lockbits_49fl00x(flash->virtual_registers, - total_size, 0, page_size); - - /* - * erase_chip_jedec() will not work... Datasheet says - * "Chip erase is available in A/A Mux Mode only". - */ - printf("Erasing page: "); - for (i = 0; i < total_size / page_size; i++) { - /* erase the page */ - if (erase_block_jedec(flash, i * page_size, page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - printf("%04d at address: 0x%08x", i, i * page_size); - printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); - fflush(stdout); - } - printf("\n"); - - /* protected */ - write_lockbits_49fl00x(flash->virtual_registers, - total_size, 1, page_size); - - return 0; -} - -int write_49fl00x(struct flashchip *flash, uint8_t *buf) -{ - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - chipaddr bios = flash->virtual_memory; - - /* unprotected */ - write_lockbits_49fl00x(flash->virtual_registers, total_size, 0, - page_size); - - printf("Programming page: "); - for (i = 0; i < total_size / page_size; i++) { - /* erase the page before programming */ - if (erase_block_jedec(flash, i * page_size, page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - - /* write to the sector */ - printf("%04d at address: 0x%08x", i, i * page_size); - write_sector_jedec_common(flash, buf + i * page_size, - bios + i * page_size, page_size, 0xffff); - printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); - fflush(stdout); - } - printf("\n"); - - /* protected */ - write_lockbits_49fl00x(flash->virtual_registers, total_size, 1, - page_size); - - return 0; -} -- 1.6.6

2 23

[commit] r943 - trunk
by repository service 16 Mar '10

16 Mar '10

Author: snelson Date: Tue Mar 16 04:09:10 2010 New Revision: 943 URL: http://flashrom.org/trac/coreboot/changeset/943 Log: convert _sst_fwhub functions to jedec kill unused sst_fwhub.c functions make unlock_* check if unlock was successful and only return 0 when fully successful Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/chipdrivers.h trunk/flashchips.c trunk/sst_fwhub.c Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Tue Mar 16 02:00:50 2010 (r942) +++ trunk/chipdrivers.h Tue Mar 16 04:09:10 2010 (r943) @@ -111,11 +111,8 @@ int unlock_49lfxxxc(struct flashchip *flash); /* sst_fwhub.c */ -int erase_sst_fwhub(struct flashchip *flash); -int erase_sst_fwhub_block(struct flashchip *flash, unsigned int offset, unsigned int page_size); -int erase_sst_fwhub_sector(struct flashchip *flash, unsigned int offset, unsigned int page_size); -int write_sst_fwhub(struct flashchip *flash, uint8_t *buf); int printlock_sst_fwhub(struct flashchip *flash); +int unlock_sst_fwhub(struct flashchip *flash); /* w39v040c.c */ int printlock_w39v040c(struct flashchip *flash); Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Tue Mar 16 02:00:50 2010 (r942) +++ trunk/flashchips.c Tue Mar 16 04:09:10 2010 (r943) @@ -4084,17 +4084,19 @@ { { .eraseblocks = { {4 * 1024, 64} }, - .block_erase = erase_sst_fwhub_sector, + .block_erase = erase_sector_jedec, }, { .eraseblocks = { {16 * 1024, 16} }, - .block_erase = erase_sst_fwhub_block, + .block_erase = erase_block_jedec, }, { .eraseblocks = { {256 * 1024, 1} }, .block_erase = NULL, /* AA 55 80 AA 55 10, only in A/A mux mode */ } }, .printlock = printlock_sst_fwhub, - .write = write_sst_fwhub, + .printlock = printlock_sst_fwhub, + .unlock = unlock_sst_fwhub, + .write = write_jedec_1, .read = read_memmapped, }, @@ -4114,17 +4116,19 @@ { { .eraseblocks = { {4 * 1024, 96} }, - .block_erase = erase_sst_fwhub_sector, + .block_erase = erase_sector_jedec, }, { .eraseblocks = { {64 * 1024, 6} }, - .block_erase = erase_sst_fwhub_block, + .block_erase = erase_block_jedec, }, { .eraseblocks = { {384 * 1024, 1} }, .block_erase = NULL, /* AA 55 80 AA 55 10, only in A/A mux mode */ } }, .printlock = printlock_sst_fwhub, - .write = write_sst_fwhub, + .printlock = printlock_sst_fwhub, + .unlock = unlock_sst_fwhub, + .write = write_jedec_1, .read = read_memmapped, }, @@ -4147,17 +4151,19 @@ { { .eraseblocks = { {4 * 1024, 128} }, - .block_erase = erase_sector_jedec, /* missing unlock */ + .block_erase = erase_sector_jedec, }, { .eraseblocks = { {64 * 1024, 8} }, - .block_erase = erase_sst_fwhub_block, /* same as erase_block_jedec, but with unlock */ + .block_erase = erase_block_jedec, }, { .eraseblocks = { {512 * 1024, 1} }, .block_erase = NULL, /* AA 55 80 AA 55 10, only in A/A mux mode */ }, }, .printlock = printlock_sst_fwhub, - .write = write_sst_fwhub, + .printlock = printlock_sst_fwhub, + .unlock = unlock_sst_fwhub, + .write = write_jedec_1, .read = read_memmapped, }, @@ -4208,17 +4214,19 @@ { { .eraseblocks = { {4 * 1024, 256} }, - .block_erase = erase_sst_fwhub_sector, + .block_erase = erase_sector_jedec, }, { .eraseblocks = { {64 * 1024, 16} }, - .block_erase = erase_sst_fwhub_block, + .block_erase = erase_block_jedec, }, { .eraseblocks = { {1024 * 1024, 1} }, .block_erase = NULL, /* AA 55 80 AA 55 10, only in A/A mux mode */ } }, .printlock = printlock_sst_fwhub, - .write = write_sst_fwhub, + .printlock = printlock_sst_fwhub, + .unlock = unlock_sst_fwhub, + .write = write_jedec_1, .read = read_memmapped, }, Modified: trunk/sst_fwhub.c ============================================================================== --- trunk/sst_fwhub.c Tue Mar 16 02:00:50 2010 (r942) +++ trunk/sst_fwhub.c Tue Mar 16 04:09:10 2010 (r943) @@ -27,18 +27,6 @@ #include "flash.h" #include "chipdrivers.h" -// I need that Berkeley bit-map printer -void print_sst_fwhub_status(uint8_t status) -{ - printf("%s", status & 0x80 ? "Ready:" : "Busy:"); - printf("%s", status & 0x40 ? "BE SUSPEND:" : "BE RUN/FINISH:"); - printf("%s", status & 0x20 ? "BE ERROR:" : "BE OK:"); - printf("%s", status & 0x10 ? "PROG ERR:" : "PROG OK:"); - printf("%s", status & 0x8 ? "VP ERR:" : "VPP OK:"); - printf("%s", status & 0x4 ? "PROG SUSPEND:" : "PROG RUN/FINISH:"); - printf("%s", status & 0x2 ? "WP|TBL#|WP#,ABORT:" : "UNLOCK:"); -} - int check_sst_fwhub_block_lock(struct flashchip *flash, int offset) { chipaddr registers = flash->virtual_registers; @@ -93,91 +81,18 @@ return 0; } -int erase_sst_fwhub_block(struct flashchip *flash, unsigned int offset, unsigned int page_size) +int unlock_sst_fwhub(struct flashchip *flash) { - uint8_t blockstatus = clear_sst_fwhub_block_lock(flash, offset); + int i, ret=0; - if (blockstatus) { - printf("Block lock clearing failed, not erasing block " - "at 0x%06x\n", offset); - return 1; - } - - if (erase_block_jedec(flash, offset, page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - toggle_ready_jedec(flash->virtual_memory); - - return 0; -} - -int erase_sst_fwhub_sector(struct flashchip *flash, unsigned int offset, unsigned int page_size) -{ - uint8_t blockstatus = clear_sst_fwhub_block_lock(flash, offset); - - if (blockstatus) { - printf("Sector lock clearing failed, not erasing sector " - "at 0x%06x\n", offset); - return 1; - } - - if (erase_sector_jedec(flash, offset, page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - toggle_ready_jedec(flash->virtual_memory); - - return 0; -} - -int erase_sst_fwhub(struct flashchip *flash) -{ - int i; - unsigned int total_size = flash->total_size * 1024; - - for (i = 0; i < total_size; i += flash->page_size) { - if (erase_sst_fwhub_block(flash, i, flash->page_size)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; + for (i = 0; i < flash->total_size * 1024; i += flash->page_size) + { + if (clear_sst_fwhub_block_lock(flash, i)) + { + msg_cdbg("Warning: Unlock Failed for block 0x%06x\n", i); + ret++; } } - - return 0; + return ret; } -int write_sst_fwhub(struct flashchip *flash, uint8_t *buf) -{ - int i, rc; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - chipaddr bios = flash->virtual_memory; - uint8_t *readbuf = malloc(page_size); - - printf("Programming page: "); - for (i = 0; i < total_size / page_size; i++) { - printf("%04d at address: 0x%08x", i, i * page_size); - - /* Auto Skip Blocks, which already contain the desired data: - * Faster, because we only write, what has changed - * More secure, because blocks, which are excluded - * (with the exclude or layout feature) - * are not erased and rewritten; data is retained also - * in sudden power off situations - */ - flash->read(flash, readbuf, i * page_size, page_size); - if (memcmp((void *)(buf + i * page_size), - (void *)(readbuf), page_size)) { - rc = erase_sst_fwhub_block(flash, i * page_size, - page_size); - if (rc) - return 1; - write_sector_jedec_common(flash, buf + i * page_size, - bios + i * page_size, page_size, 0xffff); - } - printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); - } - printf("\n"); - - return 0; -}

1 0

[commit] r942 - trunk
by repository service 15 Mar '10

15 Mar '10

Author: snelson Date: Tue Mar 16 02:00:50 2010 New Revision: 942 URL: http://flashrom.org/trac/coreboot/changeset/942 Log: remove function probe_28sf040 delete references to dead sharplhf00l04.c and sst29sf040.c functions from chipdrivers.h Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/chipdrivers.h trunk/sst28sf040.c Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Tue Mar 16 01:51:31 2010 (r941) +++ trunk/chipdrivers.h Tue Mar 16 02:00:50 2010 (r942) @@ -93,13 +93,10 @@ int lock_49fl00x(struct flashchip *flash); /* sharplhf00l04.c */ -int probe_lhf00l04(struct flashchip *flash); int erase_lhf00l04_block(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen); int write_lhf00l04(struct flashchip *flash, uint8_t *buf); -void protect_lhf00l04(chipaddr bios); /* sst28sf040.c */ -int probe_28sf040(struct flashchip *flash); int erase_chip_28sf040(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int erase_sector_28sf040(struct flashchip *flash, unsigned int address, unsigned int sector_size); int write_28sf040(struct flashchip *flash, uint8_t *buf); Modified: trunk/sst28sf040.c ============================================================================== --- trunk/sst28sf040.c Tue Mar 16 01:51:31 2010 (r941) +++ trunk/sst28sf040.c Tue Mar 16 02:00:50 2010 (r942) @@ -92,30 +92,6 @@ return 0; } -int probe_28sf040(struct flashchip *flash) -{ - chipaddr bios = flash->virtual_memory; - uint8_t id1, id2; - - chip_writeb(RESET, bios); - programmer_delay(10); - - chip_writeb(READ_ID, bios); - programmer_delay(10); - id1 = chip_readb(bios); - programmer_delay(10); - id2 = chip_readb(bios + 0x01); - - chip_writeb(RESET, bios); - programmer_delay(10); - - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); - if (id1 == flash->manufacture_id && id2 == flash->model_id) - return 1; - - return 0; -} - int erase_28sf040(struct flashchip *flash) { chipaddr bios = flash->virtual_memory;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom