coreboot May 2009

coreboot@coreboot.org

92 participants
571 discussions

device_t vs. struct device*
by Myles Watson 11 May '09

11 May '09

We seem to have a mix of usage here. Is there a reason we shouldn't just use one? Which one is preferred? >From src/include/device/device.h: typedef struct device * device_t; Thanks, Myles

3 4

[flashrom] r494 - trunk
by svn＠coreboot.org 11 May '09

11 May '09

Author: hailfinger Date: 2009-05-11 16:40:31 +0200 (Mon, 11 May 2009) New Revision: 494 Modified: trunk/jedec.c Log: When flashrom JEDEC code sends the ID command to the chip, it expects to see IDs in the default flash location. However, sometimes the chip does not react to the ID command, either because it doesn't understand the command or because the command never reached it. One way to detect this is to compare ID output with flash chip contents for the same location. If they are identical, there is a high chance you're not actually seeing ID output. Warn the user in that case. This patch helps a lot when a chip is not recognized and we want to check if the probe responses are real IDs or just random flash chip contents. This should probably be added to all probe functions, but probe_jedec is called for all sizes and thus flashrom will check this condition at least once per size, making sure we can cross-match the warning. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: FENG Yu Ning <fengyuning1984(a)gmail.com> Modified: trunk/jedec.c =================================================================== --- trunk/jedec.c 2009-05-11 14:13:25 UTC (rev 493) +++ trunk/jedec.c 2009-05-11 14:40:31 UTC (rev 494) @@ -92,6 +92,7 @@ volatile uint8_t *bios = flash->virtual_memory; uint8_t id1, id2; uint32_t largeid1, largeid2; + uint32_t flashcontent1, flashcontent2; /* Issue JEDEC Product ID Entry command */ chip_writeb(0xAA, bios + 0x5555); @@ -133,6 +134,26 @@ printf_debug("%s: id1 0x%02x, id2 0x%02x", __FUNCTION__, largeid1, largeid2); if (!oddparity(id1)) printf_debug(", id1 parity violation"); + + /* Read the product ID location again. We should now see normal flash contents. */ + flashcontent1 = chip_readb(bios); + flashcontent2 = chip_readb(bios + 0x01); + + /* Check if it is a continuation ID, this should be a while loop. */ + if (flashcontent1 == 0x7F) { + flashcontent1 <<= 8; + flashcontent1 |= chip_readb(bios + 0x100); + } + if (flashcontent2 == 0x7F) { + flashcontent2 <<= 8; + flashcontent2 |= chip_readb(bios + 0x101); + } + + if (largeid1 == flashcontent1) + printf_debug(", id1 is normal flash content"); + if (largeid2 == flashcontent2) + printf_debug(", id2 is normal flash content"); + printf_debug("\n"); if (largeid1 == flash->manufacture_id && largeid2 == flash->model_id) return 1;

1 0

[PATCH] flashrom: Abstraction for flash mapping/unmapping
by Carl-Daniel Hailfinger 11 May '09

11 May '09

Flash mapping/unmapping was performed without an abstraction layer, so even the dummy flasher caused memory mappings to be set up. Add map/unmap functions to the external flasher abstraction. Fix a possible scribble-over-low-memory corner case which fortunately never triggered so far. With this patch, --programmer dummy works fine as non-root. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-external_map_region/flash.h =================================================================== --- flashrom-external_map_region/flash.h (Revision 489) +++ flashrom-external_map_region/flash.h (Arbeitskopie) @@ -87,6 +87,9 @@ int (*init) (void); int (*shutdown) (void); + void * (*map_flash_region) (const char *descr, unsigned long phys_addr, size_t len); + void (*unmap_flash_region) (void *virt_addr, size_t len); + void (*chip_writeb) (uint8_t val, volatile void *addr); void (*chip_writew) (uint16_t val, volatile void *addr); void (*chip_writel) (uint32_t val, volatile void *addr); @@ -107,6 +110,16 @@ return programmer_table[programmer].shutdown(); } +static inline void *programmer_map_flash_region(const char *descr, unsigned long phys_addr, size_t len) +{ + return programmer_table[programmer].map_flash_region(descr, phys_addr, len); +} + +static inline void programmer_unmap_flash_region(void *virt_addr, size_t len) +{ + programmer_table[programmer].unmap_flash_region(virt_addr, len); +} + static inline void chip_writeb(uint8_t val, volatile void *addr) { programmer_table[programmer].chip_writeb(val, addr); @@ -579,6 +592,8 @@ /* dummyflasher.c */ int dummy_init(void); int dummy_shutdown(void); +void *dummy_map(const char *descr, unsigned long phys_addr, size_t len); +void dummy_unmap(void *virt_addr, size_t len); void dummy_chip_writeb(uint8_t val, volatile void *addr); void dummy_chip_writew(uint16_t val, volatile void *addr); void dummy_chip_writel(uint32_t val, volatile void *addr); Index: flashrom-external_map_region/physmap.c =================================================================== --- flashrom-external_map_region/physmap.c (Revision 489) +++ flashrom-external_map_region/physmap.c (Arbeitskopie) @@ -69,12 +69,34 @@ void physunmap(void *virt_addr, size_t len) { + if (len == 0) { + fprintf(stderr, "Not unmapping zero size at %p\n", + virt_addr); + return; + } + munmap(virt_addr, len); } #endif void *physmap(const char *descr, unsigned long phys_addr, size_t len) { + if (len == 0) { + fprintf(stderr, "Not mapping %s, zero size at 0x%08lx\n", + descr, phys_addr); + return NULL; + } + + if ((getpagesize() - 1) & len) { + fprintf(stderr, "Mapping %s at 0x%08lx, unaligned size 0x%lx\n", + descr, phys_addr, (unsigned long)len); + } + + if ((getpagesize() - 1) & phys_addr) { + fprintf(stderr, "Mapping %s, 0x%lx bytes at unaligned 0x%08lx\n", + descr, (unsigned long)len, phys_addr); + } + void *virt_addr = sys_physmap(phys_addr, len); if (NULL == virt_addr) { Index: flashrom-external_map_region/dummyflasher.c =================================================================== --- flashrom-external_map_region/dummyflasher.c (Revision 489) +++ flashrom-external_map_region/dummyflasher.c (Arbeitskopie) @@ -40,6 +40,19 @@ return 0; } +void *dummy_map(const char *descr, unsigned long phys_addr, size_t len) +{ + printf("%s: Mapping %s, 0x%lx bytes at 0x%08lx\n", + __func__, descr, (unsigned long)len, phys_addr); + return (void *)phys_addr; +} + +void dummy_unmap(void *virt_addr, size_t len) +{ + printf("%s: Unmapping 0x%lx bytes at %p\n", + __func__, (unsigned long)len, virt_addr); +} + void dummy_chip_writeb(uint8_t val, volatile void *addr) { printf("%s: addr=%p, val=0x%02x\n", __func__, addr, val); Index: flashrom-external_map_region/flashrom.c =================================================================== --- flashrom-external_map_region/flashrom.c (Revision 489) +++ flashrom-external_map_region/flashrom.c (Arbeitskopie) @@ -40,6 +40,8 @@ { .init = internal_init, .shutdown = internal_shutdown, + .map_flash_region = physmap, + .unmap_flash_region = physunmap, .chip_readb = internal_chip_readb, .chip_readw = internal_chip_readw, .chip_readl = internal_chip_readl, @@ -51,6 +53,8 @@ { .init = dummy_init, .shutdown = dummy_shutdown, + .map_flash_region = dummy_map, + .unmap_flash_region = dummy_unmap, .chip_readb = dummy_chip_readb, .chip_readw = dummy_chip_readw, .chip_readl = dummy_chip_readl, @@ -65,7 +69,7 @@ void map_flash_registers(struct flashchip *flash) { size_t size = flash->total_size * 1024; - flash->virtual_registers = physmap("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); + flash->virtual_registers = programmer_map_flash_region("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); } int read_memmapped(struct flashchip *flash, uint8_t *buf) @@ -97,23 +101,8 @@ size = flash->total_size * 1024; - /* If getpagesize() > size -> - * "Can't mmap memory using /dev/mem: Invalid argument" - * This should never happen as we don't support any flash chips - * smaller than 4k or 8k (yet). - */ - - if (getpagesize() > size) { - /* - * if a flash size of 0 is mapped, we map a single page - * so we can probe in that area whether we know the - * vendor at least. - */ - size = getpagesize(); - } - base = flashbase ? flashbase : (0xffffffff - size + 1); - flash->virtual_memory = physmap("flash chip", base, size); + flash->virtual_memory = programmer_map_flash_region("flash chip", base, size); if (force) break; @@ -126,7 +115,8 @@ break; notfound: - physunmap((void *)flash->virtual_memory, size); + /* The intermediate cast to unsigned long works around a gcc warning bug. */ + programmer_unmap_flash_region((void *)(unsigned long)flash->virtual_memory, size); } if (!flash || !flash->name) -- http://www.hailfinger.org/ Index: flashrom-external_map_region/flash.h =================================================================== --- flashrom-external_map_region/flash.h (Revision 489) +++ flashrom-external_map_region/flash.h (Arbeitskopie) @@ -87,6 +87,9 @@ int (*init) (void); int (*shutdown) (void); + void * (*map_flash_region) (const char *descr, unsigned long phys_addr, size_t len); + void (*unmap_flash_region) (void *virt_addr, size_t len); + void (*chip_writeb) (uint8_t val, volatile void *addr); void (*chip_writew) (uint16_t val, volatile void *addr); void (*chip_writel) (uint32_t val, volatile void *addr); @@ -107,6 +110,16 @@ return programmer_table[programmer].shutdown(); } +static inline void *programmer_map_flash_region(const char *descr, unsigned long phys_addr, size_t len) +{ + return programmer_table[programmer].map_flash_region(descr, phys_addr, len); +} + +static inline void programmer_unmap_flash_region(void *virt_addr, size_t len) +{ + programmer_table[programmer].unmap_flash_region(virt_addr, len); +} + static inline void chip_writeb(uint8_t val, volatile void *addr) { programmer_table[programmer].chip_writeb(val, addr); @@ -579,6 +592,8 @@ /* dummyflasher.c */ int dummy_init(void); int dummy_shutdown(void); +void *dummy_map(const char *descr, unsigned long phys_addr, size_t len); +void dummy_unmap(void *virt_addr, size_t len); void dummy_chip_writeb(uint8_t val, volatile void *addr); void dummy_chip_writew(uint16_t val, volatile void *addr); void dummy_chip_writel(uint32_t val, volatile void *addr); Index: flashrom-external_map_region/physmap.c =================================================================== --- flashrom-external_map_region/physmap.c (Revision 489) +++ flashrom-external_map_region/physmap.c (Arbeitskopie) @@ -69,12 +69,34 @@ void physunmap(void *virt_addr, size_t len) { + if (len == 0) { + fprintf(stderr, "Not unmapping zero size at %p\n", + virt_addr); + return; + } + munmap(virt_addr, len); } #endif void *physmap(const char *descr, unsigned long phys_addr, size_t len) { + if (len == 0) { + fprintf(stderr, "Not mapping %s, zero size at 0x%08lx\n", + descr, phys_addr); + return NULL; + } + + if ((getpagesize() - 1) & len) { + fprintf(stderr, "Mapping %s at 0x%08lx, unaligned size 0x%lx\n", + descr, phys_addr, (unsigned long)len); + } + + if ((getpagesize() - 1) & phys_addr) { + fprintf(stderr, "Mapping %s, 0x%lx bytes at unaligned 0x%08lx\n", + descr, (unsigned long)len, phys_addr); + } + void *virt_addr = sys_physmap(phys_addr, len); if (NULL == virt_addr) { Index: flashrom-external_map_region/dummyflasher.c =================================================================== --- flashrom-external_map_region/dummyflasher.c (Revision 489) +++ flashrom-external_map_region/dummyflasher.c (Arbeitskopie) @@ -40,6 +40,19 @@ return 0; } +void *dummy_map(const char *descr, unsigned long phys_addr, size_t len) +{ + printf("%s: Mapping %s, 0x%lx bytes at 0x%08lx\n", + __func__, descr, (unsigned long)len, phys_addr); + return (void *)phys_addr; +} + +void dummy_unmap(void *virt_addr, size_t len) +{ + printf("%s: Unmapping 0x%lx bytes at %p\n", + __func__, (unsigned long)len, virt_addr); +} + void dummy_chip_writeb(uint8_t val, volatile void *addr) { printf("%s: addr=%p, val=0x%02x\n", __func__, addr, val); Index: flashrom-external_map_region/flashrom.c =================================================================== --- flashrom-external_map_region/flashrom.c (Revision 489) +++ flashrom-external_map_region/flashrom.c (Arbeitskopie) @@ -40,6 +40,8 @@ { .init = internal_init, .shutdown = internal_shutdown, + .map_flash_region = physmap, + .unmap_flash_region = physunmap, .chip_readb = internal_chip_readb, .chip_readw = internal_chip_readw, .chip_readl = internal_chip_readl, @@ -51,6 +53,8 @@ { .init = dummy_init, .shutdown = dummy_shutdown, + .map_flash_region = dummy_map, + .unmap_flash_region = dummy_unmap, .chip_readb = dummy_chip_readb, .chip_readw = dummy_chip_readw, .chip_readl = dummy_chip_readl, @@ -65,7 +69,7 @@ void map_flash_registers(struct flashchip *flash) { size_t size = flash->total_size * 1024; - flash->virtual_registers = physmap("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); + flash->virtual_registers = programmer_map_flash_region("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); } int read_memmapped(struct flashchip *flash, uint8_t *buf) @@ -97,23 +101,8 @@ size = flash->total_size * 1024; - /* If getpagesize() > size -> - * "Can't mmap memory using /dev/mem: Invalid argument" - * This should never happen as we don't support any flash chips - * smaller than 4k or 8k (yet). - */ - - if (getpagesize() > size) { - /* - * if a flash size of 0 is mapped, we map a single page - * so we can probe in that area whether we know the - * vendor at least. - */ - size = getpagesize(); - } - base = flashbase ? flashbase : (0xffffffff - size + 1); - flash->virtual_memory = physmap("flash chip", base, size); + flash->virtual_memory = programmer_map_flash_region("flash chip", base, size); if (force) break; @@ -126,7 +115,8 @@ break; notfound: - physunmap((void *)flash->virtual_memory, size); + /* The intermediate cast to unsigned long works around a gcc warning bug. */ + programmer_unmap_flash_region((void *)(unsigned long)flash->virtual_memory, size); } if (!flash || !flash->name)

2 4

[flashrom] r493 - trunk
by svn＠coreboot.org 11 May '09

11 May '09

Author: hailfinger Date: 2009-05-11 16:13:25 +0200 (Mon, 11 May 2009) New Revision: 493 Modified: trunk/dummyflasher.c trunk/flash.h trunk/flashrom.c trunk/physmap.c Log: Flash mapping/unmapping was performed without an abstraction layer, so even the dummy flasher caused memory mappings to be set up. Add map/unmap functions to the external flasher abstraction. Fix a possible scribble-over-low-memory corner case which fortunately never triggered so far. With this patch, --programmer dummy works fine as non-root. 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/dummyflasher.c =================================================================== --- trunk/dummyflasher.c 2009-05-11 14:01:17 UTC (rev 492) +++ trunk/dummyflasher.c 2009-05-11 14:13:25 UTC (rev 493) @@ -40,6 +40,19 @@ return 0; } +void *dummy_map(const char *descr, unsigned long phys_addr, size_t len) +{ + printf("%s: Mapping %s, 0x%lx bytes at 0x%08lx\n", + __func__, descr, (unsigned long)len, phys_addr); + return (void *)phys_addr; +} + +void dummy_unmap(void *virt_addr, size_t len) +{ + printf("%s: Unmapping 0x%lx bytes at %p\n", + __func__, (unsigned long)len, virt_addr); +} + void dummy_chip_writeb(uint8_t val, volatile void *addr) { printf("%s: addr=%p, val=0x%02x\n", __func__, addr, val); Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-05-11 14:01:17 UTC (rev 492) +++ trunk/flash.h 2009-05-11 14:13:25 UTC (rev 493) @@ -87,6 +87,9 @@ int (*init) (void); int (*shutdown) (void); + void * (*map_flash_region) (const char *descr, unsigned long phys_addr, size_t len); + void (*unmap_flash_region) (void *virt_addr, size_t len); + void (*chip_writeb) (uint8_t val, volatile void *addr); void (*chip_writew) (uint16_t val, volatile void *addr); void (*chip_writel) (uint32_t val, volatile void *addr); @@ -107,6 +110,16 @@ return programmer_table[programmer].shutdown(); } +static inline void *programmer_map_flash_region(const char *descr, unsigned long phys_addr, size_t len) +{ + return programmer_table[programmer].map_flash_region(descr, phys_addr, len); +} + +static inline void programmer_unmap_flash_region(void *virt_addr, size_t len) +{ + programmer_table[programmer].unmap_flash_region(virt_addr, len); +} + static inline void chip_writeb(uint8_t val, volatile void *addr) { programmer_table[programmer].chip_writeb(val, addr); @@ -579,6 +592,8 @@ /* dummyflasher.c */ int dummy_init(void); int dummy_shutdown(void); +void *dummy_map(const char *descr, unsigned long phys_addr, size_t len); +void dummy_unmap(void *virt_addr, size_t len); void dummy_chip_writeb(uint8_t val, volatile void *addr); void dummy_chip_writew(uint16_t val, volatile void *addr); void dummy_chip_writel(uint32_t val, volatile void *addr); Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-05-11 14:01:17 UTC (rev 492) +++ trunk/flashrom.c 2009-05-11 14:13:25 UTC (rev 493) @@ -40,6 +40,8 @@ { .init = internal_init, .shutdown = internal_shutdown, + .map_flash_region = physmap, + .unmap_flash_region = physunmap, .chip_readb = internal_chip_readb, .chip_readw = internal_chip_readw, .chip_readl = internal_chip_readl, @@ -51,6 +53,8 @@ { .init = dummy_init, .shutdown = dummy_shutdown, + .map_flash_region = dummy_map, + .unmap_flash_region = dummy_unmap, .chip_readb = dummy_chip_readb, .chip_readw = dummy_chip_readw, .chip_readl = dummy_chip_readl, @@ -66,7 +70,7 @@ { size_t size = flash->total_size * 1024; /* Flash registers live 4 MByte below the flash. */ - flash->virtual_registers = physmap("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); + flash->virtual_registers = programmer_map_flash_region("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); } int read_memmapped(struct flashchip *flash, uint8_t *buf) @@ -98,23 +102,8 @@ size = flash->total_size * 1024; - /* If getpagesize() > size -> - * "Can't mmap memory using /dev/mem: Invalid argument" - * This should never happen as we don't support any flash chips - * smaller than 4k or 8k (yet). - */ - - if (getpagesize() > size) { - /* - * if a flash size of 0 is mapped, we map a single page - * so we can probe in that area whether we know the - * vendor at least. - */ - size = getpagesize(); - } - base = flashbase ? flashbase : (0xffffffff - size + 1); - flash->virtual_memory = physmap("flash chip", base, size); + flash->virtual_memory = programmer_map_flash_region("flash chip", base, size); if (force) break; @@ -127,7 +116,8 @@ break; notfound: - physunmap((void *)flash->virtual_memory, size); + /* The intermediate cast to unsigned long works around a gcc warning bug. */ + programmer_unmap_flash_region((void *)(unsigned long)flash->virtual_memory, size); } if (!flash || !flash->name) Modified: trunk/physmap.c =================================================================== --- trunk/physmap.c 2009-05-11 14:01:17 UTC (rev 492) +++ trunk/physmap.c 2009-05-11 14:13:25 UTC (rev 493) @@ -69,12 +69,33 @@ void physunmap(void *virt_addr, size_t len) { + if (len == 0) { + printf_debug("Not unmapping zero size at %p\n", virt_addr); + return; + } + munmap(virt_addr, len); } #endif void *physmap(const char *descr, unsigned long phys_addr, size_t len) { + if (len == 0) { + printf_debug("Not mapping %s, zero size at 0x%08lx\n", + descr, phys_addr); + return NULL; + } + + if ((getpagesize() - 1) & len) { + fprintf(stderr, "Mapping %s at 0x%08lx, unaligned size 0x%lx\n", + descr, phys_addr, (unsigned long)len); + } + + if ((getpagesize() - 1) & phys_addr) { + fprintf(stderr, "Mapping %s, 0x%lx bytes at unaligned 0x%08lx\n", + descr, (unsigned long)len, phys_addr); + } + void *virt_addr = sys_physmap(phys_addr, len); if (NULL == virt_addr) {

1 0

build service results for r4267
by coreboot information 11 May '09

11 May '09

Dear coreboot readers! This is the automatic build system of coreboot. The developer "uwe" checked in revision 4267 to the coreboot repository. This caused the following changes: Change Log: We should separate the it8718f_24mhz_clkin like the way IT8712 does. Signed-off-by: Zheng Bao <zheng.bao(a)amd.com> Acked-by; Ronald G. Minnich <rminnich(a)gmail.com> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Build Log: Configuration of asus:m2v-mx_se is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=4267&device=m2v-mx_se&vend… If something broke during this checkin please be a pain in uwe's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[PATCH] flashrom: Add lock bit handling to SST FWH chips
by Carl-Daniel Hailfinger 11 May '09

11 May '09

Add lock bit handling (printing, setting and checking) to SST FWH chips and abort any writes to locked sectors. Verbose mode gives you all the info. Normal mode only tells you of unlocking failed, but gives enough details to debug. Add a comment about flash register placement to flashrom.c. Thanks to Uwe for testing multiple iterations of this patch. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-sst_fwhub_lockbits/sst_fwhub.c =================================================================== --- flashrom-sst_fwhub_lockbits/sst_fwhub.c (Revision 491) +++ flashrom-sst_fwhub_lockbits/sst_fwhub.c (Arbeitskopie) @@ -35,23 +35,79 @@ printf("%s", status & 0x2 ? "WP|TBL#|WP#,ABORT:" : "UNLOCK:"); } +int check_sst_fwhub_block_lock(struct flashchip *flash, int offset) +{ + volatile uint8_t *registers = flash->virtual_registers; + uint8_t blockstatus; + + blockstatus = chip_readb(registers + offset + 2); + printf_debug("Lock status for 0x%06x (size 0x%06x) is %02x, ", + offset, flash->page_size, blockstatus); + switch (blockstatus & 0x3) { + case 0x0: + printf_debug("full access\n"); + break; + case 0x1: + printf_debug("write locked\n"); + break; + case 0x2: + printf_debug("locked open\n"); + break; + case 0x3: + printf_debug("write locked down\n"); + break; + } + /* Return content of the write_locked bit */ + return blockstatus & 0x1; +} + +int clear_sst_fwhub_block_lock(struct flashchip *flash, int offset) +{ + volatile uint8_t *registers = flash->virtual_registers; + uint8_t blockstatus; + + blockstatus = check_sst_fwhub_block_lock(flash, offset); + + if (blockstatus) { + printf_debug("Trying to clear lock for 0x%06x... ", offset) + chip_writeb(0, registers + offset + 2); + + blockstatus = check_sst_fwhub_block_lock(flash, offset); + if (blockstatus) { + printf_debug("failed\n"); + } else { + printf_debug("OK\n"); + } + } + + return blockstatus; +} + /* probe_jedec works fine for probing */ int probe_sst_fwhub(struct flashchip *flash) { + int i; + if (probe_jedec(flash) == 0) return 0; map_flash_registers(flash); + for (i = 0; i < flash->total_size * 1024; i += flash->page_size) + check_sst_fwhub_block_lock(flash, i); + return 1; } int erase_sst_fwhub_block(struct flashchip *flash, int offset) { - volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2; + uint8_t blockstatus = clear_sst_fwhub_block_lock(flash, offset); - // clear write protect - chip_writeb(0, wrprotect); + if (blockstatus) { + printf("Block lock clearing failed, not erasing block " + "at 0x%06x\n", offset); + return 1; + } erase_block_jedec(flash->virtual_memory, offset); toggle_ready_jedec(flash->virtual_memory); @@ -85,6 +141,7 @@ int total_size = flash->total_size * 1024; int page_size = flash->page_size; volatile uint8_t *bios = flash->virtual_memory; + uint8_t blockstatus; // FIXME: We want block wide erase instead of ironing the whole chip if (erase_sst_fwhub(flash)) @@ -93,6 +150,11 @@ printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); + blockstatus = clear_sst_fwhub_block_lock(flash, i * page_size); + if (blockstatus) { + printf(" is locked down permanently, aborting\n"); + return 1; + } write_sector_jedec(bios, buf + i * page_size, bios + i * page_size, 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"); Index: flashrom-sst_fwhub_lockbits/flashrom.c =================================================================== --- flashrom-sst_fwhub_lockbits/flashrom.c (Revision 491) +++ flashrom-sst_fwhub_lockbits/flashrom.c (Arbeitskopie) @@ -65,6 +65,7 @@ void map_flash_registers(struct flashchip *flash) { size_t size = flash->total_size * 1024; + /* Flash registers live 4 MByte below the flash. */ flash->virtual_registers = physmap("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); } -- http://www.hailfinger.org/ Index: flashrom-sst_fwhub_lockbits/sst_fwhub.c =================================================================== --- flashrom-sst_fwhub_lockbits/sst_fwhub.c (Revision 491) +++ flashrom-sst_fwhub_lockbits/sst_fwhub.c (Arbeitskopie) @@ -35,23 +35,79 @@ printf("%s", status & 0x2 ? "WP|TBL#|WP#,ABORT:" : "UNLOCK:"); } +int check_sst_fwhub_block_lock(struct flashchip *flash, int offset) +{ + volatile uint8_t *registers = flash->virtual_registers; + uint8_t blockstatus; + + blockstatus = chip_readb(registers + offset + 2); + printf_debug("Lock status for 0x%06x (size 0x%06x) is %02x, ", + offset, flash->page_size, blockstatus); + switch (blockstatus & 0x3) { + case 0x0: + printf_debug("full access\n"); + break; + case 0x1: + printf_debug("write locked\n"); + break; + case 0x2: + printf_debug("locked open\n"); + break; + case 0x3: + printf_debug("write locked down\n"); + break; + } + /* Return content of the write_locked bit */ + return blockstatus & 0x1; +} + +int clear_sst_fwhub_block_lock(struct flashchip *flash, int offset) +{ + volatile uint8_t *registers = flash->virtual_registers; + uint8_t blockstatus; + + blockstatus = check_sst_fwhub_block_lock(flash, offset); + + if (blockstatus) { + printf_debug("Trying to clear lock for 0x%06x... ", offset) + chip_writeb(0, registers + offset + 2); + + blockstatus = check_sst_fwhub_block_lock(flash, offset); + if (blockstatus) { + printf_debug("failed\n"); + } else { + printf_debug("OK\n"); + } + } + + return blockstatus; +} + /* probe_jedec works fine for probing */ int probe_sst_fwhub(struct flashchip *flash) { + int i; + if (probe_jedec(flash) == 0) return 0; map_flash_registers(flash); + for (i = 0; i < flash->total_size * 1024; i += flash->page_size) + check_sst_fwhub_block_lock(flash, i); + return 1; } int erase_sst_fwhub_block(struct flashchip *flash, int offset) { - volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2; + uint8_t blockstatus = clear_sst_fwhub_block_lock(flash, offset); - // clear write protect - chip_writeb(0, wrprotect); + if (blockstatus) { + printf("Block lock clearing failed, not erasing block " + "at 0x%06x\n", offset); + return 1; + } erase_block_jedec(flash->virtual_memory, offset); toggle_ready_jedec(flash->virtual_memory); @@ -85,6 +141,7 @@ int total_size = flash->total_size * 1024; int page_size = flash->page_size; volatile uint8_t *bios = flash->virtual_memory; + uint8_t blockstatus; // FIXME: We want block wide erase instead of ironing the whole chip if (erase_sst_fwhub(flash)) @@ -93,6 +150,11 @@ printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); + blockstatus = clear_sst_fwhub_block_lock(flash, i * page_size); + if (blockstatus) { + printf(" is locked down permanently, aborting\n"); + return 1; + } write_sector_jedec(bios, buf + i * page_size, bios + i * page_size, 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"); Index: flashrom-sst_fwhub_lockbits/flashrom.c =================================================================== --- flashrom-sst_fwhub_lockbits/flashrom.c (Revision 491) +++ flashrom-sst_fwhub_lockbits/flashrom.c (Arbeitskopie) @@ -65,6 +65,7 @@ void map_flash_registers(struct flashchip *flash) { size_t size = flash->total_size * 1024; + /* Flash registers live 4 MByte below the flash. */ flash->virtual_registers = physmap("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); }

3 3

[flashrom] r492 - trunk
by svn＠coreboot.org 11 May '09

11 May '09

Author: hailfinger Date: 2009-05-11 16:01:17 +0200 (Mon, 11 May 2009) New Revision: 492 Modified: trunk/flashrom.c trunk/sst_fwhub.c Log: Add lock bit handling (printing, setting and checking) to SST FWH chips and abort any writes to locked sectors. Verbose mode gives you all the info. Normal mode only tells you of unlocking failed, but gives enough details to debug. Add a comment about flash register placement to flashrom.c. Thanks to Uwe for testing multiple iterations of this patch. 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/flashrom.c =================================================================== --- trunk/flashrom.c 2009-05-10 14:11:07 UTC (rev 491) +++ trunk/flashrom.c 2009-05-11 14:01:17 UTC (rev 492) @@ -65,6 +65,7 @@ void map_flash_registers(struct flashchip *flash) { size_t size = flash->total_size * 1024; + /* Flash registers live 4 MByte below the flash. */ flash->virtual_registers = physmap("flash chip registers", (0xFFFFFFFF - 0x400000 - size + 1), size); } Modified: trunk/sst_fwhub.c =================================================================== --- trunk/sst_fwhub.c 2009-05-10 14:11:07 UTC (rev 491) +++ trunk/sst_fwhub.c 2009-05-11 14:01:17 UTC (rev 492) @@ -35,23 +35,75 @@ printf("%s", status & 0x2 ? "WP|TBL#|WP#,ABORT:" : "UNLOCK:"); } +int check_sst_fwhub_block_lock(struct flashchip *flash, int offset) +{ + volatile uint8_t *registers = flash->virtual_registers; + uint8_t blockstatus; + + blockstatus = chip_readb(registers + offset + 2); + printf_debug("Lock status for 0x%06x (size 0x%06x) is %02x, ", + offset, flash->page_size, blockstatus); + switch (blockstatus & 0x3) { + case 0x0: + printf_debug("full access\n"); + break; + case 0x1: + printf_debug("write locked\n"); + break; + case 0x2: + printf_debug("locked open\n"); + break; + case 0x3: + printf_debug("write locked down\n"); + break; + } + /* Return content of the write_locked bit */ + return blockstatus & 0x1; +} + +int clear_sst_fwhub_block_lock(struct flashchip *flash, int offset) +{ + volatile uint8_t *registers = flash->virtual_registers; + uint8_t blockstatus; + + blockstatus = check_sst_fwhub_block_lock(flash, offset); + + if (blockstatus) { + printf_debug("Trying to clear lock for 0x%06x... ", offset) + chip_writeb(0, registers + offset + 2); + + blockstatus = check_sst_fwhub_block_lock(flash, offset); + printf_debug("%s\n", (blockstatus) ? "failed" : "OK"); + } + + return blockstatus; +} + /* probe_jedec works fine for probing */ int probe_sst_fwhub(struct flashchip *flash) { + int i; + if (probe_jedec(flash) == 0) return 0; map_flash_registers(flash); + for (i = 0; i < flash->total_size * 1024; i += flash->page_size) + check_sst_fwhub_block_lock(flash, i); + return 1; } int erase_sst_fwhub_block(struct flashchip *flash, int offset) { - volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2; + uint8_t blockstatus = clear_sst_fwhub_block_lock(flash, offset); - // clear write protect - chip_writeb(0, wrprotect); + if (blockstatus) { + printf("Block lock clearing failed, not erasing block " + "at 0x%06x\n", offset); + return 1; + } erase_block_jedec(flash->virtual_memory, offset); toggle_ready_jedec(flash->virtual_memory); @@ -85,6 +137,7 @@ int total_size = flash->total_size * 1024; int page_size = flash->page_size; volatile uint8_t *bios = flash->virtual_memory; + uint8_t blockstatus; // FIXME: We want block wide erase instead of ironing the whole chip if (erase_sst_fwhub(flash)) @@ -93,6 +146,11 @@ printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); + blockstatus = clear_sst_fwhub_block_lock(flash, i * page_size); + if (blockstatus) { + printf(" is locked down permanently, aborting\n"); + return 1; + } write_sector_jedec(bios, buf + i * page_size, bios + i * page_size, 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");

1 0

Flashrom v0.9.0 r489 trunk works with Gigabyte GA-MA790GP-DS4H
by Paul Koetsier 11 May '09

11 May '09

Flashrom works with the Gigabyte GA-MA790GP-DS4H mainboard.I just updated my machine with a 64-bit build of Flashrom v0.9.0 r489 trunk. Paul

2 1

Coreboot on Acer Aspire 5100
by Jav 11 May '09

11 May '09

Hi everyone, I'm really interested on your project, I was trying to figure out if I can flash my laptop with your coreboot but I couldn't find my motherboard on your compatibility list. I have an Acer Aspire 5100 with AMD Turion X2 64 and an Ati Radeon Xpress 1100 chipset. I would apreciate your help. Greetings from Mexico... -- Mi Blog: <a href="http://manoinvisibleinexistente.blogspot.com">La mano invisible e inexistente de Adam Smith</a>

2 1

[patch]: it8718f, sometime we use 48Mhz.
by Bao, Zheng 11 May '09

11 May '09

We should separate the it8718f_24mhz_clkin like the way 8712 does. Signed-off-by: Zheng Bao <zheng.bao(a)amd.com> Index: src/superio/ite/it8718f/it8718f_early_serial.c =================================================================== --- src/superio/ite/it8718f/it8718f_early_serial.c (revision 449) +++ src/superio/ite/it8718f/it8718f_early_serial.c (working copy) @@ -45,10 +45,9 @@ outb(value, SIO_DATA); } -/* Enable the peripheral devices on the IT8718F Super I/O chip. */ -static void it8718f_enable_serial(device_t dev, unsigned iobase) +static void it8718f_enter_conf(void) { - /* (1) Enter the configuration state (MB PnP mode). */ + /* Enter the configuration state (MB PnP mode). */ /* Perform MB PnP setup to put the SIO chip at 0x2e. */ /* Base address 0x2e: 0x87 0x01 0x55 0x55. */ @@ -57,7 +56,30 @@ outb(0x01, IT8718F_CONFIGURATION_PORT); outb(0x55, IT8718F_CONFIGURATION_PORT); outb(0x55, IT8718F_CONFIGURATION_PORT); +} +static void it8718f_exit_conf(void) +{ + /* Exit the configuration state (MB PnP mode). */ + it8718f_sio_write(0x00, IT8718F_CONFIG_REG_CC, 0x02); +} + +static void it8718f_24mhz_clkin(void) +{ + it8718f_enter_conf(); + + /* Select 24MHz CLKIN (48MHZ default)*/ + it8718f_sio_write(0x00, IT8718F_CONFIG_REG_CLOCKSEL, 0x1); + + it8718f_exit_conf(); +} + +/* Enable the peripheral devices on the IT8718F Super I/O chip. */ +static void it8718f_enable_serial(device_t dev, unsigned iobase) +{ + /* (1) Enter the configuration state (MB PnP mode). */ + it8718f_enter_conf(); + /* (2) Modify the data of configuration registers. */ /* Select the chip to configure (if there's more than one). @@ -65,17 +87,14 @@ If this register is not written, both chips are configured. */ /* it8718f_sio_write(0x00, IT8718F_CONFIG_REG_CONFIGSEL, 0x00); */ - /* Enable all devices. */ + /* Enable serial port(s). */ it8718f_sio_write(IT8718F_SP1, 0x30, 0x1); /* Serial port 1 */ it8718f_sio_write(IT8718F_SP2, 0x30, 0x1); /* Serial port 2 */ - /* Select 24MHz CLKIN (set bit 0). */ - it8718f_sio_write(0x00, IT8718F_CONFIG_REG_CLOCKSEL, 0x01); - /* Clear software suspend mode (clear bit 0). TODO: Needed? */ /* it8718f_sio_write(0x00, IT8718F_CONFIG_REG_SWSUSP, 0x00); */ /* (3) Exit the configuration state (MB PnP mode). */ - it8718f_sio_write(0x00, IT8718F_CONFIG_REG_CC, 0x02); + it8718f_exit_conf(); }

3 3

← Newer
1
...
40
41
42
43
44
45
46
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot May 2009