drm/amdgpu: handle denied inject error into critical regions v2
Subsystems (2)
PATCH 1/1 drm/amdgpu: handle denied inject error into critical regions v2
Changed from v1:
remove unused brace
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 9 ++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +- drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +8 -1
@@ -1309,6 +1309,11 @@ static void psp_ras_ta_check_status(struct psp_context *psp)break ;case TA_RAS_STATUS__SUCCESS :break ; +case TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED : +if (ras_cmd->cmd_id ==TA_RAS_COMMAND__TRIGGER_ERROR ) +dev_warn (psp->adev->dev, +"RAS INFO: Inject error to critical region is not allowed\n" ); +break ;default :dev_warn (psp->adev->dev,"RAS WARNING: ras status = 0x%X\n" , ras_cmd->ras_status);
@@ -1521,7 +1526,9 @@ int psp_ras_trigger_error(struct psp_context *psp,if (amdgpu_ras_intr_triggered ())return 0 ; -if (ras_cmd->ras_status) +if (ras_cmd->ras_status ==TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED ) +return -EACCES ; +else if (ras_cmd->ras_status)return -EINVAL ;return 0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1 -1
@@ -449,7 +449,7 @@ static ssize_t amdgpu_ras_debugfs_ctrl_write(struct file *f, }if (ret) -return -EINVAL ; +return ret;return size; }
drivers/gpu/drm/amd/amdgpu/ta_ras_if.h +2 -1
@@ -64,7 +64,8 @@ enum ta_ras_status {TA_RAS_STATUS__ERROR_PCS_STATE_ERROR =0xA016 ,TA_RAS_STATUS__ERROR_PCS_STATE_HANG =0xA017 ,TA_RAS_STATUS__ERROR_PCS_STATE_UNKNOWN =0xA018 , -TA_RAS_STATUS__ERROR_UNSUPPORTED_ERROR_INJ =0xA019 +TA_RAS_STATUS__ERROR_UNSUPPORTED_ERROR_INJ =0xA019 , +TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED =0xA01A }; enum ta_ras_block {
Signature · 1 line
2.17.1
[AMD Official Use Only]
Since you use dev_warn, "RAS WARNING" is better than "RAS INFO" in the print message, with this fixed the patch is:
Quoted 84 lines
-----Original Message-----
From: Stanley.Yang <[email protected]>
Sent: Thursday, January 13, 2022 9:28 AM
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Clements, John <[email protected]>; Zhou1, Tao <[email protected]>; Yang, Stanley <[email protected]>
Subject: [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2Changed from v1:
remove unused braceSigned-off-by Stanley.Yang <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 9 ++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +- drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +5
-0@@ -1309,6 +1309,11 @@ static void psp_ras_ta_check_status(struct psp_context *psp) break;case TA_RAS_STATUS__SUCCESS :break ; +case TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED : +if (ras_cmd->cmd_id ==TA_RAS_COMMAND__TRIGGER_ERROR ) + dev_warn(psp->adev->dev, + "RAS INFO: Inject error to critical region is not allowed\n"); + break;default :drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0
-0dev_warn(psp->adev->dev, "RAS WARNING: ras status = 0x%X\n",
ras_cmd->ras_status); @@ -1521,7 +1526,9 @@ int
psp_ras_trigger_error(structpsp_context*psp,drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1
-1if (amdgpu_ras_intr_triggered ())return 0 ; -if (ras_cmd->ras_status) + if (ras_cmd->ras_status ==
TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2
-0+return -EACCES ; + else if (ras_cmd->ras_status) return -EINVAL;return 0 ;drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1
-1@@ -449,7 +449,7 @@ static ssize_t amdgpu_ras_debugfs_ctrl_write(struct file *f, }if (ret) -return -EINVAL ; +return ret;return size;}
drivers/gpu/drm/amd/amdgpu/ta_ras_if.h +2
-2@@ -64,7 +64,8 @@ enum ta_ras_status {TA_RAS_STATUS__ERROR_PCS_STATE_ERROR =0xA016 ,TA_RAS_STATUS__ERROR_PCS_STATE_HANG =0xA017 ,TA_RAS_STATUS__ERROR_PCS_STATE_UNKNOWN =0xA018 , -TA_RAS_STATUS__ERROR_UNSUPPORTED_ERROR_INJ =0xA019 +TA_RAS_STATUS__ERROR_UNSUPPORTED_ERROR_INJ =0xA019 , +TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED =0xA01A }; enum ta_ras_block { --2.17.1
[AMD Official Use Only]
Thanks, will update before submit.
Regards,
Stanley
Quoted 103 lines
-----邮件原件-----
发件人: Zhou1, Tao <[email protected]>
发送时间: Thursday, January 13, 2022 11:29 AM
收件人: Yang, Stanley <[email protected]>; amd- [email protected]
抄送: Zhang, Hawking <[email protected]>; Clements, John <[email protected]>; Yang, Stanley <[email protected]> 主题: RE: [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2[AMD Official Use Only]
Since you use
dev_warn, "RAS WARNING" is better than "RAS INFO" in the print message, with this fixed the patch is:Reviewed-by Tao Zhou <[email protected]>Quoted 6 lines
-----Original Message-----
From: Stanley.Yang <[email protected]>
Sent: Thursday, January 13, 2022 9:28 AM
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Clements, John <[email protected]>; Zhou1, Tao <[email protected]>; Yang,Stanley
Quoted 20 lines
<[email protected]>
Subject: [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2Changed from v1:
remove unused braceSigned-off-by Stanley.Yang <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 9 ++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +- drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0
-0drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c static void psp_ras_ta_check_status(struct · line 1314
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2
-0@@ -1309,6 +1309,11 @@ static void psp_ras_ta_check_status(struct psp_context *psp) break;case TA_RAS_STATUS__SUCCESS :break ; +case TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED : + if (ras_cmd->cmd_id ==
TA_RAS_COMMAND__TRIGGER_ERROR)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +3
-0+ dev_warn(psp->adev->dev, + "RAS INFO: Inject error to critical region is not allowed\n"); + break;default :drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0
-0dev_warn(psp->adev->dev, "RAS WARNING: ras status = 0x%X\n",
ras_cmd->ras_status); @@Quoted 44 lines
-1521,7 +1526,9 @@ int psp_ras_trigger_error(struct
psp_context*psp,drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1
-1if (amdgpu_ras_intr_triggered ())return 0 ; -if (ras_cmd->ras_status) + if (ras_cmd->ras_status ==
TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2
-0+return -EACCES ; + else if (ras_cmd->ras_status) return -EINVAL;return 0 ;drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1
-1@@ -449,7 +449,7 @@ static ssize_t amdgpu_ras_debugfs_ctrl_write(struct file *f, }if (ret) -return -EINVAL ; +return ret;return size;}
drivers/gpu/drm/amd/amdgpu/ta_ras_if.h +2
-2@@ -64,7 +64,8 @@ enum ta_ras_status {TA_RAS_STATUS__ERROR_PCS_STATE_ERROR =0xA016 ,TA_RAS_STATUS__ERROR_PCS_STATE_HANG =0xA017 ,TA_RAS_STATUS__ERROR_PCS_STATE_UNKNOWN =0xA018 , -TA_RAS_STATUS__ERROR_UNSUPPORTED_ERROR_INJ =0xA019 +TA_RAS_STATUS__ERROR_UNSUPPORTED_ERROR_INJ =0xA019 , +TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED =0xA01A }; enum ta_ras_block { --2.17.1
[Public]
I guess you still need to add a commit description in v2.
Regards,
Guchun
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Stanley.Yang
Sent: Thursday, January 13, 2022 9:28 AM
To: [email protected]
Cc: Yang, Stanley <[email protected]>; Zhou1, Tao <[email protected]>; Clements, John <[email protected]>; Zhang, Hawking <[email protected]>
Subject: [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2
Changed from v1:
remove unused brace
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 9 ++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +- drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +5 -0
@@ -1309,6 +1309,11 @@ static void psp_ras_ta_check_status(struct psp_context *psp)break ;case TA_RAS_STATUS__SUCCESS :break ; +case TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED : +if (ras_cmd->cmd_id ==TA_RAS_COMMAND__TRIGGER_ERROR ) +dev_warn (psp->adev->dev, +"RAS INFO: Inject error to critical region is not allowed\n" ); +break ;default :dev_warn (psp->adev->dev, "RAS WARNING: ras status = 0x%X\n", ras_cmd->ras_status); @@ -1521,7 +1526,9 @@ int psp_ras_trigger_error(struct psp_context *psp,
if (amdgpu_ras_intr_triggered())
return 0;
- if (ras_cmd->ras_status)
+ if (ras_cmd->ras_status == TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED)
+ return -EACCES;
+ else if (ras_cmd->ras_status)
return -EINVAL;
return 0;
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1 -1
@@ -449,7 +449,7 @@ static ssize_t amdgpu_ras_debugfs_ctrl_write(struct file *f, }if (ret) -return -EINVAL ; +return ret;return size; }
drivers/gpu/drm/amd/amdgpu/ta_ras_if.h +2 -1
@@ -64,7 +64,8 @@ enum ta_ras_status {TA_RAS_STATUS__ERROR_PCS_STATE_ERROR =0xA016 ,TA_RAS_STATUS__ERROR_PCS_STATE_HANG =0xA017 ,TA_RAS_STATUS__ERROR_PCS_STATE_UNKNOWN =0xA018 , -TA_RAS_STATUS__ERROR_UNSUPPORTED_ERROR_INJ =0xA019 +TA_RAS_STATUS__ERROR_UNSUPPORTED_ERROR_INJ =0xA019 , +TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED =0xA01A }; enum ta_ras_block {
--
2.17.1