[PATCH v1] firmware: microchip: fail auto-update probe if no flash found

[PATCH v1] firmware: microchip: fail auto-update probe if no flash found

[Conor Dooley]

From: Conor Dooley <conor.dooley@microchip.com>

There's no point letting the driver probe if there is no flash, as
trying to do a firmware upload will fail. Move the code that attempts
to get the flash from firmware upload to probe, and let it emit a
message to users stating why auto-update is not supported.
The code currently could have a problem if there's a flash in
devicetree, but the system controller driver fails to get a pointer to
it from the mtd subsystem, which will cause
mpfs_sys_controller_get_flash() to return an error. Check for errors and
null, instead of just null, in the new clause.

CC: stable@vger.kernel.org
Fixes: ec5b0f1193ad4 ("firmware: microchip: add PolarFire SoC Auto Update support")
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
CC: Conor Dooley <conor.dooley@microchip.com>
CC: Daire McNamara <daire.mcnamara@microchip.com>
CC: Valentina.FernandezAlanis@microchip.com
CC: linux-riscv@lists.infradead.org
CC: linux-kernel@vger.kernel.org
---
 drivers/firmware/microchip/mpfs-auto-update.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/firmware/microchip/mpfs-auto-update.c b/drivers/firmware/microchip/mpfs-auto-update.c
index 46b19d803446e..05ac82f1498b3 100644
--- a/drivers/firmware/microchip/mpfs-auto-update.c
+++ b/drivers/firmware/microchip/mpfs-auto-update.c
@@ -113,10 +113,6 @@ static enum fw_upload_err mpfs_auto_update_prepare(struct fw_upload *fw_uploader
 	 * be added here.
 	 */
 
-	priv->flash = mpfs_sys_controller_get_flash(priv->sys_controller);
-	if (!priv->flash)
-		return FW_UPLOAD_ERR_HW_ERROR;
-
 	erase_size = round_up(erase_size, (u64)priv->flash->erasesize);
 
 	/*
@@ -427,6 +423,11 @@ static int mpfs_auto_update_probe(struct platform_device *pdev)
 		return dev_err_probe(dev, PTR_ERR(priv->sys_controller),
 				     "Could not register as a sub device of the system controller\n");
 
+	priv->flash = mpfs_sys_controller_get_flash(priv->sys_controller);
+	if (IS_ERR_OR_NULL(priv->flash))
+		return dev_err_probe(dev, -ENODEV,
+				     "No flash connected to the system controller, auto-update not supported\n");
+
 	priv->dev = dev;
 	platform_set_drvdata(pdev, priv);
 
-- 
2.51.0

Re: [PATCH v1] firmware: microchip: fail auto-update probe if no flash found

[Conor Dooley]

From: Conor Dooley <conor.dooley@microchip.com>

On Tue, 03 Mar 2026 11:24:06 +0000, Conor Dooley wrote:
> There's no point letting the driver probe if there is no flash, as
> trying to do a firmware upload will fail. Move the code that attempts
> to get the flash from firmware upload to probe, and let it emit a
> message to users stating why auto-update is not supported.
> The code currently could have a problem if there's a flash in
> devicetree, but the system controller driver fails to get a pointer to
> it from the mtd subsystem, which will cause
> mpfs_sys_controller_get_flash() to return an error. Check for errors and
> null, instead of just null, in the new clause.
> 
> [...]

Applied to riscv-soc-fixes, thanks!

[1/1] firmware: microchip: fail auto-update probe if no flash found
      https://git.kernel.org/conor/c/c30b2509164f

Thanks,
Conor.

Re: [PATCH v1] firmware: microchip: fail auto-update probe if no flash found

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 2198 bytes --]

On Tue, Mar 10, 2026 at 06:24:11PM +0000, Conor Dooley wrote:
> From: Conor Dooley <conor.dooley@microchip.com>
> 
> On Tue, 03 Mar 2026 11:24:06 +0000, Conor Dooley wrote:
> > There's no point letting the driver probe if there is no flash, as
> > trying to do a firmware upload will fail. Move the code that attempts
> > to get the flash from firmware upload to probe, and let it emit a
> > message to users stating why auto-update is not supported.
> > The code currently could have a problem if there's a flash in
> > devicetree, but the system controller driver fails to get a pointer to
> > it from the mtd subsystem, which will cause
> > mpfs_sys_controller_get_flash() to return an error. Check for errors and
> > null, instead of just null, in the new clause.
> > 
> > [...]
> 
> Applied to riscv-soc-fixes, thanks!
> 
> [1/1] firmware: microchip: fail auto-update probe if no flash found
>       https://git.kernel.org/conor/c/c30b2509164f

My CI started whinging about this..
Probably needs to be:
commit 8fc167b47d48d3653639d026cc3f657f6c78ab4d
Author: Conor Dooley <conor.dooley@microchip.com>
Date:   Thu Mar 12 18:00:01 2026 +0000

    firmware: microchip: auto-update: silence error print when flash not found
    
    Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

diff --git a/drivers/firmware/microchip/mpfs-auto-update.c b/drivers/firmware/microchip/mpfs-auto-update.c
index 0105c55ed7f37..8fc3749d4a709 100644
--- a/drivers/firmware/microchip/mpfs-auto-update.c
+++ b/drivers/firmware/microchip/mpfs-auto-update.c
@@ -424,9 +424,10 @@ static int mpfs_auto_update_probe(struct platform_device *pdev)
 				     "Could not register as a sub device of the system controller\n");
 
 	priv->flash = mpfs_sys_controller_get_flash(priv->sys_controller);
-	if (IS_ERR_OR_NULL(priv->flash))
-		return dev_err_probe(dev, -ENODEV,
-				     "No flash connected to the system controller, auto-update not supported\n");
+	if (IS_ERR_OR_NULL(priv->flash)) {
+		dev_dbg(dev, "No flash connected to the system controller, auto-update not supported\n");
+		return -ENODEV;
+	}
 
 	priv->dev = dev;
 	platform_set_drvdata(pdev, priv);


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]