{"id":817311,"url":"http://patchwork.ozlabs.org/api/patches/817311/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-mtd/patch/1506052009-8285-13-git-send-email-yamada.masahiro@socionext.com/","project":{"id":3,"url":"http://patchwork.ozlabs.org/api/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":"<1506052009-8285-13-git-send-email-yamada.masahiro@socionext.com>","list_archive_url":null,"date":"2017-09-22T03:46:49","name":"[v2,12/12] mtd: nand: denali: change the setup_dma choice into hook","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4b57293db64471bc70a06693d614ef83e1d44bc1","submitter":{"id":65882,"url":"http://patchwork.ozlabs.org/api/people/65882/?format=json","name":"Masahiro Yamada","email":"yamada.masahiro@socionext.com"},"delegate":{"id":58324,"url":"http://patchwork.ozlabs.org/api/users/58324/?format=json","username":"bbrezillon","first_name":"Boris","last_name":"Brezillon","email":"boris.brezillon@free-electrons.com"},"mbox":"http://patchwork.ozlabs.org/project/linux-mtd/patch/1506052009-8285-13-git-send-email-yamada.masahiro@socionext.com/mbox/","series":[{"id":4537,"url":"http://patchwork.ozlabs.org/api/series/4537/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-mtd/list/?series=4537","date":"2017-09-22T03:46:37","name":"mtd: nand: denali: more clean-ups","version":2,"mbox":"http://patchwork.ozlabs.org/series/4537/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817311/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817311/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 (client-ip=65.50.211.133;\n\thelo=bombadil.infradead.org;\n\tenvelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"tCti1AvG\"; \n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=nifty.com header.i=@nifty.com\n\theader.b=\"GHqaq2JC\"; dkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.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 3xyzyh4PN0z9ryk\n\tfor ;\n\tFri, 22 Sep 2017 13:50:20 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dvEye-0006D1-2i; Fri, 22 Sep 2017 03:50:08 +0000","from conuserg-09.nifty.com ([210.131.2.76])\n\tby bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dvEwJ-0004FQ-3M\n\tfor linux-mtd@lists.infradead.org; Fri, 22 Sep 2017 03:47:50 +0000","from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp\n\t[153.142.97.92]) (authenticated)\n\tby conuserg-09.nifty.com with ESMTP id v8M3kwAV029389;\n\tFri, 22 Sep 2017 12:47:09 +0900"],"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=jcJK3/m7fHKrZxr0jDCm33/S8NDMl6GJ4OJ6RelKSFM=;\n\tb=tCti1AvGzG7SuMW6dew3oddOBo\n\txCYAyBSy+gMTKGSdeUTyH12e+0qY3nzHOyVBadtUbLwoaw/jOtYVocAe0QjdVZqzsm65/3+NBN9wu\n\tVyIvystumcQV4oSNSPjESt6UB4VomU6PgFYzSLQzUllMrJeIi9sdOlZMJcjiTjzBszdPlDKnxs9m6\n\tYQj9rJUdFBOcDZWGQLD8M8Tki4FbHVW2UquE1tAjo0qKI0ZSpJYhT9Tl++rTJKGMz6pWDrnKO3YuU\n\tBDEpwETXjlMraOdA1rPKUqFmFZ8f1oIyfiMUAJLNb+RwSdy2zeAQ5aAljdEvRTwW2SNaCg6oc87L4\n\tmEI/AcmQ==;","v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com;\n\ts=dec2015msa; t=1506052029;\n\tbh=3luMy4L57nnx0Dq3jtJCQGpVx5fmTXxWjwCXaeyTPac=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=GHqaq2JCJaG5udEyUq27bWDobZr9jMPKMSAT49T/C7jPtJ6znm26b2JYZpYzps6TS\n\tv1u/wyBTkr957UxXg81QX0lrznkA5qG9jCvy3WhqlXtT3c5Hk7X2tQ/F+p0XZESycU\n\t9qngH1C3+NAajWC1R9SbEOsdtP9sj/1YYLAZsTCjCGeyLy+OnCVmyr2R6a8cFtgHtL\n\tWQ30lLy8vQhv2u2ixpBxarUKEqkXQ2maMs/pAiutwiT/kvDDIXPpfNvin6pyBnWusZ\n\tFuC9nNzj9LUaxCmj8CN/jP0rhIkDdPPFEqPJEdP96yp2GxfwwCd2n0N23uYzRFmbcH\n\tmv4Q/T1Wvo0qA=="],"DKIM-Filter":"OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v8M3kwAV029389","X-Nifty-SrcIP":"[153.142.97.92]","From":"Masahiro Yamada ","To":"linux-mtd@lists.infradead.org","Subject":"[PATCH v2 12/12] mtd: nand: denali: change the setup_dma choice into\n\thook","Date":"Fri, 22 Sep 2017 12:46:49 +0900","Message-Id":"<1506052009-8285-13-git-send-email-yamada.masahiro@socionext.com>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1506052009-8285-1-git-send-email-yamada.masahiro@socionext.com>","References":"<1506052009-8285-1-git-send-email-yamada.masahiro@socionext.com>","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170921_204743_529785_E49623BC ","X-CRM114-Status":"GOOD ( 10.50 )","X-Spam-Score":"-1.2 (-)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-1.2 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail)\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]\n\t-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature\n\t0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n\tnot necessarily valid","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":"Boris Brezillon ,\n\tMarek Vasut ,\n\tRichard Weinberger , linux-kernel@vger.kernel.org,\n\tMasahiro Yamada , \n\tCyrille Pitchen ,\n\tBrian Norris ,\n\tDavid Woodhouse ","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":"The previous commit added some hooks into struct denali_nand_info,\nso here is one more for clean-up.\n\nSigned-off-by: Masahiro Yamada \n---\n\nChanges in v2:\n - Newly added\n\n drivers/mtd/nand/denali.c | 15 +++++----------\n drivers/mtd/nand/denali.h | 2 ++\n 2 files changed, 7 insertions(+), 10 deletions(-)","diff":"diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c\nindex 7c24983..0b268ec 100644\n--- a/drivers/mtd/nand/denali.c\n+++ b/drivers/mtd/nand/denali.c\n@@ -519,15 +519,6 @@ static void denali_setup_dma32(struct denali_nand_info *denali,\n \tdenali->host_write(denali, mode | 0x14000, 0x2400);\n }\n \n-static void denali_setup_dma(struct denali_nand_info *denali,\n-\t\t\t dma_addr_t dma_addr, int page, int write)\n-{\n-\tif (denali->caps & DENALI_CAP_DMA_64BIT)\n-\t\tdenali_setup_dma64(denali, dma_addr, page, write);\n-\telse\n-\t\tdenali_setup_dma32(denali, dma_addr, page, write);\n-}\n-\n static int denali_pio_read(struct denali_nand_info *denali, void *buf,\n \t\t\t size_t size, int page, int raw)\n {\n@@ -619,7 +610,7 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf,\n \tiowrite32(DMA_ENABLE__FLAG, denali->reg + DMA_ENABLE);\n \n \tdenali_reset_irq(denali);\n-\tdenali_setup_dma(denali, dma_addr, page, write);\n+\tdenali->setup_dma(denali, dma_addr, page, write);\n \n \tirq_status = denali_wait_for_irq(denali, irq_mask);\n \tif (!(irq_status & INTR__DMA_CMD_COMP))\n@@ -1314,6 +1305,10 @@ int denali_init(struct denali_nand_info *denali)\n \tif (denali->dma_avail) {\n \t\tchip->options |= NAND_USE_BOUNCE_BUFFER;\n \t\tchip->buf_align = 16;\n+\t\tif (denali->caps & DENALI_CAP_DMA_64BIT)\n+\t\t\tdenali->setup_dma = denali_setup_dma64;\n+\t\telse\n+\t\t\tdenali->setup_dma = denali_setup_dma32;\n \t}\n \n \tchip->bbt_options |= NAND_BBT_USE_FLASH;\ndiff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h\nindex 3aeb272..2911066 100644\n--- a/drivers/mtd/nand/denali.h\n+++ b/drivers/mtd/nand/denali.h\n@@ -321,6 +321,8 @@ struct denali_nand_info {\n \tconst struct nand_ecc_caps *ecc_caps;\n \tu32 (*host_read)(struct denali_nand_info *denali, u32 addr);\n \tvoid (*host_write)(struct denali_nand_info *denali, u32 addr, u32 data);\n+\tvoid (*setup_dma)(struct denali_nand_info *denali, dma_addr_t dma_addr,\n+\t\t\t int page, int write);\n };\n \n #define DENALI_CAP_HW_ECC_FIXUP\t\t\tBIT(0)\n","prefixes":["v2","12/12"]}