From: Tao Zhou Date: Mon, 21 Mar 2022 07:45:31 +0000 (+0800) Subject: drm/amdkfd: print unmap queue status for RAS poison consumption (v3) X-Git-Tag: v5.19-rc1~153^2~18^2~135 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed94aca6dbca2519cb71a73c2d276c97fe857596;p=thirdparty%2Fkernel%2Flinux.git drm/amdkfd: print unmap queue status for RAS poison consumption (v3) Print the status out when it passes, and also tell user gpu reset is triggered when we fall back to legacy way. v2: make the message more explicit. v3: change succeeds to succeeded. replace pr_warn with dev_warn. Signed-off-by: Tao Zhou Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c index 56902b5bb7b68..03c29bdd89a18 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c @@ -105,8 +105,6 @@ static void event_interrupt_poison_consumption(struct kfd_dev *dev, if (old_poison) return; - pr_warn("RAS poison consumption handling: client id %d\n", client_id); - switch (client_id) { case SOC15_IH_CLIENTID_SE0SH: case SOC15_IH_CLIENTID_SE1SH: @@ -130,10 +128,17 @@ static void event_interrupt_poison_consumption(struct kfd_dev *dev, /* resetting queue passes, do page retirement without gpu reset * resetting queue fails, fallback to gpu reset solution */ - if (!ret) + if (!ret) { + dev_warn(dev->adev->dev, + "RAS poison consumption, unmap queue flow succeeded: client id %d\n", + client_id); amdgpu_amdkfd_ras_poison_consumption_handler(dev->adev, false); - else + } else { + dev_warn(dev->adev->dev, + "RAS poison consumption, fall back to gpu reset flow: client id %d\n", + client_id); amdgpu_amdkfd_ras_poison_consumption_handler(dev->adev, true); + } } static bool event_interrupt_isr_v9(struct kfd_dev *dev,