diff mbox

mtd: nand: onfi don't WARN if we are in 16 bits mode (fwd)

Message ID alpine.DEB.2.00.1301260754500.19277@utopia.booyaka.com
State New, archived
Headers show

Commit Message

Paul Walmsley Jan. 26, 2013, 7:56 a.m. UTC 
Hi Artem, David,

if possible, it would be good to get this one into v3.8-rc, due to the 
large OMAP boot-time warning mentioned at:

http://article.gmane.org/gmane.linux.ports.arm.omap/91317


thanks,

- Paul

---------- Forwarded message ----------
Date: Wed, 16 Jan 2013 15:25:45 +0100
From: Matthieu CASTET <matthieu.castet@parrot.com>
To: linux-mtd@lists.infradead.org
Cc: dedekind1@gmail.com, paul@pwsan.com,
    Matthieu CASTET <matthieu.castet@parrot.com>
Subject: [PATCH] mtd: nand: onfi don't WARN if we are in 16 bits mode

ff3206b2450499203532af2505a7f6f8413e92c0 adds a WARN if the onfi probe is
in 16 bits mode.
This allows to detect driver that need to be fixed, but this is a bit noisy [1].
Transform the WARN in a pr_err.

[1]
http://article.gmane.org/gmane.linux.ports.arm.omap/91317

Signed-off-by: Matthieu CASTET <matthieu.castet@parrot.com>
---
 drivers/mtd/nand/nand_base.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Artem Bityutskiy Feb. 4, 2013, 8:39 a.m. UTC | #1 
On Sat, 2013-01-26 at 07:56 +0000, Paul Walmsley wrote:
> Hi Artem, David,
> 
> if possible, it would be good to get this one into v3.8-rc, due to the 
> large OMAP boot-time warning mentioned at:
> 
> http://article.gmane.org/gmane.linux.ports.arm.omap/91317

It is in David's tree, he merges things upstream, I do not know about
his plans WRT this patch, unfortunately.
Brian Norris Feb. 10, 2013, 8:14 a.m. UTC | #2 
On Mon, Feb 4, 2013 at 12:39 AM, Artem Bityutskiy <dedekind1@gmail.com> wrote:
> On Sat, 2013-01-26 at 07:56 +0000, Paul Walmsley wrote:
>> Hi Artem, David,
>>
>> if possible, it would be good to get this one into v3.8-rc, due to the
>> large OMAP boot-time warning mentioned at:
>>
>> http://article.gmane.org/gmane.linux.ports.arm.omap/91317
>
> It is in David's tree, he merges things upstream, I do not know about
> his plans WRT this patch, unfortunately.

It was merged for 3.8-rc7, FYI.

Brian
Paul Walmsley Feb. 11, 2013, 12:30 a.m. UTC | #3 
On Sun, 10 Feb 2013, Brian Norris wrote:

> On Mon, Feb 4, 2013 at 12:39 AM, Artem Bityutskiy <dedekind1@gmail.com> wrote:
> > On Sat, 2013-01-26 at 07:56 +0000, Paul Walmsley wrote:
> >> Hi Artem, David,
> >>
> >> if possible, it would be good to get this one into v3.8-rc, due to the
> >> large OMAP boot-time warning mentioned at:
> >>
> >> http://article.gmane.org/gmane.linux.ports.arm.omap/91317
> >
> > It is in David's tree, he merges things upstream, I do not know about
> > his plans WRT this patch, unfortunately.
> 
> It was merged for 3.8-rc7, FYI.

Thanks, things are much better now in v3.8-rc7.


- Paul
diff mbox

Patch

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 8323ac9..3766682 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2857,8 +2857,11 @@  static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
 	int i;
 	int val;
 
-	/* ONFI need to be probed in 8 bits mode */
-	WARN_ON(chip->options & NAND_BUSWIDTH_16);
+	/* ONFI need to be probed in 8 bits mode, and 16 bits should be selected with NAND_BUSWIDTH_AUTO */
+	if (chip->options & NAND_BUSWIDTH_16) {
+		pr_err("Trying ONFI probe in 16 bits mode, aborting !\n");
+		return 0;
+	}
 	/* Try ONFI for unknown chip or LP */
 	chip->cmdfunc(mtd, NAND_CMD_READID, 0x20, -1);
 	if (chip->read_byte(mtd) != 'O' || chip->read_byte(mtd) != 'N' ||