Re: [PATCH V4 06/19] accel/amdxdna: Add AIE version query to aie4_get_info

[Lizhi Hou <lizhi.hou@amd.com>]

On 10/9/26 15:53, David Zhang wrote:
> Add AIE version query via DRM_AMDXDNA_GET_INFO. The NPU firmware
> version query already existed internally; it is now also exposed
> through this ioctl alongside the new AIE version query.
>
> These versions are mandatory once released, the firmware management
> interfaces must support those queries in their stable version.
> Propagating any failure to abort device initialization is intentional.
>
> Co-developed-by: Hayden Laccabue <hayden.laccabue@amd.com>
> Signed-off-by: Hayden Laccabue <hayden.laccabue@amd.com>
> Signed-off-by: David Zhang <yidong.zhang@amd.com>
Reviewed-by: Lizhi Hou <lizhi.hou@amd.com>
> ---
>   drivers/accel/amdxdna/aie4_message.c  | 20 ++++++++++++++++++++
>   drivers/accel/amdxdna/aie4_msg_priv.h | 11 +++++++++++
>   drivers/accel/amdxdna/aie4_pci.c      | 10 ++++++++++
>   drivers/accel/amdxdna/aie4_pci.h      |  2 ++
>   4 files changed, 43 insertions(+)
>
> diff --git a/drivers/accel/amdxdna/aie4_message.c b/drivers/accel/amdxdna/aie4_message.c
> index f67aa8ba943c..c83f81a0e65b 100644
> --- a/drivers/accel/amdxdna/aie4_message.c
> +++ b/drivers/accel/amdxdna/aie4_message.c
> @@ -75,6 +75,26 @@ int aie4_query_aie_metadata(struct amdxdna_dev_hdl *ndev,
>   	return 0;
>   }
>   
> +int aie4_query_aie_version(struct amdxdna_dev_hdl *ndev,
> +			   struct amdxdna_drm_query_aie_version *version)
> +{
> +	DECLARE_AIE_MSG(aie4_msg_aie4_version_info, AIE4_MSG_OP_AIE_VERSION_INFO);
> +	struct amdxdna_dev *xdna = ndev->aie.xdna;
> +	int ret;
> +
> +	ret = aie_send_mgmt_msg_wait(&ndev->aie, &msg);
> +	if (ret)
> +		return ret;
> +
> +	XDNA_DBG(xdna, "Query AIE version - major: %u minor: %u",
> +		 resp.major, resp.minor);
> +
> +	version->major = resp.major;
> +	version->minor = resp.minor;
> +
> +	return 0;
> +}
> +
>   int aie4_query_npu_firmware_version(struct amdxdna_dev_hdl *ndev,
>   				    struct amdxdna_drm_query_firmware_version *fw_version)
>   {
> diff --git a/drivers/accel/amdxdna/aie4_msg_priv.h b/drivers/accel/amdxdna/aie4_msg_priv.h
> index b9f7c61f36e3..81842fa1d6ce 100644
> --- a/drivers/accel/amdxdna/aie4_msg_priv.h
> +++ b/drivers/accel/amdxdna/aie4_msg_priv.h
> @@ -22,6 +22,7 @@ enum aie4_msg_opcode {
>   	AIE4_MSG_OP_CREATE_HW_CONTEXT                = 0x30003,
>   	AIE4_MSG_OP_DESTROY_HW_CONTEXT               = 0x30004,
>   	AIE4_MSG_OP_AIE_TILE_INFO                    = 0x30006,
> +	AIE4_MSG_OP_AIE_VERSION_INFO                 = 0x30007,
>   
>   	AIE4_MSG_OP_ATTACH_WORK_BUFFER               = 0x40001,
>   };
> @@ -160,6 +161,16 @@ struct aie4_msg_aie4_tile_info_resp {
>   	struct aie4_tile_info info;
>   } __packed;
>   
> +struct aie4_msg_aie4_version_info_req {
> +	__u32 resvd;
> +} __packed;
> +
> +struct aie4_msg_aie4_version_info_resp {
> +	enum aie4_msg_status status;
> +	__u16 major;
> +	__u16 minor;
> +} __packed;
> +
>   struct aie4_msg_query_cert_firmware_version_req {
>   	__u32 resvd;
>   } __packed;
> diff --git a/drivers/accel/amdxdna/aie4_pci.c b/drivers/accel/amdxdna/aie4_pci.c
> index 1eeb1cb73b27..1cbd1665a28f 100644
> --- a/drivers/accel/amdxdna/aie4_pci.c
> +++ b/drivers/accel/amdxdna/aie4_pci.c
> @@ -289,6 +289,10 @@ static int aie4_query(struct amdxdna_dev_hdl *ndev)
>   	if (ret)
>   		return ret;
>   
> +	ret = aie4_query_aie_version(ndev, &ndev->aie.version);
> +	if (ret)
> +		return ret;
> +
>   	ret = aie4_query_aie_metadata(ndev, &ndev->aie.metadata);
>   	if (ret)
>   		return ret;
> @@ -595,6 +599,12 @@ static int aie4_get_info(struct amdxdna_client *client, struct amdxdna_drm_get_i
>   	case DRM_AMDXDNA_QUERY_AIE_METADATA:
>   		ret = amdxdna_get_metadata(&ndev->aie, client, args);
>   		break;
> +	case DRM_AMDXDNA_QUERY_AIE_VERSION:
> +		ret = amdxdna_get_aie_version(client, args, &ndev->aie.version);
> +		break;
> +	case DRM_AMDXDNA_QUERY_FIRMWARE_VERSION:
> +		ret = amdxdna_get_firmware_version(client, args, &xdna->fw_ver);
> +		break;
>   	default:
>   		XDNA_ERR(xdna, "Not supported request parameter %u", args->param);
>   		ret = -EOPNOTSUPP;
> diff --git a/drivers/accel/amdxdna/aie4_pci.h b/drivers/accel/amdxdna/aie4_pci.h
> index 940e67347d74..5ae5e8427a3b 100644
> --- a/drivers/accel/amdxdna/aie4_pci.h
> +++ b/drivers/accel/amdxdna/aie4_pci.h
> @@ -69,6 +69,8 @@ enum aie4_fw_feature {
>   /* aie4_message.c */
>   int aie4_query_aie_metadata(struct amdxdna_dev_hdl *ndev,
>   			    struct amdxdna_drm_query_aie_metadata *metadata);
> +int aie4_query_aie_version(struct amdxdna_dev_hdl *ndev,
> +			   struct amdxdna_drm_query_aie_version *version);
>   int aie4_suspend_fw(struct amdxdna_dev_hdl *ndev);
>   int aie4_attach_work_buffer(struct amdxdna_dev_hdl *ndev);
>   int aie4_query_npu_firmware_version(struct amdxdna_dev_hdl *ndev,