From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90002606D805 for ; Sat, 7 Nov 2026 20:14:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=aSMnukO/ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Unsubscribe-Post:List-Owner; bh=6U2CLJaepU3U28PoHVGWx8Xft1IR33LO7sKzUUuRcMM=; b=aSMnukO/+AnTZB5HKUXg1Y0eq3 lRcvNrsE/MoP2A5+Efc6TSYUdIzWgshqJmPf+YDon4lSqKgbehWRDesxoiKK388TP+3DZDsmLRa7Q +mABlGeu72DR1R6y+XWKEW8PG11PLcjzhVPQcQxkBkOUroSfoO9dXFsf5bP/RAqRdh1fhaFoILODy lEmO7V5bB0oU3MBl50KR6DAprku5HMJoIJoLZAwzI1YAvUx0u4q/CTKmFfuir6/2DSltuQPF1q3ei ueFszVAzr21kplq3RJRziEXg9N7EYcx1NhkQp1LFNUS1/t4TcAYMb5Y1awOBNZmN0qkgAuV2Jo6mj oqRM/KOQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xPmo8-0000000FJvW-03KP; Sat, 07 Nov 2026 20:14:36 +0000 Received: from mail-oo1-f49.google.com ([209.85.161.49]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xPmnh-0000000FJCl-2nsu for linux-amlogic@lists.infradead.org; Sat, 07 Nov 2026 20:14:11 +0000 Received: by mail-oo1-f49.google.com with SMTP id 006d021491bc7-705cb6ceebaso1240618eaf.3 for ; Sat, 07 Nov 2026 12:14:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794082448; x=1794687248; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=zd1KEiVioYI8oN7Z1XXsuI+JrCDYdIglHkXO7xk8gJ0=; b=SxaEkwQDS77kATly0sOoHn/QXKtChW0s5QYC1HNRw+VpehxtrNmZz6Vz048nCLSlk/ KhAE34zum9aOrTqaBYRHVjd26W9uS7jLKJHY/GQokCYC+57t8sEAViLNWV4KSMaMn7IQ kEQHtu2r22qQGGJA2qHWKhwhUEeJz3PxgLnvuKudiQzQLUVevahCjLkLGETJaLNjB3UR MTvkIn5h94VSQIz0prNG09hHNOau+m/XHU01ioNjCtz1bD+Pn+IN//6aE1gS3VDEbHQD dpaz8A0dWPK2cPfSY9UG97bz91npZievJjOJpygekbkMXLbYsiJH2DPTPF2PFGQwe59e ceIQ== X-Forwarded-Encrypted: i=1; AKwUvBwgzCyRSMx8gmIdBflTNTe6sVEKq0hO1eYif7E4d7f7BVDGoq/BntJiy1yEXUZnoKU67ZoeTy/gQI6+/0dy@lists.infradead.org X-Gm-Message-State: APuU4Z96D790ru3Uu57XixrUA9YpbGBzQ4gzrmFEvRdF5pAETluSKrqB JosxDzNViYg4MC+wbpapsr3bgagaRG4M4AltWB8EH0k2FgShorcC5BthRwD+u2O6N6M= X-Gm-Gg: AYBFou0EuAuHjvpgBiuuE6umfwTxpVrBjcjQbZL8RFQjmh7K+Oxzs9QTo0JPsHfeYuJ OcHNPDSG0BVbcoukHpt20v2U8bcHT+zCxKcExXNKNVt+8A5wiZUUB2rVKz/wWQCEegiFWQ/gx9k PdSn2JP/cs9/59nkxVM6w7sSnnunPCb8Lqs/6RX2FqrnmW+Vl0g3WIOPbVtZrpQp5EDffGJ+ZuD 91KgejB4g9X1cHMZSQRE1vJJjgt2K9amjCL4OaTWcZf1ZlTFx+nKGYdRQeF7ZQCrJPgsKqEL0om vvjUdbHnaMJnY1LQy9B5O7aLaXVA0SpbAijdaHgejawCfi4MmIYVBWIUTu/RY9kqOQVWnEobeY0 c/JHJgvhIDZIH/a3R+V9/11OPpodMMIKT2No6S8EyEJuiL64bbYpoNIxFeR85MJjZnKRXfKikWt DzPpvRuKhZGzVPF+Q1fhG8npmj9XdsIR3/zEnuxCs7tG9IMufBmg4CnOyDDndcJKSDzjLJceQqk WudjLfjofLYntgXvMRnAg1y5T5fOK6l95IFyuak6nRDgR//co1cFjXRnd375DRld6T8YtfgDpm8 dQXu4qw1wZRlIesvmxl8d5A9durfznqiszo5/0rewidagX34YwFFcVnJYKfs X-Received: by 2002:a05:6820:560b:b0:700:da68:7398 with SMTP id 006d021491bc7-7170f278e61mr16479eaf.43.1794082448352; Sat, 07 Nov 2026 12:14:08 -0800 (PST) Received: from [127.0.1.1] (174-29-1-49.hlrn.qwest.net. [174.29.1.49]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4ade68aa561sm226096fac.5.2026.11.07.12.14.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Nov 2026 12:14:07 -0800 (PST) From: James Hilliard Date: Sat, 07 Nov 2026 03:16:50 -0700 Subject: [PATCH 53/58] mtd: rawnand: fsl_elbc: retain chip state across removal X-Archived-By: MIME-Version: 1.0 Message-Id: <20261107-submit-rawnand-retained-handle-lifetime-v1-v1-53-0181ef0cc4c8@gmail.com> References: <20261107-submit-rawnand-retained-handle-lifetime-v1-v1-0-0181ef0cc4c8@gmail.com> In-Reply-To: <20261107-submit-rawnand-retained-handle-lifetime-v1-v1-0-0181ef0cc4c8@gmail.com> To: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Brian Norris , Boris Brezillon , Arseniy Krasnov , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Thomas Gleixner , Vitaly Wool , David Woodhouse , Russell King , David Woodhouse , Mike Rapoport , Maxime Coquelin , Alexandre Torgue , Christophe Kerello , Jason Roberts , Michal Simek , Boris Brezillon , Mason Yang , Ramuthevar Vadivel Murugan , Stefan Agner , Lucas Stach , Thierry Reding , Jonathan Hunter , Dmitry Osipenko , Matthias Brugger , AngeloGioacchino Del Regno , Jorge Ramirez-Ortiz , Heiko Stuebner , Yifeng Zhao , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Keguang Zhang , Jacky Huang , Shan-Chun Hung , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Han Xu , Liang Yang , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Manivannan Sadhasivam , Kamal Dasu , Broadcom internal kernel review list , Vladimir Zapolskiy , Piotr Wojtaszczyk , Paul Cercueil , Harvey Hunt , Maxim Levitsky , Michael Walle , Srinivas Kandagatla Cc: Tze Yee Ng , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-mips@vger.kernel.org, imx@lists.linux.dev, linux-renesas-soc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-msm@vger.kernel.org, James Hilliard X-Mailer: b4 0.15.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261107_121409_843130_283DA946 X-CRM114-Status: GOOD ( 19.23 ) X-Spam-Score: 1.7 (+) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" X-Spam-Status: No, score=-12.3 required=3.0 tests=BAYES_00,DATE_IN_PAST_06_12, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 Keep a reference to the shared FCM controller for each scanned chip, including chips retained after unbind. Count active banks separately so a new binding cannot reuse controller state still owned by old MTD handles. Unregister and drain the chip before unmapping its chip-select window. Release NAND metadata, chip storage and the shared controller reference only after the final MTD put. Signed-off-by: James Hilliard --- drivers/mtd/nand/raw/fsl_elbc_nand.c | 68 ++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c index c655d27bc4cc..c27e89050270 100644 --- a/drivers/mtd/nand/raw/fsl_elbc_nand.c +++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c @@ -48,6 +48,7 @@ struct fsl_elbc_mtd { struct fsl_elbc_fcm_ctrl { struct nand_controller controller; + struct kref refcnt; struct fsl_elbc_mtd *chips[MAX_BANKS]; u8 __iomem *addr; /* Address of assigned FCM buffer */ @@ -837,23 +838,35 @@ static const struct nand_controller_ops fsl_elbc_controller_ops = { .attach_chip = fsl_elbc_attach_chip, }; -static int fsl_elbc_chip_remove(struct fsl_elbc_mtd *priv) +static void fsl_elbc_controller_release(struct kref *ref) { - struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = priv->ctrl->nand; - struct mtd_info *mtd = nand_to_mtd(&priv->chip); + kfree(container_of(ref, struct fsl_elbc_fcm_ctrl, refcnt)); +} + +static void fsl_elbc_chip_release(struct nand_chip *chip) +{ + struct fsl_elbc_fcm_ctrl *ctrl; - kfree(mtd->name); + ctrl = container_of(chip->controller, struct fsl_elbc_fcm_ctrl, controller); + kfree(nand_get_controller_data(chip)); + kref_put(&ctrl->refcnt, fsl_elbc_controller_release); +} + +static DEFINE_MUTEX(fsl_elbc_nand_mutex); + +static void fsl_elbc_chip_remove(struct fsl_elbc_mtd *priv) +{ + struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = priv->ctrl->nand; if (priv->vbase) iounmap(priv->vbase); + guard(mutex)(&fsl_elbc_nand_mutex); elbc_fcm_ctrl->chips[priv->bank] = NULL; - kfree(priv); - return 0; + if (!--elbc_fcm_ctrl->counter) + priv->ctrl->nand = NULL; } -static DEFINE_MUTEX(fsl_elbc_nand_mutex); - static int fsl_elbc_nand_probe(struct platform_device *pdev) { struct fsl_lbc_regs __iomem *lbc; @@ -867,6 +880,7 @@ static int fsl_elbc_nand_probe(struct platform_device *pdev) struct device *dev; struct device_node *node = pdev->dev.of_node; struct mtd_info *mtd; + const char *name; if (!fsl_lbc_ctrl_dev || !fsl_lbc_ctrl_dev->regs) return dev_err_probe(&pdev->dev, -EPROBE_DEFER, "lbc_ctrl_dev missing\n"); @@ -904,21 +918,25 @@ static int fsl_elbc_nand_probe(struct platform_device *pdev) elbc_fcm_ctrl = kzalloc_obj(*elbc_fcm_ctrl); if (!elbc_fcm_ctrl) { mutex_unlock(&fsl_elbc_nand_mutex); - ret = -ENOMEM; - goto err; + kfree(priv); + return -ENOMEM; } - elbc_fcm_ctrl->counter++; + kref_init(&elbc_fcm_ctrl->refcnt); nand_controller_init(&elbc_fcm_ctrl->controller); fsl_lbc_ctrl_dev->nand = elbc_fcm_ctrl; } else { elbc_fcm_ctrl = fsl_lbc_ctrl_dev->nand; + kref_get(&elbc_fcm_ctrl->refcnt); } + elbc_fcm_ctrl->counter++; mutex_unlock(&fsl_elbc_nand_mutex); elbc_fcm_ctrl->chips[bank] = priv; priv->bank = bank; priv->ctrl = fsl_lbc_ctrl_dev; + priv->chip.controller = &elbc_fcm_ctrl->controller; + nand_set_controller_data(&priv->chip, priv); priv->dev = &pdev->dev; dev_set_drvdata(priv->dev, priv); @@ -945,11 +963,21 @@ static int fsl_elbc_nand_probe(struct platform_device *pdev) if (ret) goto err; + name = mtd->name; + ret = nand_set_release(&priv->chip, fsl_elbc_chip_release); + if (ret) + goto cleanup_nand; + kfree(name); + /* First look for RedBoot table or partitions on the command * line, these take precedence over device tree information */ ret = mtd_device_parse_register(mtd, part_probe_types, NULL, NULL, 0); - if (ret) - goto cleanup_nand; + if (ret) { + nand_disconnect(&priv->chip); + fsl_elbc_chip_remove(priv); + mtd_put_master(mtd); + return ret; + } pr_info("eLBC NAND device at 0x%llx, bank %d\n", (unsigned long long)res.start, priv->bank); @@ -959,32 +987,26 @@ static int fsl_elbc_nand_probe(struct platform_device *pdev) cleanup_nand: nand_cleanup(&priv->chip); err: + kfree(nand_to_mtd(&priv->chip)->name); fsl_elbc_chip_remove(priv); + fsl_elbc_chip_release(&priv->chip); return ret; } static void fsl_elbc_nand_remove(struct platform_device *pdev) { - struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = fsl_lbc_ctrl_dev->nand; struct fsl_elbc_mtd *priv = dev_get_drvdata(&pdev->dev); struct nand_chip *chip = &priv->chip; int ret; ret = mtd_device_unregister(nand_to_mtd(chip)); WARN_ON(ret); - nand_cleanup(chip); + nand_disconnect(chip); fsl_elbc_chip_remove(priv); - mutex_lock(&fsl_elbc_nand_mutex); - elbc_fcm_ctrl->counter--; - if (!elbc_fcm_ctrl->counter) { - fsl_lbc_ctrl_dev->nand = NULL; - kfree(elbc_fcm_ctrl); - } - mutex_unlock(&fsl_elbc_nand_mutex); - + mtd_put_master(nand_to_mtd(chip)); } static const struct of_device_id fsl_elbc_nand_match[] = { -- 2.53.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic