linux-kernel - Re: [PATCH][MTD][NAND]: fix omap2.c compile failure and warning

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <59240.192.168.10.88.1246167644.squirrel@dbdmail.itg.ti.com>
Date:	Sun, 28 Jun 2009 11:10:44 +0530 (IST)
From:	"vimal singh" <vimalsingh@...com>
To:	"David Woodhouse" <dwmw2@...radead.org>
Subject: Re: [PATCH][MTD][NAND]: fix omap2.c compile failure and warning

> Er, did he? And please put proper email addresses in. If you can't find
> an @ sign on your keyboard, cut and paste it from elsewhere.
Corrected this.

>> -             if (!(status & 0x40))
>> +             if (status & NAND_STATUS_READY)
>>                       break;
>
> Hm... now you're polling the PASS/FAIL bit in the status, not the
> READY/BUSY bit. I suspect that's not going to work too well...
>
Value of macro 'NAND_STATUS_READY' is '0x40' only. And AFAIK this is the bit
for ready/busy, isn't it?


Signed-off-by: Vimal Singh <vimalsingh@...com>
---

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 0cd76f8..3b6e6ad 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -11,6 +11,8 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
+#include <linux/jiffies.h>
+#include <linux/sched.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
@@ -541,7 +543,7 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip
 	struct omap_nand_info *info = container_of(mtd, struct omap_nand_info,
 							mtd);
 	unsigned long timeo = jiffies;
-	int status, state = this->state;
+	int status = NAND_STATUS_FAIL, state = this->state;

 	if (state == FL_ERASING)
 		timeo += (HZ * 400) / 1000;
@@ -558,6 +560,7 @@ static int omap_wait(struct mtd_info *mtd, struct nand_chip
 		status = __raw_readb(this->IO_ADDR_R);
-		if (!(status & 0x40))
+		if (status & NAND_STATUS_READY)
 			break;
+		cond_resched();
 	}
 	return status;
 }

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/