drm/i915/uc: Update to latest GuC and use new-format GuC/HuC names

Going forwards, the intention is for GuC firmware files to be named
for their major version only and HuC firmware files to have no version
number in the name at all. This patch adds those entries for all
platforms that are officially GuC/HuC enabled.

Also, update the expected GuC version numbers to the latest firmware
release for those platforms.

Signed-off-by: John Harrison <[email protected]>
Reviewed-by: Daniele Ceraolo Spurio <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 1169e2a09da2409f2ef4464973517084773292fe..b91ad4aede1f79b3b43869537fbd18f3de6d6716 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -72,12 +72,14 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
  * security fixes, etc. to be enabled.
  */
 #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_maj, guc_mmp) \
-       fw_def(DG2,          0, guc_mmp(dg2,  70, 4, 1)) \
+       fw_def(DG2,          0, guc_maj(dg2,  70, 5)) \
+       fw_def(ALDERLAKE_P,  0, guc_maj(adlp, 70, 5)) \
        fw_def(ALDERLAKE_P,  0, guc_mmp(adlp, 70, 1, 1)) \
        fw_def(ALDERLAKE_P,  0, guc_mmp(adlp, 69, 0, 3)) \
+       fw_def(ALDERLAKE_S,  0, guc_maj(tgl,  70, 5)) \
        fw_def(ALDERLAKE_S,  0, guc_mmp(tgl,  70, 1, 1)) \
        fw_def(ALDERLAKE_S,  0, guc_mmp(tgl,  69, 0, 3)) \
-       fw_def(DG1,          0, guc_mmp(dg1,  70, 1, 1)) \
+       fw_def(DG1,          0, guc_maj(dg1,  70, 5)) \
        fw_def(ROCKETLAKE,   0, guc_mmp(tgl,  70, 1, 1)) \
        fw_def(TIGERLAKE,    0, guc_mmp(tgl,  70, 1, 1)) \
        fw_def(JASPERLAKE,   0, guc_mmp(ehl,  70, 1, 1)) \
@@ -92,9 +94,11 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
        fw_def(SKYLAKE,      0, guc_mmp(skl,  70, 1, 1))
 
 #define INTEL_HUC_FIRMWARE_DEFS(fw_def, huc_raw, huc_mmp) \
+       fw_def(ALDERLAKE_P,  0, huc_raw(tgl)) \
        fw_def(ALDERLAKE_P,  0, huc_mmp(tgl,  7, 9, 3)) \
+       fw_def(ALDERLAKE_S,  0, huc_raw(tgl)) \
        fw_def(ALDERLAKE_S,  0, huc_mmp(tgl,  7, 9, 3)) \
-       fw_def(DG1,          0, huc_mmp(dg1,  7, 9, 3)) \
+       fw_def(DG1,          0, huc_raw(dg1)) \
        fw_def(ROCKETLAKE,   0, huc_mmp(tgl,  7, 9, 3)) \
        fw_def(TIGERLAKE,    0, huc_mmp(tgl,  7, 9, 3)) \
        fw_def(JASPERLAKE,   0, huc_mmp(ehl,  9, 0, 0)) \