Skip to content

drm/xe: Update XE GuC firmware version for PTL#5455

Merged
bardliao merged 5 commits intothesofproject:topic/sof-devfrom
bardliao:ptl-guc-fw
Jun 19, 2025
Merged

drm/xe: Update XE GuC firmware version for PTL#5455
bardliao merged 5 commits intothesofproject:topic/sof-devfrom
bardliao:ptl-guc-fw

Conversation

@bardliao
Copy link
Collaborator

Fix the conflict and bump the recommended GuC version.

bardliao and others added 4 commits June 12, 2025 11:08
This reverts commit 9e65e00.
The commit conflicts to the new kernel. And the GuC firmware version has
been updated.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
The `entries` variable is used to loop through the array - it's supposed
to be const, but not static.

Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250307-xe-per-gt-fw-v1-1-459574d76400@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
The different GTs on a device can be very different. Right now for all
platforms the same firmware is loaded in each GT, however future
platforms may benefit from loading a different file depending on the GT
type.

Based on previous patch by John Harrison <John.C.Harrison@Intel.com>.

Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250307-xe-per-gt-fw-v1-2-459574d76400@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
A new workaround requires a newer GuC version. So, recommend that
users install it.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://lore.kernel.org/r/20250403185619.1555853-6-John.C.Harrison@Intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
ujfalusi
ujfalusi previously approved these changes Jun 12, 2025
@bardliao
Copy link
Collaborator Author

v2:
Change the firmware version back to 70.38.1 since CI DUTs seems don't have the latest GuC firmware.

@ujfalusi
Copy link
Collaborator

v2: Change the firmware version back to 70.38.1 since CI DUTs seems don't have the latest GuC firmware.

but should not the DUTs to be updated to use the recommended firmware?

@ujfalusi
Copy link
Collaborator

v2: Change the firmware version back to 70.38.1 since CI DUTs seems don't have the latest GuC firmware.

but should not the DUTs to be updated to use the recommended firmware?

and basically we stay at the same version as before this PR, iow this is a NOP?

@bardliao
Copy link
Collaborator Author

v2: Change the firmware version back to 70.38.1 since CI DUTs seems don't have the latest GuC firmware.

but should not the DUTs to be updated to use the recommended firmware?

Need @kv2019i's comment.

and basically we stay at the same version as before this PR, iow this is a NOP?

Yes, this is a NOP. The main reason is that the previous commit conflicts to the new kernel.

@kv2019i
Copy link
Collaborator

kv2019i commented Jun 13, 2025

@bardliao @ujfalusi I think we should follow upstream kernel version needs and if the version is bumped, the newer FW should be installed on all CI machines.

@bardliao
Copy link
Collaborator Author

@bardliao @ujfalusi I think we should follow upstream kernel version needs and if the version is bumped, the newer FW should be installed on all CI machines.

Ok, but I have no idea where should we get the PTL guc firmware. I can't find it from https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/xe.

@bardliao
Copy link
Collaborator Author

CI shows below error.

Jun 16 06:12:01 gk-ptlh-rvp-04 kernel: xe 0000:00:02.0: [drm] Found pantherlake (device ID b0b0) integrated display version 30.00 stepping A0
Jun 16 06:12:01 gk-ptlh-rvp-04 kernel: xe 0000:00:02.0: Direct firmware load for xe/ptl_guc_70.bin failed with error -2
Jun 16 06:12:01 gk-ptlh-rvp-04 kernel: xe 0000:00:02.0: [drm] GuC firmware xe/ptl_guc_70.bin: fetch failed with error -2
Jun 16 06:12:01 gk-ptlh-rvp-04 kernel: xe 0000:00:02.0: [drm] GuC firmware(s) can be downloaded from https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
Jun 16 06:12:01 gk-ptlh-rvp-04 kernel: xe 0000:00:02.0: [drm] *ERROR* GT0: GuC init failed with -ENOENT
Jun 16 06:12:01 gk-ptlh-rvp-04 kernel: xe 0000:00:02.0: [drm] *ERROR* GT0: Failed to initialize uC (-ENOENT)
Jun 16 06:12:01 gk-ptlh-rvp-04 kernel: xe 0000:00:02.0: probe with driver xe failed with error -2

#define XE_GT_TYPE_ANY XE_GT_TYPE_UNINITIALIZED

#define XE_GUC_FIRMWARE_DEFS(fw_def, mmp_ver, major_ver) \
fw_def(PANTHERLAKE, GT_TYPE_ANY, major_ver(xe, guc, ptl, 70, 44, 1)) \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bardliao This is not correct. Please cherry-pick following from upstream instead:

commit 738538d0edb88e0c2f758dfc299146087f34826e
Author: Clint Taylor <clinton.a.taylor@intel.com>
Date:   Thu Apr 3 11:56:17 2025 -0700

    drm/xe/ptl: Add GuC firmware definition

This is available at least in drm-tip/drm-tip.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @kv2019i. Done

Define the GuC firmware to load on the platform.

Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com>
Signed-off-by: Matt Atwood <matthew.s.atwood@intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250403185619.1555853-8-John.C.Harrison@Intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
@bardliao
Copy link
Collaborator Author

SOFCI TEST

@bardliao
Copy link
Collaborator Author

CI test looks good now. If there is no objection, I will merge it by today. @kv2019i @ujfalusi @ranj063

@bardliao bardliao merged commit 7f452d9 into thesofproject:topic/sof-dev Jun 19, 2025
8 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants