Skip to contentSkip to conversation

drm/amdkfd: fix and enable debugging for gfx11

PATCH In review Jonathan Kim 2 participants 3 messages Jun 7, 2023

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

PATCH 1/1 drm/amdkfd: fix and enable debugging for gfx11

There are a couple of fixes required to enable gfx11 debugging.

First, ADD_QUEUE.trap_en is an inappropriate place to toggle a per-process register so move it to SET_SHADER_DEBUGGER.trap_en. When ADD_QUEUE.skip_process_ctx_clear is set, MES will prioritize the SET_SHADER_DEBUGGER.trap_en setting.

Second, to preserve correct save/restore priviledged wave states in coordination with the trap enablement setting, resume suspended waves early in the disable call.

NOTE: The AMDGPU_MES_VERSION_MASK check is a place holder as MES FW updates have been reviewed but is awaiting binary creation. Once the binaries have been created, this check may be subject to change.

v2: do a trap_en safety check in case old mes doesn't accept unused trap_en d-word.
remove unnecessary process termination work around.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c            |  7 ++++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h            |  4 +++-
 drivers/gpu/drm/amd/amdgpu/mes_v11_0.c             |  1 +
 drivers/gpu/drm/amd/amdkfd/kfd_debug.c             | 14 ++++++--------
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |  3 +--
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c          | 12 +++++++-----
 drivers/gpu/drm/amd/include/mes_v11_api_def.h      |  1 +
 7 files changed, 25 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +6 -1
index 20cc3fffe921..e9091ebfe230 100644
@@ -928,7 +928,8 @@ int amdgpu_mes_set_shader_debugger(struct amdgpu_device *adev,
 				uint64_t process_context_addr,
 				uint32_t spi_gdbg_per_vmid_cntl,
 				const uint32_t *tcp_watch_cntl,
-				uint32_t flags)
+				uint32_t flags,
+				bool trap_en)
 {
 	struct mes_misc_op_input op_input = {0};
 	int r;
@@ -945,6 +946,10 @@ int amdgpu_mes_set_shader_debugger(struct amdgpu_device *adev,
 	memcpy(op_input.set_shader_debugger.tcp_watch_cntl, tcp_watch_cntl,
 			sizeof(op_input.set_shader_debugger.tcp_watch_cntl));
 
+	if (((adev->mes.sched_version & AMDGPU_MES_API_VERSION_MASK) >>
+			AMDGPU_MES_API_VERSION_SHIFT) >= 14)
+		op_input.set_shader_debugger.trap_en = trap_en;
+
 	amdgpu_mes_lock(&adev->mes);
 
 	r = adev->mes.funcs->misc_op(&adev->mes, &op_input);
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h +3 -1
index b5f5eed2b5ef..2d6ac30b7135 100644
@@ -294,6 +294,7 @@ struct mes_misc_op_input {
 			} flags;
 			uint32_t spi_gdbg_per_vmid_cntl;
 			uint32_t tcp_watch_cntl[4];
+			uint32_t trap_en;
 		} set_shader_debugger;
 	};
 };
@@ -361,7 +362,8 @@ int amdgpu_mes_set_shader_debugger(struct amdgpu_device *adev,
 				uint64_t process_context_addr,
 				uint32_t spi_gdbg_per_vmid_cntl,
 				const uint32_t *tcp_watch_cntl,
-				uint32_t flags);
+				uint32_t flags,
+				bool trap_en);
 
 int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id,
 			int queue_type, int idx,
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +1 -0
index c4e3cb8d44de..1bdaa00c0b46 100644
@@ -347,6 +347,7 @@ static int mes_v11_0_misc_op(struct amdgpu_mes *mes,
 		memcpy(misc_pkt.set_shader_debugger.tcp_watch_cntl,
 				input->set_shader_debugger.tcp_watch_cntl,
 				sizeof(misc_pkt.set_shader_debugger.tcp_watch_cntl));
+		misc_pkt.set_shader_debugger.trap_en = input->set_shader_debugger.trap_en;
 		break;
 	default:
 		DRM_ERROR("unsupported misc op (%d) \n", input->op);
drivers/gpu/drm/amd/amdkfd/kfd_debug.c +6 -8
index 125274445f43..cd34e7aaead4 100644
@@ -349,12 +349,13 @@ int kfd_dbg_set_mes_debug_mode(struct kfd_process_device *pdd)
 {
 	uint32_t spi_dbg_cntl = pdd->spi_dbg_override | pdd->spi_dbg_launch_mode;
 	uint32_t flags = pdd->process->dbg_flags;
+	bool sq_trap_en = !!spi_dbg_cntl;
 
 	if (!kfd_dbg_is_per_vmid_supported(pdd->dev))
 		return 0;
 
 	return amdgpu_mes_set_shader_debugger(pdd->dev->adev, pdd->proc_ctx_gpu_addr, spi_dbg_cntl,
-						pdd->watch_points, flags);
+						pdd->watch_points, flags, sq_trap_en);
 }
 
 #define KFD_DEBUGGER_INVALID_WATCH_POINT_ID -1
@@ -557,6 +558,10 @@ void kfd_dbg_trap_deactivate(struct kfd_process *target, bool unwind, int unwind
 
 	if (!unwind) {
 		uint32_t flags = 0;
+		int resume_count = resume_queues(target, 0, NULL);
+
+		if (resume_count)
+			pr_debug("Resumed %d queues\n", resume_count);
 
 		cancel_work_sync(&target->debug_event_workarea);
 		kfd_dbg_clear_process_address_watch(target);
@@ -598,13 +603,6 @@ void kfd_dbg_trap_deactivate(struct kfd_process *target, bool unwind, int unwind
 	}
 
 	kfd_dbg_set_workaround(target, false);
-
-	if (!unwind) {
-		int resume_count = resume_queues(target, 0, NULL);
-
-		if (resume_count)
-			pr_debug("Resumed %d queues\n", resume_count);
-	}
 }
 
 static void kfd_dbg_clean_exception_status(struct kfd_process *target)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -2
index 0c1be91a87c6..ff0a28760494 100644
@@ -227,8 +227,7 @@ static int add_queue_mes(struct device_queue_manager *dqm, struct queue *q,
 	queue_input.tba_addr = qpd->tba_addr;
 	queue_input.tma_addr = qpd->tma_addr;
 	queue_input.trap_en = KFD_GC_VERSION(q->device) < IP_VERSION(11, 0, 0) ||
-			      KFD_GC_VERSION(q->device) >= IP_VERSION(12, 0, 0) ||
-			      q->properties.is_dbg_wa;
+			      KFD_GC_VERSION(q->device) >= IP_VERSION(12, 0, 0);
 	queue_input.skip_process_ctx_clear = qpd->pqm->process->debug_trap_enabled;
 
 	queue_type = convert_to_mes_queue_type(q->properties.type);
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +7 -5
index faa7939f35bd..90b86a6ac7bd 100644
@@ -1863,13 +1863,15 @@ static void kfd_topology_set_dbg_firmware_support(struct kfd_topology_device *de
 {
 	bool firmware_supported = true;
 
-	/*
-	 * FIXME: GFX11 FW currently not sufficient to deal with CWSR WA.
-	 * Updated FW with API changes coming soon.
-	 */
 	if (KFD_GC_VERSION(dev->gpu) >= IP_VERSION(11, 0, 0) &&
 			KFD_GC_VERSION(dev->gpu) < IP_VERSION(12, 0, 0)) {
-		firmware_supported = false;
+		uint32_t mes_api_rev = (dev->gpu->adev->mes.sched_version &
+						AMDGPU_MES_API_VERSION_MASK) >>
+						AMDGPU_MES_API_VERSION_SHIFT;
+		uint32_t mes_rev = dev->gpu->adev->mes.sched_version &
+						AMDGPU_MES_VERSION_MASK;
+
+		firmware_supported = (mes_api_rev >= 14) && (mes_rev >= 64);
 		goto out;
 	}
 
drivers/gpu/drm/amd/include/mes_v11_api_def.h +1 -0
index f3c15f18ddb5..0997e999416a 100644
@@ -575,6 +575,7 @@ struct SET_SHADER_DEBUGGER {
 	} flags;
 	uint32_t spi_gdbg_per_vmid_cntl;
 	uint32_t tcp_watch_cntl[4]; /* TCP_WATCHx_CNTL */
+	uint32_t trap_en;
 };
 
 union MESAPI__MISC {
Signature · 1 line
2.25.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 46 lines · Jonathan Kim

There are a couple of fixes required to enable gfx11 debugging.

First, ADD_QUEUE.trap_en is an inappropriate place to toggle a per-process register so move it to SET_SHADER_DEBUGGER.trap_en. When ADD_QUEUE.skip_process_ctx_clear is set, MES will prioritize the SET_SHADER_DEBUGGER.trap_en setting.

Second, to preserve correct save/restore priviledged wave states in coordination with the trap enablement setting, resume suspended waves early in the disable call.

NOTE: The AMDGPU_MES_VERSION_MASK check is a place holder as MES FW updates have been reviewed but is awaiting binary creation. Once the binaries have been created, this check may be subject to change.

v2: do a trap_en safety check in case old mes doesn't accept unused trap_en d-word.
remove unnecessary process termination work around.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c            |  7 ++++++-
  drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h            |  4 +++-
  drivers/gpu/drm/amd/amdgpu/mes_v11_0.c             |  1 +
  drivers/gpu/drm/amd/amdkfd/kfd_debug.c             | 14 ++++++--------
  .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |  3 +--
  drivers/gpu/drm/amd/amdkfd/kfd_topology.c          | 12 +++++++-----
  drivers/gpu/drm/amd/include/mes_v11_api_def.h      |  1 +
  7 files changed, 25 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +2 -1
index 20cc3fffe921..e9091ebfe230 100644
@@ -928,7 +928,8 @@ int amdgpu_mes_set_shader_debugger(struct amdgpu_device *adev,
  				uint64_t process_context_addr,
  				uint32_t spi_gdbg_per_vmid_cntl,
  				const uint32_t *tcp_watch_cntl,
-				uint32_t flags)
+				uint32_t flags,
+				bool trap_en)
  {
  	struct mes_misc_op_input op_input = {0};
  	int r;

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c int amdgpu_mes_set_shader_debugger(struct amdgpu_device *adev, · line 952

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +4 -0
@@ -945,6 +946,10 @@ int amdgpu_mes_set_shader_debugger(struct amdgpu_device *adev,
  	memcpy(op_input.set_shader_debugger.tcp_watch_cntl, tcp_watch_cntl,
  			sizeof(op_input.set_shader_debugger.tcp_watch_cntl));
 
+	if (((adev->mes.sched_version & AMDGPU_MES_API_VERSION_MASK) >>
+			AMDGPU_MES_API_VERSION_SHIFT) >= 14)
+		op_input.set_shader_debugger.trap_en = trap_en;
+

It's probably too late to change the GFX11 MES API at this point. But why didn't they just add a trap_en bit in the existing flags field? That could have avoided the need for the compatibility checks.

Anyway, the patch is

Quoted 132 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +0 -0
  	amdgpu_mes_lock(&adev->mes);
 
  	r = adev->mes.funcs->misc_op(&adev->mes, &op_input);
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h +3 -1
index b5f5eed2b5ef..2d6ac30b7135 100644
@@ -294,6 +294,7 @@ struct mes_misc_op_input {
  			} flags;
  			uint32_t spi_gdbg_per_vmid_cntl;
  			uint32_t tcp_watch_cntl[4];
+			uint32_t trap_en;
  		} set_shader_debugger;
  	};
  };
@@ -361,7 +362,8 @@ int amdgpu_mes_set_shader_debugger(struct amdgpu_device *adev,
  				uint64_t process_context_addr,
  				uint32_t spi_gdbg_per_vmid_cntl,
  				const uint32_t *tcp_watch_cntl,
-				uint32_t flags);
+				uint32_t flags,
+				bool trap_en);
 
  int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id,
  			int queue_type, int idx,
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +1 -0
index c4e3cb8d44de..1bdaa00c0b46 100644
@@ -347,6 +347,7 @@ static int mes_v11_0_misc_op(struct amdgpu_mes *mes,
  		memcpy(misc_pkt.set_shader_debugger.tcp_watch_cntl,
  				input->set_shader_debugger.tcp_watch_cntl,
  				sizeof(misc_pkt.set_shader_debugger.tcp_watch_cntl));
+		misc_pkt.set_shader_debugger.trap_en = input->set_shader_debugger.trap_en;
  		break;
  	default:
  		DRM_ERROR("unsupported misc op (%d) \n", input->op);
drivers/gpu/drm/amd/amdkfd/kfd_debug.c +6 -8
index 125274445f43..cd34e7aaead4 100644
@@ -349,12 +349,13 @@ int kfd_dbg_set_mes_debug_mode(struct kfd_process_device *pdd)
  {
  	uint32_t spi_dbg_cntl = pdd->spi_dbg_override | pdd->spi_dbg_launch_mode;
  	uint32_t flags = pdd->process->dbg_flags;
+	bool sq_trap_en = !!spi_dbg_cntl;
 
  	if (!kfd_dbg_is_per_vmid_supported(pdd->dev))
  		return 0;
 
  	return amdgpu_mes_set_shader_debugger(pdd->dev->adev, pdd->proc_ctx_gpu_addr, spi_dbg_cntl,
-						pdd->watch_points, flags);
+						pdd->watch_points, flags, sq_trap_en);
  }
 
  #define KFD_DEBUGGER_INVALID_WATCH_POINT_ID -1
@@ -557,6 +558,10 @@ void kfd_dbg_trap_deactivate(struct kfd_process *target, bool unwind, int unwind
 
  	if (!unwind) {
  		uint32_t flags = 0;
+		int resume_count = resume_queues(target, 0, NULL);
+
+		if (resume_count)
+			pr_debug("Resumed %d queues\n", resume_count);
 
  		cancel_work_sync(&target->debug_event_workarea);
  		kfd_dbg_clear_process_address_watch(target);
@@ -598,13 +603,6 @@ void kfd_dbg_trap_deactivate(struct kfd_process *target, bool unwind, int unwind
  	}
 
  	kfd_dbg_set_workaround(target, false);
-
-	if (!unwind) {
-		int resume_count = resume_queues(target, 0, NULL);
-
-		if (resume_count)
-			pr_debug("Resumed %d queues\n", resume_count);
-	}
  }
 
  static void kfd_dbg_clean_exception_status(struct kfd_process *target)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -2
index 0c1be91a87c6..ff0a28760494 100644
@@ -227,8 +227,7 @@ static int add_queue_mes(struct device_queue_manager *dqm, struct queue *q,
  	queue_input.tba_addr = qpd->tba_addr;
  	queue_input.tma_addr = qpd->tma_addr;
  	queue_input.trap_en = KFD_GC_VERSION(q->device) < IP_VERSION(11, 0, 0) ||
-			      KFD_GC_VERSION(q->device) >= IP_VERSION(12, 0, 0) ||
-			      q->properties.is_dbg_wa;
+			      KFD_GC_VERSION(q->device) >= IP_VERSION(12, 0, 0);
  	queue_input.skip_process_ctx_clear = qpd->pqm->process->debug_trap_enabled;
 
  	queue_type = convert_to_mes_queue_type(q->properties.type);
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +7 -5
index faa7939f35bd..90b86a6ac7bd 100644
@@ -1863,13 +1863,15 @@ static void kfd_topology_set_dbg_firmware_support(struct kfd_topology_device *de
  {
  	bool firmware_supported = true;
 
-	/*
-	 * FIXME: GFX11 FW currently not sufficient to deal with CWSR WA.
-	 * Updated FW with API changes coming soon.
-	 */
  	if (KFD_GC_VERSION(dev->gpu) >= IP_VERSION(11, 0, 0) &&
  			KFD_GC_VERSION(dev->gpu) < IP_VERSION(12, 0, 0)) {
-		firmware_supported = false;
+		uint32_t mes_api_rev = (dev->gpu->adev->mes.sched_version &
+						AMDGPU_MES_API_VERSION_MASK) >>
+						AMDGPU_MES_API_VERSION_SHIFT;
+		uint32_t mes_rev = dev->gpu->adev->mes.sched_version &
+						AMDGPU_MES_VERSION_MASK;
+
+		firmware_supported = (mes_api_rev >= 14) && (mes_rev >= 64);
  		goto out;
  	}
 
drivers/gpu/drm/amd/include/mes_v11_api_def.h +1 -0
index f3c15f18ddb5..0997e999416a 100644
@@ -575,6 +575,7 @@ struct SET_SHADER_DEBUGGER {
  	} flags;
  	uint32_t spi_gdbg_per_vmid_cntl;
  	uint32_t tcp_watch_cntl[4]; /* TCP_WATCHx_CNTL */
+	uint32_t trap_en;
  };
 
  union MESAPI__MISC {
#2 lore raw

[Public]

Quoted 65 lines

-----Original Message-----
From: Kuehling, Felix <[email protected]>
Sent: Wednesday, June 7, 2023 6:23 PM
To: Kim, Jonathan <[email protected]>; [email protected]
Cc: Huang, JinHuiEric <[email protected]>
Subject: Re: [PATCH] drm/amdkfd: fix and enable debugging for gfx11

Quoted 31 lines · Jonathan Kim

There are a couple of fixes required to enable gfx11 debugging.

First, ADD_QUEUE.trap_en is an inappropriate place to toggle a per-process register so move it to SET_SHADER_DEBUGGER.trap_en. When ADD_QUEUE.skip_process_ctx_clear is set, MES will prioritize the SET_SHADER_DEBUGGER.trap_en setting.

Second, to preserve correct save/restore priviledged wave states in coordination with the trap enablement setting, resume suspended waves early in the disable call.

NOTE: The AMDGPU_MES_VERSION_MASK check is a place holder as MES FW updates have been reviewed but is awaiting binary creation. Once the binaries have been created, this check may be subject to change.

v2: do a trap_en safety check in case old mes doesn't accept unused trap_en d-word.
remove unnecessary process termination work around.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c            |  7 ++++++-
  drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h            |  4 +++-
  drivers/gpu/drm/amd/amdgpu/mes_v11_0.c             |  1 +
  drivers/gpu/drm/amd/amdkfd/kfd_debug.c             | 14 ++++++--------
  .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |  3 +--
  drivers/gpu/drm/amd/amdkfd/kfd_topology.c          | 12 +++++++-----
  drivers/gpu/drm/amd/include/mes_v11_api_def.h      |  1 +
  7 files changed, 25 insertions(+), 17 deletions(-)

Review

Quoted 1 line
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c int amdgpu_mes_set_shader_debugger(struct

Quoted 4 lines

index 20cc3fffe921..e9091ebfe230 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +0 -0
@@ -928,7 +928,8 @@ int amdgpu_mes_set_shader_debugger(struct

amdgpu_device *adev,

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c int amdgpu_mes_set_shader_debugger(struct

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +2 -1
                            uint64_t process_context_addr,
                            uint32_t spi_gdbg_per_vmid_cntl,
                            const uint32_t *tcp_watch_cntl,
-                           uint32_t flags)
+                           uint32_t flags,
+                           bool trap_en)
  {
    struct mes_misc_op_input op_input = {0};
    int r;
@@ -945,6 +946,10 @@ int amdgpu_mes_set_shader_debugger(struct

amdgpu_device *adev,

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c int amdgpu_mes_set_shader_debugger(struct · line 946

Quoted 1 line
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +0 -0
    memcpy(op_input.set_shader_debugger.tcp_watch_cntl,

tcp_watch_cntl,

Quoted 1 line
      sizeof(op_input.set_shader_debugger.tcp_watch_cntl));
Quoted 3 lines

+ if (((adev->mes.sched_version & AMDGPU_MES_API_VERSION_MASK)

Quoted 1 line
Quoted 7 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c int amdgpu_mes_set_shader_debugger(struct amdgpu_device *adev, · line 952

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +3 -0
+                   AMDGPU_MES_API_VERSION_SHIFT) >= 14)
+           op_input.set_shader_debugger.trap_en = trap_en;
+

It's probably too late to change the GFX11 MES API at this point. But why didn't they just add a trap_en bit in the existing flags field? That could have avoided the need for the compatibility checks.

Thanks for the review. That was a decision I made.
The flags line up with the SQ_DEBUG register and will line up with the set_flags API.
Right now, they're a small selection but could expand to the full 32-bit width in the future (or even skip bit places and HW is much harder to change). Also, trap_en really only needs to toggle for GFX11 as a work around. It should always be set for non-GFX11.
So the flags should probably be reserved for things we actually want to toggle on an ongoing conditional basis.

Thanks,

Jon

Quoted 165 lines

Anyway, the patch is

Review

Quoted 4 lines
    amdgpu_mes_lock(&adev->mes);

    r = adev->mes.funcs->misc_op(&adev->mes, &op_input);
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h int amdgpu_mes_set_shader_debugger(struct

Quoted 12 lines

index b5f5eed2b5ef..2d6ac30b7135 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h +1 -0
@@ -294,6 +294,7 @@ struct mes_misc_op_input {
                    } flags;
                    uint32_t spi_gdbg_per_vmid_cntl;
                    uint32_t tcp_watch_cntl[4];
+                   uint32_t trap_en;
            } set_shader_debugger;
    };
  };
@@ -361,7 +362,8 @@ int amdgpu_mes_set_shader_debugger(struct

amdgpu_device *adev,

Review

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h +2 -1
                            uint64_t process_context_addr,
                            uint32_t spi_gdbg_per_vmid_cntl,
                            const uint32_t *tcp_watch_cntl,
-                           uint32_t flags);
+                           uint32_t flags,
+                           bool trap_en);
 
  int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id,
                    int queue_type, int idx,
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c

drivers/gpu/drm/amd/amdgpu/mes_v11_0.c static int mes_v11_0_misc_op(struct amdgpu_mes

Quoted 4 lines

index c4e3cb8d44de..1bdaa00c0b46 100644

drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +0 -0
@@ -347,6 +347,7 @@ static int mes_v11_0_misc_op(struct amdgpu_mes

*mes,

drivers/gpu/drm/amd/amdgpu/mes_v11_0.c static int mes_v11_0_misc_op(struct amdgpu_mes *mes,

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +0 -0
            memcpy(misc_pkt.set_shader_debugger.tcp_watch_cntl,
                            input->set_shader_debugger.tcp_watch_cntl,
 
      sizeof(misc_pkt.set_shader_debugger.tcp_watch_cntl));

Review

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +1 -0
+           misc_pkt.set_shader_debugger.trap_en = input-
 set_shader_debugger.trap_en;
            break;
    default:
            DRM_ERROR("unsupported misc op (%d) \n", input->op);
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdkfd/kfd_debug.c

drivers/gpu/drm/amd/amdkfd/kfd_debug.c int kfd_dbg_set_mes_debug_mode(struct

Quoted 4 lines

index 125274445f43..cd34e7aaead4 100644

drivers/gpu/drm/amd/amdkfd/kfd_debug.c +0 -0
@@ -349,12 +349,13 @@ int kfd_dbg_set_mes_debug_mode(struct

kfd_process_device *pdd)

drivers/gpu/drm/amd/amdkfd/kfd_debug.c int kfd_dbg_set_mes_debug_mode(struct kfd_process_device *pdd)

Quoted 13 lines
drivers/gpu/drm/amd/amdkfd/kfd_debug.c +2 -1
  {
    uint32_t spi_dbg_cntl = pdd->spi_dbg_override | pdd-
 spi_dbg_launch_mode;
    uint32_t flags = pdd->process->dbg_flags;
+   bool sq_trap_en = !!spi_dbg_cntl;
 
    if (!kfd_dbg_is_per_vmid_supported(pdd->dev))
            return 0;
 
    return amdgpu_mes_set_shader_debugger(pdd->dev->adev, pdd-
 proc_ctx_gpu_addr, spi_dbg_cntl,
-                                           pdd->watch_points, flags);
+                                           pdd->watch_points, flags,

sq_trap_en);

drivers/gpu/drm/amd/amdkfd/kfd_debug.c void kfd_dbg_trap_deactivate(struct kfd_process

Quoted 4 lines
drivers/gpu/drm/amd/amdkfd/kfd_debug.c +0 -0
  }
  #define KFD_DEBUGGER_INVALID_WATCH_POINT_ID -1
drivers/gpu/drm/amd/amdkfd/kfd_debug.c +0 -0
@@ -557,6 +558,10 @@ void kfd_dbg_trap_deactivate(struct kfd_process

*target, bool unwind, int unwind

drivers/gpu/drm/amd/amdkfd/kfd_debug.c void kfd_dbg_trap_deactivate(struct kfd_process

Quoted 11 lines
drivers/gpu/drm/amd/amdkfd/kfd_debug.c +4 -0
    if (!unwind) {
            uint32_t flags = 0;
+           int resume_count = resume_queues(target, 0, NULL);
+
+           if (resume_count)
+                   pr_debug("Resumed %d queues\n", resume_count);
 
            cancel_work_sync(&target->debug_event_workarea);
            kfd_dbg_clear_process_address_watch(target);
@@ -598,13 +603,6 @@ void kfd_dbg_trap_deactivate(struct kfd_process

*target, bool unwind, int unwind

Review

Quoted 14 lines
drivers/gpu/drm/amd/amdkfd/kfd_debug.c +0 -7
    }
 
    kfd_dbg_set_workaround(target, false);
-
-   if (!unwind) {
-           int resume_count = resume_queues(target, 0, NULL);
-
-           if (resume_count)
-                   pr_debug("Resumed %d queues\n", resume_count);
-   }
  }
 
  static void kfd_dbg_clean_exception_status(struct kfd_process *target)
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c static int add_queue_mes(struct

Quoted 4 lines

index 0c1be91a87c6..ff0a28760494 100644

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +0 -0
@@ -227,8 +227,7 @@ static int add_queue_mes(struct

device_queue_manager *dqm, struct queue *q,

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c static int add_queue_mes(struct device_queue_manager *dqm, struct queue *q,

Quoted 3 lines
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +0 -0
    queue_input.tba_addr = qpd->tba_addr;
    queue_input.tma_addr = qpd->tma_addr;
    queue_input.trap_en = KFD_GC_VERSION(q->device) <

IP_VERSION(11, 0, 0) ||

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c static int add_queue_mes(struct · line 230

Quoted 1 line
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +0 -1
-                         KFD_GC_VERSION(q->device) >= IP_VERSION(12, 0,

0) ||

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c static int add_queue_mes(struct · line 230

Quoted 2 lines
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +1 -1
-                         q->properties.is_dbg_wa;
+                         KFD_GC_VERSION(q->device) >= IP_VERSION(12, 0,

0);

Review

Quoted 5 lines
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +0 -0
    queue_input.skip_process_ctx_clear = qpd->pqm->process-
 debug_trap_enabled;
 
    queue_type = convert_to_mes_queue_type(q->properties.type);
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c

drivers/gpu/drm/amd/amdkfd/kfd_topology.c static void

Quoted 4 lines

index faa7939f35bd..90b86a6ac7bd 100644

drivers/gpu/drm/amd/amdkfd/kfd_topology.c +0 -0
@@ -1863,13 +1863,15 @@ static void

kfd_topology_set_dbg_firmware_support(struct kfd_topology_device *de

drivers/gpu/drm/amd/amdkfd/kfd_topology.c static void kfd_topology_set_dbg_firmware_support(struct kfd_topology_device *de

Quoted 11 lines
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +1 -5
  {
    bool firmware_supported = true;
 
-   /*
-    * FIXME: GFX11 FW currently not sufficient to deal with CWSR WA.
-    * Updated FW with API changes coming soon.
-    */
    if (KFD_GC_VERSION(dev->gpu) >= IP_VERSION(11, 0, 0) &&
                    KFD_GC_VERSION(dev->gpu) < IP_VERSION(12, 0, 0)) {
-           firmware_supported = false;
+           uint32_t mes_api_rev = (dev->gpu->adev->mes.sched_version

&

drivers/gpu/drm/amd/amdkfd/kfd_topology.c static void · line 1869

Quoted 1 line
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +1 -0
+

AMDGPU_MES_API_VERSION_MASK) >>

drivers/gpu/drm/amd/amdkfd/kfd_topology.c static void · line 1870

Quoted 1 line
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +1 -0
+
      AMDGPU_MES_API_VERSION_SHIFT;

drivers/gpu/drm/amd/amdkfd/kfd_topology.c static void kfd_topology_set_dbg_firmware_support(struct kfd_topology_device *de · line 1873

Quoted 2 lines
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +2 -0
+           uint32_t mes_rev = dev->gpu->adev->mes.sched_version &
+
      AMDGPU_MES_VERSION_MASK;

drivers/gpu/drm/amd/amdkfd/kfd_topology.c static void · line 1874

Quoted 2 lines
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +2 -0
+
+           firmware_supported = (mes_api_rev >= 14) && (mes_rev >=

64);

Review

Quoted 4 lines
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +0 -0
            goto out;
    }
 
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/include/mes_v11_api_def.h

Quoted 11 lines

index f3c15f18ddb5..0997e999416a 100644

drivers/gpu/drm/amd/include/mes_v11_api_def.h +1 -0
@@ -575,6 +575,7 @@ struct SET_SHADER_DEBUGGER {
    } flags;
    uint32_t spi_gdbg_per_vmid_cntl;
    uint32_t tcp_watch_cntl[4]; /* TCP_WATCHx_CNTL */
+   uint32_t trap_en;
  };
 
  union MESAPI__MISC {