Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Lucas De Marchi <lucas.demarchi@intel.com>
To: <intel-xe@lists.freedesktop.org>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>,
	Thomas Hellstrom <thomas.hellstrom@linux.intel.com>,
	John.C.Harrison@Intel.com,
	Ashutosh Dixit <ashutosh.dixit@intel.com>,
	tejas.upadhyay@intel.com,
	Lucas De Marchi <lucas.demarchi@intel.com>
Subject: [PATCH 2/2] drm/xe: Avoid crypt message when there's no GuC definition
Date: Thu,  1 Feb 2024 14:47:24 -0800	[thread overview]
Message-ID: <20240201224724.551130-3-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20240201224724.551130-1-lucas.demarchi@intel.com>

If there's no GuC firmware entry in the table and the user didn't pass
an override path, the error message is very crypt: xe will simply try to
continue and then fail when submitting the default context:

	xe 0000:00:02.0: [drm:xe_pci_probe [xe]] XE_LUNARLAKE  64b0:0001 dgfx:0 gfx:Xe2_LPG (20.04) media:Xe2_LPM (20.00) display:no dma_m_s:46 tc:1 gscfi:0
	...
	xe: probe of 0000:00:02.0 failed with error -22

Add an explicit error message and bail out:

	xe 0000:00:02.0: [drm:xe_pci_probe [xe]] XE_LUNARLAKE  64b0:0001 dgfx:0 gfx:Xe2_LPG (20.04) media:Xe2_LPM (20.00) display:no dma_m_s:46 tc:1 gscfi:0
	xe 0000:00:02.0: [drm] *ERROR* No GuC firmware defined for platform
	xe 0000:00:02.0: [drm] *ERROR* GuC init failed with -2
	...
	xe: probe of 0000:00:02.0 failed with error -2

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/xe/xe_uc_fw.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c
index c7541f1a5c0b..742170bc1a9d 100644
--- a/drivers/gpu/drm/xe/xe_uc_fw.c
+++ b/drivers/gpu/drm/xe/xe_uc_fw.c
@@ -665,8 +665,13 @@ static int uc_fw_request(struct xe_uc_fw *uc_fw, const struct firmware **firmwar
 			       XE_UC_FIRMWARE_SELECTED :
 			       XE_UC_FIRMWARE_NOT_SUPPORTED);
 
-	if (!xe_uc_fw_is_supported(uc_fw))
+	if (!xe_uc_fw_is_supported(uc_fw)) {
+		if (uc_fw->type == XE_UC_FW_TYPE_GUC) {
+			drm_err(&xe->drm, "No GuC firmware defined for platform\n");
+			return -ENOENT;
+		}
 		return 0;
+	}
 
 	/* an empty path means the firmware is disabled */
 	if (!xe_device_uc_enabled(xe) || !(*uc_fw->path)) {
-- 
2.43.0


  parent reply	other threads:[~2024-02-01 22:54 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-01 22:47 [PATCH 0/2] Improve error path handling for firmware loading Lucas De Marchi
2024-02-01 22:47 ` [PATCH 1/2] drm/xe: Always allow to override firmware Lucas De Marchi
2024-02-02 11:50   ` Francois Dugast
2024-02-01 22:47 ` Lucas De Marchi [this message]
2024-02-02 11:52   ` [PATCH 2/2] drm/xe: Avoid crypt message when there's no GuC definition Francois Dugast
2024-02-08  0:17     ` Lucas De Marchi
2024-02-01 23:21 ` ✓ CI.Patch_applied: success for Improve error path handling for firmware loading Patchwork
2024-02-01 23:22 ` ✗ CI.checkpatch: warning " Patchwork
2024-02-01 23:22 ` ✓ CI.KUnit: success " Patchwork
2024-02-01 23:30 ` ✓ CI.Build: " Patchwork
2024-02-01 23:30 ` ✓ CI.Hooks: " Patchwork
2024-02-01 23:31 ` ✓ CI.checksparse: " Patchwork
2024-02-01 23:54 ` ✓ CI.BAT: " Patchwork

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=20240201224724.551130-3-lucas.demarchi@intel.com \
    --to=lucas.demarchi@intel.com \
    --cc=John.C.Harrison@Intel.com \
    --cc=ashutosh.dixit@intel.com \
    --cc=daniele.ceraolospurio@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=tejas.upadhyay@intel.com \
    --cc=thomas.hellstrom@linux.intel.com \
    /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