From patchwork Wed Oct 3 12:00:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 978249 X-Patchwork-Delegate: miquel.raynal@bootlin.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="XkGGMd7w"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Q41sJ55Z"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42QF1l0kBcz9s8J for ; Wed, 3 Oct 2018 21:59:39 +1000 (AEST) 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=W6c2mfkwR+zQosAmqOaTa656uOYdHWIeRTlKD/3gqig=; b=XkGGMd7wMLFVAJeSvXtHDgCRE7 Lce1+pBqZmFdJnf7cJPlWcKCoPpxwD7Ws1BV4IT0zKC7/RgL13zX1noCmh2H5Gwcqyv3KMamzzeIi X2dPEiYb9f9bexSm6PYVHX3ixl/mN8WVun8TFl75iUab0WOYCniX36dmHCmDwAz5Fj0cCf3GxXauP UomwdI0ekFNfEZWK9+Q5skzyFcK1+StpNIgH4cD+Y5ve6x5jZTKhenPrg/kRNmPLY/PbzwrWankiZ MW7zrotjdHYMPG+b3G+JmObNgHjeg29reYY0OdwIHUSubQSVgsKOB6hKdE3akGUaLI6Q5KKfIpCag TKGaTKlA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7foL-0000oi-4C; Wed, 03 Oct 2018 11:59:25 +0000 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7foH-0000c3-9M for linux-mtd@lists.infradead.org; Wed, 03 Oct 2018 11:59:22 +0000 Received: by mail-lf1-x144.google.com with SMTP id t22-v6so3914032lfb.7 for ; Wed, 03 Oct 2018 04:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FlZqKwjVoeFu/nEuPnA5WnfWrBB8OUWnxD8mhm28kUQ=; b=Q41sJ55ZIFpVmf6K5XSH0egwojzvcE6ZsZ3PIBQmODsuDnashWlNFjt4g8x9dsL3HT VunYEtbc/Z2Wo2piS0jjD212n1ttuDwfprb1bmYAmV6gcX6zGJkcFgVQHclN9Ea/C5Xv rNRkgYviNsOKdgzoE+ZhPuovUzRBzRMn8BorxieQKXJ+Ph961kjgIyeHSWl5NkDEToPX sMR26S4+6Blw6uoMQFHeBIJuvXSKDjBMYTFp5aYXHXkANNn8hm/3cNG63FjbwUz9S+VX foEwefumt3m5qkK3Q/drwEKHkAtk/Q/+OwqoSqdLaDfOZfBTZQTCk1afUn/HNGc2wEOk qzWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FlZqKwjVoeFu/nEuPnA5WnfWrBB8OUWnxD8mhm28kUQ=; b=hXEENL6u6V2bMPEUYuMd+y1RF/7AYMj6zYQXX3vQdtxClwgjNa+ihepihsr4kAPV0O z66Mi+s9UK8rZ3w7O9ECpi1ntHPxugIV1a2g373M0PAuZtz7mMh1ME022g2G4EUrE/dB O0ttkRj5MEtVJe0RW6Kpt2+bWTd0re0h9qrN5avdi6gOkR1a92FQvibU229FDQbQwXCB /qgyQqpmcGBY0XFSdJgY2z3x6wmYbh5n0LEaG1G92oYX9TDHF8V9Fa+Sy2j1u8AIb3Ep qYg9M4lk/zCg5ZudavJuWfuMn4aeZLTNDmHhuXDPxGL0iSKB630HdHmL2hy190r19OYF M/hg== X-Gm-Message-State: ABuFfoiEDdEBf4z5IPXp+Oc7t5QYkwODM8FrRslRj3+HoYGjrUiSmnVS mybK7YsrRhb0K3642hrKjj4= X-Google-Smtp-Source: ACcGV624WJm+QgZ0BY/GVDAaYUajHyTSVJZoznrMfi2DpdvwMZlJ4d0R3tNlcwY7c3DtSFOW2rrmyg== X-Received: by 2002:a19:5118:: with SMTP id f24-v6mr873303lfb.104.1538567946426; Wed, 03 Oct 2018 04:59:06 -0700 (PDT) Received: from z50.intranet (78-10-164-223.static.ip.netia.com.pl. [78.10.164.223]) by smtp.gmail.com with ESMTPSA id j5-v6sm286654lfb.62.2018.10.03.04.59.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Oct 2018 04:59:05 -0700 (PDT) From: Janusz Krzysztofik To: Boris Brezillon , Miquel Raynal Subject: [RFC PATCH] mtd: rawnand: ams-delta: use ->exec_op() Date: Wed, 3 Oct 2018 14:00:28 +0200 Message-Id: <20181003120028.9257-1-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180719081508.5dafebde@bbrezillon> References: <20180719081508.5dafebde@bbrezillon> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181003_045921_356852_C0BC0129 X-CRM114-Status: GOOD ( 18.96 ) X-Spam-Score: 0.5 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (0.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:144 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (jmkrzyszt[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.6 HK_RANDOM_ENVFROM Envelope sender username looks random X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Weinberger , Janusz Krzysztofik , linux-kernel@vger.kernel.org, Marek Vasut , linux-mtd@lists.infradead.org, Brian Norris , David Woodhouse MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Replace legacy callbacks with ->select_chip() and ->exec_op(). Implementation of NAND_OP_WAITRDY_INSTR has been based on legacy nand_wait_ready(), otherwise that function would probabaly have to be reimplemented inside the driver. Hence, legacy callback ->dev_ready() is still used. Use of IO_ADDR_R and IO_ADDR_W legacy structure members will be dropped later, as soon as the driver is converted to use GPIO API for data I/O. Suggested-by: Boris Brezillon Signed-off-by: Janusz Krzysztofik --- Hi, I've not tested the change on hardware yet as I'm not sure if: - handling of NCE limited to that inside ->select_chip() is sufficient, - releasing ALE / CLE immediately after ams_delta_write_buf() is correct. Please advise before I break my test hardware :-). Thanks, Janusz drivers/mtd/nand/raw/ams-delta.c | 83 +++++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 31 deletions(-) diff --git a/drivers/mtd/nand/raw/ams-delta.c b/drivers/mtd/nand/raw/ams-delta.c index 5ba180a291eb..90c283a2c1b7 100644 --- a/drivers/mtd/nand/raw/ams-delta.c +++ b/drivers/mtd/nand/raw/ams-delta.c @@ -124,46 +124,69 @@ static void ams_delta_read_buf(struct nand_chip *this, u_char *buf, int len) buf[i] = ams_delta_io_read(priv); } -static u_char ams_delta_read_byte(struct nand_chip *this) +static int ams_delta_nand_ready(struct nand_chip *this) { - u_char res; - - ams_delta_read_buf(this, &res, 1); + struct ams_delta_nand *priv = nand_get_controller_data(this); - return res; + return gpiod_get_value(priv->gpiod_rdy); } -/* - * Command control function - * - * ctrl: - * NAND_NCE: bit 0 -> bit 2 - * NAND_CLE: bit 1 -> bit 7 - * NAND_ALE: bit 2 -> bit 6 - */ -static void ams_delta_hwcontrol(struct nand_chip *this, int cmd, - unsigned int ctrl) +static void ams_delta_select_chip(struct nand_chip *this, int n) { struct ams_delta_nand *priv = nand_get_controller_data(this); - if (ctrl & NAND_CTRL_CHANGE) { - gpiod_set_value(priv->gpiod_nce, !(ctrl & NAND_NCE)); - gpiod_set_value(priv->gpiod_cle, !!(ctrl & NAND_CLE)); - gpiod_set_value(priv->gpiod_ale, !!(ctrl & NAND_ALE)); - } - - if (cmd != NAND_CMD_NONE) { - u_char byte = cmd; + if (n > 0) + return; - ams_delta_write_buf(this, &byte, 1); - } + gpiod_set_value(priv->gpiod_nce, n < 0); } -static int ams_delta_nand_ready(struct nand_chip *this) +static int ams_delta_exec_op(struct nand_chip *this, + const struct nand_operation *op, bool check_only) { struct ams_delta_nand *priv = nand_get_controller_data(this); + const struct nand_op_instr *instr; + int i; - return gpiod_get_value(priv->gpiod_rdy); + for (i = 0; i < op->ninstrs; i++) { + instr = &op->instrs[i]; + + switch (instr->type) { + case NAND_OP_CMD_INSTR: + gpiod_set_value(priv->gpiod_cle, 1); + ams_delta_write_buf(this, &instr->ctx.cmd.opcode, 1); + gpiod_set_value(priv->gpiod_cle, 0); + break; + + case NAND_OP_ADDR_INSTR: + gpiod_set_value(priv->gpiod_ale, 1); + ams_delta_write_buf(this, instr->ctx.addr.addrs, + instr->ctx.addr.naddrs); + gpiod_set_value(priv->gpiod_ale, 0); + break; + + case NAND_OP_DATA_IN_INSTR: + ams_delta_read_buf(this, instr->ctx.data.buf.in, + instr->ctx.data.len); + break; + + case NAND_OP_DATA_OUT_INSTR: + ams_delta_write_buf(this, instr->ctx.data.buf.out, + instr->ctx.data.len); + break; + + case NAND_OP_WAITRDY_INSTR: + if (this->legacy.dev_ready) { + nand_wait_ready(this); + break; + } + + return nand_soft_waitrdy(this, + instr->ctx.waitrdy.timeout_ms); + } + } + + return 0; } @@ -213,10 +236,8 @@ static int ams_delta_init(struct platform_device *pdev) /* Set address of NAND IO lines */ this->legacy.IO_ADDR_R = io_base + OMAP_MPUIO_INPUT_LATCH; this->legacy.IO_ADDR_W = io_base + OMAP_MPUIO_OUTPUT; - this->legacy.read_byte = ams_delta_read_byte; - this->legacy.write_buf = ams_delta_write_buf; - this->legacy.read_buf = ams_delta_read_buf; - this->legacy.cmd_ctrl = ams_delta_hwcontrol; + this->select_chip = ams_delta_select_chip; + this->exec_op = ams_delta_exec_op; priv->gpiod_rdy = devm_gpiod_get_optional(&pdev->dev, "rdy", GPIOD_IN); if (IS_ERR(priv->gpiod_rdy)) {