From patchwork Wed Jun 7 07:30:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 104322 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp84449vqr; Wed, 7 Jun 2023 00:58:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4kGaxd9M/7wJqRQUja1IhOynxtxLOCxtOARZFG0OI6isL8lKNXIJo++XPE+xx7d17719Im X-Received: by 2002:a05:6870:955c:b0:18e:7c5e:b5c1 with SMTP id v28-20020a056870955c00b0018e7c5eb5c1mr4385695oal.45.1686124724652; Wed, 07 Jun 2023 00:58:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686124724; cv=none; d=google.com; s=arc-20160816; b=MRsVl27AfgRPEJu4p61uPWXTScDCy3rntwmrAWbHwSCujhlvyGaacsczDPDgwjaoHa uY29xhoepRMq9/bh86AMBpnRILq8dZ3hlKQ7PmHgXVhCVI9dPFoFVDXLbnEwnj0wjzHl FfRA4nn0D8iSirbpPH0XIfpuXaw749hnnByZj/JPU90lhKxG3bCBNogOu1X6zpSJQULv WCfU2VLXukIhUfeHV3oOzrEyGTWaWY2J2pwSMQvKbpocd9yItY+Jri7d0UkWx4tue6No 9iuOfoBG9ClWlUEsSq7JPI9jdCe3L2afr9wfRcnzds2PuMh2F67JQ8NEcoTXJRKm0VRC rIQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=14N2cMP1QG59BovPTkIgMqaHNq9tvDD14aCH5eeos9Q=; b=z2OHTWtXNSVqRGfSQ4gyBOUOOfvYvaNtvy5j7PVNHCvFd22rw0ZGJacARu65IJUnPy Sx9t/aXcrgUXOf5Ri2WrhgAsBrHLeua+UwRsZ+chvTPXE0E+fJKSi0pzyMa/Pi8JksvJ tJKbwBY+POI7xAzf8Xp3+qBitFU00akP5GJdnmNBlacbwPEipY7AeW1kHf26zte+Upse 2/t+zncwE6KTf9Y0GfVVBk1dJ60PCtlf7uo3AqTJA7muv09JOVxcS/ZTgfCVi4p1riDp /HvqZPzMCnSSuTqN6V1OvprNPBY54cRAF8uXipZfuQs2ssGVRyFbWvmXiKF92I2oPicw BKjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=rh2IUdOz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t191-20020a6381c8000000b00536b4c4b695si8299999pgd.136.2023.06.07.00.58.30; Wed, 07 Jun 2023 00:58:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=rh2IUdOz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239081AbjFGHgZ (ORCPT + 99 others); Wed, 7 Jun 2023 03:36:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239802AbjFGHfr (ORCPT ); Wed, 7 Jun 2023 03:35:47 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23303173B for ; Wed, 7 Jun 2023 00:35:27 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 993B35FD57; Wed, 7 Jun 2023 10:35:24 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1686123324; bh=14N2cMP1QG59BovPTkIgMqaHNq9tvDD14aCH5eeos9Q=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=rh2IUdOz19makuhL8iClCv91/uHGmWUcOa3T4aRXtGXZMZ7p35Mwd91Mjw/xfBI3y KpVNEaFvnfLj7cNPpZviFKKGZ6ziX5iuD4OaW8gZHzeN5TyJA2slQQMlzw3DFzcZOy stJ2FlDcr6s+YVO1Vi2ex3LZyMTWOpE0LrNXxdhs5AE8Qhexf9k9V4nwsB9UVXfA5G bpmZO3In5ec8Or7ZBd84dNUNPi2hspJEkvKwMlybrmVsZC4zIMhWj0dMuN7xM9QA7m wFmn+AZf+fnwiiKh2Xx0I0qC959FQufvZHlWeFakgzTRcqtck5vN/whKczDnBG4Mev 6VQ18gPANb1Wg== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Wed, 7 Jun 2023 10:35:23 +0300 (MSK) From: Arseniy Krasnov To: Liang Yang , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl CC: , , Arseniy Krasnov , , , , Subject: [PATCH v2] mtd: rawnand: meson: waiting w/o wired ready/busy pin Date: Wed, 7 Jun 2023 10:30:15 +0300 Message-ID: <20230607073015.1280085-1-AVKrasnov@sberdevices.ru> X-Mailer: git-send-email 2.35.0 MIME-Version: 1.0 X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/06/07 04:52:00 #21449589 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767985622308966905?= X-GMAIL-MSGID: =?utf-8?q?1768029918857080600?= If there is no wired ready/busy pin, classic way to wait for command completion is to use function 'nand_soft_waitrdy()'. Meson NAND has special command which allows to wait for NAND_STATUS_READY bit without reading status in a software loop (as 'nand_soft_waitrdy()' does). To use it send this command along with NAND_CMD_STATUS, then wait for an interrupt, and after interrupt send NAND_CMD_READ0. So this feature allows to use interrupt driven waiting without wired ready/busy pin. Suggested-by: Liang Yang Signed-off-by: Arseniy Krasnov --- Changelog: v1 -> v2: * Remove small delays from 'meson_nfc_wait_no_rb_pin()'. Both have no effect according Liang's message. * Type of 'no_rb_pin' is u32, the same as for 'nand-rb' property. * 'meson_nfc_wait_no_rb_pin()' doesn't send NAND_CMD_READ0 in case of page programming. Extra argument is added to 'meson_nfc_queue_rb()' to check that case. drivers/mtd/nand/raw/meson_nand.c | 74 +++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index 074e14225c06..ae404655b68c 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -38,6 +38,7 @@ #define NFC_CMD_SCRAMBLER_DISABLE 0 #define NFC_CMD_SHORTMODE_DISABLE 0 #define NFC_CMD_RB_INT BIT(14) +#define NFC_CMD_RB_INT_NO_PIN ((0xb << 10) | BIT(18) | BIT(16)) #define NFC_CMD_GET_SIZE(x) (((x) >> 22) & GENMASK(4, 0)) @@ -179,6 +180,7 @@ struct meson_nfc { u32 info_bytes; unsigned long assigned_cs; + u32 no_rb_pin; }; enum { @@ -392,7 +394,42 @@ static void meson_nfc_set_data_oob(struct nand_chip *nand, } } -static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms) +static int meson_nfc_wait_no_rb_pin(struct meson_nfc *nfc, int timeout_ms, + bool need_cmd_read0) +{ + u32 cmd, cfg; + + meson_nfc_cmd_idle(nfc, nfc->timing.twb); + meson_nfc_drain_cmd(nfc); + meson_nfc_wait_cmd_finish(nfc, CMD_FIFO_EMPTY_TIMEOUT); + + cfg = readl(nfc->reg_base + NFC_REG_CFG); + cfg |= NFC_RB_IRQ_EN; + writel(cfg, nfc->reg_base + NFC_REG_CFG); + + reinit_completion(&nfc->completion); + cmd = nfc->param.chip_select | NFC_CMD_CLE | NAND_CMD_STATUS; + writel(cmd, nfc->reg_base + NFC_REG_CMD); + + /* use the max erase time as the maximum clock for waiting R/B */ + cmd = NFC_CMD_RB | NFC_CMD_RB_INT_NO_PIN | nfc->timing.tbers_max; + writel(cmd, nfc->reg_base + NFC_REG_CMD); + + if (!wait_for_completion_timeout(&nfc->completion, + msecs_to_jiffies(timeout_ms))) + return -ETIMEDOUT; + + if (need_cmd_read0) { + cmd = nfc->param.chip_select | NFC_CMD_CLE | NAND_CMD_READ0; + writel(cmd, nfc->reg_base + NFC_REG_CMD); + meson_nfc_drain_cmd(nfc); + meson_nfc_wait_cmd_finish(nfc, CMD_FIFO_EMPTY_TIMEOUT); + } + + return 0; +} + +static int meson_nfc_wait_rb_pin(struct meson_nfc *nfc, int timeout_ms) { u32 cmd, cfg; int ret = 0; @@ -420,6 +457,25 @@ static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms) return ret; } +static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms, + bool need_cmd_read0) +{ + if (nfc->no_rb_pin) { + /* This mode is used when there is no wired R/B pin. + * It works like 'nand_soft_waitrdy()', but instead of + * polling NAND_CMD_STATUS bit in the software loop, + * it will wait for interrupt - controllers checks IO + * bus and when it detects NAND_CMD_STATUS on it, it + * raises interrupt. After interrupt, NAND_CMD_READ0 is + * sent as terminator of the ready waiting procedure. + */ + return meson_nfc_wait_no_rb_pin(nfc, timeout_ms, + need_cmd_read0); + } else { + return meson_nfc_wait_rb_pin(nfc, timeout_ms); + } +} + static void meson_nfc_set_user_byte(struct nand_chip *nand, u8 *oob_buf) { struct meson_nfc_nand_chip *meson_chip = to_meson_nand(nand); @@ -623,7 +679,7 @@ static int meson_nfc_rw_cmd_prepare_and_execute(struct nand_chip *nand, if (in) { nfc->cmdfifo.rw.cmd1 = cs | NFC_CMD_CLE | NAND_CMD_READSTART; writel(nfc->cmdfifo.rw.cmd1, nfc->reg_base + NFC_REG_CMD); - meson_nfc_queue_rb(nfc, PSEC_TO_MSEC(sdr->tR_max)); + meson_nfc_queue_rb(nfc, PSEC_TO_MSEC(sdr->tR_max), true); } else { meson_nfc_cmd_idle(nfc, nfc->timing.tadl); } @@ -669,7 +725,7 @@ static int meson_nfc_write_page_sub(struct nand_chip *nand, cmd = nfc->param.chip_select | NFC_CMD_CLE | NAND_CMD_PAGEPROG; writel(cmd, nfc->reg_base + NFC_REG_CMD); - meson_nfc_queue_rb(nfc, PSEC_TO_MSEC(sdr->tPROG_max)); + meson_nfc_queue_rb(nfc, PSEC_TO_MSEC(sdr->tPROG_max), false); meson_nfc_dma_buffer_release(nand, data_len, info_len, DMA_TO_DEVICE); @@ -952,7 +1008,8 @@ static int meson_nfc_exec_op(struct nand_chip *nand, break; case NAND_OP_WAITRDY_INSTR: - meson_nfc_queue_rb(nfc, instr->ctx.waitrdy.timeout_ms); + meson_nfc_queue_rb(nfc, instr->ctx.waitrdy.timeout_ms, + true); if (instr->delay_ns) meson_nfc_cmd_idle(nfc, delay_idle); break; @@ -1412,6 +1469,15 @@ static int meson_nfc_probe(struct platform_device *pdev) return ret; } + ret = of_property_read_u32(dev->of_node, "nand-rb", &nfc->no_rb_pin); + if (ret) { + /* If property was not found, don't use rb pin. */ + if (ret == -EINVAL) + nfc->no_rb_pin = 1; + else + return ret; + } + writel(0, nfc->reg_base + NFC_REG_CFG); ret = devm_request_irq(dev, irq, meson_nfc_irq, 0, dev_name(dev), nfc); if (ret) {