drm/amdgpu: Add guest driver CUID support
Subsystems (2)
PATCH 1/1 drm/amdgpu: Add guest driver CUID support
1. Add guest driver CUID support
2. Sync the feature flag between guest driver and host driver.
Signed-off-by chong li <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 55 +++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 8 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 ++ drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 12 ++++- 5 files changed, 76 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1112,6 +1112,7 @@ struct amdgpu_device {long psp_timeout;uint64_t unique_id; +uint8_t unitid;uint64_t df_perfmon_config_assign_mask[AMDGPU_MAX_DF_PERFMONS ];/* enable runtime pm on the device */
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +55 -0
67 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +6 -2
@@ -534,8 +534,12 @@ static int amdgpu_virt_read_pf2vf_data(struct amdgpu_device *adev)if ((adev->virt.decode_max_dimension_pixels >0 ) || (adev->virt.encode_max_dimension_pixels >0 )) adev->virt.is_mm_bw_enabled = true; - adev->unique_id = - ((struct amd_sriov_msg_pf2vf_info *)pf2vf_info)->uuid; + adev->unique_id = ((struct amd_sriov_msg_pf2vf_info *)pf2vf_info)->uuid; + + adev->unitid =0 ; +if (amdgpu_sriov_is_unitid_support (adev)) + adev->unitid = ((struct amd_sriov_msg_pf2vf_info *)pf2vf_info)->unitid; + adev->virt.ras_en_caps.all = ((struct amd_sriov_msg_pf2vf_info *)pf2vf_info)->ras_en_caps.all; adev->virt.ras_telemetry_en_caps.all = ((struct amd_sriov_msg_pf2vf_info *)pf2vf_info)->ras_telemetry_en_caps.all;
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +4 -0
@@ -163,6 +163,8 @@ enum AMDGIM_FEATURE_FLAG {AMDGIM_FEATURE_RAS_CPER = (1 <<11 ),AMDGIM_FEATURE_XGMI_TA_EXT_PEER_LINK = (1 <<12 ),AMDGIM_FEATURE_XGMI_CONNECTED_TO_CPU = (1 <<13 ), +AMDGIM_FEATURE_PTL_SUPPORT = (1 <<14 ), + AMDGIM_FEATURE_UNITID = (1 << 15), }; enum AMDGIM_REG_ACCESS_FLAG {
@@ -441,6 +443,8 @@ static inline bool is_virtual_machine(void) ((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) +#define amdgpu_sriov_is_unitid_support (adev) \ + ((adev)->virt.gim_feature & AMDGIM_FEATURE_UNITID)#define amdgpu_virt_xgmi_migrate_enabled (adev) \ ((adev)->virt.is_xgmi_node_migrate_enabled && (adev)->gmc.xgmi.node_segment_size != 0)
drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h +10 -2
@@ -162,7 +162,9 @@ union amd_sriov_msg_feature_flags { uint32_t ras_cper : 1; uint32_t xgmi_ta_ext_peer_link : 1; uint32_t xgmi_connected_to_cpu : 1; - uint32_t reserved : 18; + uint32_t ptl_support : 1; + uint32_t unitid_support : 1; + uint32_t reserved : 16; } flags;uint32_t all; };
@@ -256,7 +258,7 @@ struct amd_sriov_msg_pf2vf_info_header {uint32_t reserved[2 ]; }; -#define AMD_SRIOV_MSG_PF2VF_INFO_FILLED_SIZE (55) +#define AMD_SRIOV_MSG_PF2VF_INFO_FILLED_SIZE (59)struct amd_sriov_msg_pf2vf_info {/* header contains size and version */ struct amd_sriov_msg_pf2vf_info_header header;
@@ -314,6 +316,12 @@ struct amd_sriov_msg_pf2vf_info {uint32_t more_bp;//Reserved for future use. union amd_sriov_ras_caps ras_en_caps;union amd_sriov_ras_caps ras_telemetry_en_caps; +uint8_t unitid; +uint8_t padding[3 ];//use the 3 bytes to align +/* PTL status response for guest */ +uint32_t ptl_enabled;// PTL enable status: 0=disabled, 1=enabled +uint32_t ptl_pref_format1;// Current preferred format 1 +uint32_t ptl_pref_format2;// Current preferred format 2 /* reserved */ uint32_t reserved[256 -AMD_SRIOV_MSG_PF2VF_INFO_FILLED_SIZE ];
Signature · 1 line
2.48.1