drm/amdgpu: add helper to query rlcg reg access flag
Subsystems (2)
PATCH 1/9 drm/amdgpu: add helper to query rlcg reg access flag
Query rlc indirect register access approach specified by sriov host driver per ip blocks
--- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 35 ++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 8 ++++++ 2 files changed, 43 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +35 -0
@@ -820,3 +820,38 @@ void amdgpu_virt_update_sriov_video_codec(struct amdgpu_device *adev, } } } + +bool amdgpu_virt_get_rlcg_reg_access_flag (struct amdgpu_device *adev,u32 acc_flags, +u32 hwip,bool write,u32 *rlcg_flag) +{ +bool ret = false; + +switch (hwip) { +case GC_HWIP : +if (amdgpu_sriov_reg_indirect_gc (adev)) { + *rlcg_flag = + write ?AMDGPU_RLCG_GC_WRITE :AMDGPU_RLCG_GC_READ ; + ret = true; +/* only in new version, AMDGPU_REGS_NO_KIQ and +* AMDGPU_REGS_RLC are enabled simultaneously */ + }else if ((acc_flags &AMDGPU_REGS_RLC ) && + !(acc_flags &AMDGPU_REGS_NO_KIQ )) { + *rlcg_flag =AMDGPU_RLCG_GC_WRITE_LEGACY ; + ret = true; + } +break ; +case MMHUB_HWIP : +if (amdgpu_sriov_reg_indirect_mmhub (adev) && + (acc_flags &AMDGPU_REGS_RLC ) && write) { + *rlcg_flag =AMDGPU_RLCG_MMHUB_WRITE ; + ret = true; + } +break ; +default : +dev_err (adev->dev, +"indirect registers access through rlcg is not supported\n" ); + ret = false; +break ; + } +return ret; +}
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +8 -0
@@ -32,6 +32,12 @@#define AMDGPU_PASSTHROUGH_MODE (1 << 3)/* thw whole GPU is pass through for VM */ #define AMDGPU_SRIOV_CAPS_RUNTIME (1 << 4)/* is out of full access mode */ +/* flags for indirect register access path supported by rlcg for sriov */ +#define AMDGPU_RLCG_GC_WRITE_LEGACY (0x8 << 28) +#define AMDGPU_RLCG_GC_WRITE (0x0 << 28) +#define AMDGPU_RLCG_GC_READ (0x1 << 28) +#define AMDGPU_RLCG_MMHUB_WRITE (0x2 << 28) +/* all asic after AI use this offset */ #define mmRCC_IOV_FUNC_IDENTIFIER 0xDE5/* tonga/fiji use this offset */
@@ -321,4 +327,6 @@ enum amdgpu_sriov_vf_mode amdgpu_virt_get_sriov_vf_mode(struct amdgpu_device *advoid amdgpu_virt_update_sriov_video_codec (struct amdgpu_device *adev,struct amdgpu_video_codec_info *encode,uint32_t encode_array_size,struct amdgpu_video_codec_info *decode,uint32_t decode_array_size); +bool amdgpu_virt_get_rlcg_reg_access_flag (struct amdgpu_device *adev,u32 acc_flags, +u32 hwip,bool write,u32 *rlcg_flag);#endif
Signature · 1 line
2.17.1
PATCH 2/9 drm/amdgpu: switch to get_rlcg_reg_access_flag for gfx9
Switch to common helper to query rlcg access flag specified by sriov host driver for gfx9
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 33 ++++----------------------- 1 file changed, 4 insertions(+), 29 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +4 -29
@@ -63,9 +63,6 @@#define mmGCEA_PROBE_MAP 0x070c#define mmGCEA_PROBE_MAP_BASE_IDX 0 -#define GFX9_RLCG_GC_WRITE_OLD (0x8 << 28) -#define GFX9_RLCG_GC_WRITE (0x0 << 28) -#define GFX9_RLCG_GC_READ (0x1 << 28)#define GFX9_RLCG_VFGATE_DISABLED 0x4000000#define GFX9_RLCG_WRONG_OPERATION_TYPE 0x2000000#define GFX9_RLCG_NOT_IN_RANGE 0x1000000
@@ -815,35 +812,12 @@ static u32 gfx_v9_0_rlcg_rw(struct amdgpu_device *adev, u32 offset, u32 v, uint3return ret; } -static bool gfx_v9_0_get_rlcg_flag (struct amdgpu_device *adev,u32 acc_flags,u32 hwip, -int write,u32 *rlcg_flag) -{ - -switch (hwip) { -case GC_HWIP : -if (amdgpu_sriov_reg_indirect_gc (adev)) { - *rlcg_flag = write ?GFX9_RLCG_GC_WRITE :GFX9_RLCG_GC_READ ; - -return true; -/* only in new version, AMDGPU_REGS_NO_KIQ and AMDGPU_REGS_RLC enabled simultaneously */ - }else if ((acc_flags &AMDGPU_REGS_RLC ) && !(acc_flags &AMDGPU_REGS_NO_KIQ ) && write) { - *rlcg_flag =GFX9_RLCG_GC_WRITE_OLD ; -return true; - } - -break ; -default : -return false; - } - -return false; -} -static u32 gfx_v9_0_sriov_rreg (struct amdgpu_device *adev,u32 offset,u32 acc_flags,u32 hwip) {u32 rlcg_flag; -if (!amdgpu_sriov_runtime (adev) &&gfx_v9_0_get_rlcg_flag (adev, acc_flags, hwip,0 , &rlcg_flag)) +if (!amdgpu_sriov_runtime (adev) && +amdgpu_virt_get_rlcg_reg_access_flag (adev, acc_flags, hwip, false, &rlcg_flag))return gfx_v9_0_rlcg_rw (adev, offset,0 , rlcg_flag);if (acc_flags &AMDGPU_REGS_NO_KIQ )
@@ -857,7 +831,8 @@ static void gfx_v9_0_sriov_wreg(struct amdgpu_device *adev, u32 offset, {u32 rlcg_flag; -if (!amdgpu_sriov_runtime (adev) &&gfx_v9_0_get_rlcg_flag (adev, acc_flags, hwip,1 , &rlcg_flag)) { +if (!amdgpu_sriov_runtime (adev) && +amdgpu_virt_get_rlcg_reg_access_flag (adev, acc_flags, hwip, true, &rlcg_flag)) {gfx_v9_0_rlcg_rw (adev, offset, value, rlcg_flag);return ; }
Signature · 1 line
2.17.1
PATCH 3/9 drm/amdgpu: switch to get_rlcg_reg_access_flag for gfx10
In reply to Hawking ZhangSwitch to common helper to query rlcg access flag specified by sriov host driver for gfx10
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 41 ++------------------------ 1 file changed, 2 insertions(+), 39 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +2 -39
@@ -180,11 +180,6 @@#define mmRLC_SPARE_INT_0_Sienna_Cichlid 0x4ca5#define mmRLC_SPARE_INT_0_Sienna_Cichlid_BASE_IDX 1 -#define GFX_RLCG_GC_WRITE_OLD (0x8 << 28) -#define GFX_RLCG_GC_WRITE (0x0 << 28) -#define GFX_RLCG_GC_READ (0x1 << 28) -#define GFX_RLCG_MMHUB_WRITE (0x2 << 28) -#define RLCG_ERROR_REPORT_ENABLED (adev) \ (amdgpu_sriov_reg_indirect_mmhub(adev) || amdgpu_sriov_reg_indirect_gc(adev))
@@ -1463,38 +1458,6 @@ static const struct soc15_reg_golden golden_settings_gc_10_1_2[] = SOC15_REG_GOLDEN_VALUE(GC, 0, mmUTCL1_CTRL, 0xffffffff, 0x00c00000) }; -static bool gfx_v10_get_rlcg_flag (struct amdgpu_device *adev,u32 acc_flags,u32 hwip, -int write,u32 *rlcg_flag) -{ -switch (hwip) { -case GC_HWIP : -if (amdgpu_sriov_reg_indirect_gc (adev)) { - *rlcg_flag = write ?GFX_RLCG_GC_WRITE :GFX_RLCG_GC_READ ; - -return true; -/* only in new version, AMDGPU_REGS_NO_KIQ and AMDGPU_REGS_RLC enabled simultaneously */ - }else if ((acc_flags &AMDGPU_REGS_RLC ) && !(acc_flags &AMDGPU_REGS_NO_KIQ )) { - *rlcg_flag =GFX_RLCG_GC_WRITE_OLD ; - -return true; - } - -break ; -case MMHUB_HWIP : -if (amdgpu_sriov_reg_indirect_mmhub (adev) && - (acc_flags &AMDGPU_REGS_RLC ) && write) { - *rlcg_flag =GFX_RLCG_MMHUB_WRITE ; -return true; - } - -break ; -default : -DRM_DEBUG ("Not program register by RLCG\n" ); - } - -return false; -} -static u32 gfx_v10_rlcg_rw (struct amdgpu_device *adev,u32 offset,u32 v,uint32_t flag) {static void *scratch_reg0;
@@ -1575,7 +1538,7 @@ static void gfx_v10_sriov_wreg(struct amdgpu_device *adev, u32 offset, u32 valueu32 rlcg_flag;if (!amdgpu_sriov_runtime (adev) && -gfx_v10_get_rlcg_flag (adev, acc_flags, hwip,1 , &rlcg_flag)) { +amdgpu_virt_get_rlcg_reg_access_flag (adev, acc_flags, hwip, true, &rlcg_flag)) {gfx_v10_rlcg_rw (adev, offset, value, rlcg_flag);return ; }
@@ -1591,7 +1554,7 @@ static u32 gfx_v10_sriov_rreg(struct amdgpu_device *adev, u32 offset, u32 acc_flu32 rlcg_flag;if (!amdgpu_sriov_runtime (adev) && -gfx_v10_get_rlcg_flag (adev, acc_flags, hwip,0 , &rlcg_flag)) +amdgpu_virt_get_rlcg_reg_access_flag (adev, acc_flags, hwip, false, &rlcg_flag))return gfx_v10_rlcg_rw (adev, offset,0 , rlcg_flag);if (acc_flags &AMDGPU_REGS_NO_KIQ )
Signature · 1 line
2.17.1
PATCH 4/9 drm/amdgpu: add structures for rlcg indirect reg access
In reply to Hawking ZhangAdd structures that are used to cache registers offsets for rlcg indirect reg access ctrl and flag availability of such interface
--- drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h +14 -0
@@ -132,6 +132,16 @@ struct amdgpu_rlc_funcs {bool (*is_rlcg_access_range)(struct amdgpu_device *adev,uint32_t reg); }; +struct amdgpu_rlcg_reg_access_ctrl { +uint32_t scratch_reg0; +uint32_t scratch_reg1; +uint32_t scratch_reg2; +uint32_t scratch_reg3; +uint32_t grbm_cntl; +uint32_t grbm_idx; +uint32_t spare_int; +}; +struct amdgpu_rlc {/* for power gating */ struct amdgpu_bo *save_restore_obj;
@@ -191,6 +201,10 @@ struct amdgpu_rlc {struct amdgpu_bo *rlc_toc_bo;uint64_t rlc_toc_gpu_addr;void *rlc_toc_buf; + +bool rlcg_reg_access_supported; +/* registers for rlcg indirect reg access */ +struct amdgpu_rlcg_reg_access_ctrl reg_access_ctrl; };void amdgpu_gfx_rlc_enter_safe_mode (struct amdgpu_device *adev);
Signature · 1 line
2.17.1
PATCH 5/9 drm/amdgpu: init rlcg_reg_access_ctrl for gfx9
In reply to Hawking ZhangInitialize all the register offsets that will be used in rlcg indirect reg access path for gfx9 in sw_init phase
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 30 +++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +26 -4
@@ -1983,6 +1983,21 @@ static int gfx_v9_0_cp_jump_table_num(struct amdgpu_device *adev)return 4 ; } +static void gfx_v9_0_init_rlcg_reg_access_ctrl (struct amdgpu_device *adev) +{ +struct amdgpu_rlcg_reg_access_ctrl *reg_access_ctrl; + + reg_access_ctrl = &adev->gfx.rlc.reg_access_ctrl; + reg_access_ctrl->scratch_reg0 =SOC15_REG_OFFSET (GC ,0 , mmSCRATCH_REG0); + reg_access_ctrl->scratch_reg1 =SOC15_REG_OFFSET (GC ,0 , mmSCRATCH_REG1); + reg_access_ctrl->scratch_reg2 =SOC15_REG_OFFSET (GC ,0 , mmSCRATCH_REG2); + reg_access_ctrl->scratch_reg3 =SOC15_REG_OFFSET (GC ,0 , mmSCRATCH_REG3); + reg_access_ctrl->grbm_cntl =SOC15_REG_OFFSET (GC ,0 , mmGRBM_GFX_CNTL); + reg_access_ctrl->grbm_idx =SOC15_REG_OFFSET (GC ,0 , mmGRBM_GFX_INDEX); + reg_access_ctrl->spare_int =SOC15_REG_OFFSET (GC ,0 , mmRLC_SPARE_INT); + adev->gfx.rlc.rlcg_reg_access_supported = true; +} +static int gfx_v9_0_rlc_init (struct amdgpu_device *adev) {const struct cs_section_def *cs_data;
@@ -2023,6 +2038,9 @@ static int gfx_v9_0_rlc_init(struct amdgpu_device *adev)if (adev->gfx.rlc.funcs->update_spm_vmid) adev->gfx.rlc.funcs->update_spm_vmid (adev,0xf ); +/* init rlcg reg access ctrl */ +gfx_v9_0_init_rlcg_reg_access_ctrl (adev); +return 0 ; }
@@ -2432,10 +2450,14 @@ static int gfx_v9_0_sw_init(void *handle)return r; } - r = adev->gfx.rlc.funcs->init (adev); -if (r) { -DRM_ERROR ("Failed to init rlc BOs!\n" ); -return r; +if (adev->gfx.rlc.funcs) { +if (adev->gfx.rlc.funcs->init) { + r = adev->gfx.rlc.funcs->init (adev); +if (r) { +dev_err (adev->dev,"Failed to init rlc BOs!\n" ); +return r; + } + } } r =gfx_v9_0_mec_init (adev);
Signature · 1 line
2.17.1
PATCH 6/9 drm/amdgpu: init rlcg_reg_access_ctrl for gfx10
In reply to Hawking ZhangInitialize all the register offsets that will be used in rlcg indirect reg access path for gfx10 in sw_init phase
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 38 +++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +34 -4
@@ -4411,6 +4411,30 @@ static void gfx_v10_0_rlc_fini(struct amdgpu_device *adev) (void **)&adev->gfx.rlc.cp_table_ptr); } +static void gfx_v10_0_init_rlcg_reg_access_ctrl (struct amdgpu_device *adev) +{ +struct amdgpu_rlcg_reg_access_ctrl *reg_access_ctrl; + + reg_access_ctrl = &adev->gfx.rlc.reg_access_ctrl; + reg_access_ctrl->scratch_reg0 =SOC15_REG_OFFSET (GC ,0 , mmSCRATCH_REG0); + reg_access_ctrl->scratch_reg1 =SOC15_REG_OFFSET (GC ,0 , mmSCRATCH_REG1); + reg_access_ctrl->scratch_reg2 =SOC15_REG_OFFSET (GC ,0 , mmSCRATCH_REG2); + reg_access_ctrl->scratch_reg3 =SOC15_REG_OFFSET (GC ,0 , mmSCRATCH_REG3); + reg_access_ctrl->grbm_cntl =SOC15_REG_OFFSET (GC ,0 , mmGRBM_GFX_CNTL); + reg_access_ctrl->grbm_idx =SOC15_REG_OFFSET (GC ,0 , mmGRBM_GFX_INDEX); +switch (adev->ip_versions[GC_HWIP ][0 ]) { +case IP_VERSION (10 ,3 ,0 ): + reg_access_ctrl->spare_int = +SOC15_REG_OFFSET (GC ,0 , mmRLC_SPARE_INT_0_Sienna_Cichlid); +break ; +default : + reg_access_ctrl->spare_int = +SOC15_REG_OFFSET (GC ,0 , mmRLC_SPARE_INT); +break ; + } + adev->gfx.rlc.rlcg_reg_access_supported = true; +} +static int gfx_v10_0_rlc_init (struct amdgpu_device *adev) {const struct cs_section_def *cs_data;
@@ -4431,6 +4455,8 @@ static int gfx_v10_0_rlc_init(struct amdgpu_device *adev)if (adev->gfx.rlc.funcs->update_spm_vmid) adev->gfx.rlc.funcs->update_spm_vmid (adev,0xf ); +gfx_v10_0_init_rlcg_reg_access_ctrl (adev); +return 0 ; }
@@ -4828,10 +4854,14 @@ static int gfx_v10_0_sw_init(void *handle)if (r)return r; - r =gfx_v10_0_rlc_init (adev); -if (r) { -DRM_ERROR ("Failed to init rlc BOs!\n" ); -return r; +if (adev->gfx.rlc.funcs) { +if (adev->gfx.rlc.funcs->init) { + r = adev->gfx.rlc.funcs->init (adev); +if (r) { +dev_err (adev->dev,"Failed to init rlc BOs!\n" ); +return r; + } + } } r =gfx_v10_0_mec_init (adev);
Signature · 1 line
2.17.1
PATCH 7/9 drm/amdgpu: add helper for rlcg indirect reg access
In reply to Hawking ZhangThe helper will be used to access registers from sriov guest in full access time
--- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 111 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 14 ++- 2 files changed, 124 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +111 -0
@@ -855,3 +855,114 @@ bool amdgpu_virt_get_rlcg_reg_access_flag(struct amdgpu_device *adev, u32 acc_fl }return ret; } + +static u32 amdgpu_virt_rlcg_reg_rw (struct amdgpu_device *adev,u32 offset,u32 v,u32 flag) +{ +struct amdgpu_rlcg_reg_access_ctrl *reg_access_ctrl; +uint32_t timeout =50000 ; +uint32_t i, tmp; +uint32_t ret =0 ; +static void *scratch_reg0; +static void *scratch_reg1; +static void *scratch_reg2; +static void *scratch_reg3; +static void *spare_int; + +if (!adev->gfx.rlc.rlcg_reg_access_supported) { +dev_err (adev->dev, +"indirect registers access through rlcg is not available\n" ); +return 0 ; + } + + scratch_reg0 = (void __iomem *)adev->rmmio +4 * reg_access_ctrl->scratch_reg0; + scratch_reg1 = (void __iomem *)adev->rmmio +4 * reg_access_ctrl->scratch_reg1; + scratch_reg2 = (void __iomem *)adev->rmmio +4 * reg_access_ctrl->scratch_reg2; + scratch_reg3 = (void __iomem *)adev->rmmio +4 * reg_access_ctrl->scratch_reg3; +if (reg_access_ctrl->spare_int) + spare_int = (void __iomem *)adev->rmmio +4 * reg_access_ctrl->spare_int; + +if (offset == reg_access_ctrl->grbm_cntl) { +/* if the target reg offset is grbm_cntl, write to scratch_reg2 */ +writel (v, scratch_reg2); +writel (v, ((void __iomem *)adev->rmmio) + (offset *4 )); + }else if (offset == reg_access_ctrl->grbm_idx) { +/* if the target reg offset is grbm_idx, write to scratch_reg3 */ +writel (v, scratch_reg3); +writel (v, ((void __iomem *)adev->rmmio) + (offset *4 )); + }else { +/* +* SCRATCH_REG0 = read/write value +* SCRATCH_REG1[30:28] = command +* SCRATCH_REG1[19:0] = address in dword +* SCRATCH_REG1[26:24] = Error reporting +*/ +writel (v, scratch_reg0); +writel ((offset | flag), scratch_reg1); +if (reg_access_ctrl->spare_int) +writel (1 , spare_int); + +for (i =0 ; i < timeout; i++) { + tmp =readl (scratch_reg1); +if (!(tmp & flag)) +break ; +udelay (10 ); + } + +if (i >= timeout) { +if (amdgpu_sriov_rlcg_error_report_enabled (adev)) { +if (tmp &AMDGPU_RLCG_VFGATE_DISABLED ) { +dev_err (adev->dev, +"vfgate is disabled, rlcg failed to program reg: 0x%05x\n" , offset); + }else if (tmp &AMDGPU_RLCG_WRONG_OPERATION_TYPE ) { +dev_err (adev->dev, +"wrong operation type, rlcg failed to program reg: 0x%05x\n" , offset); + }else if (tmp &AMDGPU_RLCG_REG_NOT_IN_RANGE ) { +dev_err (adev->dev, +"regiser is not in range, rlcg failed to program reg: 0x%05x\n" , offset); + }else { +dev_err (adev->dev, +"unknown error type, rlcg failed to program reg: 0x%05x\n" , offset); + } + }else { +dev_err (adev->dev, +"timeout: rlcg faled to program reg: 0x%05x\n" , offset); + } + } + } + + ret =readl (scratch_reg0); +return ret; +} + +void amdgpu_sriov_wreg (struct amdgpu_device *adev, +u32 offset,u32 value, +u32 acc_flags,u32 hwip) +{ +u32 rlcg_flag; + +if (!amdgpu_sriov_runtime (adev) && +amdgpu_virt_get_rlcg_reg_access_flag (adev, acc_flags, hwip, true, &rlcg_flag)) { +amdgpu_virt_rlcg_reg_rw (adev, offset, value, rlcg_flag); +return ; + } + +if (acc_flags &AMDGPU_REGS_NO_KIQ ) +WREG32_NO_KIQ (offset, value); +else +WREG32 (offset, value); +} + +u32 amdgpu_sriov_rreg (struct amdgpu_device *adev, +u32 offset,u32 acc_flags,u32 hwip) +{ +u32 rlcg_flag; + +if (!amdgpu_sriov_runtime (adev) && +amdgpu_virt_get_rlcg_reg_access_flag (adev, acc_flags, hwip, false, &rlcg_flag)) +return amdgpu_virt_rlcg_reg_rw (adev, offset,0 , rlcg_flag); + +if (acc_flags &AMDGPU_REGS_NO_KIQ ) +return RREG32_NO_KIQ (offset); +else +return RREG32 (offset); +}
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +13 -1
@@ -38,6 +38,11 @@#define AMDGPU_RLCG_GC_READ (0x1 << 28)#define AMDGPU_RLCG_MMHUB_WRITE (0x2 << 28) +/* error code for indirect register access path supported by rlcg for sriov */ +#define AMDGPU_RLCG_VFGATE_DISABLED 0x4000000 +#define AMDGPU_RLCG_WRONG_OPERATION_TYPE 0x2000000 +#define AMDGPU_RLCG_REG_NOT_IN_RANGE 0x1000000 +/* all asic after AI use this offset */ #define mmRCC_IOV_FUNC_IDENTIFIER 0xDE5/* tonga/fiji use this offset */
@@ -281,6 +286,9 @@ struct amdgpu_video_codec_info; (amdgpu_sriov_vf ((adev)) && \ ((adev)->virt.reg_access & (AMDGIM_FEATURE_GC_REG_RLC_EN))) +#define amdgpu_sriov_rlcg_error_report_enabled (adev) \ + (amdgpu_sriov_reg_indirect_mmhub(adev) || amdgpu_sriov_reg_indirect_gc(adev)) +#define amdgpu_passthrough (adev) \ ((adev)->virt.caps & AMDGPU_PASSTHROUGH_MODE)
@@ -299,7 +307,6 @@ static inline bool is_virtual_machine(void) ((!amdgpu_in_reset(adev)) && adev->virt.tdr_debug)#define amdgpu_sriov_is_normal (adev) \ ((!amdgpu_in_reset(adev)) && (!adev->virt.tdr_debug)) -bool amdgpu_virt_mmio_blocked (struct amdgpu_device *adev);void amdgpu_virt_init_setting (struct amdgpu_device *adev); void amdgpu_virt_kiq_reg_write_reg_wait(struct amdgpu_device *adev,
@@ -329,4 +336,9 @@ void amdgpu_virt_update_sriov_video_codec(struct amdgpu_device *adev, struct amdgpu_video_codec_info *decode, uint32_t decode_array_size);bool amdgpu_virt_get_rlcg_reg_access_flag (struct amdgpu_device *adev,u32 acc_flags,u32 hwip,bool write,u32 *rlcg_flag); +void amdgpu_sriov_wreg (struct amdgpu_device *adev, +u32 offset,u32 value, +u32 acc_flags,u32 hwip); +u32 amdgpu_sriov_rreg (struct amdgpu_device *adev, +u32 offset,u32 acc_flags,u32 hwip);#endif
Signature · 1 line
2.17.1
PATCH 8/9 drm/amdgpu: switch to amdgpu_sriov_rreg/wreg
In reply to Hawking ZhangInstead of ip specific implementation for rlcg
indirect register access
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- drivers/gpu/drm/amd/amdgpu/soc15_common.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
@@ -566,7 +566,7 @@ void amdgpu_mm_wreg_mmio_rlc(struct amdgpu_device *adev, adev->gfx.rlc.funcs && adev->gfx.rlc.funcs->is_rlcg_access_range) {if (adev->gfx.rlc.funcs->is_rlcg_access_range (adev, reg)) -return adev->gfx.rlc.funcs->sriov_wreg (adev, reg, v,0 ,0 ); +return amdgpu_sriov_wreg (adev, reg, v,0 ,0 ); } else if ((reg * 4) >= adev->rmmio_size) { adev->pcie_wreg (adev, reg *4 , v); } else {
drivers/gpu/drm/amd/amdgpu/soc15_common.h +4 -4
@@ -28,13 +28,13 @@#define SOC15_REG_OFFSET (ip, inst, reg) (adev->reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg)#define __WREG32_SOC15_RLC__ (reg, value, flag, hwip) \ - ((amdgpu_sriov_vf(adev) && adev->gfx.rlc.funcs && adev->gfx.rlc.funcs->sriov_wreg) ? \ - adev->gfx.rlc.funcs->sriov_wreg(adev, reg, value, flag, hwip) : \ + ((amdgpu_sriov_vf(adev) && adev->gfx.rlc.funcs && adev->gfx.rlc.rlcg_reg_access_supported) ? \ + amdgpu_sriov_wreg(adev, reg, value, flag, hwip) : \ WREG32(reg, value))#define __RREG32_SOC15_RLC__ (reg, flag, hwip) \ - ((amdgpu_sriov_vf(adev) && adev->gfx.rlc.funcs && adev->gfx.rlc.funcs->sriov_rreg) ? \ - adev->gfx.rlc.funcs->sriov_rreg(adev, reg, flag, hwip) : \ + ((amdgpu_sriov_vf(adev) && adev->gfx.rlc.funcs && adev->gfx.rlc.rlcg_reg_access_supported) ? \ + amdgpu_sriov_rreg(adev, reg, flag, hwip) : \ RREG32(reg))#define WREG32_FIELD15 (ip, idx, reg, field, val) \
Signature · 1 line
2.17.1
PATCH 9/9 drm/amdgpu: retire rlc callbacks sriov_rreg/wreg
In reply to Hawking ZhangNot needed anymore.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 2 - drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 114 ----------------------- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 106 --------------------- 5 files changed, 3 insertions(+), 226 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h +0 -2
@@ -127,8 +127,6 @@ struct amdgpu_rlc_funcs {void (*reset)(struct amdgpu_device *adev);void (*start)(struct amdgpu_device *adev);void (*update_spm_vmid)(struct amdgpu_device *adev,unsigned vmid); -void (*sriov_wreg)(struct amdgpu_device *adev,u32 offset,u32 v,u32 acc_flags,u32 hwip); -u32 (*sriov_rreg)(struct amdgpu_device *adev,u32 offset,u32 acc_flags,u32 hwip);bool (*is_rlcg_access_range)(struct amdgpu_device *adev,uint32_t reg); };
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +3 -2
@@ -821,8 +821,9 @@ void amdgpu_virt_update_sriov_video_codec(struct amdgpu_device *adev, } } -bool amdgpu_virt_get_rlcg_reg_access_flag (struct amdgpu_device *adev,u32 acc_flags, -u32 hwip,bool write,u32 *rlcg_flag) +static bool amdgpu_virt_get_rlcg_reg_access_flag (struct amdgpu_device *adev, +u32 acc_flags,u32 hwip, +bool write,u32 *rlcg_flag) {bool ret = false;
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +0 -2
@@ -334,8 +334,6 @@ enum amdgpu_sriov_vf_mode amdgpu_virt_get_sriov_vf_mode(struct amdgpu_device *advoid amdgpu_virt_update_sriov_video_codec (struct amdgpu_device *adev,struct amdgpu_video_codec_info *encode,uint32_t encode_array_size,struct amdgpu_video_codec_info *decode,uint32_t decode_array_size); -bool amdgpu_virt_get_rlcg_reg_access_flag (struct amdgpu_device *adev,u32 acc_flags, -u32 hwip,bool write,u32 *rlcg_flag);void amdgpu_sriov_wreg (struct amdgpu_device *adev,u32 offset,u32 value,u32 acc_flags,u32 hwip);
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +0 -114
138 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0 -106
124 lines not on this page · raw message
Signature · 1 line
2.17.1
Series is
Thanks,
Lijo
Quoted 79 lines · Hawking Zhang
Query rlc indirect register access approach specified by sriov host driver per ip blocks
Signed-off-by Hawking Zhang <[email protected]>Reviewed-by Zhou, Peng Ju <[email protected]>Acked-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 35 ++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 8 ++++++ 2 files changed, 43 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +35
-0@@ -820,3 +820,38 @@ void amdgpu_virt_update_sriov_video_codec(struct amdgpu_device *adev, } } } + +bool amdgpu_virt_get_rlcg_reg_access_flag (struct amdgpu_device *adev,u32 acc_flags, +u32 hwip,bool write,u32 *rlcg_flag) +{ +bool ret = false; + +switch (hwip) { +case GC_HWIP : +if (amdgpu_sriov_reg_indirect_gc (adev)) { + *rlcg_flag = + write ?AMDGPU_RLCG_GC_WRITE :AMDGPU_RLCG_GC_READ ; + ret = true; +/* only in new version, AMDGPU_REGS_NO_KIQ and +* AMDGPU_REGS_RLC are enabled simultaneously */ + }else if ((acc_flags &AMDGPU_REGS_RLC ) && + !(acc_flags &AMDGPU_REGS_NO_KIQ )) { + *rlcg_flag =AMDGPU_RLCG_GC_WRITE_LEGACY ; + ret = true; + } +break ; +case MMHUB_HWIP : +if (amdgpu_sriov_reg_indirect_mmhub (adev) && + (acc_flags &AMDGPU_REGS_RLC ) && write) { + *rlcg_flag =AMDGPU_RLCG_MMHUB_WRITE ; + ret = true; + } +break ; +default : +dev_err (adev->dev, +"indirect registers access through rlcg is not supported\n" ); + ret = false; +break ; + } +return ret; +}drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +8
-0@@ -32,6 +32,12 @@#define AMDGPU_PASSTHROUGH_MODE (1 << 3)/* thw whole GPU is pass through for VM */ #define AMDGPU_SRIOV_CAPS_RUNTIME (1 << 4)/* is out of full access mode */ +/* flags for indirect register access path supported by rlcg for sriov */ +#define AMDGPU_RLCG_GC_WRITE_LEGACY (0x8 << 28) +#define AMDGPU_RLCG_GC_WRITE (0x0 << 28) +#define AMDGPU_RLCG_GC_READ (0x1 << 28) +#define AMDGPU_RLCG_MMHUB_WRITE (0x2 << 28) +/* all asic after AI use this offset */ #define mmRCC_IOV_FUNC_IDENTIFIER 0xDE5/* tonga/fiji use this offset */ @@ -321,4 +327,6 @@ enum amdgpu_sriov_vf_mode amdgpu_virt_get_sriov_vf_mode(struct amdgpu_device *advoid amdgpu_virt_update_sriov_video_codec (struct amdgpu_device *adev,struct amdgpu_video_codec_info *encode,uint32_t encode_array_size,struct amdgpu_video_codec_info *decode,uint32_t decode_array_size); +bool amdgpu_virt_get_rlcg_reg_access_flag (struct amdgpu_device *adev,u32 acc_flags, +u32 hwip,bool write,u32 *rlcg_flag);#endif