Skip to content

Commit db54a72

Browse files
amd-sukhatrialexdeucher
authored andcommitted
drm/amdgpu: Add sdma_v4_4_2 ip dump for devcoredump
Add ip dump for sdma_v4_4_2 for devcoredump for all instances of sdma. Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Sunil Khatri <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent a11b36b commit db54a72

File tree

1 file changed

+80
-0
lines changed

1 file changed

+80
-0
lines changed

drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,53 @@
4646
MODULE_FIRMWARE("amdgpu/sdma_4_4_2.bin");
4747
MODULE_FIRMWARE("amdgpu/sdma_4_4_5.bin");
4848

49+
static const struct amdgpu_hwip_reg_entry sdma_reg_list_4_4_2[] = {
50+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_STATUS_REG),
51+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_STATUS1_REG),
52+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_STATUS2_REG),
53+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_STATUS3_REG),
54+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_UCODE_CHECKSUM),
55+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_RB_RPTR_FETCH_HI),
56+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_RB_RPTR_FETCH),
57+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_UTCL1_RD_STATUS),
58+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_UTCL1_WR_STATUS),
59+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_UTCL1_RD_XNACK0),
60+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_UTCL1_RD_XNACK1),
61+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_UTCL1_WR_XNACK0),
62+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_UTCL1_WR_XNACK1),
63+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_GFX_RB_CNTL),
64+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_GFX_RB_RPTR),
65+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_GFX_RB_RPTR_HI),
66+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_GFX_RB_WPTR),
67+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_GFX_RB_WPTR_HI),
68+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_GFX_IB_OFFSET),
69+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_GFX_IB_BASE_LO),
70+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_GFX_IB_BASE_HI),
71+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_GFX_IB_CNTL),
72+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_GFX_IB_RPTR),
73+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_GFX_IB_SUB_REMAIN),
74+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_GFX_DUMMY_REG),
75+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_PAGE_RB_CNTL),
76+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_PAGE_RB_RPTR),
77+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_PAGE_RB_RPTR_HI),
78+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_PAGE_RB_WPTR),
79+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_PAGE_RB_WPTR_HI),
80+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_PAGE_IB_OFFSET),
81+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_PAGE_IB_BASE_LO),
82+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_PAGE_IB_BASE_HI),
83+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_PAGE_DUMMY_REG),
84+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_RLC0_RB_CNTL),
85+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_RLC0_RB_RPTR),
86+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_RLC0_RB_RPTR_HI),
87+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_RLC0_RB_WPTR),
88+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_RLC0_RB_WPTR_HI),
89+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_RLC0_IB_OFFSET),
90+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_RLC0_IB_BASE_LO),
91+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_RLC0_IB_BASE_HI),
92+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_RLC0_DUMMY_REG),
93+
SOC15_REG_ENTRY_STR(GC, 0, regSDMA_VM_CNTL)
94+
};
95+
4996
#define mmSMNAID_AID0_MCA_SMU 0x03b30400
5097

5198
#define WREG32_SDMA(instance, offset, value) \
@@ -1291,6 +1338,8 @@ static int sdma_v4_4_2_sw_init(void *handle)
12911338
int r, i;
12921339
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
12931340
u32 aid_id;
1341+
uint32_t reg_count = ARRAY_SIZE(sdma_reg_list_4_4_2);
1342+
uint32_t *ptr;
12941343

12951344
/* SDMA trap event */
12961345
for (i = 0; i < adev->sdma.num_inst_per_aid; i++) {
@@ -1386,6 +1435,13 @@ static int sdma_v4_4_2_sw_init(void *handle)
13861435
return -EINVAL;
13871436
}
13881437

1438+
/* Allocate memory for SDMA IP Dump buffer */
1439+
ptr = kcalloc(adev->sdma.num_instances * reg_count, sizeof(uint32_t), GFP_KERNEL);
1440+
if (ptr)
1441+
adev->sdma.ip_dump = ptr;
1442+
else
1443+
DRM_ERROR("Failed to allocated memory for SDMA IP Dump\n");
1444+
13891445
return r;
13901446
}
13911447

@@ -1406,6 +1462,8 @@ static int sdma_v4_4_2_sw_fini(void *handle)
14061462
else
14071463
amdgpu_sdma_destroy_inst_ctx(adev, false);
14081464

1465+
kfree(adev->sdma.ip_dump);
1466+
14091467
return 0;
14101468
}
14111469

@@ -1799,6 +1857,27 @@ static void sdma_v4_4_2_get_clockgating_state(void *handle, u64 *flags)
17991857
*flags |= AMD_CG_SUPPORT_SDMA_LS;
18001858
}
18011859

1860+
static void sdma_v4_4_2_dump_ip_state(void *handle)
1861+
{
1862+
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
1863+
int i, j;
1864+
uint32_t instance_offset;
1865+
uint32_t reg_count = ARRAY_SIZE(sdma_reg_list_4_4_2);
1866+
1867+
if (!adev->sdma.ip_dump)
1868+
return;
1869+
1870+
amdgpu_gfx_off_ctrl(adev, false);
1871+
for (i = 0; i < adev->sdma.num_instances; i++) {
1872+
instance_offset = i * reg_count;
1873+
for (j = 0; j < reg_count; j++)
1874+
adev->sdma.ip_dump[instance_offset + j] =
1875+
RREG32(sdma_v4_4_2_get_reg_offset(adev, i,
1876+
sdma_reg_list_4_4_2[j].reg_offset));
1877+
}
1878+
amdgpu_gfx_off_ctrl(adev, true);
1879+
}
1880+
18021881
const struct amd_ip_funcs sdma_v4_4_2_ip_funcs = {
18031882
.name = "sdma_v4_4_2",
18041883
.early_init = sdma_v4_4_2_early_init,
@@ -1815,6 +1894,7 @@ const struct amd_ip_funcs sdma_v4_4_2_ip_funcs = {
18151894
.set_clockgating_state = sdma_v4_4_2_set_clockgating_state,
18161895
.set_powergating_state = sdma_v4_4_2_set_powergating_state,
18171896
.get_clockgating_state = sdma_v4_4_2_get_clockgating_state,
1897+
.dump_ip_state = sdma_v4_4_2_dump_ip_state,
18181898
};
18191899

18201900
static const struct amdgpu_ring_funcs sdma_v4_4_2_ring_funcs = {

0 commit comments

Comments
 (0)