[{"id":1961079,"web_url":"http://patchwork.ozlabs.org/comment/1961079/","msgid":"<20180725174353.17947525@bbrezillon>","list_archive_url":null,"date":"2018-07-25T15:43:53","subject":"Re: [PATCH v5 06/17] mtd: rawnand: atmel: convert driver to\n\tnand_scan()","submitter":{"id":73370,"url":"http://patchwork.ozlabs.org/api/people/73370/","name":"Boris Brezillon","email":"boris.brezillon@bootlin.com"},"content":"On Wed, 25 Jul 2018 15:31:41 +0200\nMiquel Raynal wrote:\n\n> Two helpers have been added to the core to do all kind of controller\n> side configuration/initialization between the detection phase and the\n> final NAND scan. Implement these hooks so that we can convert the driver\n> to just use nand_scan() instead of the nand_scan_ident() +\n> nand_scan_tail() pair.\n> \n> Signed-off-by: Miquel Raynal \n\nReviewed-by: Boris Brezillon \n\n> ---\n> drivers/mtd/nand/raw/atmel/nand-controller.c | 113 +++++++++++++--------------\n> 1 file changed, 54 insertions(+), 59 deletions(-)\n> \n> diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c\n> index 143d029710f0..a068b214ebaa 100644\n> --- a/drivers/mtd/nand/raw/atmel/nand-controller.c\n> +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c\n> @@ -201,7 +201,7 @@ struct atmel_nand_controller_ops {\n> \tint (*remove)(struct atmel_nand_controller *nc);\n> \tvoid (*nand_init)(struct atmel_nand_controller *nc,\n> \t\t\t struct atmel_nand *nand);\n> -\tint (*ecc_init)(struct atmel_nand *nand);\n> +\tint (*ecc_init)(struct nand_chip *chip);\n> \tint (*setup_data_interface)(struct atmel_nand *nand, int csline,\n> \t\t\t\t const struct nand_data_interface *conf);\n> };\n> @@ -1132,9 +1132,8 @@ static int atmel_nand_pmecc_init(struct nand_chip *chip)\n> \treturn 0;\n> }\n> \n> -static int atmel_nand_ecc_init(struct atmel_nand *nand)\n> +static int atmel_nand_ecc_init(struct nand_chip *chip)\n> {\n> -\tstruct nand_chip *chip = &nand->base;\n> \tstruct atmel_nand_controller *nc;\n> \tint ret;\n> \n> @@ -1169,12 +1168,11 @@ static int atmel_nand_ecc_init(struct atmel_nand *nand)\n> \treturn 0;\n> }\n> \n> -static int atmel_hsmc_nand_ecc_init(struct atmel_nand *nand)\n> +static int atmel_hsmc_nand_ecc_init(struct nand_chip *chip)\n> {\n> -\tstruct nand_chip *chip = &nand->base;\n> \tint ret;\n> \n> -\tret = atmel_nand_ecc_init(nand);\n> +\tret = atmel_nand_ecc_init(chip);\n> \tif (ret)\n> \t\treturn ret;\n> \n> @@ -1557,22 +1555,6 @@ static void atmel_hsmc_nand_init(struct atmel_nand_controller *nc,\n> \tchip->select_chip = atmel_hsmc_nand_select_chip;\n> }\n> \n> -static int atmel_nand_detect(struct atmel_nand *nand)\n> -{\n> -\tstruct nand_chip *chip = &nand->base;\n> -\tstruct mtd_info *mtd = nand_to_mtd(chip);\n> -\tstruct atmel_nand_controller *nc;\n> -\tint ret;\n> -\n> -\tnc = to_nand_controller(chip->controller);\n> -\n> -\tret = nand_scan_ident(mtd, nand->numcs, NULL);\n> -\tif (ret)\n> -\t\tdev_err(nc->dev, \"nand_scan_ident() failed: %d\\n\", ret);\n> -\n> -\treturn ret;\n> -}\n> -\n> static int atmel_nand_controller_remove_nand(struct atmel_nand *nand)\n> {\n> \tstruct nand_chip *chip = &nand->base;\n> @@ -1700,6 +1682,8 @@ static int\n> atmel_nand_controller_add_nand(struct atmel_nand_controller *nc,\n> \t\t\t struct atmel_nand *nand)\n> {\n> +\tstruct nand_chip *chip = &nand->base;\n> +\tstruct mtd_info *mtd = nand_to_mtd(chip);\n> \tint ret;\n> \n> \t/* No card inserted, skip this NAND. */\n> @@ -1710,44 +1694,9 @@ atmel_nand_controller_add_nand(struct atmel_nand_controller *nc,\n> \n> \tnc->caps->ops->nand_init(nc, nand);\n> \n> -\tret = atmel_nand_detect(nand);\n> -\tif (ret)\n> -\t\treturn ret;\n> -\n> -\tret = nc->caps->ops->ecc_init(nand);\n> -\tif (ret)\n> -\t\treturn ret;\n> -\n> -\tif (nc->caps->legacy_of_bindings || !nc->dev->of_node) {\n> -\t\t/*\n> -\t\t * We keep the MTD name unchanged to avoid breaking platforms\n> -\t\t * where the MTD cmdline parser is used and the bootloader\n> -\t\t * has not been updated to use the new naming scheme.\n> -\t\t */\n> -\t\tmtd->name = \"atmel_nand\";\n> -\t} else if (!mtd->name) {\n> -\t\t/*\n> -\t\t * If the new bindings are used and the bootloader has not been\n> -\t\t * updated to pass a new mtdparts parameter on the cmdline, you\n> -\t\t * should define the following property in your nand node:\n> -\t\t *\n> -\t\t *\tlabel = \"atmel_nand\";\n> -\t\t *\n> -\t\t * This way, mtd->name will be set by the core when\n> -\t\t * nand_set_flash_node() is called.\n> -\t\t */\n> -\t\tmtd->name = devm_kasprintf(nc->dev, GFP_KERNEL,\n> -\t\t\t\t\t \"%s:nand.%d\", dev_name(nc->dev),\n> -\t\t\t\t\t nand->cs[0].id);\n> -\t\tif (!mtd->name) {\n> -\t\t\tdev_err(nc->dev, \"Failed to allocate mtd->name\\n\");\n> -\t\t\treturn -ENOMEM;\n> -\t\t}\n> -\t}\n> -\n> -\tret = nand_scan_tail(mtd);\n> +\tret = nand_scan(mtd, nand->numcs);\n> \tif (ret) {\n> -\t\tdev_err(nc->dev, \"nand_scan_tail() failed: %d\\n\", ret);\n> +\t\tdev_err(nc->dev, \"NAND scan failed: %d\\n\", ret);\n> \t\treturn ret;\n> \t}\n> \n> @@ -1945,6 +1894,51 @@ static const struct of_device_id atmel_matrix_of_ids[] = {\n> \t{ /* sentinel */ },\n> };\n> \n> +static int atmel_nand_attach_chip(struct nand_chip *chip)\n> +{\n> +\tstruct atmel_nand_controller *nc = to_nand_controller(chip->controller);\n> +\tstruct atmel_nand *nand = to_atmel_nand(chip);\n> +\tstruct mtd_info *mtd = nand_to_mtd(chip);\n> +\tint ret;\n> +\n> +\tret = nc->caps->ops->ecc_init(chip);\n> +\tif (ret)\n> +\t\treturn ret;\n> +\n> +\tif (nc->caps->legacy_of_bindings || !nc->dev->of_node) {\n> +\t\t/*\n> +\t\t * We keep the MTD name unchanged to avoid breaking platforms\n> +\t\t * where the MTD cmdline parser is used and the bootloader\n> +\t\t * has not been updated to use the new naming scheme.\n> +\t\t */\n> +\t\tmtd->name = \"atmel_nand\";\n> +\t} else if (!mtd->name) {\n> +\t\t/*\n> +\t\t * If the new bindings are used and the bootloader has not been\n> +\t\t * updated to pass a new mtdparts parameter on the cmdline, you\n> +\t\t * should define the following property in your nand node:\n> +\t\t *\n> +\t\t *\tlabel = \"atmel_nand\";\n> +\t\t *\n> +\t\t * This way, mtd->name will be set by the core when\n> +\t\t * nand_set_flash_node() is called.\n> +\t\t */\n> +\t\tmtd->name = devm_kasprintf(nc->dev, GFP_KERNEL,\n> +\t\t\t\t\t \"%s:nand.%d\", dev_name(nc->dev),\n> +\t\t\t\t\t nand->cs[0].id);\n> +\t\tif (!mtd->name) {\n> +\t\t\tdev_err(nc->dev, \"Failed to allocate mtd->name\\n\");\n> +\t\t\treturn -ENOMEM;\n> +\t\t}\n> +\t}\n> +\n> +\treturn 0;\n> +}\n> +\n> +static const struct nand_controller_ops atmel_nand_controller_ops = {\n> +\t.attach_chip = atmel_nand_attach_chip,\n> +};\n> +\n> static int atmel_nand_controller_init(struct atmel_nand_controller *nc,\n> \t\t\t\tstruct platform_device *pdev,\n> \t\t\t\tconst struct atmel_nand_controller_caps *caps)\n> @@ -1954,6 +1948,7 @@ static int atmel_nand_controller_init(struct atmel_nand_controller *nc,\n> \tint ret;\n> \n> \tnand_controller_init(&nc->base);\n> +\tnc->base.ops = &atmel_nand_controller_ops;\n> \tINIT_LIST_HEAD(&nc->chips);\n> \tnc->dev = dev;\n> \tnc->caps = caps;","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (mailfrom)\n\tsmtp.mailfrom=lists.infradead.org\n\t(client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org;\n\tenvelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=bootlin.com","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"MePfLY2A\"; \n\tdkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[IPv6:2607:7c80:54:e::133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 41bKKM1F54z9s1x\n\tfor ;\n\tThu, 26 Jul 2018 01:44:23 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux))\n\tid 1fiLxa-0005jh-N7; Wed, 25 Jul 2018 15:44:18 +0000","from mail.bootlin.com ([62.4.15.54])\n\tby bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux))\n\tid 1fiLxX-0005j4-5W\n\tfor linux-mtd@lists.infradead.org; Wed, 25 Jul 2018 15:44:16 +0000","by mail.bootlin.com (Postfix, from userid 110)\n\tid 6A7FF20935; Wed, 25 Jul 2018 17:44:03 +0200 (CEST)","from bbrezillon (AAubervilliers-681-1-78-122.w90-88.abo.wanadoo.fr\n\t[90.88.20.122])\n\tby mail.bootlin.com (Postfix) with ESMTPSA id 1CF3C207A8;\n\tWed, 25 Jul 2018 17:43:53 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:\n\tMessage-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=vWn4J+/Kxa+j75V2no8CjnwQD6OswyfPrECs/IP/J9Q=;\n\tb=MePfLY2AGKKwVW\n\t0aHcONkOufo4+9ckV4zCxHiJAgYdy1BwT8YhiOMvq1T/ncKOf/hEuyVjutv9xGRdsHnTeUdbm4jPM\n\t6x8/RCschloexwf3C5ai6z0jZ5C31uzwst0IvjFP0fVz0RBZt9Yr39wyhy9lmmA5NDKBlMMxRDaWJ\n\tsYIdvX5E1VDzduU2YtEn9qcj+P9oJU7u7ZCMPJ2FXt+rb+Q9PR9Eia9fU4vgZrksFVpB5ZXjBDXRZ\n\tTozUQSH6cRd6cBqoe8WlztzPfxSc0/aJ0yonqdem9dukUEIWpUn91hLataLZSzasVNycXSrKHlGK4\n\t7q2zGboxXjprf9gXIHkA==;","X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on mail.bootlin.com","X-Spam-Level":"","X-Spam-Status":"No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT,\n\tURIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0","Date":"Wed, 25 Jul 2018 17:43:53 +0200","From":"Boris Brezillon ","To":"Miquel Raynal ","Subject":"Re: [PATCH v5 06/17] mtd: rawnand: atmel: convert driver to\n\tnand_scan()","Message-ID":"<20180725174353.17947525@bbrezillon>","In-Reply-To":"<20180725133152.30898-7-miquel.raynal@bootlin.com>","References":"<20180725133152.30898-1-miquel.raynal@bootlin.com>\n\t<20180725133152.30898-7-miquel.raynal@bootlin.com>","X-Mailer":"Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-pc-linux-gnu)","MIME-Version":"1.0","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20180725_084415_481102_68EC3DD8 ","X-CRM114-Status":"GOOD ( 28.62 )","X-Spam-Score":"-0.0 (/)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-0.0 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/,\n\tno trust [62.4.15.54 listed in list.dnswl.org]\n\t-0.0 SPF_PASS SPF: sender matches SPF record","X-BeenThere":"linux-mtd@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"Linux MTD discussion mailing list ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Lucas Stach , Wenyou Yang ,\n\tRichard Weinberger , Stefan Agner , \n\tMarek Vasut , linux-mtd@lists.infradead.org,\n\tJosh Wu ,\n\tBrian Norris , \n\tDavid Woodhouse ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"linux-mtd\" ","Errors-To":"linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"}}]