drm/amdkfd: add sdma poison consumption handling
Subsystems (3)
PATCH 1/1 drm/amdkfd: add sdma poison consumption handling
Follow the same apporach as GFX to handle SDMA poison consumption. Send SIGBUS to application when receives SDMA_ECC interrupt and issue gpu reset either mode 2 or mode 1 to get the engine back
--- drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 7 ++++++- drivers/gpu/drm/amd/amdkfd/soc15_int.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +6 -1
@@ -309,8 +309,13 @@ static void event_interrupt_wq_v9(struct kfd_dev *dev, client_id == SOC15_IH_CLIENTID_SDMA5 || client_id == SOC15_IH_CLIENTID_SDMA6 || client_id == SOC15_IH_CLIENTID_SDMA7) { -if (source_id ==SOC15_INTSRC_SDMA_TRAP ) +if (source_id ==SOC15_INTSRC_SDMA_TRAP ) {kfd_signal_event_interrupt (pasid, context_id0 &0xfffffff ,28 ); + }else if (source_id ==SOC15_INTSRC_SDMA_ECC ) { +kfd_signal_poison_consumed_event (dev, pasid); +amdgpu_amdkfd_gpu_reset (dev->kgd); +return ; + } } else if (client_id == SOC15_IH_CLIENTID_VMC || client_id == SOC15_IH_CLIENTID_VMC1 || client_id == SOC15_IH_CLIENTID_UTCL2) {
drivers/gpu/drm/amd/amdkfd/soc15_int.h +1 -0
@@ -30,6 +30,7 @@#define SOC15_INTSRC_SQ_INTERRUPT_MSG 239#define SOC15_INTSRC_VMC_FAULT 0#define SOC15_INTSRC_SDMA_TRAP 224 +#define SOC15_INTSRC_SDMA_ECC 220#define SOC15_CLIENT_ID_FROM_IH_ENTRY (entry) (le32_to_cpu(entry[0]) & 0xff)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only]
This patch looks good to me.
-----Original Message-----
From: Zhang, Hawking <[email protected]>
Sent: Friday, June 4, 2021 12:58 PM
To: [email protected]; Li, Dennis <[email protected]>; Deucher, Alexander <[email protected]>; Kuehling, Felix <[email protected]>
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH] drm/amdkfd: add sdma poison consumption handling
Follow the same apporach as GFX to handle SDMA poison consumption. Send SIGBUS to application when receives SDMA_ECC interrupt and issue gpu reset either mode 2 or mode 1 to get the engine back
--- drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 7 ++++++- drivers/gpu/drm/amd/amdkfd/soc15_int.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +6 -1
@@ -309,8 +309,13 @@ static void event_interrupt_wq_v9(struct kfd_dev *dev, client_id == SOC15_IH_CLIENTID_SDMA5 || client_id == SOC15_IH_CLIENTID_SDMA6 || client_id == SOC15_IH_CLIENTID_SDMA7) { -if (source_id ==SOC15_INTSRC_SDMA_TRAP ) +if (source_id ==SOC15_INTSRC_SDMA_TRAP ) {kfd_signal_event_interrupt (pasid, context_id0 &0xfffffff ,28 ); + }else if (source_id ==SOC15_INTSRC_SDMA_ECC ) { +kfd_signal_poison_consumed_event (dev, pasid); +amdgpu_amdkfd_gpu_reset (dev->kgd); +return ; + } } else if (client_id == SOC15_IH_CLIENTID_VMC || client_id == SOC15_IH_CLIENTID_VMC1 || client_id == SOC15_IH_CLIENTID_UTCL2) { diff --git a/drivers/gpu/drm/amd/amdkfd/soc15_int.h b/drivers/gpu/drm/amd/amdkfd/soc15_int.h
index 0bc0b25cb410..daf3c44547d3 100644
drivers/gpu/drm/amd/amdkfd/soc15_int.h +1 -0
@@ -30,6 +30,7 @@#define SOC15_INTSRC_SQ_INTERRUPT_MSG 239#define SOC15_INTSRC_VMC_FAULT 0#define SOC15_INTSRC_SDMA_TRAP 224 +#define SOC15_INTSRC_SDMA_ECC 220#define SOC15_CLIENT_ID_FROM_IH_ENTRY (entry) (le32_to_cpu(entry[0]) & 0xff)
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx