From patchwork Wed Jan 16 14:25:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu CASTET X-Patchwork-Id: 212526 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 898592C0092 for ; Thu, 17 Jan 2013 01:27:38 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TvTwm-0002Bd-8H; Wed, 16 Jan 2013 14:26:32 +0000 Received: from mail-wi0-f178.google.com ([209.85.212.178]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TvTwj-0002BA-3W for linux-mtd@lists.infradead.org; Wed, 16 Jan 2013 14:26:29 +0000 Received: by mail-wi0-f178.google.com with SMTP id hn3so1287143wib.5 for ; Wed, 16 Jan 2013 06:26:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer; bh=Z2qz7ExKIqIBi/yxydhe/IMnX9GQuqOB1IpDpck2lC8=; b=cgNkZSIevW6nJUowG6UC05/XzUlkGX1tE4/Jp2cHjJ/zFIvFUQfMfZHZX4wmsu/Sk1 eWV+emVvq+AHBhpVLjLtPgcsLPJN9hWPvqShGmuoc5mOmEfIT3GLXy4ge+d7KyOyDV09 n6usStaitgWbMuqmsFUuTAlaiVY6gCddxVvFZXnNRuogYJ4kKph0LZrTFajbjV1oJlyY vk+Z1z0Wp1fjeVRIPlj2YF+klJnUFCD0xCRTCJ4S8Ggn1TaxGaJuUFAwoHow0whpKInr G65PDrG9MQ7kQ81ySMfaTjye9Q9TztEny0UGMCSkcVZi4cUU6xxoX5J5AXJTzHLlAak1 gZdg== X-Received: by 10.180.20.109 with SMTP id m13mr10385970wie.16.1358346385029; Wed, 16 Jan 2013 06:26:25 -0800 (PST) Received: from perruche.Parrot.Biz ([46.218.109.82]) by mx.google.com with ESMTPS id dm3sm8513921wib.9.2013.01.16.06.26.22 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 16 Jan 2013 06:26:24 -0800 (PST) From: Matthieu CASTET To: linux-mtd@lists.infradead.org Subject: [PATCH] mtd: nand: onfi don't WARN if we are in 16 bits mode Date: Wed, 16 Jan 2013 15:25:45 +0100 Message-Id: <1358346345-7920-1-git-send-email-matthieu.castet@parrot.com> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130116_092629_282231_512C7334 X-CRM114-Status: GOOD ( 12.58 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (matthieu.castet[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.178 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: paul@pwsan.com, Matthieu CASTET , dedekind1@gmail.com X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 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 --- drivers/mtd/nand/nand_base.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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' ||