From patchwork Fri Mar 2 17:03:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10255211 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 C7B50603ED for ; Fri, 2 Mar 2018 17:05:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B873B2580E for ; Fri, 2 Mar 2018 17:05:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD2BC25EA6; Fri, 2 Mar 2018 17:05: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 207E32582C for ; Fri, 2 Mar 2018 17:05:12 +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=oaKk5raBvm9qoNv8or4If9WJokE04crS3Oro5YFUQa8=; b=ufUAahejDlOWoIW831wtpY8pso 7NHEjEHRVhoSgA/AkRZ9q8Btz2fFx+ukHolt9bbLJEiX+fA5wMHTzEf1BVyJw7/aNdQ/YEPoOnw3C cGkTwk0Xr0YcYPI9LN9OzTf2iiFTD6DNVQVHZaclaO6nVHK94wqR3XNJe1ieuQr9k4PUHBTjcjcGz q1oTxSUedm6qF7vEDQdA+KumDojcbU2C0Sa2r4eFObzxcP0RrdCDNmOzpWsSXvFzBQWgJK5Ed8uDC fZfBn4k9AWvhX9+AV8sJq6G7Xy0pWfQ4PfBaJDJHZ7+rRnDWjXcKOFa0gBduEDv7+Q1T8t42xF9Bq B8fliQqQ==; 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 1ero7A-0002wZ-To; Fri, 02 Mar 2018 17:05:00 +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-0002Xz-Tg; Fri, 02 Mar 2018 17:04:25 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id F0287207F2; Fri, 2 Mar 2018 18:04:11 +0100 (CET) Received: from localhost.localdomain (unknown [91.224.148.103]) by mail.bootlin.com (Postfix) with ESMTPSA id 337C62043E; Fri, 2 Mar 2018 18:04:11 +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 03/52] mtd: rawnand: bf5xx: convert driver to nand_scan() Date: Fri, 2 Mar 2018 18:03:11 +0100 Message-Id: <20180302170400.6712-4-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_332214_BD4435DC X-CRM114-Status: GOOD ( 15.65 ) 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 Two helpers have been added to the core to make ECC-related configuration between the detection phase and the final NAND scan. Use these hooks and convert the driver to just use nand_scan() instead of both nand_scan_ident() and nand_scan_tail(). Signed-off-by: Miquel Raynal --- drivers/mtd/nand/raw/bf5xx_nand.c | 48 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/drivers/mtd/nand/raw/bf5xx_nand.c b/drivers/mtd/nand/raw/bf5xx_nand.c index da7a6083b0e5..bc42bccf1beb 100644 --- a/drivers/mtd/nand/raw/bf5xx_nand.c +++ b/drivers/mtd/nand/raw/bf5xx_nand.c @@ -697,33 +697,31 @@ static int bf5xx_nand_remove(struct platform_device *pdev) return 0; } -static int bf5xx_nand_scan(struct mtd_info *mtd) +static int bf5xx_nand_attach_chip(struct nand_chip *chip) { - struct nand_chip *chip = mtd_to_nand(mtd); - int ret; + struct mtd_info *mtd = nand_to_mtd(chip); - ret = nand_scan_ident(mtd, 1, NULL); - if (ret) - return ret; + if (!hardware_ecc) + return 0; - if (hardware_ecc) { - /* - * for nand with page size > 512B, think it as several sections with 512B - */ - if (likely(mtd->writesize >= 512)) { - chip->ecc.size = 512; - chip->ecc.bytes = 6; - chip->ecc.strength = 2; - } else { - chip->ecc.size = 256; - chip->ecc.bytes = 3; - chip->ecc.strength = 1; - bfin_write_NFC_CTL(bfin_read_NFC_CTL() & ~(1 << NFC_PG_SIZE_OFFSET)); - SSYNC(); - } + /* + * For NAND with page size > 512B, it is like if it had several sections + * of 512B. + */ + if (likely(mtd->writesize >= 512)) { + chip->ecc.size = 512; + chip->ecc.bytes = 6; + chip->ecc.strength = 2; + } else { + chip->ecc.size = 256; + chip->ecc.bytes = 3; + chip->ecc.strength = 1; + bfin_write_NFC_CTL(bfin_read_NFC_CTL() & + ~(1 << NFC_PG_SIZE_OFFSET)); + SSYNC(); } - return nand_scan_tail(mtd); + return 0; } /* @@ -821,10 +819,10 @@ static int bf5xx_nand_probe(struct platform_device *pdev) } /* scan hardware nand chip and setup mtd info data struct */ - if (bf5xx_nand_scan(mtd)) { - err = -ENXIO; + chip->ecc.attach_chip = bf5xx_nand_attach_chip; + err = nand_scan(mtd, 1); + if (err) goto out_err_nand_scan; - } #ifdef CONFIG_MTD_NAND_BF5XX_BOOTROM_ECC chip->badblockpos = 63;