From: Conor Dooley <conor@kernel.org>
To: linux-riscv@lists.infradead.org
Cc: Conor Dooley <conor.dooley@microchip.com>,
stable@vger.kernel.org,
Daire McNamara <daire.mcnamara@microchip.com>,
Valentina.FernandezAlanis@microchip.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1] firmware: microchip: fail auto-update probe if no flash found
Date: Thu, 12 Mar 2026 18:01:24 +0000 [thread overview]
Message-ID: <20260312-distress-figure-e05517910026@spud> (raw)
In-Reply-To: <20260310-gyration-smasher-1eb31125b2b6@spud>
[-- 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 --]
prev parent reply other threads:[~2026-03-12 18:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-03 11:24 [PATCH v1] firmware: microchip: fail auto-update probe if no flash found Conor Dooley
2026-03-10 18:24 ` Conor Dooley
2026-03-12 18:01 ` Conor Dooley [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260312-distress-figure-e05517910026@spud \
--to=conor@kernel.org \
--cc=Valentina.FernandezAlanis@microchip.com \
--cc=conor.dooley@microchip.com \
--cc=daire.mcnamara@microchip.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox