From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3099C47254 for ; Tue, 5 May 2020 10:19:15 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C6E1620675 for ; Tue, 5 May 2020 10:19:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Egz4gnqj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6E1620675 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=ZdcNZz25ru6QhX1dL108HluQUegrqeT49ffG2QGeVUg=; b=Egz4gnqjr6O63a Vg5PFHYBn00o50EgIkueVC2KvCaYNcXeiggVIPYMdbN2iqZOoRHU0D00SDGrkB1NaAcRE9Cl0GJqY zBleQU4bYR7k2OW8u4VY3lDgLVSkPfoM+d2NQa7jgqRp1yhVA3O1qrMNUrI/tL5EpzC42o+kCkbv4 bIEoSLDGp0KPpvNEFz9SKBjMeO6uppYjmI7xi5qxa5D+ITmdlnxT69K8WLJiaIyCyWsMrifr2xXB8 5zovaZ+9IEB4pW3lVQTx14yup364GiNAxE4seqWa14d9okqJOE+AdG2f9OsmgbmaJoHDMonzVCUQ9 9E+AvZ+80/tMVKdxlSeQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jVufG-0005nB-O4; Tue, 05 May 2020 10:19:02 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jVuaR-00078D-F0 for linux-mtd@lists.infradead.org; Tue, 05 May 2020 10:14:08 +0000 Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:2c:6930:d3ea:1c7:41fd:3038]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id E628A2A1BDB; Tue, 5 May 2020 11:14:01 +0100 (BST) From: Boris Brezillon To: Miquel Raynal , linux-mtd@lists.infradead.org, Lubomir Rintel Subject: [PATCH v2 14/19] mtd: rawnand: cafe: Add exec_op() support Date: Tue, 5 May 2020 12:13:48 +0200 Message-Id: <20200505101353.1776394-15-boris.brezillon@collabora.com> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200505101353.1776394-1-boris.brezillon@collabora.com> References: <20200505101353.1776394-1-boris.brezillon@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200505_031403_853327_508BA074 X-CRM114-Status: GOOD ( 16.79 ) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Weinberger , Boris Brezillon , Vignesh Raghavendra , Tudor Ambarus Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" Errors-To: linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org Implementing exec_op() will help us get rid of the legacy interface and should make drivers much cleaner too. Signed-off-by: Boris Brezillon Reviewed-by: Lubomir Rintel Tested-by: Lubomir Rintel --- Changes in v2: * Add R-b/T-b * Drop WARN_ON()s * Use nand_subop_get_xxx() where appropriate * Write ADDR2 unconditionally * Do not wait on CMD_DONE when the last instruction is a DATA instruction and DMA is used * s/CAFE_NAND_DMA_CTRL_DATA_IN/CAFE_NAND_CTRL1_HAS_DATA_IN/ --- drivers/mtd/nand/raw/cafe_nand.c | 140 ++++++++++++++++++++++++++++++- 1 file changed, 139 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/cafe_nand.c b/drivers/mtd/nand/raw/cafe_nand.c index 36685bee9d83..2f35faf13805 100644 --- a/drivers/mtd/nand/raw/cafe_nand.c +++ b/drivers/mtd/nand/raw/cafe_nand.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #define CAFE_NAND_CTRL1 0x00 #define CAFE_NAND_CTRL1_HAS_CMD BIT(31) @@ -773,9 +773,147 @@ static void cafe_nand_detach_chip(struct nand_chip *chip) dma_free_coherent(&cafe->pdev->dev, 2112, cafe->dmabuf, cafe->dmaaddr); } +static int cafe_nand_exec_subop(struct nand_chip *chip, + const struct nand_subop *subop) +{ + struct cafe_priv *cafe = nand_get_controller_data(chip); + u32 ctrl1 = 0, ctrl2 = cafe->ctl2, addr1 = 0, addr2 = 0; + u32 status, wait = CAFE_NAND_IRQ_CMD_DONE; + int ret, data_instr = -1; + bool waitrdy = false; + unsigned int i, j; + + cafe->datalen = 0; + ctrl1 |= CAFE_FIELD_PREP(NAND_CTRL1, CE, subop->cs); + + for (i = 0; i < subop->ninstrs; i++) { + const struct nand_op_instr *instr = &subop->instrs[i]; + + switch (instr->type) { + case NAND_OP_CMD_INSTR: + if (!(ctrl1 & CAFE_NAND_CTRL1_HAS_CMD)) + ctrl1 |= CAFE_NAND_CTRL1_HAS_CMD | + CAFE_FIELD_PREP(NAND_CTRL1, CMD, + instr->ctx.cmd.opcode); + else + ctrl2 |= CAFE_NAND_CTRL2_HAS_CMD2 | + CAFE_FIELD_PREP(NAND_CTRL2, CMD2, + instr->ctx.cmd.opcode); + break; + + case NAND_OP_ADDR_INSTR: + for (j = nand_subop_get_addr_start_off(subop, i); + j < nand_subop_get_num_addr_cyc(subop, i); j++) { + u32 addr = instr->ctx.addr.addrs[j]; + + if (j < 2) + addr1 |= addr << (8 * j); + else + addr2 |= addr << (8 * (j - 2)); + } + + ctrl1 |= CAFE_NAND_CTRL1_HAS_ADDR | + CAFE_FIELD_PREP(NAND_CTRL1, NUM_ADDR_CYC, + instr->ctx.addr.naddrs - 1); + cafe_writel(cafe, addr1, NAND_ADDR1); + cafe_writel(cafe, addr2, NAND_ADDR2); + break; + + case NAND_OP_DATA_IN_INSTR: + data_instr = i; + ctrl1 |= CAFE_NAND_CTRL1_HAS_DATA_IN; + break; + + case NAND_OP_DATA_OUT_INSTR: + data_instr = i; + ctrl1 |= CAFE_NAND_CTRL1_HAS_DATA_OUT; + cafe_write_buf(chip, + instr->ctx.data.buf.out + + nand_subop_get_data_start_off(subop, i), + nand_subop_get_data_len(subop, i)); + break; + + case NAND_OP_WAITRDY_INSTR: + wait |= CAFE_NAND_IRQ_FLASH_RDY; + waitrdy = true; + break; + } + } + + if (data_instr >= 0) + cafe_writel(cafe, nand_subop_get_data_len(subop, data_instr), + NAND_DATA_LEN); + + if (cafe->usedma && data_instr >= 0) { + u32 dmactrl = CAFE_NAND_DMA_CTRL_ENABLE | + CAFE_NAND_DMA_CTRL_RESERVED; + + dmactrl |= CAFE_FIELD_PREP(NAND_DMA_CTRL, DATA_LEN, + nand_subop_get_data_len(subop, + data_instr)); + if (ctrl1 & CAFE_NAND_CTRL1_HAS_DATA_IN) + dmactrl |= CAFE_NAND_DMA_CTRL_DATA_IN; + + cafe_writel(cafe, dmactrl, NAND_DMA_CTRL); + + /* + * If the last instruction is a data transfer and we're using + * DMA, we should wait on DMA_DONE only, otherwise, keep + * waiting on CMD_DONE. + */ + if (data_instr == subop->ninstrs - 1) { + wait &= ~CAFE_NAND_IRQ_CMD_DONE; + wait |= CAFE_NAND_IRQ_DMA_DONE; + } + } + + /* Clear the pending interrupts before starting the operation. */ + cafe_writel(cafe, wait, NAND_IRQ); + + cafe_writel(cafe, ctrl2, NAND_CTRL2); + cafe_writel(cafe, ctrl1, NAND_CTRL1); + + ret = readl_poll_timeout(cafe->mmio + CAFE_NAND_IRQ, status, + (status & wait) == wait, 1, USEC_PER_SEC); + if (ret) + return ret; + + if (ctrl1 & CAFE_NAND_CTRL1_HAS_DATA_IN) + cafe_read_buf(chip, + subop->instrs[data_instr].ctx.data.buf.in + + nand_subop_get_data_start_off(subop, data_instr), + nand_subop_get_data_len(subop, data_instr)); + + return 0; +} + +static const struct nand_op_parser cafe_nand_op_parser = NAND_OP_PARSER( + NAND_OP_PARSER_PATTERN(cafe_nand_exec_subop, + NAND_OP_PARSER_PAT_CMD_ELEM(true), + NAND_OP_PARSER_PAT_ADDR_ELEM(true, 5), + NAND_OP_PARSER_PAT_CMD_ELEM(true), + NAND_OP_PARSER_PAT_WAITRDY_ELEM(true), + NAND_OP_PARSER_PAT_DATA_IN_ELEM(true, 2112)), + NAND_OP_PARSER_PATTERN(cafe_nand_exec_subop, + NAND_OP_PARSER_PAT_CMD_ELEM(true), + NAND_OP_PARSER_PAT_ADDR_ELEM(true, 5), + NAND_OP_PARSER_PAT_CMD_ELEM(true), + NAND_OP_PARSER_PAT_DATA_IN_ELEM(true, 2112), + NAND_OP_PARSER_PAT_WAITRDY_ELEM(true)) +); + +static int cafe_nand_exec_op(struct nand_chip *chip, + const struct nand_operation *op, + bool check_only) +{ + return nand_op_parser_exec_op(chip, &cafe_nand_op_parser, op, + check_only); +} + static const struct nand_controller_ops cafe_nand_controller_ops = { .attach_chip = cafe_nand_attach_chip, .detach_chip = cafe_nand_detach_chip, + .exec_op = cafe_nand_exec_op, }; static void cafe_nand_init(struct cafe_priv *cafe) -- 2.25.3 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/