drm/amdgpu: revise RLCG access path
Subsystems (2)
PATCH 1/1 drm/amdgpu: revise RLCG access path
what changed:
1)provide new implementation interface for the rlcg access path 2)put SQ_CMD/SQ_IND_INDEX to GFX9 RLCG path to let debugfs's reg_op function can access reg that need RLCG path help
now even debugfs's reg_op can used to dump wave.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 50 +++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 3 + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 74 +++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 95 ++++++++++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/soc15.h | 7 +++ drivers/gpu/drm/amd/amdgpu/soc15_common.h | 5 +- 9 files changed, 221 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
@@ -999,6 +999,8 @@ uint32_t amdgpu_mm_rreg(struct amdgpu_device *adev, uint32_t reg, uint32_t acc_flags);void amdgpu_mm_wreg (struct amdgpu_device *adev,uint32_t reg,uint32_t v,uint32_t acc_flags); +void amdgpu_mm_wreg_mmio_rlc (struct amdgpu_device *adev,uint32_t reg,uint32_t v, +uint32_t acc_flags);void amdgpu_mm_wreg8 (struct amdgpu_device *adev,uint32_t offset,uint8_t value);uint8_t amdgpu_mm_rreg8 (struct amdgpu_device *adev,uint32_t offset);
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1 -1
@@ -179,7 +179,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f, }else { r =get_user (value, (uint32_t *)buf);if (!r) -WREG32 (*pos >>2 , value); +amdgpu_mm_wreg_mmio_rlc (adev, *pos >>2 , value,0 ); }if (r) { result = r;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +37 -13
71 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h +2 -0
@@ -127,6 +127,8 @@ 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 (*rlcg_wreg)(struct amdgpu_device *adev,u32 offset,u32 v); +bool (*is_rlcg_access_range)(struct amdgpu_device *adev,uint32_t reg); };struct amdgpu_rlc {
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +3 -0
@@ -270,6 +270,9 @@ struct amdgpu_virt {#define amdgpu_sriov_runtime (adev) \ ((adev)->virt.caps & AMDGPU_SRIOV_CAPS_RUNTIME) +#define amdgpu_sriov_fullaccess (adev) \ +(amdgpu_sriov_vf((adev)) && !amdgpu_sriov_runtime((adev))) +#define amdgpu_passthrough (adev) \ ((adev)->virt.caps & AMDGPU_PASSTHROUGH_MODE)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +73 -1
92 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +94 -1
119 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/soc15.h +7 -0
@@ -42,6 +42,13 @@ struct soc15_reg_golden {u32 or_mask; }; +struct soc15_reg_rlcg { +u32 hwip; +u32 instance; +u32 segment; +u32 reg; +}; +struct soc15_reg_entry {uint32_t hwip;uint32_t inst;
drivers/gpu/drm/amd/amdgpu/soc15_common.h +2 -3
@@ -70,10 +70,9 @@ } \ } while (0) -#define AMDGPU_VIRT_SUPPORT_RLC_PRG_REG (a) (amdgpu_sriov_vf((a)) && !amdgpu_sriov_runtime((a)))#define WREG32_RLC (reg, value) \ do { \ - if (AMDGPU_VIRT_SUPPORT_RLC_PRG_REG(adev)) { \ + if (amdgpu_sriov_fullaccess(adev)) { \ uint32_t i = 0; \ uint32_t retries = 50000; \ uint32_t r0 = adev->reg_offset[GC_HWIP][0][mmSCRATCH_REG0_BASE_IDX] + mmSCRATCH_REG0; \
@@ -98,7 +97,7 @@#define WREG32_SOC15_RLC_SHADOW (ip, inst, reg, value) \ do { \ uint32_t target_reg = adev->reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg;\ - if (AMDGPU_VIRT_SUPPORT_RLC_PRG_REG(adev)) { \ + if (amdgpu_sriov_fullaccess(adev)) { \ uint32_t r2 = adev->reg_offset[GC_HWIP][0][mmSCRATCH_REG1_BASE_IDX] + mmSCRATCH_REG2; \ uint32_t r3 = adev->reg_offset[GC_HWIP][0][mmSCRATCH_REG1_BASE_IDX] + mmSCRATCH_REG3; \ uint32_t grbm_cntl = adev->reg_offset[GC_HWIP][0][mmGRBM_GFX_CNTL_BASE_IDX] + mmGRBM_GFX_CNTL; \
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
-----邮件原件-----
发件人: amd-gfx <[email protected]> 代表 Monk Liu 发送时间: 2020年3月16日 12:06
收件人: [email protected]
抄送: Liu, Monk <[email protected]>
主题: [PATCH] drm/amdgpu: revise RLCG access path
what changed:
1)provide new implementation interface for the rlcg access path 2)put SQ_CMD/SQ_IND_INDEX to GFX9 RLCG path to let debugfs's reg_op function can access reg that need RLCG path help
now even debugfs's reg_op can used to dump wave.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 50 +++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 3 + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 74 +++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 95 ++++++++++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/soc15.h | 7 +++ drivers/gpu/drm/amd/amdgpu/soc15_common.h | 5 +- 9 files changed, 221 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
@@ -999,6 +999,8 @@ uint32_t amdgpu_mm_rreg(struct amdgpu_device *adev, uint32_t reg, uint32_t acc_flags);void amdgpu_mm_wreg (struct amdgpu_device *adev,uint32_t reg,uint32_t v,uint32_t acc_flags); +void amdgpu_mm_wreg_mmio_rlc (struct amdgpu_device *adev,uint32_t reg,uint32_t v, +uint32_t acc_flags);void amdgpu_mm_wreg8 (struct amdgpu_device *adev,uint32_t offset,uint8_t value);uint8_t amdgpu_mm_rreg8 (struct amdgpu_device *adev,uint32_t offset);
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1 -1
@@ -179,7 +179,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f, }else { r =get_user (value, (uint32_t *)buf);if (!r) -WREG32 (*pos >>2 , value); +amdgpu_mm_wreg_mmio_rlc (adev, *pos >>2 , value,0 ); }if (r) { result = r;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +37 -13
70 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h +3 -0
@@ -127,6 +127,8 @@ 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 (*rlcg_wreg)(struct amdgpu_device *adev,u32 offset,u32 v); +bool (*is_rlcg_access_range)(struct amdgpu_device *adev,uint32_t +reg); };
struct amdgpu_rlc {
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +3 -0
@@ -270,6 +270,9 @@ struct amdgpu_virt { #define amdgpu_sriov_runtime(adev) \ ((adev)->virt.caps & AMDGPU_SRIOV_CAPS_RUNTIME) +#define amdgpu_sriov_fullaccess (adev) \ +(amdgpu_sriov_vf((adev)) && !amdgpu_sriov_runtime((adev))) +#define amdgpu_passthrough (adev) \ ((adev)->virt.caps & AMDGPU_PASSTHROUGH_MODE)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +70 -0
80 lines not on this page · raw message
.reset = gfx_v10_0_rlc_reset, .start = gfx_v10_0_rlc_start,
- .update_spm_vmid = gfx_v10_0_update_spm_vmid
+ .update_spm_vmid = gfx_v10_0_update_spm_vmid,
+ .rlcg_wreg = gfx_v10_rlcg_wreg,
+ .is_rlcg_access_range = gfx_v10_0_is_rlcg_access_range,
};
static int gfx_v10_0_set_powergating_state(void *handle, diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index fb9c45f..18e2b57 100644
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +5 -0
@@ -697,6 +697,11 @@ static const struct soc15_reg_golden golden_settings_gc_9_4_1_arct[] = SOC15_REG_GOLDEN_VALUE(GC, 0, mmSQ_FIFO_SIZES, 0xffffffff, 0x00000f00), }; +static const struct soc15_reg_rlcg rlcg_access_gc_9_0[] = { + {SOC15_REG_ENTRY (GC ,0 , mmGRBM_GFX_INDEX)}, + {SOC15_REG_ENTRY (GC ,0 , mmSQ_IND_INDEX)}, }; +static const u32 GFX_RLC_SRM_INDEX_CNTL_ADDR_OFFSETS [] = { mmRLC_SRM_INDEX_CNTL_ADDR_0 - mmRLC_SRM_INDEX_CNTL_ADDR_0, @@ -721,6 +726,63 @@ static const u32 GFX_RLC_SRM_INDEX_CNTL_DATA_OFFSETS[] = mmRLC_SRM_INDEX_CNTL_DATA_7 - mmRLC_SRM_INDEX_CNTL_DATA_0, }; +void gfx_v9_0_rlcg_wreg (struct amdgpu_device *adev,u32 offset,u32 v)
+{
+ static void *scratch_reg0;
+ static void *scratch_reg1;
+ static void *scratch_reg2;
+ static void *scratch_reg3;
+ static void *spare_int;
+ static uint32_t grbm_cntl;
+ static uint32_t grbm_idx;
+ bool shadow;
+
+ scratch_reg0 = adev->rmmio + (adev->reg_offset[GC_HWIP][0][mmSCRATCH_REG0_BASE_IDX] + mmSCRATCH_REG0)*4;
+ scratch_reg1 = adev->rmmio + (adev->reg_offset[GC_HWIP][0][mmSCRATCH_REG1_BASE_IDX] + mmSCRATCH_REG1)*4;
+ scratch_reg2 = adev->rmmio + (adev->reg_offset[GC_HWIP][0][mmSCRATCH_REG1_BASE_IDX] + mmSCRATCH_REG2)*4;
+ scratch_reg3 = adev->rmmio + (adev->reg_offset[GC_HWIP][0][mmSCRATCH_REG1_BASE_IDX] + mmSCRATCH_REG3)*4;
+ spare_int = adev->rmmio +
+(adev->reg_offset[GC_HWIP][0][mmRLC_SPARE_INT_BASE_IDX] +
+mmRLC_SPARE_INT)*4;
+
+ grbm_cntl = adev->reg_offset[GC_HWIP][0][mmGRBM_GFX_CNTL_BASE_IDX] + mmGRBM_GFX_CNTL;
+ grbm_idx = adev->reg_offset[GC_HWIP][0][mmGRBM_GFX_INDEX_BASE_IDX] +
+mmGRBM_GFX_INDEX;
+
+ if (amdgpu_sriov_runtime(adev)) {
+ pr_err("shoudn't call rlcg write register during runtime\n");
+ return;
+ }
+
+ if (offset == grbm_cntl || offset == grbm_idx)
+ shadow = true;
+
+ if (shadow) {
+ if (offset == grbm_cntl)
+ writel(v, scratch_reg2);
+ else if (offset == grbm_idx)
+ writel(v, scratch_reg3);
+
+ writel(v, ((void __iomem *)adev->rmmio) + (offset * 4));
+ } else {
+ uint32_t i = 0;
+ uint32_t retries = 50000;
+
+ writel(v, scratch_reg0);
+ writel(offset | 0x80000000, scratch_reg1);
+ writel(1, spare_int);
+ for (i = 0; i < retries; i++) {
+ u32 tmp;
+
+ tmp = readl(scratch_reg1);
+ if (!(tmp & 0x80000000))
+ break;
+
+ udelay(10);
+ }
+ if (i >= retries)
+ pr_err("timeout: rlcg program reg:0x%05x failed !\n", offset);
+ }
+
+}
+
#define VEGA10_GB_ADDR_CONFIG_GOLDEN 0x2a114042 #define VEGA12_GB_ADDR_CONFIG_GOLDEN 0x24104041 #define RAVEN_GB_ADDR_CONFIG_GOLDEN 0x24000042 @@ -4908,6 +4970,35 @@ static void gfx_v9_0_update_spm_vmid(struct amdgpu_device *adev, unsigned vmid)
WREG32_SOC15(GC, 0, mmRLC_SPM_MC_CNTL, data); }
+static bool gfx_v9_0_check_rlcg_range(struct amdgpu_device *adev,
+ uint32_t offset,
+ struct soc15_reg_rlcg *entries, int arr_size) {
+ int i;
+ uint32_t reg;
+
+ if (!entries)
+ return false;
+
+ for (i = 0; i < arr_size; i++) {
+ const struct soc15_reg_rlcg *entry;
+
+ entry = &entries[i];
+ reg = adev->reg_offset[entry->hwip][entry->instance][entry->segment] + entry->reg;
+ if (offset == reg)
+ return true;
+ }
+
+ return false;
+}
+
+static bool gfx_v9_0_is_rlcg_access_range(struct amdgpu_device *adev,
+u32 offset) {
+ return gfx_v9_0_check_rlcg_range(adev, offset,
+ (void *)rlcg_access_gc_9_0,
+ ARRAY_SIZE(rlcg_access_gc_9_0));
+}
+
static const struct amdgpu_rlc_funcs gfx_v9_0_rlc_funcs = {
.is_rlc_enabled = gfx_v9_0_is_rlc_enabled,
.set_safe_mode = gfx_v9_0_set_safe_mode, @@ -4920,7 +5011,9 @@ static const struct amdgpu_rlc_funcs gfx_v9_0_rlc_funcs = { .stop = gfx_v9_0_rlc_stop,
.reset = gfx_v9_0_rlc_reset,
.start = gfx_v9_0_rlc_start,
- .update_spm_vmid = gfx_v9_0_update_spm_vmid
+ .update_spm_vmid = gfx_v9_0_update_spm_vmid,
+ .rlcg_wreg = gfx_v9_0_rlcg_wreg,
+ .is_rlcg_access_range = gfx_v9_0_is_rlcg_access_range,
};
static int gfx_v9_0_set_powergating_state(void *handle, diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.h b/drivers/gpu/drm/amd/amdgpu/soc15.h
index d0fb7a6..b03f950 100644
drivers/gpu/drm/amd/amdgpu/soc15.h +7 -0
@@ -42,6 +42,13 @@ struct soc15_reg_golden {u32 or_mask; }; +struct soc15_reg_rlcg { +u32 hwip; +u32 instance; +u32 segment; +u32 reg; +}; +struct soc15_reg_entry {uint32_t hwip;uint32_t inst;
drivers/gpu/drm/amd/amdgpu/soc15_common.h +2 -3
@@ -70,10 +70,9 @@ } \ } while (0) -#define AMDGPU_VIRT_SUPPORT_RLC_PRG_REG (a) (amdgpu_sriov_vf((a)) && !amdgpu_sriov_runtime((a))) #define WREG32_RLC(reg, value) \ do { \ - if (AMDGPU_VIRT_SUPPORT_RLC_PRG_REG(adev)) { \ + if (amdgpu_sriov_fullaccess(adev)) { \ uint32_t i = 0; \ uint32_t retries = 50000; \ uint32_t r0 = adev->reg_offset[GC_HWIP][0][mmSCRATCH_REG0_BASE_IDX] + mmSCRATCH_REG0; \
@@ -98,7 +97,7 @@#define WREG32_SOC15_RLC_SHADOW (ip, inst, reg, value) \ do { \ uint32_t target_reg = adev->reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg;\ - if (AMDGPU_VIRT_SUPPORT_RLC_PRG_REG(adev)) { \ + if (amdgpu_sriov_fullaccess(adev)) { \ uint32_t r2 = adev->reg_offset[GC_HWIP][0][mmSCRATCH_REG1_BASE_IDX] + mmSCRATCH_REG2; \ uint32_t r3 = adev->reg_offset[GC_HWIP][0][mmSCRATCH_REG1_BASE_IDX] + mmSCRATCH_REG3; \ uint32_t grbm_cntl = adev->reg_offset[GC_HWIP][0][mmGRBM_GFX_CNTL_BASE_IDX] + mmGRBM_GFX_CNTL; \
--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CEmily.Deng%40amd.com%7C5a4c9b22ea50482009db08d7c95f4d5b%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637199283474250934&sdata=hg7r3E2DLgcGKeLUFdGDesDVGIzhrM7B5EkKIzUAMDg%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx