Commit 8fa7a41f authored by David Woodhouse's avatar David Woodhouse
parents abb536e7 0fc2ccea
...@@ -192,8 +192,6 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le ...@@ -192,8 +192,6 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le
struct onenand_chip *this = mtd->priv; struct onenand_chip *this = mtd->priv;
int value, readcmd = 0, block_cmd = 0; int value, readcmd = 0, block_cmd = 0;
int block, page; int block, page;
/* Now we use page size operation */
int sectors = 4, count = 4;
/* Address translation */ /* Address translation */
switch (cmd) { switch (cmd) {
...@@ -245,6 +243,8 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le ...@@ -245,6 +243,8 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le
} }
if (page != -1) { if (page != -1) {
/* Now we use page size operation */
int sectors = 4, count = 4;
int dataram; int dataram;
switch (cmd) { switch (cmd) {
...@@ -298,7 +298,7 @@ static int onenand_wait(struct mtd_info *mtd, int state) ...@@ -298,7 +298,7 @@ static int onenand_wait(struct mtd_info *mtd, int state)
unsigned long timeout; unsigned long timeout;
unsigned int flags = ONENAND_INT_MASTER; unsigned int flags = ONENAND_INT_MASTER;
unsigned int interrupt = 0; unsigned int interrupt = 0;
unsigned int ctrl, ecc; unsigned int ctrl;
/* The 20 msec is enough */ /* The 20 msec is enough */
timeout = jiffies + msecs_to_jiffies(20); timeout = jiffies + msecs_to_jiffies(20);
...@@ -310,7 +310,6 @@ static int onenand_wait(struct mtd_info *mtd, int state) ...@@ -310,7 +310,6 @@ static int onenand_wait(struct mtd_info *mtd, int state)
if (state != FL_READING) if (state != FL_READING)
cond_resched(); cond_resched();
touch_softlockup_watchdog();
} }
/* To get correct interrupt status in timeout case */ /* To get correct interrupt status in timeout case */
interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT); interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT);
...@@ -318,24 +317,20 @@ static int onenand_wait(struct mtd_info *mtd, int state) ...@@ -318,24 +317,20 @@ static int onenand_wait(struct mtd_info *mtd, int state)
ctrl = this->read_word(this->base + ONENAND_REG_CTRL_STATUS); ctrl = this->read_word(this->base + ONENAND_REG_CTRL_STATUS);
if (ctrl & ONENAND_CTRL_ERROR) { if (ctrl & ONENAND_CTRL_ERROR) {
/* It maybe occur at initial bad block */
DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: controller error = 0x%04x\n", ctrl); DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: controller error = 0x%04x\n", ctrl);
/* Clear other interrupt bits for preventing ECC error */ if (ctrl & ONENAND_CTRL_LOCK)
interrupt &= ONENAND_INT_MASTER; DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: it's locked error.\n");
} return ctrl;
if (ctrl & ONENAND_CTRL_LOCK) {
DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: it's locked error = 0x%04x\n", ctrl);
return -EACCES;
} }
if (interrupt & ONENAND_INT_READ) { if (interrupt & ONENAND_INT_READ) {
ecc = this->read_word(this->base + ONENAND_REG_ECC_STATUS); int ecc = this->read_word(this->base + ONENAND_REG_ECC_STATUS);
if (ecc) { if (ecc) {
DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: ECC error = 0x%04x\n", ecc); DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: ECC error = 0x%04x\n", ecc);
if (ecc & ONENAND_ECC_2BIT_ALL) if (ecc & ONENAND_ECC_2BIT_ALL) {
mtd->ecc_stats.failed++; mtd->ecc_stats.failed++;
else if (ecc & ONENAND_ECC_1BIT_ALL) return ecc;
} else if (ecc & ONENAND_ECC_1BIT_ALL)
mtd->ecc_stats.corrected++; mtd->ecc_stats.corrected++;
} }
} }
...@@ -372,9 +367,6 @@ static int onenand_interrupt_wait(struct mtd_info *mtd, int state) ...@@ -372,9 +367,6 @@ static int onenand_interrupt_wait(struct mtd_info *mtd, int state)
{ {
struct onenand_chip *this = mtd->priv; struct onenand_chip *this = mtd->priv;
/* To prevent soft lockup */
touch_softlockup_watchdog();
wait_for_completion(&this->complete); wait_for_completion(&this->complete);
return onenand_wait(mtd, state); return onenand_wait(mtd, state);
...@@ -395,9 +387,6 @@ static int onenand_try_interrupt_wait(struct mtd_info *mtd, int state) ...@@ -395,9 +387,6 @@ static int onenand_try_interrupt_wait(struct mtd_info *mtd, int state)
/* We use interrupt wait first */ /* We use interrupt wait first */
this->wait = onenand_interrupt_wait; this->wait = onenand_interrupt_wait;
/* To prevent soft lockup */
touch_softlockup_watchdog();
timeout = msecs_to_jiffies(100); timeout = msecs_to_jiffies(100);
remain = wait_for_completion_timeout(&this->complete, timeout); remain = wait_for_completion_timeout(&this->complete, timeout);
if (!remain) { if (!remain) {
...@@ -721,7 +710,7 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len, ...@@ -721,7 +710,7 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
struct mtd_ecc_stats stats; struct mtd_ecc_stats stats;
int read = 0, column; int read = 0, column;
int thislen; int thislen;
int ret = 0; int ret = 0, boundary = 0;
DEBUG(MTD_DEBUG_LEVEL3, "onenand_read: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len); DEBUG(MTD_DEBUG_LEVEL3, "onenand_read: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
...@@ -738,38 +727,60 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len, ...@@ -738,38 +727,60 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
/* TODO handling oob */ /* TODO handling oob */
stats = mtd->ecc_stats; stats = mtd->ecc_stats;
while (read < len) {
thislen = min_t(int, mtd->writesize, len - read);
column = from & (mtd->writesize - 1); /* Read-while-load method */
if (column + thislen > mtd->writesize)
thislen = mtd->writesize - column;
/* Do first load to bufferRAM */
if (read < len) {
if (!onenand_check_bufferram(mtd, from)) { if (!onenand_check_bufferram(mtd, from)) {
this->command(mtd, ONENAND_CMD_READ, from, mtd->writesize); this->command(mtd, ONENAND_CMD_READ, from, mtd->writesize);
ret = this->wait(mtd, FL_READING); ret = this->wait(mtd, FL_READING);
/* First copy data and check return value for ECC handling */ onenand_update_bufferram(mtd, from, !ret);
onenand_update_bufferram(mtd, from, 1); }
} }
this->read_bufferram(mtd, ONENAND_DATARAM, buf, column, thislen); thislen = min_t(int, mtd->writesize, len - read);
column = from & (mtd->writesize - 1);
if (column + thislen > mtd->writesize)
thislen = mtd->writesize - column;
while (!ret) {
/* If there is more to load then start next load */
from += thislen;
if (read + thislen < len) {
this->command(mtd, ONENAND_CMD_READ, from, mtd->writesize);
/*
* Chip boundary handling in DDP
* Now we issued chip 1 read and pointed chip 1
* bufferam so we have to point chip 0 bufferam.
*/
if (this->device_id & ONENAND_DEVICE_IS_DDP &&
unlikely(from == (this->chipsize >> 1))) {
this->write_word(0, this->base + ONENAND_REG_START_ADDRESS2);
boundary = 1;
} else
boundary = 0;
ONENAND_SET_PREV_BUFFERRAM(this);
}
/* While load is going, read from last bufferRAM */
this->read_bufferram(mtd, ONENAND_DATARAM, buf, column, thislen);
/* See if we are done */
read += thislen; read += thislen;
if (read == len) if (read == len)
break; break;
/* Set up for next read from bufferRAM */
if (ret) { if (unlikely(boundary))
DEBUG(MTD_DEBUG_LEVEL0, "onenand_read: read failed = %d\n", ret); this->write_word(0x8000, this->base + ONENAND_REG_START_ADDRESS2);
goto out; ONENAND_SET_NEXT_BUFFERRAM(this);
}
from += thislen;
buf += thislen; buf += thislen;
thislen = min_t(int, mtd->writesize, len - read);
column = 0;
cond_resched();
/* Now wait for load */
ret = this->wait(mtd, FL_READING);
onenand_update_bufferram(mtd, from, !ret);
} }
out:
/* Deselect and wake up anyone waiting on the device */ /* Deselect and wake up anyone waiting on the device */
onenand_release_device(mtd); onenand_release_device(mtd);
...@@ -783,6 +794,9 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len, ...@@ -783,6 +794,9 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
if (mtd->ecc_stats.failed - stats.failed) if (mtd->ecc_stats.failed - stats.failed)
return -EBADMSG; return -EBADMSG;
if (ret)
return ret;
return mtd->ecc_stats.corrected - stats.corrected ? -EUCLEAN : 0; return mtd->ecc_stats.corrected - stats.corrected ? -EUCLEAN : 0;
} }
...@@ -820,6 +834,8 @@ int onenand_do_read_oob(struct mtd_info *mtd, loff_t from, size_t len, ...@@ -820,6 +834,8 @@ int onenand_do_read_oob(struct mtd_info *mtd, loff_t from, size_t len,
column = from & (mtd->oobsize - 1); column = from & (mtd->oobsize - 1);
while (read < len) { while (read < len) {
cond_resched();
thislen = mtd->oobsize - column; thislen = mtd->oobsize - column;
thislen = min_t(int, thislen, len); thislen = min_t(int, thislen, len);
...@@ -832,16 +848,16 @@ int onenand_do_read_oob(struct mtd_info *mtd, loff_t from, size_t len, ...@@ -832,16 +848,16 @@ int onenand_do_read_oob(struct mtd_info *mtd, loff_t from, size_t len,
this->read_bufferram(mtd, ONENAND_SPARERAM, buf, column, thislen); this->read_bufferram(mtd, ONENAND_SPARERAM, buf, column, thislen);
if (ret) {
DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_oob: read failed = 0x%x\n", ret);
goto out;
}
read += thislen; read += thislen;
if (read == len) if (read == len)
break; break;
if (ret) {
DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_oob: read failed = %d\n", ret);
goto out;
}
buf += thislen; buf += thislen;
/* Read more? */ /* Read more? */
...@@ -919,6 +935,10 @@ static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, loff_t addr) ...@@ -919,6 +935,10 @@ static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, loff_t addr)
void __iomem *dataram0, *dataram1; void __iomem *dataram0, *dataram1;
int ret = 0; int ret = 0;
/* In partial page write, just skip it */
if ((addr & (mtd->writesize - 1)) != 0)
return 0;
this->command(mtd, ONENAND_CMD_READ, addr, mtd->writesize); this->command(mtd, ONENAND_CMD_READ, addr, mtd->writesize);
ret = this->wait(mtd, FL_READING); ret = this->wait(mtd, FL_READING);
...@@ -941,7 +961,7 @@ static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, loff_t addr) ...@@ -941,7 +961,7 @@ static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, loff_t addr)
#define onenand_verify_oob(...) (0) #define onenand_verify_oob(...) (0)
#endif #endif
#define NOTALIGNED(x) ((x & (mtd->writesize - 1)) != 0) #define NOTALIGNED(x) ((x & (this->subpagesize - 1)) != 0)
/** /**
* onenand_write - [MTD Interface] write buffer to FLASH * onenand_write - [MTD Interface] write buffer to FLASH
...@@ -959,6 +979,7 @@ static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len, ...@@ -959,6 +979,7 @@ static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len,
struct onenand_chip *this = mtd->priv; struct onenand_chip *this = mtd->priv;
int written = 0; int written = 0;
int ret = 0; int ret = 0;
int column, subpage;
DEBUG(MTD_DEBUG_LEVEL3, "onenand_write: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len); DEBUG(MTD_DEBUG_LEVEL3, "onenand_write: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
...@@ -977,45 +998,63 @@ static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len, ...@@ -977,45 +998,63 @@ static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len,
return -EINVAL; return -EINVAL;
} }
column = to & (mtd->writesize - 1);
subpage = column || (len & (mtd->writesize - 1));
/* Grab the lock and see if the device is available */ /* Grab the lock and see if the device is available */
onenand_get_device(mtd, FL_WRITING); onenand_get_device(mtd, FL_WRITING);
/* Loop until all data write */ /* Loop until all data write */
while (written < len) { while (written < len) {
int thislen = min_t(int, mtd->writesize, len - written); int bytes = mtd->writesize;
int thislen = min_t(int, bytes, len - written);
u_char *wbuf = (u_char *) buf;
cond_resched();
this->command(mtd, ONENAND_CMD_BUFFERRAM, to, bytes);
this->command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd->writesize); /* Partial page write */
if (subpage) {
bytes = min_t(int, bytes - column, (int) len);
memset(this->page_buf, 0xff, mtd->writesize);
memcpy(this->page_buf + column, buf, bytes);
wbuf = this->page_buf;
/* Even though partial write, we need page size */
thislen = mtd->writesize;
}
this->write_bufferram(mtd, ONENAND_DATARAM, buf, 0, thislen); this->write_bufferram(mtd, ONENAND_DATARAM, wbuf, 0, thislen);
this->write_bufferram(mtd, ONENAND_SPARERAM, ffchars, 0, mtd->oobsize); this->write_bufferram(mtd, ONENAND_SPARERAM, ffchars, 0, mtd->oobsize);
this->command(mtd, ONENAND_CMD_PROG, to, mtd->writesize); this->command(mtd, ONENAND_CMD_PROG, to, mtd->writesize);
onenand_update_bufferram(mtd, to, 1); /* In partial page write we don't update bufferram */
onenand_update_bufferram(mtd, to, !subpage);
ret = this->wait(mtd, FL_WRITING); ret = this->wait(mtd, FL_WRITING);
if (ret) { if (ret) {
DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: write filaed %d\n", ret); DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: write filaed %d\n", ret);
goto out; break;
} }
written += thislen;
/* Only check verify write turn on */ /* Only check verify write turn on */
ret = onenand_verify_page(mtd, (u_char *) buf, to); ret = onenand_verify_page(mtd, (u_char *) wbuf, to);
if (ret) { if (ret) {
DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: verify failed %d\n", ret); DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: verify failed %d\n", ret);
goto out; break;
} }
written += thislen;
if (written == len) if (written == len)
break; break;
column = 0;
to += thislen; to += thislen;
buf += thislen; buf += thislen;
} }
out:
/* Deselect and wake up anyone waiting on the device */ /* Deselect and wake up anyone waiting on the device */
onenand_release_device(mtd); onenand_release_device(mtd);
...@@ -1059,6 +1098,8 @@ static int onenand_do_write_oob(struct mtd_info *mtd, loff_t to, size_t len, ...@@ -1059,6 +1098,8 @@ static int onenand_do_write_oob(struct mtd_info *mtd, loff_t to, size_t len,
while (written < len) { while (written < len) {
int thislen = min_t(int, mtd->oobsize, len - written); int thislen = min_t(int, mtd->oobsize, len - written);
cond_resched();
column = to & (mtd->oobsize - 1); column = to & (mtd->oobsize - 1);
this->command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd->oobsize); this->command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd->oobsize);
...@@ -1186,6 +1227,7 @@ static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr) ...@@ -1186,6 +1227,7 @@ static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)
instr->state = MTD_ERASING; instr->state = MTD_ERASING;
while (len) { while (len) {
cond_resched();
/* Check if we have a bad block, we do not erase bad blocks */ /* Check if we have a bad block, we do not erase bad blocks */
if (onenand_block_checkbad(mtd, addr, 0, 0)) { if (onenand_block_checkbad(mtd, addr, 0, 0)) {
...@@ -1199,9 +1241,6 @@ static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr) ...@@ -1199,9 +1241,6 @@ static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)
ret = this->wait(mtd, FL_ERASING); ret = this->wait(mtd, FL_ERASING);
/* Check, if it is write protected */ /* Check, if it is write protected */
if (ret) { if (ret) {
if (ret == -EPERM)
DEBUG(MTD_DEBUG_LEVEL0, "onenand_erase: Device is write protected!!!\n");
else
DEBUG(MTD_DEBUG_LEVEL0, "onenand_erase: Failed erase, block %d\n", (unsigned) (addr >> this->erase_shift)); DEBUG(MTD_DEBUG_LEVEL0, "onenand_erase: Failed erase, block %d\n", (unsigned) (addr >> this->erase_shift));
instr->state = MTD_ERASE_FAILED; instr->state = MTD_ERASE_FAILED;
instr->fail_addr = addr; instr->fail_addr = addr;
...@@ -2029,23 +2068,30 @@ int onenand_scan(struct mtd_info *mtd, int maxchips) ...@@ -2029,23 +2068,30 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
init_waitqueue_head(&this->wq); init_waitqueue_head(&this->wq);
spin_lock_init(&this->chip_lock); spin_lock_init(&this->chip_lock);
/*
* Allow subpage writes up to oobsize.
*/
switch (mtd->oobsize) { switch (mtd->oobsize) {
case 64: case 64:
this->ecclayout = &onenand_oob_64; this->ecclayout = &onenand_oob_64;
mtd->subpage_sft = 2;
break; break;
case 32: case 32:
this->ecclayout = &onenand_oob_32; this->ecclayout = &onenand_oob_32;
mtd->subpage_sft = 1;
break; break;
default: default:
printk(KERN_WARNING "No OOB scheme defined for oobsize %d\n", printk(KERN_WARNING "No OOB scheme defined for oobsize %d\n",
mtd->oobsize); mtd->oobsize);
mtd->subpage_sft = 0;
/* To prevent kernel oops */ /* To prevent kernel oops */
this->ecclayout = &onenand_oob_32; this->ecclayout = &onenand_oob_32;
break; break;
} }
this->subpagesize = mtd->writesize >> mtd->subpage_sft;
mtd->ecclayout = this->ecclayout; mtd->ecclayout = this->ecclayout;
/* Fill in remaining MTD driver data */ /* Fill in remaining MTD driver data */
......
...@@ -93,7 +93,8 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr ...@@ -93,7 +93,8 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
ret = onenand_do_read_oob(mtd, from + j * mtd->writesize + bd->offs, ret = onenand_do_read_oob(mtd, from + j * mtd->writesize + bd->offs,
readlen, &retlen, &buf[0]); readlen, &retlen, &buf[0]);
if (ret) /* If it is a initial bad block, just ignore it */
if (ret && !(ret & ONENAND_CTRL_LOAD))
return ret; return ret;
if (check_short_pattern(&buf[j * scanlen], scanlen, mtd->writesize, bd)) { if (check_short_pattern(&buf[j * scanlen], scanlen, mtd->writesize, bd)) {
......
...@@ -88,6 +88,7 @@ struct onenand_bufferram { ...@@ -88,6 +88,7 @@ struct onenand_bufferram {
* operation is in progress * operation is in progress
* @state: [INTERN] the current state of the OneNAND device * @state: [INTERN] the current state of the OneNAND device
* @page_buf: data buffer * @page_buf: data buffer
* @subpagesize: [INTERN] holds the subpagesize
* @ecclayout: [REPLACEABLE] the default ecc placement scheme * @ecclayout: [REPLACEABLE] the default ecc placement scheme
* @bbm: [REPLACEABLE] pointer to Bad Block Management * @bbm: [REPLACEABLE] pointer to Bad Block Management
* @priv: [OPTIONAL] pointer to private chip date * @priv: [OPTIONAL] pointer to private chip date
...@@ -128,6 +129,7 @@ struct onenand_chip { ...@@ -128,6 +129,7 @@ struct onenand_chip {
onenand_state_t state; onenand_state_t state;
unsigned char *page_buf; unsigned char *page_buf;
int subpagesize;
struct nand_ecclayout *ecclayout; struct nand_ecclayout *ecclayout;
void *bbm; void *bbm;
...@@ -141,6 +143,7 @@ struct onenand_chip { ...@@ -141,6 +143,7 @@ struct onenand_chip {
#define ONENAND_CURRENT_BUFFERRAM(this) (this->bufferram_index) #define ONENAND_CURRENT_BUFFERRAM(this) (this->bufferram_index)
#define ONENAND_NEXT_BUFFERRAM(this) (this->bufferram_index ^ 1) #define ONENAND_NEXT_BUFFERRAM(this) (this->bufferram_index ^ 1)
#define ONENAND_SET_NEXT_BUFFERRAM(this) (this->bufferram_index ^= 1) #define ONENAND_SET_NEXT_BUFFERRAM(this) (this->bufferram_index ^= 1)
#define ONENAND_SET_PREV_BUFFERRAM(this) (this->bufferram_index ^= 1)
#define ONENAND_GET_SYS_CFG1(this) \ #define ONENAND_GET_SYS_CFG1(this) \
(this->read_word(this->base + ONENAND_REG_SYS_CFG1)) (this->read_word(this->base + ONENAND_REG_SYS_CFG1))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment