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

Commit 4a600cb7 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915/uc: Cleanup fw fetch on every GuC/HuC init failure 



Be consistent and always perform fw fetch cleanup in GuC/HuC specific
init functions on every failure. Also while converting firmware
status to error, stop treating SELECTED as non-error, as long term
we should not see it.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190817131144.26884-3-michal.wajdeczko@intel.com
parent 5bde5a45

drivers/gpu/drm/i915/gt/uc/intel_guc.c

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ int intel_guc_init(struct intel_guc *guc) 
	intel_uc_fw_fini(&guc->fw);

err_fetch:

	intel_uc_fw_cleanup_fetch(&guc->fw);

	DRM_DEV_DEBUG_DRIVER(gt->i915->drm.dev, "failed with %d\n", ret);

	return ret;

}

drivers/gpu/drm/i915/gt/uc/intel_huc.c

+5 −1
Original line number Diff line number Diff line
@@ -77,11 +77,12 @@ static void intel_huc_rsa_data_destroy(struct intel_huc *huc) 


int intel_huc_init(struct intel_huc *huc)

{

	struct drm_i915_private *i915 = huc_to_gt(huc)->i915;

	int err;



	err = intel_uc_fw_init(&huc->fw);

	if (err)

		return err;

		goto out;



	/*

	 * HuC firmware image is outside GuC accessible range.
@@ -96,6 +97,9 @@ int intel_huc_init(struct intel_huc *huc) 


out_fini:

	intel_uc_fw_fini(&huc->fw);

out:

	intel_uc_fw_cleanup_fetch(&huc->fw);

	DRM_DEV_DEBUG_DRIVER(i915->drm.dev, "failed with %d\n", err);

	return err;

}

drivers/gpu/drm/i915/gt/uc/intel_uc.c

+1 −7
Original line number Diff line number Diff line
@@ -305,16 +305,10 @@ int intel_uc_init(struct intel_uc *uc) 
		return ret;



	if (intel_uc_uses_huc(uc)) {

		ret = intel_huc_init(huc);

		if (ret)

			goto out_huc;

		intel_huc_init(huc);

	}



	return 0;



out_huc:

	intel_uc_fw_cleanup_fetch(&huc->fw);

	return 0;

}



void intel_uc_fini(struct intel_uc *uc)

drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c

+3 −1
Original line number Diff line number Diff line
@@ -542,9 +542,11 @@ int intel_uc_fw_init(struct intel_uc_fw *uc_fw) 
		return -ENOEXEC;



	err = i915_gem_object_pin_pages(uc_fw->obj);

	if (err)

	if (err) {

		DRM_DEBUG_DRIVER("%s fw pin-pages err=%d\n",

				 intel_uc_fw_type_repr(uc_fw->type), err);

		intel_uc_fw_change_status(uc_fw, INTEL_UC_FIRMWARE_FAIL);

	}



	return err;

}

drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ static inline int intel_uc_fw_status_to_error(enum intel_uc_fw_status status) 
	case INTEL_UC_FIRMWARE_FAIL:

		return -EIO;

	case INTEL_UC_FIRMWARE_SELECTED:

		return -ESTALE;

	case INTEL_UC_FIRMWARE_AVAILABLE:

	case INTEL_UC_FIRMWARE_TRANSFERRED:

	case INTEL_UC_FIRMWARE_RUNNING: