From patchwork Wed Jul 5 10:43:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 116065 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1784977vqx; Wed, 5 Jul 2023 04:07:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlFBeeDnq1V0UfX9k7zs4Y6nEv5cZg0xvIO2KhrE4oFH4Rx3PR0jXe5tDL/MvMI5/RSFo+qK X-Received: by 2002:a17:90b:80b:b0:25e:abc9:3cb1 with SMTP id bk11-20020a17090b080b00b0025eabc93cb1mr16031528pjb.4.1688555274406; Wed, 05 Jul 2023 04:07:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688555274; cv=none; d=google.com; s=arc-20160816; b=DMd38eES7COTf/7ChmRiCwCMYiChYehS5RZ8R2WgaBq5PJcSZmvq7TkM0jZeTuyebM JbzL99a5xJJ1v8iIIIuzTQgslXJqMiDqa33gKw90Zz3idSXQDR/TQHIWrGiyl1katSGo wJ1Ab9fr9DCsz+Oqz6o6PkADqpb7VQCMh4h0OxPQ/BQDi517clYM0luU74PBIEdbCVJF tlEzVtuUBc8eNY0dfqrF3vWwM0FTool/ICKGYOMtXYrm7tJTcek8Kgs0CMPTYRCA1NJe rKf+Hv6MDO+s99jWuDgHPa8U+JPbaUNoYZDmc1dTo6CEX4XjS5SPVntHu8J/mIUwn1Id hAtw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=hwuIkah7tdQ/ux/daGas/Or4t38i1CesFllcRMgtpB4=; fh=As7ZD1NN9AP2RcejaO91GBFz4H1E0Gbpz0wPr+7/afs=; b=PZBl9XdgY0l7FeWCDinbQs57I6fOyWyZ/Gm/eo7Zr8ecIyr9xNacDxcNKO4UufsOVk tgMYHBMtqTPlY46C2Jx+hCy1K0crikjEpoSsWLwGyvBHiPXCzVopXA2PZvBYDRFydwui IHBPEHygsV7d335Feg5O0BKmYt0tJfa3b/kxkHWO6kgPgmAovwVHGHEgnOQ0WkKlaDQv A109826qr/1whhGo1C97aUSgarUQENHpkz/ulw81F4qNn7XF0Vhb3zNaGKIPEVubxDIZ uIvnJsVBin0D1/Lset+6RO54iM3S4e+iQdofGkRl7tEgGSHjUJEcBlyZQ6K29YVPpRc9 7BaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=LCrgUoQk; 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 136-20020a63028e000000b0055bac19d21bsi6137127pgc.679.2023.07.05.04.07.36; Wed, 05 Jul 2023 04:07:54 -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=LCrgUoQk; 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 S231742AbjGEKtq (ORCPT + 99 others); Wed, 5 Jul 2023 06:49:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231580AbjGEKto (ORCPT ); Wed, 5 Jul 2023 06:49:44 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE52C1719 for ; Wed, 5 Jul 2023 03:49:42 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 4FB6510007C; Wed, 5 Jul 2023 13:49:41 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 4FB6510007C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1688554181; bh=hwuIkah7tdQ/ux/daGas/Or4t38i1CesFllcRMgtpB4=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=LCrgUoQkNEiOr6e6O1dwXK1JjmVaO0lqpozfIRWVjYdzZjuDFjwINjJOW7U4tSTxr 5achdhqLr7WTN53PaZaRGSrURCLG+azXunoyo8/Ipjnqf0ijKu2/hV4vAU/VyRtS/Y n3ltxFK5DGvoyr8rr7tOK+gjsW7gIVUEbrBWnzyobUCNcO6N3lGrEfPdZm3I1kfzEr /RZ0yHEQmvcb8+1ogLDukXiniiR849nckVw48Aq9thifA5oV4K8jrNlhlTb3QZMvpo DAUNy0xZEq51KS97dyvKR0T3570mwlVs2GWoZlJN0ln5N6Y1rMMVjS7UVUjpsdjWVO VZwrJfRdovaAw== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Wed, 5 Jul 2023 13:49:41 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Wed, 5 Jul 2023 13:49:38 +0300 From: Arseniy Krasnov To: Liang Yang , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , JaimeLiao , =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= , Andy Shevchenko , Arseniy Krasnov , ChenXiaoSong , Adam Borowski CC: , , , , , Subject: [PATCH v1 1/2] mtd: rawnand: export 'nand_exit_status_op()' Date: Wed, 5 Jul 2023 13:43:57 +0300 Message-ID: <20230705104403.696680-2-AVKrasnov@sberdevices.ru> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20230705104403.696680-1-AVKrasnov@sberdevices.ru> References: <20230705104403.696680-1-AVKrasnov@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 178443 [Jul 05 2023] X-KSMG-AntiSpam-Version: 5.9.59.0 X-KSMG-AntiSpam-Envelope-From: AVKrasnov@sberdevices.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 520 520 ccb018a655251011855942a2571029252d3d69a2, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;p-i-exch-sc-m01.sberdevices.ru:5.0.1,7.1.1;sberdevices.ru:5.0.1,7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;100.64.160.123:7.1.2, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/05 05:28:00 #21565829 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?1770578535260188401?= X-GMAIL-MSGID: =?utf-8?q?1770578535260188401?= Export this function to work in pair with 'nand_status_op()' which is already exported. Signed-off-by: Arseniy Krasnov --- drivers/mtd/nand/raw/nand_base.c | 1 + include/linux/mtd/rawnand.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index a6af521832aa..d4b55155aeae 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -1885,6 +1885,7 @@ int nand_exit_status_op(struct nand_chip *chip) return 0; } +EXPORT_SYMBOL_GPL(nand_exit_status_op); /** * nand_erase_op - Do an erase operation diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 5159d692f9ce..90a141ba2a5a 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -1540,6 +1540,7 @@ int nand_reset_op(struct nand_chip *chip); int nand_readid_op(struct nand_chip *chip, u8 addr, void *buf, unsigned int len); int nand_status_op(struct nand_chip *chip, u8 *status); +int nand_exit_status_op(struct nand_chip *chip); int nand_erase_op(struct nand_chip *chip, unsigned int eraseblock); int nand_read_page_op(struct nand_chip *chip, unsigned int page, unsigned int offset_in_page, void *buf, unsigned int len); From patchwork Wed Jul 5 10:43:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 116070 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1795665vqx; Wed, 5 Jul 2023 04:28:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7r3sIarLKg3IIpGykW8XAFbFqrIOQU5WaOL++leg0SBY0I0JOgFuT8U7SLzIGFcuzbWehe X-Received: by 2002:a05:6808:95:b0:3a3:7505:7038 with SMTP id s21-20020a056808009500b003a375057038mr14992438oic.45.1688556507703; Wed, 05 Jul 2023 04:28:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688556507; cv=none; d=google.com; s=arc-20160816; b=zw90BcWYqFxJiMuMVSbJDwdoDnmucNsFs2K+KY3xwzybyxSaXreARzagugh3KcWmyX CSCrQl023N1uFl3FWai9UuwrRZpbVzkDIqgYDYAa9HYu6jJVMWPSAzgidJKmzHkB/ULw bQqEYMko7ClhoaLrGJ7YjlXPAuQKQOCH2hrj9VCYChDAOdmrk7j6HMeyQaF5BDwqQ+Uh Suo5j3oL2Ge6rrBjPaUYF0puXoJyaMJycc9wbmSQT9oUaK+dy7RusKpQDBr4lSxM5DEl FLaakRtExtANHgq130Ku61Bao3u4JnSmXPQ0rv9ymG+K09IGreG6kVLqfQV0M+uMvnk7 K1mg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=nKCAk3CURTbAaGdu/4XW28wHRq4gX1MBZxHD357NVK4=; fh=jqg7NMmtuChf2n8DbRAO8Kzhn/cxgQV8oK6n5Hkj4+I=; b=a0m3DS9MfFPePE4b9wFgaOpeQS0M4EzUclcfDdto/mgpKcXTSKUdoM+EBNK0LgUj5X oZfOgwfG1WOT4/jHc7sPN6IVTgz4/bC2w+9c6GD864CeLhZ6g+Vi0+adYkAMezCeRait 4kuIplK0yL/mp47cD5CUq6S8YIyl0NBNc8awlOJ9oL1pnzVyU5E2UP+aMCPLiURaxTTL W2LSR3sTrNsg+DwUQax3KbRIQSaRBqJFEC4mHZYMnjUzrwrqLsfIU2EyV2PafmSUa4t5 pG84JPXUHhlL4Hu++WiVIyzgdtQ8+NxEP474F5zU8paTpdzSIneMrPPY7HRj+mAK0ApX hL6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=dYgNKbh7; 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 e12-20020a63db0c000000b0055b5f13dd64si12277684pgg.92.2023.07.05.04.28.12; Wed, 05 Jul 2023 04:28:27 -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=dYgNKbh7; 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 S231572AbjGEKtx (ORCPT + 99 others); Wed, 5 Jul 2023 06:49:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231811AbjGEKts (ORCPT ); Wed, 5 Jul 2023 06:49:48 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C993171C for ; Wed, 5 Jul 2023 03:49:47 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id B8A2A120062; Wed, 5 Jul 2023 13:49:45 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru B8A2A120062 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1688554185; bh=nKCAk3CURTbAaGdu/4XW28wHRq4gX1MBZxHD357NVK4=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=dYgNKbh73XfSAbYT+STUUYbXrlhI+czkt+r0nRDQnjC4LpWCi7gkA8DBTcOICGKoB lr0dh4RF2LqsyzlP/RgkWoQwoyr5POMmywpDwreerqXkFcH1BeLUEzt3sm23Pv3J87 87dMMTsmzXqxXVgpZFMtGgAP094Lfht9wE3SAhHheWZ6w4LVoEU6GnRyUkDIthNMHl JTxEbBvPmkv9lO3zdS22P5FBpqHaWXbN7sUkiPurINyZ4mnQrd3rKOCtBcEZdHrHyu hvFUwj6T5qHlKSYn47/E1ioqNVQu6926XlAEFphcYNC/t5mrtARRNnN2X0kZN/zfIZ hIKXWg3LS1RaQ== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Wed, 5 Jul 2023 13:49:45 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Wed, 5 Jul 2023 13:49:42 +0300 From: Arseniy Krasnov To: Liang Yang , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Adam Borowski , ChenXiaoSong , JaimeLiao , Andy Shevchenko , =?utf-8?b?TWljaGHFgiBL?= =?utf-8?b?xJlwaWXFhA==?= CC: , , Arseniy Krasnov , , , , Subject: [PATCH v1 2/2] mtd: rawnand: meson: use NAND core API to check status Date: Wed, 5 Jul 2023 13:43:58 +0300 Message-ID: <20230705104403.696680-3-AVKrasnov@sberdevices.ru> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20230705104403.696680-1-AVKrasnov@sberdevices.ru> References: <20230705104403.696680-1-AVKrasnov@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 178444 [Jul 05 2023] X-KSMG-AntiSpam-Version: 5.9.59.0 X-KSMG-AntiSpam-Envelope-From: AVKrasnov@sberdevices.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 520 520 ccb018a655251011855942a2571029252d3d69a2, {Tracking_from_domain_doesnt_match_to}, p-i-exch-sc-m01.sberdevices.ru:5.0.1,7.1.1;100.64.160.123:7.1.2;sberdevices.ru:5.0.1,7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/05 05:28:00 #21565829 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?1770579828800568095?= X-GMAIL-MSGID: =?utf-8?q?1770579828800568095?= NAND core API already has functions to send NAND_CMD_STATUS and leave status checking mode by sending NAND_CMD_READ0, so use both of them instead of direct access to the controller registers. Signed-off-by: Arseniy Krasnov --- drivers/mtd/nand/raw/meson_nand.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index c7213f03a773..54e7fdbf0706 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -422,9 +422,10 @@ static void meson_nfc_set_data_oob(struct nand_chip *nand, } } -static int meson_nfc_wait_no_rb_pin(struct meson_nfc *nfc, int timeout_ms, +static int meson_nfc_wait_no_rb_pin(struct nand_chip *nand, int timeout_ms, bool need_cmd_read0) { + struct meson_nfc *nfc = nand_get_controller_data(nand); u32 cmd, cfg; meson_nfc_cmd_idle(nfc, nfc->timing.twb); @@ -436,8 +437,7 @@ static int meson_nfc_wait_no_rb_pin(struct meson_nfc *nfc, int timeout_ms, 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); + nand_status_op(nand, NULL); /* 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; @@ -447,12 +447,8 @@ static int meson_nfc_wait_no_rb_pin(struct meson_nfc *nfc, int timeout_ms, 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); - } + if (need_cmd_read0) + nand_exit_status_op(nand); return 0; } @@ -485,9 +481,11 @@ static int meson_nfc_wait_rb_pin(struct meson_nfc *nfc, int timeout_ms) return ret; } -static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms, +static int meson_nfc_queue_rb(struct nand_chip *nand, int timeout_ms, bool need_cmd_read0) { + struct meson_nfc *nfc = nand_get_controller_data(nand); + 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 @@ -499,7 +497,7 @@ static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms, * needed (for all cases except page programming - this * is reason of 'need_cmd_read0' flag). */ - return meson_nfc_wait_no_rb_pin(nfc, timeout_ms, + return meson_nfc_wait_no_rb_pin(nand, timeout_ms, need_cmd_read0); } else { return meson_nfc_wait_rb_pin(nfc, timeout_ms); @@ -709,7 +707,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), true); + meson_nfc_queue_rb(nand, PSEC_TO_MSEC(sdr->tR_max), true); } else { meson_nfc_cmd_idle(nfc, nfc->timing.tadl); } @@ -755,7 +753,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), false); + meson_nfc_queue_rb(nand, PSEC_TO_MSEC(sdr->tPROG_max), false); meson_nfc_dma_buffer_release(nand, data_len, info_len, DMA_TO_DEVICE); @@ -1071,7 +1069,7 @@ 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(nand, instr->ctx.waitrdy.timeout_ms, true); if (instr->delay_ns) meson_nfc_cmd_idle(nfc, delay_idle);