Re: [PATCH v3 4/5] drm/xe/guc: Extract function to print load error

[John Harrison <john.c.harrison@intel.com>]

On 9/11/2025 10:25 AM, Lucas De Marchi wrote:
> Move the error parsing and print out of guc_wait_ucode() into a helper
> to clean up the wait function.
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: John Harrison <John.C.Harrison@Intel.com>

> ---
>   drivers/gpu/drm/xe/xe_guc.c | 81 ++++++++++++++++++++++-----------------------
>   1 file changed, 39 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
> index d8fc060c9682e..da1bb4939c6b8 100644
> --- a/drivers/gpu/drm/xe/xe_guc.c
> +++ b/drivers/gpu/drm/xe/xe_guc.c
> @@ -1049,6 +1049,44 @@ static int guc_load_done(u32 status)
>   #endif
>   #define GUC_LOAD_TIME_WARN_MS      200
>   
> +static void print_bootrom_ukernel_err(struct xe_gt *gt, u32 bootrom, u32 ukernel)
> +{
> +	switch (bootrom) {
> +	case XE_BOOTROM_STATUS_NO_KEY_FOUND:
> +		xe_gt_err(gt, "invalid key requested, header = 0x%08X\n",
> +			  xe_mmio_read32(&gt->mmio, GUC_HEADER_INFO));
> +		break;
> +	case XE_BOOTROM_STATUS_RSA_FAILED:
> +		xe_gt_err(gt, "firmware signature verification failed\n");
> +		break;
> +	case XE_BOOTROM_STATUS_PROD_KEY_CHECK_FAILURE:
> +		xe_gt_err(gt, "firmware production part check failure\n");
> +		break;
> +	}
> +
> +	switch (ukernel) {
> +	case XE_GUC_LOAD_STATUS_HWCONFIG_START:
> +		xe_gt_err(gt, "still extracting hwconfig table.\n");
> +		break;
> +	case XE_GUC_LOAD_STATUS_EXCEPTION:
> +		xe_gt_err(gt, "firmware exception. EIP: %#x\n",
> +			  xe_mmio_read32(&gt->mmio, SOFT_SCRATCH(13)));
> +		break;
> +	case XE_GUC_LOAD_STATUS_INIT_DATA_INVALID:
> +		xe_gt_err(gt, "illegal init/ADS data\n");
> +		break;
> +	case XE_GUC_LOAD_STATUS_INIT_MMIO_SAVE_RESTORE_INVALID:
> +		xe_gt_err(gt, "illegal register in save/restore workaround list\n");
> +		break;
> +	case XE_GUC_LOAD_STATUS_KLV_WORKAROUND_INIT_ERROR:
> +		xe_gt_err(gt, "illegal workaround KLV data\n");
> +		break;
> +	case XE_GUC_LOAD_STATUS_INVALID_FTR_FLAG:
> +		xe_gt_err(gt, "illegal feature flag specified\n");
> +		break;
> +	}
> +}
> +
>   static void guc_wait_ucode(struct xe_guc *guc)
>   {
>   	struct xe_gt *gt = guc_to_gt(guc);
> @@ -1114,48 +1152,7 @@ static void guc_wait_ucode(struct xe_guc *guc)
>   			  REG_FIELD_GET(GS_MIA_MASK, status),
>   			  REG_FIELD_GET(GS_AUTH_STATUS_MASK, status));
>   
> -		switch (bootrom) {
> -		case XE_BOOTROM_STATUS_NO_KEY_FOUND:
> -			xe_gt_err(gt, "invalid key requested, header = 0x%08X\n",
> -				  xe_mmio_read32(mmio, GUC_HEADER_INFO));
> -			break;
> -
> -		case XE_BOOTROM_STATUS_RSA_FAILED:
> -			xe_gt_err(gt, "firmware signature verification failed\n");
> -			break;
> -
> -		case XE_BOOTROM_STATUS_PROD_KEY_CHECK_FAILURE:
> -			xe_gt_err(gt, "firmware production part check failure\n");
> -			break;
> -		}
> -
> -		switch (ukernel) {
> -		case XE_GUC_LOAD_STATUS_HWCONFIG_START:
> -			xe_gt_err(gt, "still extracting hwconfig table.\n");
> -			break;
> -
> -		case XE_GUC_LOAD_STATUS_EXCEPTION:
> -			xe_gt_err(gt, "firmware exception. EIP: %#x\n",
> -				  xe_mmio_read32(mmio, SOFT_SCRATCH(13)));
> -			break;
> -
> -		case XE_GUC_LOAD_STATUS_INIT_DATA_INVALID:
> -			xe_gt_err(gt, "illegal init/ADS data\n");
> -			break;
> -
> -		case XE_GUC_LOAD_STATUS_INIT_MMIO_SAVE_RESTORE_INVALID:
> -			xe_gt_err(gt, "illegal register in save/restore workaround list\n");
> -			break;
> -
> -		case XE_GUC_LOAD_STATUS_KLV_WORKAROUND_INIT_ERROR:
> -			xe_gt_err(gt, "illegal workaround KLV data\n");
> -			break;
> -
> -		case XE_GUC_LOAD_STATUS_INVALID_FTR_FLAG:
> -			xe_gt_err(gt, "illegal feature flag specified\n");
> -			break;
> -		}
> -
> +		print_bootrom_ukernel_err(gt, bootrom, ukernel);
>   		xe_device_declare_wedged(gt_to_xe(gt));
>   	} else if (delta_ms > GUC_LOAD_TIME_WARN_MS) {
>   		xe_gt_warn(gt, "excessive init time: %lldms! [status = 0x%08X, timeouts = %d]\n",
>