Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: add gfx9.4.2 hw debug mode enable and disable calls

GFX9.4.2 now supports per-VMID debug mode controls registers
(SPI_GDBG_PER_VMID_CNTL).

Because the KFD lets the HWS handle PASID-VMID mapping, the KFD will
forward all debug mode setting register writes to the HWS scheduler
using a new MAP_PROCESS API, so instead of writing to registers, return
the required register values that the HWS needs to write on debug enable
and disable.

Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
Reviewed-by: Felix Kuehling <felix.kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Jonathan Kim and committed by
Alex Deucher
be6f9403 d13f050f

+41 -1
+41 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c
··· 23 23 #include "amdgpu_amdkfd.h" 24 24 #include "amdgpu_amdkfd_arcturus.h" 25 25 #include "amdgpu_amdkfd_gfx_v9.h" 26 + #include "gc/gc_9_4_2_offset.h" 27 + #include "gc/gc_9_4_2_sh_mask.h" 28 + 29 + /* 30 + * Returns TRAP_EN, EXCP_EN and EXCP_REPLACE. 31 + * 32 + * restore_dbg_registers is ignored here but is a general interface requirement 33 + * for devices that support GFXOFF and where the RLC save/restore list 34 + * does not support hw registers for debugging i.e. the driver has to manually 35 + * initialize the debug mode registers after it has disabled GFX off during the 36 + * debug session. 37 + */ 38 + static uint32_t kgd_aldebaran_enable_debug_trap(struct amdgpu_device *adev, 39 + bool restore_dbg_registers, 40 + uint32_t vmid) 41 + { 42 + uint32_t data = 0; 43 + 44 + data = REG_SET_FIELD(data, SPI_GDBG_PER_VMID_CNTL, TRAP_EN, 1); 45 + data = REG_SET_FIELD(data, SPI_GDBG_PER_VMID_CNTL, EXCP_EN, 0); 46 + data = REG_SET_FIELD(data, SPI_GDBG_PER_VMID_CNTL, EXCP_REPLACE, 0); 47 + 48 + return data; 49 + } 50 + 51 + /* returns TRAP_EN, EXCP_EN and EXCP_REPLACE. */ 52 + static uint32_t kgd_aldebaran_disable_debug_trap(struct amdgpu_device *adev, 53 + bool keep_trap_enabled, 54 + uint32_t vmid) 55 + { 56 + uint32_t data = 0; 57 + 58 + data = REG_SET_FIELD(data, SPI_GDBG_PER_VMID_CNTL, TRAP_EN, keep_trap_enabled); 59 + data = REG_SET_FIELD(data, SPI_GDBG_PER_VMID_CNTL, EXCP_EN, 0); 60 + data = REG_SET_FIELD(data, SPI_GDBG_PER_VMID_CNTL, EXCP_REPLACE, 0); 61 + 62 + return data; 63 + } 26 64 27 65 const struct kfd2kgd_calls aldebaran_kfd2kgd = { 28 66 .program_sh_mem_settings = kgd_gfx_v9_program_sh_mem_settings, ··· 80 42 kgd_gfx_v9_get_atc_vmid_pasid_mapping_info, 81 43 .set_vm_context_page_table_base = kgd_gfx_v9_set_vm_context_page_table_base, 82 44 .get_cu_occupancy = kgd_gfx_v9_get_cu_occupancy, 83 - .program_trap_handler_settings = kgd_gfx_v9_program_trap_handler_settings 45 + .enable_debug_trap = kgd_aldebaran_enable_debug_trap, 46 + .disable_debug_trap = kgd_aldebaran_disable_debug_trap, 47 + .program_trap_handler_settings = kgd_gfx_v9_program_trap_handler_settings, 84 48 };