Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afb3484f authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Joonas Lahtinen
Browse files

drm/i915/uc: Check all firmwares against WOPCM size 



Both GuC and HuC firmwares will be moved into WOPCM so
we can check ucode size early for both cases.

Suggested-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171016144724.17244-8-michal.wajdeczko@intel.com
parent cd5a917e

drivers/gpu/drm/i915/intel_uc_fw.c

+9 −8
Original line number Diff line number Diff line
@@ -85,6 +85,15 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv, 
	uc_fw->ucode_offset = uc_fw->header_offset + uc_fw->header_size;

	uc_fw->ucode_size = (css->size_dw - css->header_size_dw) * sizeof(u32);



	/* Header and uCode will be loaded to WOPCM */

	size = uc_fw->header_size + uc_fw->ucode_size;

	if (size > intel_guc_wopcm_size(dev_priv)) {

		DRM_WARN("%s: Firmware is too large to fit in WOPCM\n",

			 intel_uc_fw_type_repr(uc_fw->type));

		err = -E2BIG;

		goto fail;

	}



	/* now RSA */

	if (css->key_size_dw != UOS_RSA_SCRATCH_MAX_COUNT) {

		DRM_NOTE("RSA key size is bad\n");
@@ -108,14 +117,6 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv, 
	 */

	switch (uc_fw->type) {

	case INTEL_UC_FW_TYPE_GUC:

		/* Header and uCode will be loaded to WOPCM. Size of the two. */

		size = uc_fw->header_size + uc_fw->ucode_size;



		/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */

		if (size > intel_guc_wopcm_size(dev_priv)) {

			DRM_ERROR("Firmware is too large to fit in WOPCM\n");

			goto fail;

		}

		uc_fw->major_ver_found = css->guc.sw_version >> 16;

		uc_fw->minor_ver_found = css->guc.sw_version & 0xFFFF;

		break;