Re: [PATCH v2 2/2] drm/xe: Extend uAPI to query HuC micro-controler firmware version

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Thu, Feb 08, 2024 at 10:35:39AM -0800, José Roberto de Souza wrote:
> From: Francois Dugast <francois.dugast@intel.com>
> 
> The infrastructure to query GuC firmware version is already in place. It
> is extended with a new micro-controller type to query the HuC firmware
> version. It can be used from user space to know if HuC is running.
> 
> Cc: John Harrison <John.C.Harrison@Intel.com>
> Cc: Francois Dugast <francois.dugast@intel.com>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Signed-off-by: Francois Dugast <francois.dugast@intel.com>
> Signed-off-by: José Roberto de Souza <jose.souza@intel.com>

to merge this we need to wait for the media to be ready and using this.
But for the patch itself:

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_query.c | 38 +++++++++++++++++++++++++++++++----
>  include/uapi/drm/xe_drm.h     |  1 +
>  2 files changed, 35 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
> index 92bb06c0586eb..7855d04e032f2 100644
> --- a/drivers/gpu/drm/xe/xe_query.c
> +++ b/drivers/gpu/drm/xe/xe_query.c
> @@ -544,14 +544,44 @@ query_uc_fw_version(struct xe_device *xe, struct drm_xe_device_query *query)
>  		version = &guc->fw.versions.found[XE_UC_FW_VER_COMPATIBILITY];
>  		break;
>  	}
> +	case XE_QUERY_UC_TYPE_HUC: {
> +		struct xe_gt *media_gt = NULL;
> +		struct xe_huc *huc;
> +
> +		if (MEDIA_VER(xe) >= 13) {
> +			struct xe_tile *tile;
> +			u8 gt_id;
> +
> +			for_each_tile(tile, xe, gt_id) {
> +				if (tile->media_gt) {
> +					media_gt = tile->media_gt;
> +					break;
> +				}
> +			}
> +		} else {
> +			media_gt = xe->tiles[0].primary_gt;
> +		}
> +
> +		if (!media_gt)
> +			break;
> +
> +		huc = &media_gt->uc.huc;
> +		if (huc->fw.status == XE_UC_FIRMWARE_RUNNING)
> +			version = &huc->fw.versions.found[XE_UC_FW_VER_RELEASE];
> +		break;
> +	}
>  	default:
>  		return -EINVAL;
>  	}
>  
> -	resp.branch_ver = 0;
> -	resp.major_ver = version->major;
> -	resp.minor_ver = version->minor;
> -	resp.patch_ver = version->patch;
> +	if (version) {
> +		resp.branch_ver = 0;
> +		resp.major_ver = version->major;
> +		resp.minor_ver = version->minor;
> +		resp.patch_ver = version->patch;
> +	} else {
> +		return -ENODEV;
> +	}
>  
>  	if (copy_to_user(query_ptr, &resp, size))
>  		return -EFAULT;
> diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
> index 0819959a52227..03d12b8f33744 100644
> --- a/include/uapi/drm/xe_drm.h
> +++ b/include/uapi/drm/xe_drm.h
> @@ -583,6 +583,7 @@ struct drm_xe_query_engine_cycles {
>  struct drm_xe_query_uc_fw_version {
>  	/** @uc_type: The micro-controller type to query firmware version */
>  #define XE_QUERY_UC_TYPE_GUC_SUBMISSION 0
> +#define XE_QUERY_UC_TYPE_HUC 1
>  	__u16 uc_type;
>  
>  	/** @pad: MBZ */
> -- 
> 2.43.0
>