* [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2 @ 2022-01-13 1:28 Stanley.Yang 2022-01-13 3:28 ` Zhou1, Tao 2022-01-13 14:46 ` Chen, Guchun 0 siblings, 2 replies; 4+ messages in thread From: Stanley.Yang @ 2022-01-13 1:28 UTC (permalink / raw) To: amd-gfx; +Cc: Stanley.Yang, Tao.Zhou1, John.Clements, Hawking.Zhang Changed from v1: remove unused brace Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com> --- 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(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index c742d1aacf5a..144176779f9e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -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; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index e674dbed3615..8bdc2e85cb20 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -449,7 +449,7 @@ static ssize_t amdgpu_ras_debugfs_ctrl_write(struct file *f, } if (ret) - return -EINVAL; + return ret; return size; } diff --git a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h index 5093826a43d1..509d8a1945eb 100644 --- a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h +++ b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h @@ -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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2 2022-01-13 1:28 [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2 Stanley.Yang @ 2022-01-13 3:28 ` Zhou1, Tao 2022-01-13 6:38 ` 回复: " Yang, Stanley 2022-01-13 14:46 ` Chen, Guchun 1 sibling, 1 reply; 4+ messages in thread From: Zhou1, Tao @ 2022-01-13 3:28 UTC (permalink / raw) To: Yang, Stanley, amd-gfx; +Cc: Yang, Stanley, Clements, John, Zhang, Hawking [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 <tao.zhou1@amd.com> > -----Original Message----- > From: Stanley.Yang <Stanley.Yang@amd.com> > Sent: Thursday, January 13, 2022 9:28 AM > To: amd-gfx@lists.freedesktop.org > Cc: Zhang, Hawking <Hawking.Zhang@amd.com>; Clements, John > <John.Clements@amd.com>; Zhou1, Tao <Tao.Zhou1@amd.com>; Yang, > Stanley <Stanley.Yang@amd.com> > Subject: [PATCH Review 1/1] drm/amdgpu: handle denied inject error into > critical regions v2 > > Changed from v1: > remove unused brace > > Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com> > --- > 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(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > index c742d1aacf5a..144176779f9e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > @@ -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; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > index e674dbed3615..8bdc2e85cb20 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > @@ -449,7 +449,7 @@ static ssize_t amdgpu_ras_debugfs_ctrl_write(struct file > *f, > } > > if (ret) > - return -EINVAL; > + return ret; > > return size; > } > diff --git a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h > b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h > index 5093826a43d1..509d8a1945eb 100644 > --- a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h > +++ b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h > @@ -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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* 回复: [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2 2022-01-13 3:28 ` Zhou1, Tao @ 2022-01-13 6:38 ` Yang, Stanley 0 siblings, 0 replies; 4+ messages in thread From: Yang, Stanley @ 2022-01-13 6:38 UTC (permalink / raw) To: Zhou1, Tao, amd-gfx; +Cc: Clements, John, Zhang, Hawking [AMD Official Use Only] Thanks, will update before submit. Regards, Stanley > -----邮件原件----- > 发件人: Zhou1, Tao <Tao.Zhou1@amd.com> > 发送时间: Thursday, January 13, 2022 11:29 AM > 收件人: Yang, Stanley <Stanley.Yang@amd.com>; amd- > gfx@lists.freedesktop.org > 抄送: Zhang, Hawking <Hawking.Zhang@amd.com>; Clements, John > <John.Clements@amd.com>; Yang, Stanley <Stanley.Yang@amd.com> > 主题: 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 <tao.zhou1@amd.com> > > > -----Original Message----- > > From: Stanley.Yang <Stanley.Yang@amd.com> > > Sent: Thursday, January 13, 2022 9:28 AM > > To: amd-gfx@lists.freedesktop.org > > Cc: Zhang, Hawking <Hawking.Zhang@amd.com>; Clements, John > > <John.Clements@amd.com>; Zhou1, Tao <Tao.Zhou1@amd.com>; Yang, > Stanley > > <Stanley.Yang@amd.com> > > Subject: [PATCH Review 1/1] drm/amdgpu: handle denied inject error > > into critical regions v2 > > > > Changed from v1: > > remove unused brace > > > > Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com> > > --- > > 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(-) > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > index c742d1aacf5a..144176779f9e 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c > > @@ -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; > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > > b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > > index e674dbed3615..8bdc2e85cb20 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > > @@ -449,7 +449,7 @@ static ssize_t > > amdgpu_ras_debugfs_ctrl_write(struct file *f, > > } > > > > if (ret) > > - return -EINVAL; > > + return ret; > > > > return size; > > } > > diff --git a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h > > b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h > > index 5093826a43d1..509d8a1945eb 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h > > +++ b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h > > @@ -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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2 2022-01-13 1:28 [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2 Stanley.Yang 2022-01-13 3:28 ` Zhou1, Tao @ 2022-01-13 14:46 ` Chen, Guchun 1 sibling, 0 replies; 4+ messages in thread From: Chen, Guchun @ 2022-01-13 14:46 UTC (permalink / raw) To: Yang, Stanley, amd-gfx Cc: Clements, John, Zhou1, Tao, Yang, Stanley, Zhang, Hawking [Public] I guess you still need to add a commit description in v2. Regards, Guchun -----Original Message----- From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Stanley.Yang Sent: Thursday, January 13, 2022 9:28 AM To: amd-gfx@lists.freedesktop.org Cc: Yang, Stanley <Stanley.Yang@amd.com>; Zhou1, Tao <Tao.Zhou1@amd.com>; Clements, John <John.Clements@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com> Subject: [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2 Changed from v1: remove unused brace Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com> --- 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(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index c742d1aacf5a..144176779f9e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -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; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index e674dbed3615..8bdc2e85cb20 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -449,7 +449,7 @@ static ssize_t amdgpu_ras_debugfs_ctrl_write(struct file *f, } if (ret) - return -EINVAL; + return ret; return size; } diff --git a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h index 5093826a43d1..509d8a1945eb 100644 --- a/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h +++ b/drivers/gpu/drm/amd/amdgpu/ta_ras_if.h @@ -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 ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-13 14:46 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-01-13 1:28 [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2 Stanley.Yang 2022-01-13 3:28 ` Zhou1, Tao 2022-01-13 6:38 ` 回复: " Yang, Stanley 2022-01-13 14:46 ` Chen, Guchun
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.