Author: snelson
Date: 2010-01-04 18:15:23 +0100 (Mon, 04 Jan 2010)
New Revision: 828
Modified:
trunk/chipdrivers.h
trunk/flash.h
trunk/flashchips.c
trunk/jedec.c
trunk/pm49fl00x.c
trunk/sst49lf040.c
trunk/sst_fwhub.c
trunk/w39v040c.c
trunk/w39v080fa.c
trunk/w49f002u.c
Log:
The patch converts jedec functions into mask-based generics which can be used
for many chip provided the only changes are the addresses are converted from
0x5555/0x2AAA to 0x555/0x2AA or similar. The patch mostly changes jedec.c, but
a few other files are changed because they use the jedec functions within
their own functions.
The patch also adds a copyright line to flashchips.c because of my recent work in converting AMD and Atmel chips to use struct erase_block.
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/chipdrivers.h 2010-01-03 23:50:28 UTC (rev 827)
+++ trunk/chipdrivers.h 2010-01-04 17:15:23 UTC (rev 828)
@@ -76,7 +76,6 @@
uint8_t oddparity(uint8_t val);
void toggle_ready_jedec(chipaddr dst);
void data_polling_jedec(chipaddr dst, uint8_t data);
-void start_program_jedec(chipaddr bios);
int write_byte_program_jedec(chipaddr bios, uint8_t *src,
chipaddr dst);
int probe_jedec(struct flashchip *flash);
@@ -86,8 +85,7 @@
int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int pagesize);
int erase_block_jedec(struct flashchip *flash, unsigned int page, unsigned int blocksize);
int erase_chip_block_jedec(struct flashchip *flash, unsigned int page, unsigned int blocksize);
-int write_sector_jedec(chipaddr bios, uint8_t *src,
- chipaddr dst, unsigned int page_size);
+int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, chipaddr dst, unsigned int page_size, unsigned int mask);
/* m29f002.c */
int erase_m29f002(struct flashchip *flash);
Modified: trunk/flash.h
===================================================================
--- trunk/flash.h 2010-01-03 23:50:28 UTC (rev 827)
+++ trunk/flash.h 2010-01-04 17:15:23 UTC (rev 828)
@@ -144,6 +144,9 @@
*/
#define NUM_ERASEFUNCTIONS 5
+#define FEATURE_REGISTERMAP (1 << 0)
+#define FEATURE_BYTEWRITES (1 << 1)
+
struct flashchip {
const char *vendor;
const char *name;
@@ -160,6 +163,7 @@
int total_size;
int page_size;
+ int feature_bits;
/*
* Indicate if flashrom has been tested with this flash chip and if
Modified: trunk/flashchips.c
===================================================================
--- trunk/flashchips.c 2010-01-03 23:50:28 UTC (rev 827)
+++ trunk/flashchips.c 2010-01-04 17:15:23 UTC (rev 828)
@@ -5,6 +5,7 @@
* Copyright (C) 2004 Tyan Corp
* Copyright (C) 2005-2008 coresystems GmbH <stepan(a)openbios.org>
* Copyright (C) 2006-2009 Carl-Daniel Hailfinger
+ * Copyright (C) 2009 Sean Nelson <audiohacked(a)gmail.com>
*
* 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
Modified: trunk/jedec.c
===================================================================
--- trunk/jedec.c 2010-01-03 23:50:28 UTC (rev 827)
+++ trunk/jedec.c 2010-01-04 17:15:23 UTC (rev 828)
@@ -5,6 +5,7 @@
* Copyright (C) 2006 Giampiero Giancipoli <gianci(a)email.it>
* Copyright (C) 2006 coresystems GmbH <info(a)coresystems.de>
* Copyright (C) 2007 Carl-Daniel Hailfinger
+ * Copyright (C) 2009 Sean Nelson <audiohacked(a)gmail.com>
*
* 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
@@ -24,6 +25,8 @@
#include "flash.h"
#define MAX_REFLASH_TRIES 0x10
+#define MASK_FULL 0xffff
+#define MASK_2AA 0x7ff
/* Check one byte for odd parity */
uint8_t oddparity(uint8_t val)
@@ -87,14 +90,16 @@
printf_debug("%s: excessive loops, i=0x%x\n", __func__, i);
}
-void start_program_jedec(chipaddr bios)
+void start_program_jedec_common(struct flashchip *flash, unsigned int mask)
{
- chip_writeb(0xAA, bios + 0x5555);
- chip_writeb(0x55, bios + 0x2AAA);
- chip_writeb(0xA0, bios + 0x5555);
+ chipaddr bios = flash->virtual_memory;
+ chip_writeb(0xAA, bios + (0x5555 & mask));
+ chip_writeb(0x55, bios + (0x2AAA & mask));
+ chip_writeb(0xA0, bios + (0x5555 & mask));
}
-int probe_jedec(struct flashchip *flash)
+int probe_jedec_common(struct flashchip *flash,
+ unsigned int mask, int long_reset)
{
chipaddr bios = flash->virtual_memory;
uint8_t id1, id2;
@@ -118,13 +123,13 @@
}
/* Issue JEDEC Product ID Entry command */
- chip_writeb(0xAA, bios + 0x5555);
+ chip_writeb(0xAA, bios + (0x5555 & mask));
if (probe_timing_enter)
programmer_delay(10);
- chip_writeb(0x55, bios + 0x2AAA);
+ chip_writeb(0x55, bios + (0x2AAA & mask));
if (probe_timing_enter)
programmer_delay(10);
- chip_writeb(0x90, bios + 0x5555);
+ chip_writeb(0x90, bios + (0x5555 & mask));
if (probe_timing_enter)
programmer_delay(probe_timing_enter);
@@ -147,14 +152,17 @@
}
/* Issue JEDEC Product ID Exit command */
- chip_writeb(0xAA, bios + 0x5555);
+ if (long_reset)
+ {
+ chip_writeb(0xAA, bios + (0x5555 & mask));
+ if (probe_timing_exit)
+ programmer_delay(10);
+ chip_writeb(0x55, bios + (0x2AAA & mask));
+ if (probe_timing_exit)
+ programmer_delay(10);
+ }
+ chip_writeb(0xF0, bios + (0x5555 & mask));
if (probe_timing_exit)
- programmer_delay(10);
- chip_writeb(0x55, bios + 0x2AAA);
- if (probe_timing_exit)
- programmer_delay(10);
- chip_writeb(0xF0, bios + 0x5555);
- if (probe_timing_exit)
programmer_delay(probe_timing_exit);
printf_debug("%s: id1 0x%02x, id2 0x%02x", __func__, largeid1, largeid2);
@@ -184,24 +192,28 @@
if (largeid1 == flash->manufacture_id && largeid2 == flash->model_id)
return 1;
+ if (flash->feature_bits & FEATURE_REGISTERMAP)
+ map_flash_registers(flash);
+
return 0;
}
-int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int pagesize)
+int erase_sector_jedec_common(struct flashchip *flash, unsigned int page,
+ unsigned int pagesize, unsigned int mask)
{
chipaddr bios = flash->virtual_memory;
/* Issue the Sector Erase command */
- chip_writeb(0xAA, bios + 0x5555);
+ chip_writeb(0xAA, bios + (0x5555 & mask));
programmer_delay(10);
- chip_writeb(0x55, bios + 0x2AAA);
+ chip_writeb(0x55, bios + (0x2AAA & mask));
programmer_delay(10);
- chip_writeb(0x80, bios + 0x5555);
+ chip_writeb(0x80, bios + (0x5555 & mask));
programmer_delay(10);
- chip_writeb(0xAA, bios + 0x5555);
+ chip_writeb(0xAA, bios + (0x5555 & mask));
programmer_delay(10);
- chip_writeb(0x55, bios + 0x2AAA);
+ chip_writeb(0x55, bios + (0x2AAA & mask));
programmer_delay(10);
chip_writeb(0x30, bios + page);
programmer_delay(10);
@@ -216,21 +228,22 @@
return 0;
}
-int erase_block_jedec(struct flashchip *flash, unsigned int block, unsigned int blocksize)
+int erase_block_jedec_common(struct flashchip *flash, unsigned int block,
+ unsigned int blocksize, unsigned int mask)
{
chipaddr bios = flash->virtual_memory;
/* Issue the Sector Erase command */
- chip_writeb(0xAA, bios + 0x5555);
+ chip_writeb(0xAA, bios + (0x5555 & mask));
programmer_delay(10);
- chip_writeb(0x55, bios + 0x2AAA);
+ chip_writeb(0x55, bios + (0x2AAA & mask));
programmer_delay(10);
- chip_writeb(0x80, bios + 0x5555);
+ chip_writeb(0x80, bios + (0x5555 & mask));
programmer_delay(10);
- chip_writeb(0xAA, bios + 0x5555);
+ chip_writeb(0xAA, bios + (0x5555 & mask));
programmer_delay(10);
- chip_writeb(0x55, bios + 0x2AAA);
+ chip_writeb(0x55, bios + (0x2AAA & mask));
programmer_delay(10);
chip_writeb(0x50, bios + block);
programmer_delay(10);
@@ -245,35 +258,24 @@
return 0;
}
-/* erase chip with block_erase() prototype */
-int erase_chip_block_jedec(struct flashchip *flash, unsigned int addr, unsigned int blocksize)
+int erase_chip_jedec_common(struct flashchip *flash, unsigned int mask)
{
- if ((addr != 0) || (blocksize != flash->total_size * 1024)) {
- fprintf(stderr, "%s called with incorrect arguments\n",
- __func__);
- return -1;
- }
- return erase_chip_jedec(flash);
-}
-
-int erase_chip_jedec(struct flashchip *flash)
-{
int total_size = flash->total_size * 1024;
chipaddr bios = flash->virtual_memory;
/* Issue the JEDEC Chip Erase command */
- chip_writeb(0xAA, bios + 0x5555);
+ chip_writeb(0xAA, bios + (0x5555 & mask));
programmer_delay(10);
- chip_writeb(0x55, bios + 0x2AAA);
+ chip_writeb(0x55, bios + (0x2AAA & mask));
programmer_delay(10);
- chip_writeb(0x80, bios + 0x5555);
+ chip_writeb(0x80, bios + (0x5555 & mask));
programmer_delay(10);
- chip_writeb(0xAA, bios + 0x5555);
+ chip_writeb(0xAA, bios + (0x5555 & mask));
programmer_delay(10);
- chip_writeb(0x55, bios + 0x2AAA);
+ chip_writeb(0x55, bios + (0x2AAA & mask));
programmer_delay(10);
- chip_writeb(0x10, bios + 0x5555);
+ chip_writeb(0x10, bios + (0x5555 & mask));
programmer_delay(10);
toggle_ready_jedec_slow(bios);
@@ -285,50 +287,12 @@
return 0;
}
-int write_page_write_jedec(struct flashchip *flash, uint8_t *src,
- int start, int page_size)
+int write_byte_program_jedec_common(struct flashchip *flash, uint8_t *src,
+ chipaddr dst, unsigned int mask)
{
- int i, tried = 0, failed;
- uint8_t *s = src;
+ int tried = 0, failed = 0;
chipaddr bios = flash->virtual_memory;
- chipaddr dst = bios + start;
- chipaddr d = dst;
-retry:
- /* Issue JEDEC Data Unprotect comand */
- start_program_jedec(bios);
-
- /* transfer data from source to destination */
- for (i = 0; i < page_size; i++) {
- /* If the data is 0xFF, don't program it */
- if (*src != 0xFF)
- chip_writeb(*src, dst);
- dst++;
- src++;
- }
-
- toggle_ready_jedec(dst - 1);
-
- dst = d;
- src = s;
- failed = verify_range(flash, src, start, page_size, NULL);
-
- if (failed && tried++ < MAX_REFLASH_TRIES) {
- fprintf(stderr, "retrying.\n");
- goto retry;
- }
- if (failed) {
- fprintf(stderr, " page 0x%lx failed!\n",
- (d - bios) / page_size);
- }
- return failed;
-}
-
-int write_byte_program_jedec(chipaddr bios, uint8_t *src,
- chipaddr dst)
-{
- int tried = 0, failed = 0;
-
/* If the data is 0xFF, don't program it and don't complain. */
if (*src == 0xFF) {
return 0;
@@ -336,7 +300,7 @@
retry:
/* Issue JEDEC Byte Program command */
- start_program_jedec(bios);
+ start_program_jedec_common(flash, mask);
/* transfer data from source to destination */
chip_writeb(*src, dst);
@@ -352,15 +316,15 @@
return failed;
}
-int write_sector_jedec(chipaddr bios, uint8_t *src,
- chipaddr dst, unsigned int page_size)
+int write_sector_jedec_common(struct flashchip *flash, uint8_t *src,
+ chipaddr dst, unsigned int page_size, unsigned int mask)
{
int i, failed = 0;
chipaddr olddst;
olddst = dst;
for (i = 0; i < page_size; i++) {
- if (write_byte_program_jedec(bios, src, dst))
+ if (write_byte_program_jedec_common(flash, src, dst, mask))
failed = 1;
dst++, src++;
}
@@ -370,6 +334,45 @@
return failed;
}
+int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src,
+ int start, int page_size, unsigned int mask)
+{
+ int i, tried = 0, failed;
+ uint8_t *s = src;
+ chipaddr bios = flash->virtual_memory;
+ chipaddr dst = bios + start;
+ chipaddr d = dst;
+
+retry:
+ /* Issue JEDEC Start Program comand */
+ start_program_jedec_common(flash, mask);
+
+ /* transfer data from source to destination */
+ for (i = 0; i < page_size; i++) {
+ /* If the data is 0xFF, don't program it */
+ if (*src != 0xFF)
+ chip_writeb(*src, dst);
+ dst++;
+ src++;
+ }
+
+ toggle_ready_jedec(dst - 1);
+
+ dst = d;
+ src = s;
+ failed = verify_range(flash, src, start, page_size, NULL);
+
+ if (failed && tried++ < MAX_REFLASH_TRIES) {
+ fprintf(stderr, "retrying.\n");
+ goto retry;
+ }
+ if (failed) {
+ fprintf(stderr, " page 0x%lx failed!\n",
+ (d - bios) / page_size);
+ }
+ return failed;
+}
+
int write_jedec(struct flashchip *flash, uint8_t *buf)
{
int i, failed = 0;
@@ -384,8 +387,8 @@
printf("Programming page: ");
for (i = 0; i < total_size / page_size; i++) {
printf("%04d at address: 0x%08x", i, i * page_size);
- if (write_page_write_jedec(flash, buf + i * page_size,
- i * page_size, page_size))
+ if (write_page_write_jedec_common(flash, buf + i * page_size,
+ i * page_size, page_size, MASK_FULL))
failed = 1;
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");
}
@@ -411,7 +414,7 @@
if ((i & 0x3) == 0)
printf("address: 0x%08lx", (unsigned long)i * 1024);
- write_sector_jedec(bios, buf + i * 1024, dst + i * 1024, 1024);
+ write_sector_jedec_common(flash, buf + i * 1024, dst + i * 1024, 1024, MASK_FULL);
if ((i & 0x3) == 0)
printf("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b");
@@ -420,3 +423,35 @@
printf("\n");
return 0;
}
+
+/* erase chip with block_erase() prototype */
+int erase_chip_block_jedec(struct flashchip *flash, unsigned int addr,
+ unsigned int blocksize)
+{
+ if ((addr != 0) || (blocksize != flash->total_size * 1024)) {
+ fprintf(stderr, "%s called with incorrect arguments\n",
+ __func__);
+ return -1;
+ }
+ return erase_chip_jedec_common(flash, MASK_FULL);
+}
+
+int probe_jedec(struct flashchip *flash)
+{
+ return probe_jedec_common(flash, MASK_FULL, 1);
+}
+
+int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int size)
+{
+ return erase_sector_jedec_common(flash, page, size, MASK_FULL);
+}
+
+int erase_block_jedec(struct flashchip *flash, unsigned int page, unsigned int size)
+{
+ return erase_block_jedec_common(flash, page, size, MASK_FULL);
+}
+
+int erase_chip_jedec(struct flashchip *flash)
+{
+ return erase_chip_jedec_common(flash, MASK_FULL);
+}
Modified: trunk/pm49fl00x.c
===================================================================
--- trunk/pm49fl00x.c 2010-01-03 23:50:28 UTC (rev 827)
+++ trunk/pm49fl00x.c 2010-01-04 17:15:23 UTC (rev 828)
@@ -101,8 +101,8 @@
/* write to the sector */
printf("%04d at address: 0x%08x", i, i * page_size);
- write_sector_jedec(bios, buf + i * page_size,
- bios + i * page_size, 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);
}
Modified: trunk/sst49lf040.c
===================================================================
--- trunk/sst49lf040.c 2010-01-03 23:50:28 UTC (rev 827)
+++ trunk/sst49lf040.c 2010-01-04 17:15:23 UTC (rev 828)
@@ -59,8 +59,8 @@
if (i % 10 == 0)
printf("%04d at address: 0x%08x ", i, i * page_size);
- write_sector_jedec(bios, buf + i * page_size,
- bios + i * page_size, page_size);
+ write_sector_jedec_common(flash, buf + i * page_size,
+ bios + i * page_size, page_size, 0xffff);
if (i % 10 == 0)
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\b");
Modified: trunk/sst_fwhub.c
===================================================================
--- trunk/sst_fwhub.c 2010-01-03 23:50:28 UTC (rev 827)
+++ trunk/sst_fwhub.c 2010-01-04 17:15:23 UTC (rev 828)
@@ -157,8 +157,8 @@
page_size);
if (rc)
return 1;
- write_sector_jedec(bios, buf + i * page_size,
- bios + i * page_size, 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");
}
Modified: trunk/w39v040c.c
===================================================================
--- trunk/w39v040c.c 2010-01-03 23:50:28 UTC (rev 827)
+++ trunk/w39v040c.c 2010-01-04 17:15:23 UTC (rev 828)
@@ -80,8 +80,8 @@
printf("Programming page: ");
for (i = 0; i < total_size / page_size; i++) {
printf("%04d at address: 0x%08x", i, i * page_size);
- write_sector_jedec(bios, buf + i * page_size,
- bios + i * page_size, 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");
}
printf("\n");
Modified: trunk/w39v080fa.c
===================================================================
--- trunk/w39v080fa.c 2010-01-03 23:50:28 UTC (rev 827)
+++ trunk/w39v080fa.c 2010-01-04 17:15:23 UTC (rev 828)
@@ -182,7 +182,7 @@
printf("Programming: ");
for (i = 0; i < total_size; i += flash->page_size) {
printf("0x%08x\b\b\b\b\b\b\b\b\b\b", i);
- write_sector_jedec(bios, buf + i, bios + i, flash->page_size);
+ write_sector_jedec_common(flash, buf + i, bios + i, flash->page_size, 0xffff);
}
printf("\n");
Modified: trunk/w49f002u.c
===================================================================
--- trunk/w49f002u.c 2010-01-03 23:50:28 UTC (rev 827)
+++ trunk/w49f002u.c 2010-01-04 17:15:23 UTC (rev 828)
@@ -36,8 +36,8 @@
for (i = 0; i < total_size / page_size; i++) {
printf("%04d at address: 0x%08x ", i, i * page_size);
/* Byte-wise writing of 'page_size' bytes. */
- write_sector_jedec(bios, buf + i * page_size,
- bios + i * page_size, 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\b");
fflush(stdout);
}
