[PATCH v5 29/58] mtd: rawnand: ma35d1: retain open-handle state on removal

From: James Hilliard

Date: Mon Nov 16 2026 - 01:32:08 EST


Keep chip metadata and controller storage alive until the final MTD
reference is released. Unregister and disconnect each published chip
before releasing the resources used by its hardware operations.

Unlink each chip before dropping its initial lifetime reference.

Run NAND cleanup during disconnection; the final core-owned put only
releases retained allocation and layout data.

Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
Cc: Shan-Chun Hung <schung@xxxxxxxxxxx>
Cc: Jacky Huang <ychuang3@xxxxxxxxxxx>
Signed-off-by: James Hilliard <james.hilliard1@xxxxxxxxx>
---
.../mtd/nand/raw/nuvoton-ma35d1-nand-controller.c | 36 +++++++++++++++-------
1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/drivers/mtd/nand/raw/nuvoton-ma35d1-nand-controller.c b/drivers/mtd/nand/raw/nuvoton-ma35d1-nand-controller.c
index 23db2f4fefbb..9d89263ac09c 100644
--- a/drivers/mtd/nand/raw/nuvoton-ma35d1-nand-controller.c
+++ b/drivers/mtd/nand/raw/nuvoton-ma35d1-nand-controller.c
@@ -866,8 +866,7 @@ static int ma35_nand_chip_init(struct device *dev, struct ma35_nand_info *nand,
return -EINVAL;
}

- nvtnand = devm_kzalloc(dev, struct_size(nvtnand, sels, nsels),
- GFP_KERNEL);
+ nvtnand = kzalloc(struct_size(nvtnand, sels, nsels), GFP_KERNEL);
if (!nvtnand)
return -ENOMEM;

@@ -876,17 +875,19 @@ static int ma35_nand_chip_init(struct device *dev, struct ma35_nand_info *nand,
ret = of_property_read_u32_index(np, "reg", i, &cs);
if (ret) {
dev_err(dev, "reg property failure : %d\n", ret);
- return ret;
+ goto free_chip;
}

if (cs >= MA35_MAX_NSELS) {
dev_err(dev, "invalid CS: %u\n", cs);
- return -EINVAL;
+ ret = -EINVAL;
+ goto free_chip;
}

if (test_and_set_bit(cs, &nand->assigned_cs)) {
dev_err(dev, "CS %u already assigned\n", cs);
- return -EINVAL;
+ ret = -EINVAL;
+ goto free_chip;
}

nvtnand->sels[i] = cs;
@@ -899,23 +900,33 @@ static int ma35_nand_chip_init(struct device *dev, struct ma35_nand_info *nand,
nand_set_controller_data(chip, nand);

mtd = nand_to_mtd(chip);
- mtd->owner = THIS_MODULE;
+
mtd->parent_dev = dev;

mtd_set_ooblayout(mtd, &ma35_ooblayout_ops);
ret = nand_scan(chip, nsels);
if (ret)
- return ret;
+ goto free_chip;
+ ret = nand_set_lifetime(chip, container_of(chip, struct ma35_nand_chip, chip));
+ if (ret) {
+ nand_cleanup(chip);
+ goto free_chip;
+ }

ret = mtd_device_register(mtd, NULL, 0);
if (ret) {
- nand_cleanup(chip);
+ nand_disconnect(chip);
+ mtd_put_master(mtd);
return ret;
}

list_add_tail(&nvtnand->node, &nand->chips);

return 0;
+
+free_chip:
+ kfree(nvtnand);
+ return ret;
}

static void ma35_chips_cleanup(struct ma35_nand_info *nand)
@@ -928,8 +939,9 @@ static void ma35_chips_cleanup(struct ma35_nand_info *nand)
chip = &nvtnand->chip;
ret = mtd_device_unregister(nand_to_mtd(chip));
WARN_ON(ret);
- nand_cleanup(chip);
+ nand_disconnect(chip);
list_del(&nvtnand->node);
+ mtd_put_master(nand_to_mtd(chip));
}
}

@@ -953,11 +965,13 @@ static int ma35_nand_probe(struct platform_device *pdev)
struct ma35_nand_info *nand;
int ret = 0;

- nand = devm_kzalloc(&pdev->dev, sizeof(*nand), GFP_KERNEL);
+ nand = kzalloc_obj(*nand);
if (!nand)
return -ENOMEM;

- nand_controller_init(&nand->controller);
+ ret = devm_nand_controller_init(&pdev->dev, &nand->controller, nand);
+ if (ret)
+ return ret;
INIT_LIST_HEAD(&nand->chips);
nand->controller.ops = &ma35_nfc_ops;


--
2.53.0