summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Halasa <khc@pm.waw.pl>2011-01-16 22:40:41 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-01-17 08:26:06 +0100
commit04e89d094aea0284ee9c330a22adf0602c9738c5 (patch)
treef5a871d5f3e0d853aa0dc1424a5d1d75e8439d03
parentcfa9144fc1757b1cf817c703a133ae76f953097d (diff)
downloadbarebox-04e89d094aea0284ee9c330a22adf0602c9738c5.tar.gz
CFI NOR flash: fix write timeout units.
Write timeouts are expressed in microseconds. Milliseconds are 1000 times longer than microseconds, not 1000 times shorter. Before (Intel 28F128J3D75): CFI conformant FLASH (16 x 16) Size: 16 MB in 128 Sectors Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x18 Erase timeout: 4096 ms, write timeout: 256000 ms Buffer write timeout: 1024000 ms, buffer size: 32 bytes After: ... Erase timeout: 4096 ms, write timeout: 256 us Buffer write timeout: 1024 us, buffer size: 32 bytes Signed-off-by: Krzysztof HaƂasa <khc@pm.waw.pl> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--drivers/nor/cfi_flash.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/nor/cfi_flash.c b/drivers/nor/cfi_flash.c
index efe8785..fccb008 100644
--- a/drivers/nor/cfi_flash.c
+++ b/drivers/nor/cfi_flash.c
@@ -424,14 +424,12 @@ static ulong flash_get_size (struct flash_info *info, ulong base)
/* multiply the size by the number of chips */
info->size = (1 << qry.dev_size) * size_ratio;
info->buffer_size = (1 << le16_to_cpu(qry.max_buf_write_size));
- tmp = 1 << qry.block_erase_timeout_typ;
- info->erase_blk_tout = (tmp * (1 << qry.block_erase_timeout_max));
- tmp = (1 << qry.buf_write_timeout_typ) *
- (1 << qry.buf_write_timeout_max);
- info->buffer_write_tout = tmp * 1000;
- tmp = (1 << qry.word_write_timeout_typ) *
- (1 << qry.word_write_timeout_max);
- info->write_tout = tmp * 1000;
+ info->erase_blk_tout = 1 << (qry.block_erase_timeout_typ +
+ qry.block_erase_timeout_max);
+ info->buffer_write_tout = 1 << (qry.buf_write_timeout_typ +
+ qry.buf_write_timeout_max);
+ info->write_tout = 1 << (qry.word_write_timeout_typ +
+ qry.word_write_timeout_max);
info->flash_id = FLASH_MAN_CFI;
if ((info->interface == FLASH_CFI_X8X16) && (info->chipwidth == FLASH_CFI_BY8)) {
info->portwidth >>= 1; /* XXX - Need to test on x8/x16 in parallel. */
@@ -699,11 +697,11 @@ static void cfi_info (struct device_d* dev)
if (info->device_id == 0x7E) {
printf("%04X", info->device_id2);
}
- printf ("\n Erase timeout: %ld ms, write timeout: %ld ms\n",
+ printf ("\n Erase timeout: %ld ms, write timeout: %ld us\n",
info->erase_blk_tout,
info->write_tout);
if (info->buffer_size > 1) {
- printf (" Buffer write timeout: %ld ms, buffer size: %d bytes\n",
+ printf (" Buffer write timeout: %ld us, buffer size: %d bytes\n",
info->buffer_write_tout,
info->buffer_size);
}