Message ID | 20180302170400.6712-45-miquel.raynal@bootlin.com |
---|---|
State | Changes Requested |
Delegated to: | Boris Brezillon |
Headers | show
Return-Path: <linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rCRuyae4"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="d0N53XK3"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ztHcZ4ZgMz9s4w for <incoming@patchwork.ozlabs.org>; Sat, 3 Mar 2018 05:18:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=XzFlKjPiY2zgDfhZk1QiDpSRw54D16BmCzj1sybrPKU=; b=rCRuyae4XxuUW/jUg2jH9FLte2 qPXkCwo1dIV3D79FNcGbDpRSAom55ylmYoO7quFncl0NVx2LpCj8hlXIJcIU5gi30Zt1KfmhIEOfr 3UaI0am3IVuFUFPGvRAEUyAX/hAxCar9r5q9W2N2E79SJuBMdINFumuAiDTnQxF3gLtjtbd/Cl1eW arJzjigHcQoxzlZ0UPIKuRipQWA0NRxxEw4ZKI2/RPBv2eUejtTNMmHuW4gAEW/vziHvxTwK7pV2K 73gq1I0xM8di//mqnWKx6fo55gDQ2tmS6GeYBeSTg33Gcgj/2JRbvvqTWCvlz51RkwWX6q0pYNfny 6uJgDfEA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1erpGZ-0006uX-6t; Fri, 02 Mar 2018 18:18:47 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1erpBs-0001qC-Ct; Fri, 02 Mar 2018 18:13:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Sl6yPdhiyIyNP4CiiuvUWrJYJs6xdNBnn+lnAw8Xk6o=; b=d0N53XK3EGxI5fG6UilX7Y8Gl 2ZnG/yu/VneabAcJhl9HF4tHIVY4DQ3Zve4s7sGUA5drgsIHz6KUY58vB6movuWgs9xqBd3DgmwCX Jai+H5PW+anumJtGkatrKiDkMYKaH13FCB+yld0wu8rFsyiKLtSjCTAf2HJQXTsQCyBk5DSDGsDtf bTw7UKk/WwGjRDNMvaIXToWA9LeTQUIP/duOU48FTd3ZkRZqNvgYIGEXymjrzntHg30O/6tU5VElj FI0STv+3kB6swh5VmrtCVyQcJ+wt7hnUnP8kyA4S77drSOglc31jG/G0hKiyQPLxTdqZg8y0MWLFG fK1Lmxb8w==; Received: from mail.bootlin.com ([62.4.15.54]) by merlin.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ero7C-00075U-7p; Fri, 02 Mar 2018 17:05:08 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 2F8CE209F9; Fri, 2 Mar 2018 18:04:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost.localdomain (unknown [91.224.148.103]) by mail.bootlin.com (Postfix) with ESMTPSA id 4944420974; Fri, 2 Mar 2018 18:04:41 +0100 (CET) From: Miquel Raynal <miquel.raynal@bootlin.com> To: Boris Brezillon <boris.brezillon@bootlin.com>, Richard Weinberger <richard@nod.at>, David Woodhouse <dwmw2@infradead.org>, Brian Norris <computersforpeace@gmail.com>, Marek Vasut <marek.vasut@gmail.com>, Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>, Josh Wu <rainyfeeling@outlook.com>, Kamal Dasu <kdasu.kdev@gmail.com>, Harvey Hunt <harveyhuntnexus@gmail.com>, Stefan Agner <stefan@agner.ch> Subject: [PATCH 44/52] mtd: rawnand: add a field in nand_chip to fill an array of IDs Date: Fri, 2 Mar 2018 18:03:52 +0100 Message-Id: <20180302170400.6712-45-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180302170400.6712-1-miquel.raynal@bootlin.com> References: <20180302170400.6712-1-miquel.raynal@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180302_120502_593194_8191D0A6 X-CRM114-Status: GOOD ( 15.71 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list <linux-mtd.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-mtd/> List-Post: <mailto:linux-mtd@lists.infradead.org> List-Help: <mailto:linux-mtd-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=subscribe> Cc: linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Miquel Raynal <miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org> Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
Allow dynamic allocations during NAND chip identification phase
|
expand
|
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 182904b2fc07..0d850dbf843d 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -5594,8 +5594,12 @@ static int nand_detect(struct nand_chip *chip, struct nand_flash_dev *type) manufacturer = nand_get_manufacturer(maf_id); chip->manufacturer.desc = manufacturer; - if (!type) - type = nand_flash_ids; + if (!type) { + if (chip->flash_ids) + type = chip->flash_ids; + else + type = nand_flash_ids; + } /* * Save the NAND_BUSWIDTH_16 flag before letting auto-detection logic diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 53bb6ef1a7c2..318c73a206fc 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -1201,6 +1201,7 @@ int nand_op_parser_exec_op(struct nand_chip *chip, * chipnr is set to %NAND_DATA_IFACE_CHECK_ONLY this * means the configuration should not be applied but * only checked. + * @flash_ids: [OPTIONAL] local NAND flash ID table * @bbt: [INTERN] bad block table pointer * @bbt_td: [REPLACEABLE] bad block table descriptor for flash * lookup. @@ -1287,6 +1288,8 @@ struct nand_chip { unsigned long buf_align; struct nand_hw_control hwcontrol; + struct nand_flash_dev *flash_ids; + uint8_t *bbt; struct nand_bbt_descr *bbt_td; struct nand_bbt_descr *bbt_md;
Add an alternate way to give to the core another ID table to later remove the one given in nand_scan_ident() as part of the migration to nand_scan(). Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/mtd/nand/raw/nand_base.c | 8 ++++++-- include/linux/mtd/rawnand.h | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-)