Re: [PATCH i-g-t, v2 2/2] drm-uapi/xe: Add test to query HuC firmware version

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

On 2/14/2024 02:24, Francois Dugast wrote:
> This aligns with kernel commit ("drm/xe: Extend uAPI to query HuC
> micro-controler firmware version").
>
> v2:
> - Fix printing branch (Francois Dugast)
> - Make ENODEV the only accepted error (José Roberto de Souza)
>
> Cc: John Harrison <John.C.Harrison@Intel.com>
> Cc: José Roberto de Souza <jose.souza@intel.com>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Signed-off-by: Francois Dugast <francois.dugast@intel.com>
> ---
>   include/drm-uapi/xe_drm.h |  1 +
>   tests/intel/xe_query.c    | 57 +++++++++++++++++++++++++++++++++++++++
>   2 files changed, 58 insertions(+)
>
> diff --git a/include/drm-uapi/xe_drm.h b/include/drm-uapi/xe_drm.h
> index 3bd795f27..ce4acf9d4 100644
> --- a/include/drm-uapi/xe_drm.h
> +++ b/include/drm-uapi/xe_drm.h
> @@ -583,6 +583,7 @@ struct drm_xe_query_engine_cycles {
>   struct drm_xe_query_uc_fw_version {
>   	/** @uc: 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 */
> diff --git a/tests/intel/xe_query.c b/tests/intel/xe_query.c
> index d51e73ea5..e523c380b 100644
> --- a/tests/intel/xe_query.c
> +++ b/tests/intel/xe_query.c
> @@ -825,6 +825,62 @@ test_query_uc_fw_version_invalid_mbz(int fd)
>   	free(uc_fw_version);
>   }
>   
> +/**
> + * SUBTEST: query-uc-fw-version-huc
> + * Test category: functionality test
> + * Description: Display the HuC firmware version
> + *
> + * SUBTEST: multigpu-query-uc-fw-version-huc
> + * Test category: functionality test
> + * Sub-category: MultiGPU
> + * Description: Display HuC firmware version for all Xe devices.
> + */
> +static void
> +test_query_uc_fw_version_huc(int fd)
> +{
> +	struct drm_xe_query_uc_fw_version *uc_fw_version;
> +	struct drm_xe_device_query query = {
> +		.extensions = 0,
> +		.query = DRM_XE_DEVICE_QUERY_UC_FW_VERSION,
> +		.size = 0,
> +		.data = 0,
> +	};
> +	int ret;
> +
> +	igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0);
> +
> +	uc_fw_version = malloc(query.size);
> +	igt_assert(uc_fw_version);
> +
> +	uc_fw_version->uc_type = XE_QUERY_UC_TYPE_HUC;
> +	uc_fw_version->pad = 0;
> +	uc_fw_version->pad2 = 0;
> +	uc_fw_version->reserved = 0;
> +	query.data = to_user_pointer(uc_fw_version);
> +
> +	ret = igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query);
> +
> +	igt_assert(ret == 0 || errno == ENODEV);
> +
> +	if (ret == 0) {
> +		igt_assert(uc_fw_version->major_ver > 0);
> +
> +		igt_info("XE_QUERY_UC_TYPE_HUC %u.%u.%u.%u\n",
> +			 uc_fw_version->major_ver,
> +			 uc_fw_version->minor_ver,
> +			 uc_fw_version->patch_ver,
> +			 uc_fw_version->branch_ver);
> +	} else {
> +		/*
> +		 * No HuC was found, either because it is not running
> +		 * yet or there is no media IP.
> +		 */
> +		igt_info("XE_QUERY_UC_TYPE_HUC No HuC is running\n");
> +	}
> +
> +	free(uc_fw_version);
Why duplicate this entire function? It could all be common code that 
just takes the firmware type enum as a parameter.

John.

> +}
> +
>   igt_main
>   {
>   	const struct {
> @@ -839,6 +895,7 @@ igt_main
>   		{ "query-topology", test_query_gt_topology },
>   		{ "query-cs-cycles", test_query_engine_cycles },
>   		{ "query-uc-fw-version-guc", test_query_uc_fw_version_guc },
> +		{ "query-uc-fw-version-huc", test_query_uc_fw_version_huc },
>   		{ "query-invalid-cs-cycles", test_engine_cycles_invalid },
>   		{ "query-invalid-query", test_query_invalid_query },
>   		{ "query-invalid-size", test_query_invalid_size },