[PATCH v2] mtd: rawnand: atmel: keep the HSMC clock on until the NFC IRQ is freed
From: James Hilliard
Date: Fri Nov 20 2026 - 11:01:19 EST
When the Atmel NAND driver is unbound on a system using the legacy DT
binding, another device on the shared interrupt line can still cause the
NFC handler to read registers after the HSMC clock has been disabled.
The remove callback turns off the clock, but devres releases the IRQ
only after the callback returns.
Register a clock cleanup action before requesting the IRQ. Devres then
drains the handler before disabling and releasing the clock, both on
removal and when probe fails after requesting the IRQ.
Fixes: f88fc122cc34 ("mtd: nand: Cleanup/rework the atmel_nand driver")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: James Hilliard <james.hilliard1@xxxxxxxxx>
---
Changes in v2:
- Use a devres action for clock cleanup so devres releases the IRQ first.
- Link to v1: https://patch.msgid.link/20261108-submit-atmel-nand-irq-teardown-v1-v1-1-341643c83ee3@xxxxxxxxx
---
drivers/mtd/nand/raw/atmel/nand-controller.c | 56 ++++++++++++++--------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
index b86d080bcb2c..ce5e13276d2e 100644
--- a/drivers/mtd/nand/raw/atmel/nand-controller.c
+++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
@@ -263,9 +263,6 @@ struct atmel_hsmc_nand_controller {
struct completion complete;
u32 cfg;
int irq;
-
- /* Only used when instantiating from legacy DT bindings. */
- struct clk *clk;
};
static inline struct atmel_hsmc_nand_controller *
@@ -2151,6 +2148,14 @@ atmel_smc_nand_controller_init(struct atmel_smc_nand_controller *nc)
return 0;
}
+static void atmel_hsmc_nand_clk_cleanup(void *data)
+{
+ struct clk *clk = data;
+
+ clk_disable_unprepare(clk);
+ clk_put(clk);
+}
+
static int
atmel_hsmc_nand_controller_legacy_init(struct atmel_hsmc_nand_controller *nc)
{
@@ -2164,6 +2169,7 @@ atmel_hsmc_nand_controller_legacy_init(struct atmel_hsmc_nand_controller *nc)
struct device_node *nand_np, *nfc_np;
void __iomem *iomem;
struct resource res;
+ struct clk *clk;
int ret;
nand_np = dev->of_node;
@@ -2173,41 +2179,46 @@ atmel_hsmc_nand_controller_legacy_init(struct atmel_hsmc_nand_controller *nc)
return -ENODEV;
}
- nc->clk = of_clk_get(nfc_np, 0);
- if (IS_ERR(nc->clk)) {
- ret = PTR_ERR(nc->clk);
+ clk = of_clk_get(nfc_np, 0);
+ if (IS_ERR(clk)) {
+ ret = PTR_ERR(clk);
dev_err(dev, "Failed to retrieve HSMC clock (err = %d)\n",
ret);
goto out;
}
- ret = clk_prepare_enable(nc->clk);
+ ret = clk_prepare_enable(clk);
if (ret) {
dev_err(dev, "Failed to enable the HSMC clock (err = %d)\n",
ret);
- goto out_put_clk;
+ clk_put(clk);
+ goto out;
}
+ ret = devm_add_action_or_reset(dev, atmel_hsmc_nand_clk_cleanup, clk);
+ if (ret)
+ goto out;
+
nc->irq = of_irq_get(nand_np, 0);
if (nc->irq <= 0) {
ret = nc->irq ?: -ENXIO;
if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get IRQ number (err = %d)\n",
ret);
- goto out_disable_clk;
+ goto out;
}
ret = of_address_to_resource(nfc_np, 0, &res);
if (ret) {
dev_err(dev, "Invalid or missing NFC IO resource (err = %d)\n",
ret);
- goto out_disable_clk;
+ goto out;
}
iomem = devm_ioremap_resource(dev, &res);
if (IS_ERR(iomem)) {
ret = PTR_ERR(iomem);
- goto out_disable_clk;
+ goto out;
}
regmap_conf.name = "nfc-io";
@@ -2217,20 +2228,20 @@ atmel_hsmc_nand_controller_legacy_init(struct atmel_hsmc_nand_controller *nc)
ret = PTR_ERR(nc->io);
dev_err(dev, "Could not create NFC IO regmap (err = %d)\n",
ret);
- goto out_disable_clk;
+ goto out;
}
ret = of_address_to_resource(nfc_np, 1, &res);
if (ret) {
dev_err(dev, "Invalid or missing HSMC resource (err = %d)\n",
ret);
- goto out_disable_clk;
+ goto out;
}
iomem = devm_ioremap_resource(dev, &res);
if (IS_ERR(iomem)) {
ret = PTR_ERR(iomem);
- goto out_disable_clk;
+ goto out;
}
regmap_conf.name = "smc";
@@ -2240,30 +2251,24 @@ atmel_hsmc_nand_controller_legacy_init(struct atmel_hsmc_nand_controller *nc)
ret = PTR_ERR(nc->base.smc);
dev_err(dev, "Could not create NFC IO regmap (err = %d)\n",
ret);
- goto out_disable_clk;
+ goto out;
}
ret = of_address_to_resource(nfc_np, 2, &res);
if (ret) {
dev_err(dev, "Invalid or missing SRAM resource (err = %d)\n",
ret);
- goto out_disable_clk;
+ goto out;
}
nc->sram.virt = devm_ioremap_resource(dev, &res);
if (IS_ERR(nc->sram.virt)) {
ret = PTR_ERR(nc->sram.virt);
- goto out_disable_clk;
+ goto out;
}
nc->sram.dma = res.start;
- goto out;
-
-out_disable_clk:
- clk_disable_unprepare(nc->clk);
-out_put_clk:
- clk_put(nc->clk);
out:
of_node_put(nfc_np);
@@ -2345,11 +2350,6 @@ atmel_hsmc_nand_controller_remove(struct atmel_nand_controller *nc)
(unsigned long)hsmc_nc->sram.virt,
ATMEL_NFC_SRAM_SIZE);
- if (hsmc_nc->clk) {
- clk_disable_unprepare(hsmc_nc->clk);
- clk_put(hsmc_nc->clk);
- }
-
atmel_nand_controller_cleanup(nc);
return 0;
---
base-commit: ec1e844b9486302a488abc03ea918db60709766e
base-tree: git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next
change-id: 20261107-submit-atmel-nand-irq-teardown-v1-f902307c18db
Best regards,
--
James Hilliard <james.hilliard1@xxxxxxxxx>