Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=61a7e1983e773b93aac172dadc97f1eb484536b4
Commit: 61a7e1983e773b93aac172dadc97f1eb484536b4
Parent: 60d84f9739a47d0ed8e19805d9056e39fba31c79
Author: Artem Bityutskiy <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 26 16:41:24 2006 +0900
Committer: Artem Bityutskiy <[EMAIL PROTECTED]>
CommitDate: Wed Jan 10 14:39:57 2007 +0200
[MTD] OneNAND: release CPU in cycles
This patch teaches OneNAND to release processor in
read/write/erase cycles and let other processes proceed.
Also, remove buggi touch watchdog call which only hides
the problem instead of solving it.
Signed-off-by: Artem Bityutskiy <[EMAIL PROTECTED]>
Signed-off-by: Kyungmin Park <[EMAIL PROTECTED]>
---
drivers/mtd/onenand/onenand_base.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/mtd/onenand/onenand_base.c
b/drivers/mtd/onenand/onenand_base.c
index 51fb840..0037cee 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -310,7 +310,6 @@ static int onenand_wait(struct mtd_info *mtd, int state)
if (state != FL_READING)
cond_resched();
- touch_softlockup_watchdog();
}
/* To get correct interrupt status in timeout case */
interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT);
@@ -367,9 +366,6 @@ static int onenand_interrupt_wait(struct mtd_info *mtd, int
state)
{
struct onenand_chip *this = mtd->priv;
- /* To prevent soft lockup */
- touch_softlockup_watchdog();
-
wait_for_completion(&this->complete);
return onenand_wait(mtd, state);
@@ -390,9 +386,6 @@ static int onenand_try_interrupt_wait(struct mtd_info *mtd,
int state)
/* We use interrupt wait first */
this->wait = onenand_interrupt_wait;
- /* To prevent soft lockup */
- touch_softlockup_watchdog();
-
timeout = msecs_to_jiffies(100);
remain = wait_for_completion_timeout(&this->complete, timeout);
if (!remain) {
@@ -734,6 +727,8 @@ static int onenand_read(struct mtd_info *mtd, loff_t from,
size_t len,
stats = mtd->ecc_stats;
while (read < len) {
+ cond_resched();
+
thislen = min_t(int, mtd->writesize, len - read);
column = from & (mtd->writesize - 1);
@@ -815,6 +810,8 @@ int onenand_do_read_oob(struct mtd_info *mtd, loff_t from,
size_t len,
column = from & (mtd->oobsize - 1);
while (read < len) {
+ cond_resched();
+
thislen = mtd->oobsize - column;
thislen = min_t(int, thislen, len);
@@ -989,6 +986,8 @@ static int onenand_write(struct mtd_info *mtd, loff_t to,
size_t len,
int thislen = min_t(int, bytes, len - written);
u_char *wbuf = (u_char *) buf;
+ cond_resched();
+
this->command(mtd, ONENAND_CMD_BUFFERRAM, to, bytes);
/* Partial page write */
@@ -1075,6 +1074,8 @@ static int onenand_do_write_oob(struct mtd_info *mtd,
loff_t to, size_t len,
while (written < len) {
int thislen = min_t(int, mtd->oobsize, len - written);
+ cond_resched();
+
column = to & (mtd->oobsize - 1);
this->command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd->oobsize);
@@ -1202,6 +1203,7 @@ static int onenand_erase(struct mtd_info *mtd, struct
erase_info *instr)
instr->state = MTD_ERASING;
while (len) {
+ cond_resched();
/* Check if we have a bad block, we do not erase bad blocks */
if (onenand_block_checkbad(mtd, addr, 0, 0)) {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
