{"id":949184,"url":"http://patchwork.ozlabs.org/api/1.2/patches/949184/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-mtd/patch/20180725133152.30898-3-miquel.raynal@bootlin.com/","project":{"id":3,"url":"http://patchwork.ozlabs.org/api/1.2/projects/3/?format=json","name":"Linux MTD development","link_name":"linux-mtd","list_id":"linux-mtd.lists.infradead.org","list_email":"linux-mtd@lists.infradead.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20180725133152.30898-3-miquel.raynal@bootlin.com>","list_archive_url":null,"date":"2018-07-25T13:31:37","name":"[v5,02/17] mtd: rawnand: cafe: convert driver to nand_scan()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c5e30fc8cb47b3b54c478d1256e3443021270ed2","submitter":{"id":73368,"url":"http://patchwork.ozlabs.org/api/1.2/people/73368/?format=json","name":"Miquel Raynal","email":"miquel.raynal@bootlin.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-mtd/patch/20180725133152.30898-3-miquel.raynal@bootlin.com/mbox/","series":[{"id":57526,"url":"http://patchwork.ozlabs.org/api/1.2/series/57526/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-mtd/list/?series=57526","date":"2018-07-25T13:31:36","name":"Allow dynamic allocations during NAND chip identification phase","version":5,"mbox":"http://patchwork.ozlabs.org/series/57526/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/949184/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/949184/checks/","tags":{},"related":[],"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=\"fEEbCSaX\"; \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 41bGPr1zY6z9s4c\n\tfor ;\n\tWed, 25 Jul 2018 23:33:04 +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 1fiJuR-00013U-6m; Wed, 25 Jul 2018 13:32:55 +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 1fiJtr-0000It-Di\n\tfor linux-mtd@lists.infradead.org; Wed, 25 Jul 2018 13:32:23 +0000","by mail.bootlin.com (Postfix, from userid 110)\n\tid 6275A206A6; Wed, 25 Jul 2018 15:32:07 +0200 (CEST)","from localhost.localdomain\n\t(AAubervilliers-681-1-78-122.w90-88.abo.wanadoo.fr [90.88.20.122])\n\tby mail.bootlin.com (Postfix) with ESMTPSA id 0F3532072F;\n\tWed, 25 Jul 2018 15:31:57 +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:MIME-Version:Cc:List-Subscribe:\n\tList-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References:\n\tIn-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID:\n\tContent-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc\n\t:Resent-Message-ID:List-Owner;\n\tbh=zNk/6iab1CQTIZFOQRKgnXLH7EgGNrrAL+MUCFFKZLA=;\n\tb=fEEbCSaXMAPpgK6kRvr63yKRmZ\n\tsNEQoTJzM6frh8DvsMRjbUC0ywngR/E/I1l+mOHYATKf/wJSzyfIL1kSohW4t2Whb3fVmsoXuWGlL\n\t6qmFZVjXW5kTYmc3h52nQfNH+BWSpQCnblv9Zme0xw3cS7iOxlGb2HWzJVE5desBzsiC5AXD3Wetq\n\tGNnLn2Q3zPxzxo5/+uGAC1Y1BXesqGCAZy5gXOx4YBcN9iYKSlEy5JIfTdS6V6NljGLpGzRyqf3kF\n\twD4LXAPAqXCSBlY/jpLDsMBNz50CN6YvuIVjvER88MniRF8uY8MAyatDkWSdeGPwrOIM6RnOd7IyJ\n\tf/kapHuw==;","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","From":"Miquel Raynal ","To":"Boris Brezillon ,\n\tRichard Weinberger ,\n\tDavid Woodhouse , \n\tBrian Norris ,\n\tMarek Vasut ","Subject":"[PATCH v5 02/17] mtd: rawnand: cafe: convert driver to nand_scan()","Date":"Wed, 25 Jul 2018 15:31:37 +0200","Message-Id":"<20180725133152.30898-3-miquel.raynal@bootlin.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20180725133152.30898-1-miquel.raynal@bootlin.com>","References":"<20180725133152.30898-1-miquel.raynal@bootlin.com>","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20180725_063219_763532_0AF91F66 ","X-CRM114-Status":"GOOD ( 21.51 )","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\tJosh Wu , Stefan Agner ,\n\tlinux-mtd@lists.infradead.org, Miquel Raynal ","MIME-Version":"1.0","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"},"content":"Two helpers have been added to the core to do all kind of controller\nside configuration/initialization between the detection phase and the\nfinal NAND scan. Implement these hooks so that we can convert the driver\nto just use nand_scan() instead of the nand_scan_ident() +\nnand_scan_tail() pair.\n\nSigned-off-by: Miquel Raynal \n---\n drivers/mtd/nand/raw/cafe_nand.c | 135 ++++++++++++++++++++++-----------------\n 1 file changed, 78 insertions(+), 57 deletions(-)","diff":"diff --git a/drivers/mtd/nand/raw/cafe_nand.c b/drivers/mtd/nand/raw/cafe_nand.c\nindex ac0be933a490..1dbe43adcfe7 100644\n--- a/drivers/mtd/nand/raw/cafe_nand.c\n+++ b/drivers/mtd/nand/raw/cafe_nand.c\n@@ -67,6 +67,7 @@ struct cafe_priv {\n \tint nr_data;\n \tint data_pos;\n \tint page_addr;\n+\tbool usedma;\n \tdma_addr_t dmaaddr;\n \tunsigned char *dmabuf;\n };\n@@ -121,7 +122,7 @@ static void cafe_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)\n \tstruct nand_chip *chip = mtd_to_nand(mtd);\n \tstruct cafe_priv *cafe = nand_get_controller_data(chip);\n \n-\tif (usedma)\n+\tif (cafe->usedma)\n \t\tmemcpy(cafe->dmabuf + cafe->datalen, buf, len);\n \telse\n \t\tmemcpy_toio(cafe->mmio + CAFE_NAND_WRITE_DATA + cafe->datalen, buf, len);\n@@ -137,7 +138,7 @@ static void cafe_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)\n \tstruct nand_chip *chip = mtd_to_nand(mtd);\n \tstruct cafe_priv *cafe = nand_get_controller_data(chip);\n \n-\tif (usedma)\n+\tif (cafe->usedma)\n \t\tmemcpy(buf, cafe->dmabuf + cafe->datalen, len);\n \telse\n \t\tmemcpy_fromio(buf, cafe->mmio + CAFE_NAND_READ_DATA + cafe->datalen, len);\n@@ -253,7 +254,7 @@ static void cafe_nand_cmdfunc(struct mtd_info *mtd, unsigned command,\n \t/* NB: The datasheet lies -- we really should be subtracting 1 here */\n \tcafe_writel(cafe, cafe->datalen, NAND_DATA_LEN);\n \tcafe_writel(cafe, 0x90000000, NAND_IRQ);\n-\tif (usedma && (ctl1 & (3<<25))) {\n+\tif (cafe->usedma && (ctl1 & (3<<25))) {\n \t\tuint32_t dmactl = 0xc0000000 + cafe->datalen;\n \t\t/* If WR or RD bits set, set up DMA */\n \t\tif (ctl1 & (1<<26)) {\n@@ -593,6 +594,76 @@ static int cafe_mul(int x)\n \treturn gf4096_mul(x, 0xe01);\n }\n \n+static int cafe_nand_attach_chip(struct nand_chip *chip)\n+{\n+\tstruct mtd_info *mtd = nand_to_mtd(chip);\n+\tstruct cafe_priv *cafe = nand_get_controller_data(chip);\n+\tint err = 0;\n+\n+\tcafe->dmabuf = dma_alloc_coherent(&cafe->pdev->dev, 2112,\n+\t\t\t\t\t &cafe->dmaaddr, GFP_KERNEL);\n+\tif (!cafe->dmabuf)\n+\t\treturn -ENOMEM;\n+\n+\t/* Set up DMA address */\n+\tcafe_writel(cafe, lower_32_bits(cafe->dmaaddr), NAND_DMA_ADDR0);\n+\tcafe_writel(cafe, upper_32_bits(cafe->dmaaddr), NAND_DMA_ADDR1);\n+\n+\tcafe_dev_dbg(&cafe->pdev->dev, \"Set DMA address to %x (virt %p)\\n\",\n+\t\t cafe_readl(cafe, NAND_DMA_ADDR0), cafe->dmabuf);\n+\n+\t/* Restore the DMA flag */\n+\tcafe->usedma = usedma;\n+\n+\tcafe->ctl2 = BIT(27); /* Reed-Solomon ECC */\n+\tif (mtd->writesize == 2048)\n+\t\tcafe->ctl2 |= BIT(29); /* 2KiB page size */\n+\n+\t/* Set up ECC according to the type of chip we found */\n+\tmtd_set_ooblayout(mtd, &cafe_ooblayout_ops);\n+\tif (mtd->writesize == 2048) {\n+\t\tcafe->nand.bbt_td = &cafe_bbt_main_descr_2048;\n+\t\tcafe->nand.bbt_md = &cafe_bbt_mirror_descr_2048;\n+\t} else if (mtd->writesize == 512) {\n+\t\tcafe->nand.bbt_td = &cafe_bbt_main_descr_512;\n+\t\tcafe->nand.bbt_md = &cafe_bbt_mirror_descr_512;\n+\t} else {\n+\t\tdev_warn(&cafe->pdev->dev,\n+\t\t\t \"Unexpected NAND flash writesize %d. Aborting\\n\",\n+\t\t\t mtd->writesize);\n+\t\terr = -ENOTSUPP;\n+\t\tgoto out_free_dma;\n+\t}\n+\n+\tcafe->nand.ecc.mode = NAND_ECC_HW_SYNDROME;\n+\tcafe->nand.ecc.size = mtd->writesize;\n+\tcafe->nand.ecc.bytes = 14;\n+\tcafe->nand.ecc.strength = 4;\n+\tcafe->nand.ecc.write_page = cafe_nand_write_page_lowlevel;\n+\tcafe->nand.ecc.write_oob = cafe_nand_write_oob;\n+\tcafe->nand.ecc.read_page = cafe_nand_read_page;\n+\tcafe->nand.ecc.read_oob = cafe_nand_read_oob;\n+\n+\treturn 0;\n+\n+ out_free_dma:\n+\tdma_free_coherent(&cafe->pdev->dev, 2112, cafe->dmabuf, cafe->dmaaddr);\n+\n+\treturn err;\n+}\n+\n+static void cafe_nand_detach_chip(struct nand_chip *chip)\n+{\n+\tstruct cafe_priv *cafe = nand_get_controller_data(chip);\n+\n+\tdma_free_coherent(&cafe->pdev->dev, 2112, cafe->dmabuf, cafe->dmaaddr);\n+}\n+\n+static const struct nand_controller_ops cafe_nand_controller_ops = {\n+\t.attach_chip = cafe_nand_attach_chip,\n+\t.detach_chip = cafe_nand_detach_chip,\n+};\n+\n static int cafe_nand_probe(struct pci_dev *pdev,\n \t\t\t\t const struct pci_device_id *ent)\n {\n@@ -600,7 +671,6 @@ static int cafe_nand_probe(struct pci_dev *pdev,\n \tstruct cafe_priv *cafe;\n \tuint32_t ctrl;\n \tint err = 0;\n-\tint old_dma;\n \n \t/* Very old versions shared the same PCI ident for all three\n \t functions on the chip. Verify the class too... */\n@@ -708,62 +778,15 @@ static int cafe_nand_probe(struct pci_dev *pdev,\n \t\tcafe_readl(cafe, GLOBAL_CTRL),\n \t\tcafe_readl(cafe, GLOBAL_IRQ_MASK));\n \n-\t/* Do not use the DMA for the nand_scan_ident() */\n-\told_dma = usedma;\n-\tusedma = 0;\n+\t/* Do not use the DMA during the NAND identification */\n+\tcafe->usedma = 0;\n \n \t/* Scan to find existence of the device */\n-\terr = nand_scan_ident(mtd, 2, NULL);\n+\tcafe->nand.dummy_controller.ops = &cafe_nand_controller_ops;\n+\terr = nand_scan(mtd, 2);\n \tif (err)\n \t\tgoto out_irq;\n \n-\tcafe->dmabuf = dma_alloc_coherent(&cafe->pdev->dev, 2112,\n-\t\t\t\t\t &cafe->dmaaddr, GFP_KERNEL);\n-\tif (!cafe->dmabuf) {\n-\t\terr = -ENOMEM;\n-\t\tgoto out_irq;\n-\t}\n-\n-\t/* Set up DMA address */\n-\tcafe_writel(cafe, lower_32_bits(cafe->dmaaddr), NAND_DMA_ADDR0);\n-\tcafe_writel(cafe, upper_32_bits(cafe->dmaaddr), NAND_DMA_ADDR1);\n-\n-\tcafe_dev_dbg(&cafe->pdev->dev, \"Set DMA address to %x (virt %p)\\n\",\n-\t\tcafe_readl(cafe, NAND_DMA_ADDR0), cafe->dmabuf);\n-\n-\t/* Restore the DMA flag */\n-\tusedma = old_dma;\n-\n-\tcafe->ctl2 = 1<<27; /* Reed-Solomon ECC */\n-\tif (mtd->writesize == 2048)\n-\t\tcafe->ctl2 |= 1<<29; /* 2KiB page size */\n-\n-\t/* Set up ECC according to the type of chip we found */\n-\tmtd_set_ooblayout(mtd, &cafe_ooblayout_ops);\n-\tif (mtd->writesize == 2048) {\n-\t\tcafe->nand.bbt_td = &cafe_bbt_main_descr_2048;\n-\t\tcafe->nand.bbt_md = &cafe_bbt_mirror_descr_2048;\n-\t} else if (mtd->writesize == 512) {\n-\t\tcafe->nand.bbt_td = &cafe_bbt_main_descr_512;\n-\t\tcafe->nand.bbt_md = &cafe_bbt_mirror_descr_512;\n-\t} else {\n-\t\tpr_warn(\"Unexpected NAND flash writesize %d. Aborting\\n\",\n-\t\t\tmtd->writesize);\n-\t\tgoto out_free_dma;\n-\t}\n-\tcafe->nand.ecc.mode = NAND_ECC_HW_SYNDROME;\n-\tcafe->nand.ecc.size = mtd->writesize;\n-\tcafe->nand.ecc.bytes = 14;\n-\tcafe->nand.ecc.strength = 4;\n-\tcafe->nand.ecc.write_page = cafe_nand_write_page_lowlevel;\n-\tcafe->nand.ecc.write_oob = cafe_nand_write_oob;\n-\tcafe->nand.ecc.read_page = cafe_nand_read_page;\n-\tcafe->nand.ecc.read_oob = cafe_nand_read_oob;\n-\n-\terr = nand_scan_tail(mtd);\n-\tif (err)\n-\t\tgoto out_free_dma;\n-\n \tpci_set_drvdata(pdev, mtd);\n \n \tmtd->name = \"cafe_nand\";\n@@ -775,8 +798,6 @@ static int cafe_nand_probe(struct pci_dev *pdev,\n \n out_cleanup_nand:\n \tnand_cleanup(&cafe->nand);\n- out_free_dma:\n-\tdma_free_coherent(&cafe->pdev->dev, 2112, cafe->dmabuf, cafe->dmaaddr);\n out_irq:\n \t/* Disable NAND IRQ in global IRQ mask register */\n \tcafe_writel(cafe, ~1 & cafe_readl(cafe, GLOBAL_IRQ_MASK), GLOBAL_IRQ_MASK);\n","prefixes":["v5","02/17"]}