From: Javier Martinez Canillas <javierm@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: "Maxime Ripard" <mripard@kernel.org>,
"Erico Nunes" <nunes.erico@gmail.com>,
"José Expósito" <jose.exposito89@gmail.com>,
"Javier Martinez Canillas" <javierm@redhat.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"David Airlie" <airlied@gmail.com>,
"Donald Robson" <donald.robson@imgtec.com>,
"Frank Binns" <frank.binns@imgtec.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Matt Coster" <matt.coster@imgtec.com>,
"Sarah Walker" <sarah.walker@imgtec.com>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
dri-devel@lists.freedesktop.org
Subject: [PATCH] drm/imagination: Defer probe if requested firmware is not available
Date: Tue, 9 Jan 2024 13:05:59 +0100 [thread overview]
Message-ID: <20240109120604.603700-1-javierm@redhat.com> (raw)
The device is initialized in the driver's probe callback and as part of
that initialization, the required firmware is loaded. But this fails if
the driver is built-in and the firmware isn't present in the initramfs:
$ dmesg | grep powervr
[ 2.969757] powervr fd00000.gpu: Direct firmware load for powervr/rogue_33.15.11.3_v1.fw failed with error -2
[ 2.979727] powervr fd00000.gpu: [drm] *ERROR* failed to load firmware powervr/rogue_33.15.11.3_v1.fw (err=-2)
[ 2.989885] powervr: probe of fd00000.gpu failed with error -2
$ ls -lh /lib/firmware/powervr/rogue_33.15.11.3_v1.fw.xz
-rw-r--r-- 1 root root 51K Dec 12 19:00 /lib/firmware/powervr/rogue_33.15.11.3_v1.fw.xz
To prevent the probe to fail for this case, let's defer the probe if the
firmware isn't available. That way, the driver core can retry it and get
the probe to eventually succeed once the root filesystem has been mounted.
If the firmware is also not present in the root filesystem, then the probe
will never succeed and the reason listed in the debugfs devices_deferred:
$ cat /sys/kernel/debug/devices_deferred
fd00000.gpu powervr: failed to load firmware powervr/rogue_33.15.11.3_v1.fw (err=-517)
Fixes: f99f5f3ea7ef ("drm/imagination: Add GPU ID parsing and firmware loading")
Suggested-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---
drivers/gpu/drm/imagination/pvr_device.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/imagination/pvr_device.c b/drivers/gpu/drm/imagination/pvr_device.c
index 1704c0268589..6eda25366431 100644
--- a/drivers/gpu/drm/imagination/pvr_device.c
+++ b/drivers/gpu/drm/imagination/pvr_device.c
@@ -295,8 +295,16 @@ pvr_request_firmware(struct pvr_device *pvr_dev)
*/
err = request_firmware(&fw, filename, pvr_dev->base.dev);
if (err) {
- drm_err(drm_dev, "failed to load firmware %s (err=%d)\n",
- filename, err);
+ /*
+ * Defer probe if the firmware is not available yet (e.g: the driver
+ * is built-in and the firmware not present in the initramfs image).
+ */
+ if (err == -ENOENT)
+ err = -EPROBE_DEFER;
+
+ dev_err_probe(drm_dev->dev, err, "failed to load firmware %s (err=%d)\n",
+ filename, err);
+
goto err_free_filename;
}
--
2.43.0
next reply other threads:[~2024-01-09 12:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-09 12:05 Javier Martinez Canillas [this message]
2024-01-09 13:22 ` Daniel Vetter
2024-01-09 13:48 ` Javier Martinez Canillas
2024-01-09 14:02 ` Daniel Vetter
2024-01-09 15:21 ` Javier Martinez Canillas
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=20240109120604.603700-1-javierm@redhat.com \
--to=javierm@redhat.com \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=donald.robson@imgtec.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=frank.binns@imgtec.com \
--cc=jose.exposito89@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=matt.coster@imgtec.com \
--cc=mripard@kernel.org \
--cc=nunes.erico@gmail.com \
--cc=sarah.walker@imgtec.com \
--cc=tzimmermann@suse.de \
/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
all inboxes | Powered by JetHome®