<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"> <head> <meta http-equiv="Content-Type" content="text/html; charset=Windows-1252"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style></style> </head> <body lang="en-CN" link="#467886" vlink="#96607D" style="word-wrap:break-word"> [AMD Official Use Only - General] <div> <div class="WordSection1"> Hi <a id="OWAAMF8548CD07BB205478DF776E1014D2B98" href="mailto:Alexander.Deucher@amd.com">@Deucher, Alexander</a> and <a id="OWAAM645E9576D2BF254CB415F66326EABD7B" href="mailto:Christian.Koenig@amd.com"> @Koenig, Christian</a> Could you help review this patch? <o:p></o:p> Without this patch, when customer set `reset_method=3` modprobe param to use mode2 reset, ras recovery will also use mode2 reset and skip mode1 reset. <o:p></o:p> When ECC error happens, GPU can’t be recovered with mode2 reset and mode1 reset is skipped, this will cause GPU reset failure.<o:p></o:p> <o:p> </o:p> This patch is to always use mode1 reset for ras recovery (ECC error) when setting `reset_method=3`.<o:p></o:p> <o:p> </o:p> Thanks<o:p></o:p> Sam <o:p> </o:p> <div id="mail-editor-reference-message-container"> <div> <div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm"> From: Feng, Kenneth <Kenneth.Feng@amd.com> Date: Monday, April 29, 2024 at 16:15 To: Feng, Kenneth <Kenneth.Feng@amd.com>, amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>, Zhang, GuoQing (Sam) <GuoQing.Zhang@amd.com> Cc: Zhang, Owen(SRDC) <Owen.Zhang2@amd.com>, Aldabagh, Maad <Maad.Aldabagh@amd.com>, Ma, Qing (Mark) <Qing.Ma@amd.com> Subject: RE: [PATCH 2/2] drm/amd/amdgpu: use the default reset for ras recovery<o:p></o:p> </div> <div> <a name="BM_BEGIN"></a>[AMD Official Use Only - General] +@Zhang, GuoQing (Sam) -----Original Message----- From: Kenneth Feng <kenneth.feng@amd.com> Sent: Monday, April 29, 2024 3:32 PM To: amd-gfx@lists.freedesktop.org Cc: Zhang, Owen(SRDC) <Owen.Zhang2@amd.com>; Aldabagh, Maad <Maad.Aldabagh@amd.com>; Ma, Qing (Mark) <Qing.Ma@amd.com>; Feng, Kenneth <Kenneth.Feng@amd.com> Subject: [PATCH 2/2] drm/amd/amdgpu: use the default reset for ras recovery use the default reset for ras recovery Signed-off-by: Kenneth Feng <kenneth.feng@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index a037e8fba29f..f92b2c4f0d5c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -2437,6 +2437,7 @@ static void amdgpu_ras_do_recovery(struct work_struct *work) struct amdgpu_device *adev = ras->adev; struct list_head device_list, *device_list_handle = NULL; struct amdgpu_hive_info *hive = amdgpu_get_xgmi_hive(adev); + int save_reset_method = amdgpu_reset_method; if (hive) { atomic_set(&hive->ras_recovery, 1); @@ -2501,7 +2502,13 @@ static void amdgpu_ras_do_recovery(struct work_struct *work) } } + if (amdgpu_gpu_recovery == 2) + amdgpu_reset_method = -1; + amdgpu_device_gpu_recover(ras->adev, NULL, &reset_context); + + if (amdgpu_gpu_recovery == 2) + amdgpu_reset_method = save_reset_method; } atomic_set(&ras->in_recovery, 0); if (hive) { -- 2.34.1<o:p></o:p> </div> </div> </div> </div> </div> </body> </html>