[PATCH v2 39/58] mtd: rawnand: qcom: retain open-handle state on removal
From: James Hilliard
Date: Tue Nov 10 2026 - 02:51:39 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.
Install lifetime ownership after scanning each chip and before any MTD
device is published. On a partial probe failure, unregister only the
published chips, then disconnect and release every initialized chip.
Cc: linux-arm-msm@xxxxxxxxxxxxxxx
Cc: Manivannan Sadhasivam <mani@xxxxxxxxxx>
Signed-off-by: James Hilliard <james.hilliard1@xxxxxxxxx>
---
drivers/mtd/nand/raw/qcom_nandc.c | 46 +++++++++++++++++++++++++++++----------
1 file changed, 34 insertions(+), 12 deletions(-)
diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
index 978fa84f051d..2e8fc574f718 100644
--- a/drivers/mtd/nand/raw/qcom_nandc.c
+++ b/drivers/mtd/nand/raw/qcom_nandc.c
@@ -1903,7 +1903,6 @@ static int qcom_nandc_setup(struct qcom_nand_controller *nandc)
{
u32 nand_ctrl;
- nand_controller_init(&nandc->controller);
nandc->controller.ops = &qcom_nandc_ops;
/* kill onenand */
@@ -2010,6 +2009,11 @@ static int qcom_nand_host_parse_boot_partitions(struct qcom_nand_controller *nan
return 0;
}
+static void qcom_nand_host_release(struct nand_chip *chip)
+{
+ kfree(to_qcom_nand_host(chip));
+}
+
static int qcom_nand_host_init(struct qcom_nand_controller *nandc,
struct qcom_nand_host *host,
struct device_node *dn)
@@ -2022,13 +2026,16 @@ static int qcom_nand_host_init(struct qcom_nand_controller *nandc,
ret = of_property_read_u32(dn, "reg", &host->cs);
if (ret) {
dev_err(dev, "can't get chip-select\n");
- return -ENXIO;
+ ret = -ENXIO;
+ goto free_host;
}
nand_set_flash_node(chip, dn);
mtd->name = devm_kasprintf(dev, GFP_KERNEL, "qcom_nand.%d", host->cs);
- if (!mtd->name)
- return -ENOMEM;
+ if (!mtd->name) {
+ ret = -ENOMEM;
+ goto free_host;
+ }
mtd->owner = THIS_MODULE;
mtd->dev.parent = dev;
@@ -2053,7 +2060,7 @@ static int qcom_nand_host_init(struct qcom_nand_controller *nandc,
ret = nand_scan(chip, 1);
if (ret)
- return ret;
+ goto free_host;
if (nandc->props->use_codeword_fixup) {
ret = qcom_nand_host_parse_boot_partitions(nandc, host, dn);
@@ -2061,10 +2068,15 @@ static int qcom_nand_host_init(struct qcom_nand_controller *nandc,
goto err;
}
+ ret = nand_set_release(chip, qcom_nand_host_release);
+ if (ret)
+ goto err;
return 0;
err:
nand_cleanup(chip);
+free_host:
+ kfree(host);
return ret;
}
@@ -2076,15 +2088,13 @@ static int qcom_probe_nand_devices(struct qcom_nand_controller *nandc)
int ret = -ENODEV;
for_each_available_child_of_node_scoped(dn, child) {
- host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);
+ host = kzalloc_obj(*host);
if (!host)
return -ENOMEM;
ret = qcom_nand_host_init(nandc, host, child);
- if (ret) {
- devm_kfree(dev, host);
+ if (ret)
return ret;
- }
list_add_tail(&host->node, &nandc->host_list);
}
@@ -2106,12 +2116,16 @@ static void qcom_nandc_cleanup_chips(struct qcom_nand_controller *nandc)
int ret;
list_for_each_entry_safe(host, tmp, &nandc->host_list, node) {
+ struct nand_chip *chip = &host->chip;
+ struct mtd_info *mtd = nand_to_mtd(chip);
+
if (host->registered) {
- ret = mtd_device_unregister(nand_to_mtd(&host->chip));
+ ret = mtd_device_unregister(mtd);
WARN_ON(ret);
}
- nand_cleanup(&host->chip);
+ nand_disconnect(chip);
list_del(&host->node);
+ mtd_put_master(mtd);
}
}
@@ -2141,6 +2155,11 @@ static int qcom_nandc_parse_dt(struct platform_device *pdev)
return 0;
}
+static void qcom_nandc_release(struct nand_controller *controller)
+{
+ kfree(container_of(controller, struct qcom_nand_controller, controller));
+}
+
static int qcom_nandc_probe(struct platform_device *pdev)
{
struct qcom_nand_controller *nandc;
@@ -2149,9 +2168,12 @@ static int qcom_nandc_probe(struct platform_device *pdev)
struct resource *res;
int ret;
- nandc = devm_kzalloc(&pdev->dev, sizeof(*nandc), GFP_KERNEL);
+ nandc = kzalloc_obj(*nandc);
if (!nandc)
return -ENOMEM;
+ ret = devm_nand_controller_init(dev, &nandc->controller, qcom_nandc_release);
+ if (ret)
+ return ret;
platform_set_drvdata(pdev, nandc);
nandc->dev = dev;
--
2.53.0