Skip to contentSkip to conversation

drm/amdgpu: remove ME0 registers from mi300 dump

PATCH In review Sunil Khatri 2 participants 2 messages Aug 13, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: remove ME0 registers from mi300 dump

Remove ME0 registers from MI300 gfx_9_4_3 ipdump MI300 does not have gfx ME and hence those register are just empty one and could be dropped.

---
 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 37 -------------------------
 1 file changed, 37 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c +0 -37
index 7b4ae197eb49..edebc4459b75 100644
@@ -75,42 +75,11 @@ static const struct amdgpu_hwip_reg_entry gc_reg_list_9_4_3[] = {
 	SOC15_REG_ENTRY_STR(GC, 0, regCP_CPF_BUSY_STAT),
 	SOC15_REG_ENTRY_STR(GC, 0, regCP_CPF_STATUS),
 	SOC15_REG_ENTRY_STR(GC, 0, regCP_GFX_ERROR),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_RB_BASE),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_RB_RPTR),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_RB_WPTR),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_RB0_BASE),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_RB0_RPTR),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_RB0_WPTR),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_RB1_BASE),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_RB1_RPTR),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_RB1_WPTR),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_RB2_BASE),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_RB2_WPTR),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_RB2_WPTR),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB1_CMD_BUFSZ),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB2_CMD_BUFSZ),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_IB1_CMD_BUFSZ),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_IB2_CMD_BUFSZ),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB1_BASE_LO),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB1_BASE_HI),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB1_BUFSZ),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB2_BASE_LO),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB2_BASE_HI),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB2_BUFSZ),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_IB1_BASE_LO),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_IB1_BASE_HI),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_IB1_BUFSZ),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_IB2_BASE_LO),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_IB2_BASE_HI),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_IB2_BUFSZ),
 	SOC15_REG_ENTRY_STR(GC, 0, regCPF_UTCL1_STATUS),
 	SOC15_REG_ENTRY_STR(GC, 0, regCPC_UTCL1_STATUS),
 	SOC15_REG_ENTRY_STR(GC, 0, regCPG_UTCL1_STATUS),
 	SOC15_REG_ENTRY_STR(GC, 0, regGDS_PROTECTION_FAULT),
 	SOC15_REG_ENTRY_STR(GC, 0, regGDS_VM_PROTECTION_FAULT),
-	SOC15_REG_ENTRY_STR(GC, 0, regIA_UTCL1_STATUS),
-	SOC15_REG_ENTRY_STR(GC, 0, regIA_UTCL1_CNTL),
-	SOC15_REG_ENTRY_STR(GC, 0, regPA_CL_CNTL_STATUS),
 	SOC15_REG_ENTRY_STR(GC, 0, regRLC_UTCL1_STATUS),
 	SOC15_REG_ENTRY_STR(GC, 0, regRMI_UTCL1_STATUS),
 	SOC15_REG_ENTRY_STR(GC, 0, regSQC_DCACHE_UTCL1_STATUS),
@@ -122,11 +91,8 @@ static const struct amdgpu_hwip_reg_entry gc_reg_list_9_4_3[] = {
 	SOC15_REG_ENTRY_STR(GC, 0, regVM_L2_PROTECTION_FAULT_STATUS),
 	SOC15_REG_ENTRY_STR(GC, 0, regCP_DEBUG),
 	SOC15_REG_ENTRY_STR(GC, 0, regCP_MEC_CNTL),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_INSTR_PNTR),
 	SOC15_REG_ENTRY_STR(GC, 0, regCP_MEC1_INSTR_PNTR),
 	SOC15_REG_ENTRY_STR(GC, 0, regCP_MEC2_INSTR_PNTR),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_ME_INSTR_PNTR),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_PFP_INSTR_PNTR),
 	SOC15_REG_ENTRY_STR(GC, 0, regCP_CPC_STATUS),
 	SOC15_REG_ENTRY_STR(GC, 0, regRLC_STAT),
 	SOC15_REG_ENTRY_STR(GC, 0, regRLC_SMU_COMMAND),
@@ -139,11 +105,8 @@ static const struct amdgpu_hwip_reg_entry gc_reg_list_9_4_3[] = {
 	SOC15_REG_ENTRY_STR(GC, 0, regRLC_INT_STAT),
 	SOC15_REG_ENTRY_STR(GC, 0, regRLC_GPM_GENERAL_6),
 	/* cp header registers */
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_HEADER_DUMP),
 	SOC15_REG_ENTRY_STR(GC, 0, regCP_MEC_ME1_HEADER_DUMP),
 	SOC15_REG_ENTRY_STR(GC, 0, regCP_MEC_ME2_HEADER_DUMP),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_PFP_HEADER_DUMP),
-	SOC15_REG_ENTRY_STR(GC, 0, regCP_ME_HEADER_DUMP),
 	/* SE status registers */
 	SOC15_REG_ENTRY_STR(GC, 0, regGRBM_STATUS_SE0),
 	SOC15_REG_ENTRY_STR(GC, 0, regGRBM_STATUS_SE1),
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Sunil Khatri

Remove ME0 registers from MI300 gfx_9_4_3 ipdump MI300 does not have gfx ME and hence those register are just empty one and could be dropped.

Quoted 78 lines
---
 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 37 -------------------------
 1 file changed, 37 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c +0 -38
index 7b4ae197eb49..edebc4459b75 100644
@@ -75,42 +75,11 @@ static const struct amdgpu_hwip_reg_entry gc_reg_list_9_4_3[] = {
        SOC15_REG_ENTRY_STR(GC, 0, regCP_CPF_BUSY_STAT),
        SOC15_REG_ENTRY_STR(GC, 0, regCP_CPF_STATUS),
        SOC15_REG_ENTRY_STR(GC, 0, regCP_GFX_ERROR),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_RB_BASE),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_RB_RPTR),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_RB_WPTR),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_RB0_BASE),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_RB0_RPTR),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_RB0_WPTR),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_RB1_BASE),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_RB1_RPTR),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_RB1_WPTR),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_RB2_BASE),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_RB2_WPTR),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_RB2_WPTR),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB1_CMD_BUFSZ),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB2_CMD_BUFSZ),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_IB1_CMD_BUFSZ),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_IB2_CMD_BUFSZ),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB1_BASE_LO),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB1_BASE_HI),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB1_BUFSZ),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB2_BASE_LO),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB2_BASE_HI),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_IB2_BUFSZ),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_IB1_BASE_LO),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_IB1_BASE_HI),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_IB1_BUFSZ),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_IB2_BASE_LO),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_IB2_BASE_HI),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_IB2_BUFSZ),
        SOC15_REG_ENTRY_STR(GC, 0, regCPF_UTCL1_STATUS),
        SOC15_REG_ENTRY_STR(GC, 0, regCPC_UTCL1_STATUS),
        SOC15_REG_ENTRY_STR(GC, 0, regCPG_UTCL1_STATUS),
        SOC15_REG_ENTRY_STR(GC, 0, regGDS_PROTECTION_FAULT),
        SOC15_REG_ENTRY_STR(GC, 0, regGDS_VM_PROTECTION_FAULT),
-       SOC15_REG_ENTRY_STR(GC, 0, regIA_UTCL1_STATUS),
-       SOC15_REG_ENTRY_STR(GC, 0, regIA_UTCL1_CNTL),
-       SOC15_REG_ENTRY_STR(GC, 0, regPA_CL_CNTL_STATUS),
        SOC15_REG_ENTRY_STR(GC, 0, regRLC_UTCL1_STATUS),
        SOC15_REG_ENTRY_STR(GC, 0, regRMI_UTCL1_STATUS),
        SOC15_REG_ENTRY_STR(GC, 0, regSQC_DCACHE_UTCL1_STATUS),
@@ -122,11 +91,8 @@ static const struct amdgpu_hwip_reg_entry gc_reg_list_9_4_3[] = {
        SOC15_REG_ENTRY_STR(GC, 0, regVM_L2_PROTECTION_FAULT_STATUS),
        SOC15_REG_ENTRY_STR(GC, 0, regCP_DEBUG),
        SOC15_REG_ENTRY_STR(GC, 0, regCP_MEC_CNTL),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_INSTR_PNTR),
        SOC15_REG_ENTRY_STR(GC, 0, regCP_MEC1_INSTR_PNTR),
        SOC15_REG_ENTRY_STR(GC, 0, regCP_MEC2_INSTR_PNTR),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_ME_INSTR_PNTR),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_PFP_INSTR_PNTR),
        SOC15_REG_ENTRY_STR(GC, 0, regCP_CPC_STATUS),
        SOC15_REG_ENTRY_STR(GC, 0, regRLC_STAT),
        SOC15_REG_ENTRY_STR(GC, 0, regRLC_SMU_COMMAND),
@@ -139,11 +105,8 @@ static const struct amdgpu_hwip_reg_entry gc_reg_list_9_4_3[] = {
        SOC15_REG_ENTRY_STR(GC, 0, regRLC_INT_STAT),
        SOC15_REG_ENTRY_STR(GC, 0, regRLC_GPM_GENERAL_6),
        /* cp header registers */
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_CE_HEADER_DUMP),
        SOC15_REG_ENTRY_STR(GC, 0, regCP_MEC_ME1_HEADER_DUMP),
        SOC15_REG_ENTRY_STR(GC, 0, regCP_MEC_ME2_HEADER_DUMP),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_PFP_HEADER_DUMP),
-       SOC15_REG_ENTRY_STR(GC, 0, regCP_ME_HEADER_DUMP),
        /* SE status registers */
        SOC15_REG_ENTRY_STR(GC, 0, regGRBM_STATUS_SE0),
        SOC15_REG_ENTRY_STR(GC, 0, regGRBM_STATUS_SE1),
--

2.34.1