github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 02:53:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/xe/uc: Include patch version in expectations

Browse Source 
Patch level releases can be just as important as major level releases
if they fix a critical bug. So include the patch version in the
expectation check so the user is properly informed if they need to
update.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240202200017.2133438-4-John.C.Harrison@Intel.com
This commit is contained in:
John Harrison 2024-02-02 12:00:14 -08:00 committed by Lucas De Marchi
parent 86c99abb5f
commit 6650ad3e09
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
drivers/gpu/drm/xe/xe_uc_fw.c
View File

@ -92,6 +92,7 @@ struct uc_fw_entry {
const char *path;
u16 major;
u16 minor;
u16 patch;
bool full_ver_required;
};
};
@ -102,14 +103,14 @@ struct fw_blobs_by_type {
};
#define XE_GUC_FIRMWARE_DEFS(fw_def, mmp_ver, major_ver) \
fw_def(METEORLAKE, major_ver(i915, guc, mtl, 70, 7)) \
fw_def(DG2, major_ver(i915, guc, dg2, 70, 5)) \
fw_def(DG1, major_ver(i915, guc, dg1, 70, 5)) \
fw_def(ALDERLAKE_N, major_ver(i915, guc, tgl, 70, 5)) \
fw_def(ALDERLAKE_P, major_ver(i915, guc, adlp, 70, 5)) \
fw_def(ALDERLAKE_S, major_ver(i915, guc, tgl, 70, 5)) \
fw_def(ROCKETLAKE, major_ver(i915, guc, tgl, 70, 5)) \
fw_def(TIGERLAKE, major_ver(i915, guc, tgl, 70, 5))
fw_def(METEORLAKE, major_ver(i915, guc, mtl, 70, 7, 0)) \
fw_def(DG2, major_ver(i915, guc, dg2, 70, 5, 0)) \
fw_def(DG1, major_ver(i915, guc, dg1, 70, 5, 0)) \
fw_def(ALDERLAKE_N, major_ver(i915, guc, tgl, 70, 5, 0)) \
fw_def(ALDERLAKE_P, major_ver(i915, guc, adlp, 70, 5, 0)) \
fw_def(ALDERLAKE_S, major_ver(i915, guc, tgl, 70, 5, 0)) \
fw_def(ROCKETLAKE, major_ver(i915, guc, tgl, 70, 5, 0)) \
fw_def(TIGERLAKE, major_ver(i915, guc, tgl, 70, 5, 0))
#define XE_HUC_FIRMWARE_DEFS(fw_def, mmp_ver, no_ver) \
fw_def(METEORLAKE, no_ver(i915, huc_gsc, mtl)) \
@ -121,24 +122,24 @@ struct fw_blobs_by_type {
/* for the GSC FW we match the compatibility version and not the release one */
#define XE_GSC_FIRMWARE_DEFS(fw_def, major_ver) \
fw_def(METEORLAKE, major_ver(i915, gsc, mtl, 1, 0))
fw_def(METEORLAKE, major_ver(i915, gsc, mtl, 1, 0, 0))
#define MAKE_FW_PATH(dir__, uc__, shortname__, version__) \
__stringify(dir__) "/" __stringify(shortname__) "_" __stringify(uc__) version__ ".bin"
#define fw_filename_mmp_ver(dir_, uc_, shortname_, a, b, c) \
MAKE_FW_PATH(dir_, uc_, shortname_, "_" __stringify(a ## . ## b ## . ## c))
#define fw_filename_major_ver(dir_, uc_, shortname_, a, b) \
#define fw_filename_major_ver(dir_, uc_, shortname_, a, b, c) \
MAKE_FW_PATH(dir_, uc_, shortname_, "_" __stringify(a))
#define fw_filename_no_ver(dir_, uc_, shortname_) \
MAKE_FW_PATH(dir_, uc_, shortname_, "")
#define uc_fw_entry_mmp_ver(dir_, uc_, shortname_, a, b, c) \
{ fw_filename_mmp_ver(dir_, uc_, shortname_, a, b, c), \
a, b, true }
#define uc_fw_entry_major_ver(dir_, uc_, shortname_, a, b) \
{ fw_filename_major_ver(dir_, uc_, shortname_, a, b), \
a, b }
a, b, c, true }
#define uc_fw_entry_major_ver(dir_, uc_, shortname_, a, b, c) \
{ fw_filename_major_ver(dir_, uc_, shortname_, a, b, c), \
a, b, c }
#define uc_fw_entry_no_ver(dir_, uc_, shortname_) \
{ fw_filename_no_ver(dir_, uc_, shortname_), \
0, 0 }
@ -221,6 +222,7 @@ uc_fw_auto_select(struct xe_device *xe, struct xe_uc_fw *uc_fw)
uc_fw->path = entries[i].path;
uc_fw->versions.wanted.major = entries[i].major;
uc_fw->versions.wanted.minor = entries[i].minor;
uc_fw->versions.wanted.patch = entries[i].patch;
uc_fw->full_ver_required = entries[i].full_ver_required;
if (uc_fw->type == XE_UC_FW_TYPE_GSC)
@ -340,19 +342,22 @@ int xe_uc_fw_check_version_requirements(struct xe_uc_fw *uc_fw)
* Otherwise, at least the major version.
*/
if (wanted->major != found->major ||
(uc_fw->full_ver_required && wanted->minor != found->minor)) {
drm_notice(&xe->drm, "%s firmware %s: unexpected version: %u.%u != %u.%u\n",
(uc_fw->full_ver_required &&
((wanted->minor != found->minor) ||
(wanted->patch != found->patch)))) {
drm_notice(&xe->drm, "%s firmware %s: unexpected version: %u.%u.%u != %u.%u.%u\n",
xe_uc_fw_type_repr(uc_fw->type), uc_fw->path,
found->major, found->minor,
wanted->major, wanted->minor);
found->major, found->minor, found->patch,
wanted->major, wanted->minor, wanted->patch);
goto fail;
}
if (wanted->minor > found->minor) {
drm_notice(&xe->drm, "%s firmware (%u.%u) is recommended, but only (%u.%u) was found in %s\n",
if (wanted->minor > found->minor ||
(wanted->minor == found->minor && wanted->patch > found->patch)) {
drm_notice(&xe->drm, "%s firmware (%u.%u.%u) is recommended, but only (%u.%u.%u) was found in %s\n",
xe_uc_fw_type_repr(uc_fw->type),
wanted->major, wanted->minor,
found->major, found->minor,
wanted->major, wanted->minor, wanted->patch,
found->major, found->minor, found->patch,
uc_fw->path);
drm_info(&xe->drm, "Consider updating your linux-firmware pkg or downloading from %s\n",
XE_UC_FIRMWARE_URL);