<html xmlns:v="urn:schemas-microsoft-com:vml" 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=us-ascii"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style></style> </head> <body lang="EN-US" link="#0563C1" vlink="#954F72" style="word-wrap:break-word"> <p style="font-family:Arial;font-size:10pt;color:#0000FF;margin:5pt;font-style:normal;font-weight:normal;text-decoration:none;" align="Left"> [AMD Official Use Only - General]<br> </p> <br> <div> <div class="WordSection1"> <p class="MsoNormal">Yes, it is.<o:p></o:p></p> <p class="MsoNormal"><o:p> </o:p></p> <p class="MsoNormal">Regards,<br> Hawking<o:p></o:p></p> <p class="MsoNormal"><o:p> </o:p></p> <div> <div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in"> <p class="MsoNormal"><b>From:</b> Deucher, Alexander <Alexander.Deucher@amd.com> <br> <b>Sent:</b> Wednesday, January 3, 2024 03:45<br> <b>To:</b> Zhang, Hawking <Hawking.Zhang@amd.com>; amd-gfx@lists.freedesktop.org; Zhou1, Tao <Tao.Zhou1@amd.com>; Yang, Stanley <Stanley.Yang@amd.com>; Wang, Yang(Kevin) <KevinYang.Wang@amd.com>; Chai, Thomas <YiPeng.Chai@amd.com>; Li, Candice <Candice.Li@amd.com><br> <b>Cc:</b> Lazar, Lijo <Lijo.Lazar@amd.com>; Ma, Le <Le.Ma@amd.com><br> <b>Subject:</b> Re: [PATCH 4/5] drm/amdgpu: Query boot status if discovery failed<o:p></o:p></p> </div> </div> <p class="MsoNormal"><o:p> </o:p></p> <p style="margin:5.0pt"><span style="font-size:10.0pt;font-family:"Arial",sans-serif;color:blue">[AMD Official Use Only - General]<o:p></o:p></span></p> <p class="MsoNormal"><o:p> </o:p></p> <div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;font-family:"Aptos",sans-serif;color:black">Is </span><span class="contentpasted0"><span style="font-family:"Segoe UI",sans-serif;color:#242424;background:white">mmIP_DISCOVERY_VERSION at the same offset across ASIC families?</span></span><span style="font-size:12.0pt;font-family:"Aptos",sans-serif;color:black"><o:p></o:p></span></p> </div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;font-family:"Aptos",sans-serif;color:black"><o:p> </o:p></span></p> </div> <div> <p class="MsoNormal"><span class="contentpasted0"><span style="font-family:"Segoe UI",sans-serif;color:#242424;background:white">Alex</span></span><span style="font-size:12.0pt;font-family:"Aptos",sans-serif;color:black"><o:p></o:p></span></p> </div> <div> <p class="MsoNormal"><span style="font-size:12.0pt;font-family:"Aptos",sans-serif;color:black"><o:p> </o:p></span></p> </div> <div class="MsoNormal" align="center" style="text-align:center"> <hr size="2" width="98%" align="center"> </div> <div id="divRplyFwdMsg"> <p class="MsoNormal"><b><span style="color:black">From:</span></b><span style="color:black"> Hawking Zhang <<a href="mailto:Hawking.Zhang@amd.com">Hawking.Zhang@amd.com</a>><br> <b>Sent:</b> Monday, January 1, 2024 10:43 PM<br> <b>To:</b> <a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a> <<a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a>>; Zhou1, Tao <<a href="mailto:Tao.Zhou1@amd.com">Tao.Zhou1@amd.com</a>>; Yang, Stanley <<a href="mailto:Stanley.Yang@amd.com">Stanley.Yang@amd.com</a>>; Wang, Yang(Kevin) <<a href="mailto:KevinYang.Wang@amd.com">KevinYang.Wang@amd.com</a>>; Chai, Thomas <<a href="mailto:YiPeng.Chai@amd.com">YiPeng.Chai@amd.com</a>>; Li, Candice <<a href="mailto:Candice.Li@amd.com">Candice.Li@amd.com</a>><br> <b>Cc:</b> Zhang, Hawking <<a href="mailto:Hawking.Zhang@amd.com">Hawking.Zhang@amd.com</a>>; Deucher, Alexander <<a href="mailto:Alexander.Deucher@amd.com">Alexander.Deucher@amd.com</a>>; Lazar, Lijo <<a href="mailto:Lijo.Lazar@amd.com">Lijo.Lazar@amd.com</a>>; Ma, Le <<a href="mailto:Le.Ma@amd.com">Le.Ma@amd.com</a>><br> <b>Subject:</b> [PATCH 4/5] drm/amdgpu: Query boot status if discovery failed</span> <o:p></o:p></p> <div> <p class="MsoNormal"> <o:p></o:p></p> </div> </div> <div> <div> <p class="MsoNormal" style="margin-bottom:12.0pt">Check and report boot status if discovery failed.<br> <br> Signed-off-by: Hawking Zhang <<a href="mailto:Hawking.Zhang@amd.com">Hawking.Zhang@amd.com</a>><br> ---<br> drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 6 +++++-<br> 1 file changed, 5 insertions(+), 1 deletion(-)<br> <br> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c<br> index b8fde08aec8e..302b71e9f1e2 100644<br> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c<br> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c<br> @@ -27,6 +27,7 @@<br> #include "amdgpu_discovery.h"<br> #include "soc15_hw_ip.h"<br> #include "discovery.h"<br> +#include "amdgpu_ras.h"<br> <br> #include "soc15.h"<br> #include "gfx_v9_0.h"<br> @@ -98,6 +99,7 @@<br> #define FIRMWARE_IP_DISCOVERY "amdgpu/ip_discovery.bin"<br> MODULE_FIRMWARE(FIRMWARE_IP_DISCOVERY);<br> <br> +#define mmIP_DISCOVERY_VERSION 0x16A00<br> #define mmRCC_CONFIG_MEMSIZE 0xde3<br> #define mmMP0_SMN_C2PMSG_33 0x16061<br> #define mmMM_INDEX 0x0<br> @@ -518,7 +520,9 @@ static int amdgpu_discovery_init(struct amdgpu_device *adev)<br> out:<br> kfree(adev->mman.discovery_bin);<br> adev->mman.discovery_bin = NULL;<br> -<br> + if ((amdgpu_discovery != 2) &&<br> + (RREG32(mmIP_DISCOVERY_VERSION) == 4))<br> + amdgpu_ras_query_boot_status(adev, 4);<br> return r;<br> }<br> <br> -- <br> 2.17.1<o:p></o:p></p> </div> </div> </div> </div> </div> </body> </html>