Commit 4fd4fde8 authored by John Harrison's avatar John Harrison
Browse files

drm/i915/guc: More debug print updates - UC firmware 



Update a bunch more debug prints to use the new GT based scheme.

v2: Also change prints to use %pe for error values (MichalW).

Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230207050717.1833718-2-John.C.Harrison@Intel.com
parent 4602f42f

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

+18 −24
Original line number Diff line number Diff line
@@ -83,10 +83,10 @@ static int __intel_uc_reset_hw(struct intel_uc *uc) 


static void __confirm_options(struct intel_uc *uc)

{

	struct drm_i915_private *i915 = uc_to_gt(uc)->i915;

	struct intel_gt *gt = uc_to_gt(uc);

	struct drm_i915_private *i915 = gt->i915;



	drm_dbg(&i915->drm,

		"enable_guc=%d (guc:%s submission:%s huc:%s slpc:%s)\n",

	gt_dbg(gt, "enable_guc=%d (guc:%s submission:%s huc:%s slpc:%s)\n",

	       i915->params.enable_guc,

	       str_yes_no(intel_uc_wants_guc(uc)),

	       str_yes_no(intel_uc_wants_guc_submission(uc)),
@@ -102,25 +102,21 @@ static void __confirm_options(struct intel_uc *uc) 
	}



	if (!intel_uc_supports_guc(uc))

		drm_info(&i915->drm,

			 "Incompatible option enable_guc=%d - %s\n",

		gt_info(gt,  "Incompatible option enable_guc=%d - %s\n",

			i915->params.enable_guc, "GuC is not supported!");



	if (i915->params.enable_guc & ENABLE_GUC_LOAD_HUC &&

	    !intel_uc_supports_huc(uc))

		drm_info(&i915->drm,

			 "Incompatible option enable_guc=%d - %s\n",

		gt_info(gt, "Incompatible option enable_guc=%d - %s\n",

			i915->params.enable_guc, "HuC is not supported!");



	if (i915->params.enable_guc & ENABLE_GUC_SUBMISSION &&

	    !intel_uc_supports_guc_submission(uc))

		drm_info(&i915->drm,

			 "Incompatible option enable_guc=%d - %s\n",

		gt_info(gt, "Incompatible option enable_guc=%d - %s\n",

			i915->params.enable_guc, "GuC submission is N/A");



	if (i915->params.enable_guc & ~ENABLE_GUC_MASK)

		drm_info(&i915->drm,

			 "Incompatible option enable_guc=%d - %s\n",

		gt_info(gt, "Incompatible option enable_guc=%d - %s\n",

			i915->params.enable_guc, "undocumented flag");

}
@@ -549,10 +545,8 @@ static int __uc_init_hw(struct intel_uc *uc) 


	intel_gsc_uc_load_start(&uc->gsc);



	gt_info(gt, "GuC submission %s\n",

		str_enabled_disabled(intel_uc_uses_guc_submission(uc)));

	gt_info(gt, "GuC SLPC %s\n",

		str_enabled_disabled(intel_uc_uses_guc_slpc(uc)));

	guc_info(guc, "submission %s\n", str_enabled_disabled(intel_uc_uses_guc_submission(uc)));

	guc_info(guc, "SLPC %s\n", str_enabled_disabled(intel_uc_uses_guc_slpc(uc)));



	return 0;

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

+55 −61
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <drm/drm_print.h>



#include "gem/i915_gem_lmem.h"

#include "gt/intel_gt_print.h"

#include "intel_uc_fw.h"

#include "intel_uc_fw_abi.h"

#include "i915_drv.h"
@@ -44,8 +45,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, 
			       enum intel_uc_fw_status status)

{

	uc_fw->__status =  status;

	drm_dbg(&__uc_fw_to_gt(uc_fw)->i915->drm,

		"%s firmware -> %s\n",

	gt_dbg(__uc_fw_to_gt(uc_fw), "%s firmware -> %s\n",

	       intel_uc_fw_type_repr(uc_fw->type),

	       status == INTEL_UC_FIRMWARE_SELECTED ?

	       uc_fw->file_selected.path : intel_uc_fw_status_repr(status));
@@ -562,13 +562,12 @@ static int check_ccs_header(struct intel_gt *gt, 
			    const struct firmware *fw,

			    struct intel_uc_fw *uc_fw)

{

	struct drm_i915_private *i915 = gt->i915;

	struct uc_css_header *css;

	size_t size;



	/* Check the size of the blob before examining buffer contents */

	if (unlikely(fw->size < sizeof(struct uc_css_header))) {

		drm_warn(&i915->drm, "%s firmware %s: invalid size: %zu < %zu\n",

		gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",

			intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,

			fw->size, sizeof(struct uc_css_header));

		return -ENODATA;
@@ -580,8 +579,7 @@ static int check_ccs_header(struct intel_gt *gt, 
	size = (css->header_size_dw - css->key_size_dw - css->modulus_size_dw -

		css->exponent_size_dw) * sizeof(u32);

	if (unlikely(size != sizeof(struct uc_css_header))) {

		drm_warn(&i915->drm,

			 "%s firmware %s: unexpected header size: %zu != %zu\n",

		gt_warn(gt, "%s firmware %s: unexpected header size: %zu != %zu\n",

			intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,

			fw->size, sizeof(struct uc_css_header));

		return -EPROTO;
@@ -596,7 +594,7 @@ static int check_ccs_header(struct intel_gt *gt, 
	/* At least, it should have header, uCode and RSA. Size of all three. */

	size = sizeof(struct uc_css_header) + uc_fw->ucode_size + uc_fw->rsa_size;

	if (unlikely(fw->size < size)) {

		drm_warn(&i915->drm, "%s firmware %s: invalid size: %zu < %zu\n",

		gt_warn(gt, "%s firmware %s: invalid size: %zu < %zu\n",

			intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,

			fw->size, size);

		return -ENOEXEC;
@@ -605,7 +603,7 @@ static int check_ccs_header(struct intel_gt *gt, 
	/* Sanity check whether this fw is not larger than whole WOPCM memory */

	size = __intel_uc_fw_get_upload_size(uc_fw);

	if (unlikely(size >= gt->wopcm.size)) {

		drm_warn(&i915->drm, "%s firmware %s: invalid size: %zu > %zu\n",

		gt_warn(gt, "%s firmware %s: invalid size: %zu > %zu\n",

			intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,

			size, (size_t)gt->wopcm.size);

		return -E2BIG;
@@ -635,7 +633,7 @@ static bool guc_check_version_range(struct intel_uc_fw *uc_fw) 
	 */



	if (!is_ver_8bit(&uc_fw->file_selected.ver)) {

		drm_warn(&__uc_fw_to_gt(uc_fw)->i915->drm, "%s firmware: invalid file version: 0x%02X:%02X:%02X\n",

		gt_warn(__uc_fw_to_gt(uc_fw), "%s firmware: invalid file version: 0x%02X:%02X:%02X\n",

			intel_uc_fw_type_repr(uc_fw->type),

			uc_fw->file_selected.ver.major,

			uc_fw->file_selected.ver.minor,
@@ -644,7 +642,7 @@ static bool guc_check_version_range(struct intel_uc_fw *uc_fw) 
	}



	if (!is_ver_8bit(&guc->submission_version)) {

		drm_warn(&__uc_fw_to_gt(uc_fw)->i915->drm, "%s firmware: invalid submit version: 0x%02X:%02X:%02X\n",

		gt_warn(__uc_fw_to_gt(uc_fw), "%s firmware: invalid submit version: 0x%02X:%02X:%02X\n",

			intel_uc_fw_type_repr(uc_fw->type),

			guc->submission_version.major,

			guc->submission_version.minor,
@@ -687,8 +685,7 @@ static int try_firmware_load(struct intel_uc_fw *uc_fw, const struct firmware ** 
		return err;



	if ((*fw)->size > INTEL_UC_RSVD_GGTT_PER_FW) {

		drm_err(&gt->i915->drm,

			"%s firmware %s: size (%zuKB) exceeds max supported size (%uKB)\n",

		gt_err(gt, "%s firmware %s: size (%zuKB) exceeds max supported size (%uKB)\n",

		       intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,

		       (*fw)->size / SZ_1K, INTEL_UC_RSVD_GGTT_PER_FW / SZ_1K);
@@ -768,7 +765,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw) 
	if (uc_fw->file_wanted.ver.major && uc_fw->file_selected.ver.major) {

		/* Check the file's major version was as it claimed */

		if (uc_fw->file_selected.ver.major != uc_fw->file_wanted.ver.major) {

			drm_notice(&i915->drm, "%s firmware %s: unexpected version: %u.%u != %u.%u\n",

			gt_notice(gt, "%s firmware %s: unexpected version: %u.%u != %u.%u\n",

				  intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,

				  uc_fw->file_selected.ver.major, uc_fw->file_selected.ver.minor,

				  uc_fw->file_wanted.ver.major, uc_fw->file_wanted.ver.minor);
@@ -786,15 +783,13 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw) 
		/* Preserve the version that was really wanted */

		memcpy(&uc_fw->file_wanted, &file_ideal, sizeof(uc_fw->file_wanted));



		drm_notice(&i915->drm,

			   "%s firmware %s (%d.%d) is recommended, but only %s (%d.%d) was found\n",

		gt_notice(gt, "%s firmware %s (%d.%d) is recommended, but only %s (%d.%d) was found\n",

			  intel_uc_fw_type_repr(uc_fw->type),

			  uc_fw->file_wanted.path,

			  uc_fw->file_wanted.ver.major, uc_fw->file_wanted.ver.minor,

			  uc_fw->file_selected.path,

			  uc_fw->file_selected.ver.major, uc_fw->file_selected.ver.minor);

		drm_info(&i915->drm,

			 "Consider updating your linux-firmware pkg or downloading from %s\n",

		gt_info(gt, "Consider updating your linux-firmware pkg or downloading from %s\n",

			INTEL_UC_FIRMWARE_URL);

	}
@@ -823,9 +818,9 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw) 
				  INTEL_UC_FIRMWARE_MISSING :

				  INTEL_UC_FIRMWARE_ERROR);



	i915_probe_error(i915, "%s firmware %s: fetch failed with error %d\n",

			 intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path, err);

	drm_info(&i915->drm, "%s firmware(s) can be downloaded from %s\n",

	gt_probe_error(gt, "%s firmware %s: fetch failed %pe\n",

		       intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path, ERR_PTR(err));

	gt_info(gt, "%s firmware(s) can be downloaded from %s\n",

		intel_uc_fw_type_repr(uc_fw->type), INTEL_UC_FIRMWARE_URL);



	release_firmware(fw);		/* OK even if fw is NULL */
@@ -932,7 +927,7 @@ static int uc_fw_xfer(struct intel_uc_fw *uc_fw, u32 dst_offset, u32 dma_flags) 
	/* Wait for DMA to finish */

	ret = intel_wait_for_register_fw(uncore, DMA_CTRL, START_DMA, 0, 100);

	if (ret)

		drm_err(&gt->i915->drm, "DMA for %s fw failed, DMA_CTRL=%u\n",

		gt_err(gt, "DMA for %s fw failed, DMA_CTRL=%u\n",

		       intel_uc_fw_type_repr(uc_fw->type),

		       intel_uncore_read_fw(uncore, DMA_CTRL));
@@ -950,9 +945,8 @@ int intel_uc_fw_mark_load_failed(struct intel_uc_fw *uc_fw, int err) 


	GEM_BUG_ON(!intel_uc_fw_is_loadable(uc_fw));



	i915_probe_error(gt->i915, "Failed to load %s firmware %s (%d)\n",

			 intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path,

			 err);

	gt_probe_error(gt, "Failed to load %s firmware %s %pe\n",

		       intel_uc_fw_type_repr(uc_fw->type), uc_fw->file_selected.path, ERR_PTR(err));

	intel_uc_fw_change_status(uc_fw, INTEL_UC_FIRMWARE_LOAD_FAIL);



	return err;
@@ -1078,15 +1072,15 @@ int intel_uc_fw_init(struct intel_uc_fw *uc_fw) 


	err = i915_gem_object_pin_pages_unlocked(uc_fw->obj);

	if (err) {

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

				 intel_uc_fw_type_repr(uc_fw->type), err);

		gt_dbg(__uc_fw_to_gt(uc_fw), "%s fw pin-pages failed %pe\n",

		       intel_uc_fw_type_repr(uc_fw->type), ERR_PTR(err));

		goto out;

	}



	err = uc_fw_rsa_data_create(uc_fw);

	if (err) {

		DRM_DEBUG_DRIVER("%s fw rsa data creation failed, err=%d\n",

				 intel_uc_fw_type_repr(uc_fw->type), err);

		gt_dbg(__uc_fw_to_gt(uc_fw), "%s fw rsa data creation failed %pe\n",

		       intel_uc_fw_type_repr(uc_fw->type), ERR_PTR(err));

		goto out_unpin;

	}