Acked-by: Jingwen Chen <Jingwen.Chen2@xxxxxxx>
On 2024/3/27 11:52, chongli2 wrote:
> support MES command SET_HW_RESOURCE1 in sriov
>
> Signed-off-by: chongli2 <chongli2@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 6 +++
> drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 5 +++
> drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 ++
> drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 9 ++--
> drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 43 +++++++++++++++++++
> drivers/gpu/drm/amd/include/mes_v11_api_def.h | 21 +++++++++
> 6 files changed, 85 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
> index 7d4f93fea937..3774148f3e5d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h
> @@ -140,6 +140,12 @@ struct amdgpu_mes {
>
> /* ip specific functions */
> const struct amdgpu_mes_funcs *funcs;
> +
> + /* mes resource_1 bo*/
> + struct amdgpu_bo *resource_1;
> + uint64_t resource_1_gpu_addr;
> + void *resource_1_addr;
> +
> };
>
> struct amdgpu_mes_process {
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> index aed60aaf1a55..52f01efde2fe 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
> @@ -576,6 +576,11 @@ static int amdgpu_virt_write_vf2pf_data(struct amdgpu_device *adev)
> vf2pf_info->decode_usage = 0;
>
> vf2pf_info->dummy_page_addr = (uint64_t)adev->dummy_page_addr;
> + vf2pf_info->mes_info_addr = (uint64_t)adev->mes.resource_1_gpu_addr;
> +
> + if (adev->mes.resource_1) {
> + vf2pf_info->mes_info_size = adev->mes.resource_1->tbo.base.size;
> + }
> vf2pf_info->checksum =
> amd_sriov_msg_checksum(
> vf2pf_info, vf2pf_info->header.size, 0, 0);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
> index a858bc98cad4..a9f2f0c4f799 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
> @@ -132,6 +132,8 @@ enum AMDGIM_FEATURE_FLAG {
> AMDGIM_FEATURE_AV1_SUPPORT = (1 << 6),
> /* VCN RB decouple */
> AMDGIM_FEATURE_VCN_RB_DECOUPLE = (1 << 7),
> + /* MES info */
> + AMDGIM_FEATURE_MES_INFO_ENABLE = (1 << 8),
> };
>
> enum AMDGIM_REG_ACCESS_FLAG {
> @@ -335,6 +337,8 @@ static inline bool is_virtual_machine(void)
> ((adev)->virt.gim_feature & AMDGIM_FEATURE_AV1_SUPPORT)
> #define amdgpu_sriov_is_vcn_rb_decouple(adev) \
> ((adev)->virt.gim_feature & AMDGIM_FEATURE_VCN_RB_DECOUPLE)
> +#define amdgpu_sriov_is_mes_info_enable(adev) \
> + ((adev)->virt.gim_feature & AMDGIM_FEATURE_MES_INFO_ENABLE)
> bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev);
> void amdgpu_virt_init_setting(struct amdgpu_device *adev);
> int amdgpu_virt_request_full_gpu(struct amdgpu_device *adev, bool init);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h b/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h
> index 51a14f6d93bd..0de78d6a83fe 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h
> @@ -94,7 +94,8 @@ union amd_sriov_msg_feature_flags {
> uint32_t reg_indirect_acc : 1;
> uint32_t av1_support : 1;
> uint32_t vcn_rb_decouple : 1;
> - uint32_t reserved : 24;
> + uint32_t mes_info_enable : 1;
> + uint32_t reserved : 23;
> } flags;
> uint32_t all;
> };
> @@ -221,7 +222,7 @@ struct amd_sriov_msg_vf2pf_info_header {
> uint32_t reserved[2];
> };
>
> -#define AMD_SRIOV_MSG_VF2PF_INFO_FILLED_SIZE (70)
> +#define AMD_SRIOV_MSG_VF2PF_INFO_FILLED_SIZE (73)
> struct amd_sriov_msg_vf2pf_info {
> /* header contains size and version */
> struct amd_sriov_msg_vf2pf_info_header header;
> @@ -265,7 +266,9 @@ struct amd_sriov_msg_vf2pf_info {
> uint32_t version;
> } ucode_info[AMD_SRIOV_MSG_RESERVE_UCODE];
> uint64_t dummy_page_addr;
> -
> + /* FB allocated for guest MES to record UQ info */
> + uint64_t mes_info_addr;
> + uint32_t mes_info_size;
> /* reserved */
> uint32_t reserved[256 - AMD_SRIOV_MSG_VF2PF_INFO_FILLED_SIZE];
> };
> diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> index 072c478665ad..78ec170cfeef 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> @@ -419,6 +419,36 @@ static int mes_v11_0_set_hw_resources(struct amdgpu_mes *mes)
> offsetof(union MESAPI_SET_HW_RESOURCES, api_status));
> }
>
> +static int mes_v11_0_set_hw_resources_1(struct amdgpu_mes *mes)
> +{
> + int size = 128 * PAGE_SIZE;
> + int ret = 0;
> + struct amdgpu_device *adev = mes->adev;
> + union MESAPI_SET_HW_RESOURCES_1 mes_set_hw_res_pkt;
> + memset(&mes_set_hw_res_pkt, 0, sizeof(mes_set_hw_res_pkt));
> +
> + mes_set_hw_res_pkt.header.type = MES_API_TYPE_SCHEDULER;
> + mes_set_hw_res_pkt.header.opcode = MES_SCH_API_SET_HW_RSRC_1;
> + mes_set_hw_res_pkt.header.dwsize = API_FRAME_SIZE_IN_DWORDS;
> + mes_set_hw_res_pkt.enable_mes_info_ctx = 1;
> +
> + ret = amdgpu_bo_create_kernel(adev, size, PAGE_SIZE,
> + AMDGPU_GEM_DOMAIN_VRAM,
> + &mes->resource_1,
> + &mes->resource_1_gpu_addr,
> + &mes->resource_1_addr);
> + if (ret) {
> + dev_err(adev->dev, "(%d) failed to create mes resource_1 bo\n", ret);
> + return ret;
> + }
> +
> + mes_set_hw_res_pkt.mes_info_ctx_mc_addr = mes->resource_1_gpu_addr;
> + mes_set_hw_res_pkt.mes_info_ctx_size = mes->resource_1->tbo.base.size;
> + return mes_v11_0_submit_pkt_and_poll_completion(mes,
> + &mes_set_hw_res_pkt, sizeof(mes_set_hw_res_pkt),
> + offsetof(union MESAPI_SET_HW_RESOURCES_1, api_status));
> +}
> +
> static const struct amdgpu_mes_funcs mes_v11_0_funcs = {
> .add_hw_queue = mes_v11_0_add_hw_queue,
> .remove_hw_queue = mes_v11_0_remove_hw_queue,
> @@ -1200,6 +1230,14 @@ static int mes_v11_0_hw_init(void *handle)
> if (r)
> goto failure;
>
> + if (amdgpu_sriov_is_mes_info_enable(adev)) {
> + r = mes_v11_0_set_hw_resources_1(&adev->mes);
> + if (r) {
> + DRM_ERROR("failed mes_v11_0_set_hw_resources_1, r=%d\n", r);
> + goto failure;
> + }
> + }
> +
> r = mes_v11_0_query_sched_status(&adev->mes);
> if (r) {
> DRM_ERROR("MES is busy\n");
> @@ -1223,6 +1261,11 @@ static int mes_v11_0_hw_init(void *handle)
>
> static int mes_v11_0_hw_fini(void *handle)
> {
> + struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> + if (amdgpu_sriov_is_mes_info_enable(adev)) {
> + amdgpu_bo_free_kernel(&adev->mes.resource_1, &adev->mes.resource_1_gpu_addr,
> + &adev->mes.resource_1_addr);
> + }
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/amd/include/mes_v11_api_def.h b/drivers/gpu/drm/amd/include/mes_v11_api_def.h
> index ec5b9ab67c5e..410c8d664336 100644
> --- a/drivers/gpu/drm/amd/include/mes_v11_api_def.h
> +++ b/drivers/gpu/drm/amd/include/mes_v11_api_def.h
> @@ -61,6 +61,7 @@ enum MES_SCH_API_OPCODE {
> MES_SCH_API_MISC = 14,
> MES_SCH_API_UPDATE_ROOT_PAGE_TABLE = 15,
> MES_SCH_API_AMD_LOG = 16,
> + MES_SCH_API_SET_HW_RSRC_1 = 19,
> MES_SCH_API_MAX = 0xFF
> };
>
> @@ -238,6 +239,26 @@ union MESAPI_SET_HW_RESOURCES {
> uint32_t max_dwords_in_api[API_FRAME_SIZE_IN_DWORDS];
> };
>
> +union MESAPI_SET_HW_RESOURCES_1 {
> + struct {
> + union MES_API_HEADER header;
> + struct MES_API_STATUS api_status;
> + uint64_t timestamp;
> + union {
> + struct {
> + uint32_t enable_mes_info_ctx : 1;
> + uint32_t reserved : 31;
> + };
> + uint32_t uint32_all;
> + };
> + uint64_t mes_info_ctx_mc_addr;
> + uint32_t mes_info_ctx_size;
> + uint32_t mes_kiq_unmap_timeout; // unit is 100ms
> + };
> +
> + uint32_t max_dwords_in_api[API_FRAME_SIZE_IN_DWORDS];
> +};
> +
> union MESAPI__ADD_QUEUE {
> struct {
> union MES_API_HEADER header;
--
Best Regards,
JingWen Chen
