From patchwork Fri Mar 2 17:03:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10255215 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DE25160211 for ; Fri, 2 Mar 2018 17:09:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEE4826419 for ; Fri, 2 Mar 2018 17:09:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C37D32654B; Fri, 2 Mar 2018 17:09:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A221026419 for ; Fri, 2 Mar 2018 17:09:11 +0000 (UTC) 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=oUtVrcruQ+Fj0dT1ymE2fihO2Ln9pDSZ7Ls0N2z3YnI=; b=XrZR3ie0fiaP/KPao0BWB6Bl2s C9SLzQSGccFbFY05NDSxLy4pPOXA4JTUU/dIEByPbRHjQoGer+V7JNt3lxzkOdSM/02Q+234Iqa2d a55m3J92SBDF+mWNdsygYtjwYJJPCEnYMRzFHZaFSU9pE60KaMAwsyP+OMeAxrcfEFkfGx6yx6tIx Bn5nFRjqTnIeRjMOpVkmjXevbdYh8FPC9rHWt0+hxZsuRqr19/7Rzmc7GrcH2mAngwWDQUulCljIX XgwN2O/ZI9nkWG1RWF2Ca3Jf3ZZf01+Ge6lIAnUwXMwixhVIJU2I8Hoo0zrO5h8eCB4R0ds4OwTxt 0v0jbZXw==; 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 1eroB4-0006eq-Ar; Fri, 02 Mar 2018 17:09:02 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ero6Y-0002Xw-Tq; Fri, 02 Mar 2018 17:04:27 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 8131320715; Fri, 2 Mar 2018 18:04:10 +0100 (CET) Received: from localhost.localdomain (unknown [91.224.148.103]) by mail.bootlin.com (Postfix) with ESMTPSA id B222E2066A; Fri, 2 Mar 2018 18:04:09 +0100 (CET) From: Miquel Raynal To: Boris Brezillon , Richard Weinberger , David Woodhouse , Brian Norris , Marek Vasut , Cyrille Pitchen , Josh Wu , Kamal Dasu , Harvey Hunt , Stefan Agner Subject: [PATCH 01/52] mtd: rawnand: add hooks that may be called during nand_scan() Date: Fri, 2 Mar 2018 18:03:09 +0100 Message-Id: <20180302170400.6712-2-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_090423_388583_C90C945D X-CRM114-Status: GOOD ( 16.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Miquel Raynal MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In order to remove the limitation that forbids dynamic allocation in nand_scan_ident(), we must create a path that will be the same for all controller drivers. The idea is to use nand_scan() instead of the widely implemented nand_scan_ident()/nand_scan_tail() couple. In order to achieve this, controller drivers will need to adjust some parameters between these two functions depending on the NAND chip wired on them. For that, a hook called ->attach_chip() is created in the nand_hw_control structure (called *controller in struct nand_chip) of the NAND chip structure. Another hook, ->detach_chip() is also introduced in order to clean the controller driver's potential allocations in case of failure of nand_scan_tail(). There is no need for the controller driver to call the ->detach_chip() hook directly upon error after a successful nand_scan(). In this situation, calling nand_release() as before is enough. Signed-off-by: Miquel Raynal --- drivers/mtd/nand/raw/nand_base.c | 21 +++++++++++++++++++-- include/linux/mtd/rawnand.h | 6 ++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index ef0a44a8c3d5..182904b2fc07 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -6647,11 +6647,23 @@ EXPORT_SYMBOL(nand_scan_tail); */ int nand_scan(struct mtd_info *mtd, int maxchips) { + struct nand_chip *chip = mtd_to_nand(mtd); int ret; ret = nand_scan_ident(mtd, maxchips, NULL); - if (!ret) - ret = nand_scan_tail(mtd); + if (ret) + return ret; + + if (chip->ecc.attach_chip) { + ret = chip->ecc.attach_chip(chip); + if (ret) + return ret; + } + + ret = nand_scan_tail(mtd); + if (ret && chip->ecc.detach_chip) + chip->ecc.detach_chip(chip); + return ret; } EXPORT_SYMBOL(nand_scan); @@ -6679,7 +6691,12 @@ void nand_cleanup(struct nand_chip *chip) /* Free manufacturer priv data. */ nand_manufacturer_cleanup(chip); + + /* Free controller specific allocations after chip identification */ + if (chip->ecc.detach_chip) + chip->ecc.detach_chip(chip); } + EXPORT_SYMBOL_GPL(nand_cleanup); /** diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 348f2aba0b9e..53bb6ef1a7c2 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -576,6 +576,10 @@ static const struct nand_ecc_caps __name = { \ * @read_oob_raw: function to read chip OOB data without ECC * @read_oob: function to read chip OOB data * @write_oob: function to write chip OOB data + * @attach_chip: Callback that may be called between nand_detec() and + * nand_scan_tail() during nand_scan() (optional). + * @detach_chip: Callback that may be called if nand_scan_tail() fails + * (optional). */ struct nand_ecc_ctrl { nand_ecc_modes_t mode; @@ -616,6 +620,8 @@ struct nand_ecc_ctrl { int (*read_oob)(struct mtd_info *mtd, struct nand_chip *chip, int page); int (*write_oob)(struct mtd_info *mtd, struct nand_chip *chip, int page); + int (*attach_chip)(struct nand_chip *chip); + void (*detach_chip)(struct nand_chip *chip); }; /**