drm/i915/huc: Mark firmware as failed on auth failure (7b026763) · Commits · 戴 / test

drivers/gpu/drm/i915/intel_huc.c

+18 −10

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ int intel_huc_auth(struct intel_huc *huc)
		struct drm_i915_private *i915 = huc_to_i915(huc);
		struct intel_guc *guc = &i915->guc;
		struct i915_vma *vma;
		u32 status;
		int ret;

		if (huc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS)
		@@ -58,28 +59,35 @@ int intel_huc_auth(struct intel_huc *huc)
		if (IS_ERR(vma)) {
		ret = PTR_ERR(vma);
		DRM_ERROR("HuC: Failed to pin huc fw object %d\n", ret);
		return ret;
		goto fail;
		}

		ret = intel_guc_auth_huc(guc,
		guc_ggtt_offset(vma) + huc->fw.rsa_offset);
		if (ret) {
		DRM_ERROR("HuC: GuC did not ack Auth request %d\n", ret);
		goto out;
		goto fail_unpin;
		}

		/* Check authentication status, it should be done by now */
		ret = intel_wait_for_register(i915,
		ret = __intel_wait_for_register(i915,
		HUC_STATUS2,
		HUC_FW_VERIFIED,
		HUC_FW_VERIFIED,
		50);
		2, 50, &status);
		if (ret) {
		DRM_ERROR("HuC: Authentication failed %d\n", ret);
		goto out;
		DRM_ERROR("HuC: Firmware not verified %#x\n", status);
		goto fail_unpin;
		}

		out:
		i915_vma_unpin(vma);
		return 0;

		fail_unpin:
		i915_vma_unpin(vma);
		fail:
		huc->fw.load_status = INTEL_UC_FIRMWARE_FAIL;

		DRM_ERROR("HuC: Authentication failed %d\n", ret);
		return ret;
		}