iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: onenand: fix omap2 code to handle cache program feature

Browse Source 
Some fixes are introduced into omap2 code to handle errors when
cache program feature is used.

Signed-off-by: Roman Tereshonkov <roman.tereshonkov@nokia.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Roman Tereshonkov 2010-11-03 12:55:20 +02:00 committed by David Woodhouse
parent 3e3198f1ad
commit d19d7b46d2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mtd/onenand/omap2.c
View File

@ -108,8 +108,9 @@ static void wait_warn(char *msg, int state, unsigned int ctrl,
static int omap2_onenand_wait(struct mtd_info *mtd, int state) static int omap2_onenand_wait(struct mtd_info *mtd, int state)
{ {
struct omap2_onenand *c = container_of(mtd, struct omap2_onenand, mtd); struct omap2_onenand *c = container_of(mtd, struct omap2_onenand, mtd);
struct onenand_chip *this = mtd->priv;
unsigned int intr = 0; unsigned int intr = 0;
unsigned int ctrl; unsigned int ctrl, ctrl_mask;
unsigned long timeout; unsigned long timeout;
u32 syscfg; u32 syscfg;
@ -180,7 +181,8 @@ retry:
if (result == 0) { if (result == 0) {
/* Timeout after 20ms */ /* Timeout after 20ms */
ctrl = read_reg(c, ONENAND_REG_CTRL_STATUS); ctrl = read_reg(c, ONENAND_REG_CTRL_STATUS);
if (ctrl & ONENAND_CTRL_ONGO) { if (ctrl & ONENAND_CTRL_ONGO &&
!this->ongoing) {
/* /*
* The operation seems to be still going * The operation seems to be still going
* so give it some more time. * so give it some more time.
@ -269,7 +271,11 @@ retry:
return -EIO; return -EIO;
} }
if (ctrl & 0xFE9F) ctrl_mask = 0xFE9F;
if (this->ongoing)
ctrl_mask &= ~0x8000;
if (ctrl & ctrl_mask)
wait_warn("unexpected controller status", state, ctrl, intr); wait_warn("unexpected controller status", state, ctrl, intr);
return 0; return 0;