]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915/uc: Prepare for different firmware key sizes
authorMichal Wajdeczko <michal.wajdeczko@intel.com>
Sat, 11 Dec 2021 00:07:55 +0000 (16:07 -0800)
committerDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Mon, 13 Dec 2021 19:37:49 +0000 (11:37 -0800)
Future GuC/HuC firmwares might be signed with different key sizes.
Don't assume that it must be always 2048 bits long.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211211000756.1698923-3-daniele.ceraolospurio@intel.com
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c

index 2520743a84341532ec2c0077533a4c3ef7585039..b72310e94c8c4fbfcb2a07cfef38611c26580d6c 100644 (file)
@@ -355,13 +355,6 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)
        uc_fw->ucode_size = (css->size_dw - css->header_size_dw) * sizeof(u32);
 
        /* now RSA */
-       if (unlikely(css->key_size_dw != UOS_RSA_SCRATCH_COUNT)) {
-               drm_warn(&i915->drm, "%s firmware %s: unexpected key size: %u != %u\n",
-                        intel_uc_fw_type_repr(uc_fw->type), uc_fw->path,
-                        css->key_size_dw, UOS_RSA_SCRATCH_COUNT);
-               err = -EPROTO;
-               goto fail;
-       }
        uc_fw->rsa_size = css->key_size_dw * sizeof(u32);
 
        /* At least, it should have header, uCode and RSA. Size of all three. */