<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body>
<p style="font-family:Arial;font-size:10pt;color:#008000;margin:15pt;" align="Left">
[Public]<br>
</p>
<br>
<div>
<div dir="auto"><span style="font-size:14.6667px; display:inline!important"><span style="font-family:-apple-system, HelveticaNeue;font-size:14.6667px;display:inline !important">Reviewed-by:</span> Candice Li <</span><a href="mailto:candice.li@amd.com" style="color:rgb(0,120,212)!important; font-size:14.6667px">candice.li@amd.com</a><span style="font-size:14.6667px; display:inline!important">></span></div>
<div dir="auto"><span style="font-size:14.6667px; display:inline!important"><br>
</span></div>
<div id="ms-outlook-mobile-signature" dir="auto">
<div><br>
</div>
<div dir="auto">Thanks</div>
<div dir="auto">Candice</div>
</div>
<hr tabindex="-1" style="display:inline-block; width:98%">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>From:</b> Zhou1, Tao <Tao.Zhou1@amd.com><br>
<b>Sent:</b> Thursday, November 10, 2022 3:04:00 PM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; Li, Candice <Candice.Li@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com>; Chai, Thomas <YiPeng.Chai@amd.com>; Yang, Stanley <Stanley.Yang@amd.com><br>
<b>Cc:</b> Zhou1, Tao <Tao.Zhou1@amd.com><br>
<b>Subject:</b> [PATCH] drm/amdgpu: remove the check of init status in psp_ras_initialize</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt">
<div class="PlainText">The initialized status indicates RAS TA is loaded, but in some cases<br>
(such as RAS fatal error) RAS TA could be destroyed although it's not<br>
unloaded. Hence we load RAS TA unconditionally here.<br>
<br>
Signed-off-by: Tao Zhou <tao.zhou1@amd.com><br>
---<br>
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 8 +++-----<br>
1 file changed, 3 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c<br>
index 2fcb5bfbef89..0a8c30475dda 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c<br>
@@ -1526,11 +1526,6 @@ int psp_ras_initialize(struct psp_context *psp)<br>
if (amdgpu_sriov_vf(adev))<br>
return 0;<br>
<br>
- if (psp->ras_context.context.initialized) {<br>
- dev_warn(adev->dev, "RAS WARN: TA has already been loaded\n");<br>
- return 0;<br>
- }<br>
-<br>
if (!adev->psp.ras_context.context.bin_desc.size_bytes ||<br>
!adev->psp.ras_context.context.bin_desc.start_addr) {<br>
dev_info(adev->dev, "RAS: optional ras ta ucode is not available\n");<br>
@@ -1602,6 +1597,9 @@ int psp_ras_initialize(struct psp_context *psp)<br>
else {<br>
if (ras_cmd->ras_status)<br>
dev_warn(psp->adev->dev, "RAS Init Status: 0x%X\n", ras_cmd->ras_status);<br>
+<br>
+ /* fail to load RAS TA */<br>
+ psp->ras_context.context.initialized = false;<br>
}<br>
<br>
return ret;<br>
-- <br>
2.35.1<br>
<br>
</div>
</span></font></div>
</div>
</body>
</html>