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.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 45998C433DF for ; Tue, 19 May 2020 10:05:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A5AF20756 for ; Tue, 19 May 2020 10:05:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JH+cUBBH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728674AbgESKF2 (ORCPT ); Tue, 19 May 2020 06:05:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726466AbgESKF0 (ORCPT ); Tue, 19 May 2020 06:05:26 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FD7FC061A0C for ; Tue, 19 May 2020 03:05:25 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id g14so2045961wme.1 for ; Tue, 19 May 2020 03:05:25 -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=zgSEgyu5An5GyigcNkf1Yhsncd+sLucumkdkFEyxqlE=; b=JH+cUBBHxaloKdNbGpr8YDQgU3mg+XNBEvXH11SUVSCv5SfcFRw8Vv/Ru/6DCln4uH ZhodAAGMcQ2rr52tWoaQP719X/vU57xbnMdgHlETCRdYXzWSivJoz+sGgIYx5LACK4ae +W2wPH3dx6UuMj85UTBbYtQbARmpiES2WVFeCJM2A3MJFUdBiaOxkTt8Gp1Qjaf/QBoN otL29cIDHC2a7gTuYDQQK+TSR2tISFbRuCHcgFSYDsLucqojWakaVuZxshW0YcmEvLg4 LWYB6UxTF0zxKIWDpqqa7WtKkv4oWR29yyN+JFyC9k/gHrmDGO332pwYJmsvCkZ6Opjg kfDg== 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=zgSEgyu5An5GyigcNkf1Yhsncd+sLucumkdkFEyxqlE=; b=FYVJfIZSaBBy0MBhjhk9JwYSAyusjhdepK55YswHjef/zurpQyqPFmmNwFz0dxKQ1Y qYhu8qBUgq+/fBJjuVdIWxqLXpjDFj0rUAkTPzgBOcN7OA4x59paS/TGiDv8Ph24btyb fW28/tDb/vQdQbQYuEUCTNyn5oIuFIi/2NK43VsxE2w7uoRoByhFbxiMEpwvt+w+5H5r 6SXcCSHe1KawD7LQwNefyK8Ps+maCmwH5aT3A009XjK0eFXPr0BNyhykog8go0cjkCiq lWOx+/FVI7L74FH+/35fbL7rEJkv1b3cPsC4PAJJKTyAPWLc2wbrDPNmr6w/lZ+oJLwt ufTA== X-Gm-Message-State: AOAM532BfQMaOQz7Q+dPLVnOngSMPzEveI3fFPYTUjy5prPBADl+z9ss UxuVn0dwyAcl7J8+btH782w= X-Google-Smtp-Source: ABdhPJzq+RfkgajAyRTiROXQLCFk9vTlMru/P8UByjvYwNeU4tUlEnH8LGwyV2wjDfKsh7i8CuNfWQ== X-Received: by 2002:a7b:cb53:: with SMTP id v19mr4452837wmj.166.1589882724396; Tue, 19 May 2020 03:05:24 -0700 (PDT) Received: from ubuntu-G3.micron.com ([165.225.86.140]) by smtp.gmail.com with ESMTPSA id b18sm19968008wrn.82.2020.05.19.03.05.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 03:05:24 -0700 (PDT) From: Bean Huo To: miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, s.hauer@pengutronix.de, boris.brezillon@collabora.com, derosier@gmail.com Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, huobean@gmail.com, Bean Huo Subject: [PATCH v5 2/5] mtd: rawnand: Add {pre,post}_erase hooks in nand_chip_ops Date: Tue, 19 May 2020 12:05:04 +0200 Message-Id: <20200519100507.19323-3-huobean@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200519100507.19323-1-huobean@gmail.com> References: <20200519100507.19323-1-huobean@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bean Huo Add {pre,post}_erase hooks in the structure nand_chip_ops: pre_erase will be called before a block is physically erased. post_erase will be called after a block is erased. Signed-off-by: Bean Huo --- drivers/mtd/nand/raw/nand_base.c | 18 +++++++++++++----- include/linux/mtd/rawnand.h | 16 ++++++++++------ 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 7af21cf49290..e90b7ae878e2 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4318,7 +4318,7 @@ static int nand_erase(struct mtd_info *mtd, struct erase_info *instr) int nand_erase_nand(struct nand_chip *chip, struct erase_info *instr, int allowbbt) { - int page, pages_per_block, ret, chipnr; + int page, pages_per_block, ret, chipnr, eb; loff_t len; pr_debug("%s: start = 0x%012llx, len = %llu\n", @@ -4372,16 +4372,24 @@ int nand_erase_nand(struct nand_chip *chip, struct erase_info *instr, (page + pages_per_block)) chip->pagecache.page = -1; - ret = nand_erase_op(chip, (page & chip->pagemask) >> - (chip->phys_erase_shift - chip->page_shift)); + eb = (page & chip->pagemask) >> + (chip->phys_erase_shift - chip->page_shift); + + if (chip->ops.pre_erase) + chip->ops.pre_erase(chip, eb); + + ret = nand_erase_op(chip, eb); if (ret) { - pr_debug("%s: failed erase, page 0x%08x\n", - __func__, page); + pr_debug("%s: failed erase block %d, page 0x%08x\n", + __func__, eb, page); instr->fail_addr = ((loff_t)page << chip->page_shift); goto erase_exit; } + if (chip->ops.post_erase) + chip->ops.post_erase(chip, eb); + /* Increment page address and decrement length */ len -= (1ULL << chip->phys_erase_shift); page += pages_per_block; diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 62932cc3ed8d..df3d4b3ef2f6 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -1027,12 +1027,14 @@ struct nand_legacy { /** * struct nand_chip_ops - NAND Chip specific operations - * @suspend: [REPLACEABLE] specific NAND device suspend operation - * @resume: [REPLACEABLE] specific NAND device resume operation - * @lock_area: [REPLACEABLE] specific NAND chip lock operation - * @unlock_area: [REPLACEABLE] specific NAND chip unlock operation - * @setup_read_retry: [FLASHSPECIFIC] flash (vendor) specific function for - * setting the read-retry mode. Mostly needed for MLC NAND. + * @suspend: [REPLACEABLE] specific NAND device suspend operation + * @resume: [REPLACEABLE] specific NAND device resume operation + * @lock_area: [REPLACEABLE] specific NAND chip lock operation + * @unlock_area: [REPLACEABLE] specific NAND chip unlock operation + * @setup_read_retry: [FLASHSPECIFIC] flash (vendor) specific function for + * setting the read-retry mode. Mostly needed for MLC NAND. + * @pre_erase: [FLASHSPECIFIC] prepare a physical erase block + * @post_erase: [FLASHSPECIFIC] physical block erase post */ struct nand_chip_ops { int (*suspend)(struct nand_chip *chip); @@ -1040,6 +1042,8 @@ struct nand_chip_ops { int (*lock_area)(struct nand_chip *chip, loff_t ofs, u64 len); int (*unlock_area)(struct nand_chip *chip, loff_t ofs, u64 len); int (*setup_read_retry)(struct nand_chip *chip, int retry_mode); + int (*pre_erase)(struct nand_chip *chip, u32 eraseblock); + int (*post_erase)(struct nand_chip *chip, u32 eraseblock); }; /** -- 2.17.1