drm/amdgpu: add pcie bif ras query functionality
Subsystems (2)
cover drm/amdgpu: add pcie bif ras query functionality
These patches are implemented for ras inject/query error in PCIE BIF block.
Guchun Chen (4):
drm/amdgpu: add ras error query count interface for nbio drm/amdgpu: support pcie bif ras query and inject drm/amdgpu: add pcie bif ras related registers drm/amdgpu: implement ras query function for pcie bif
drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 5 +++ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 36 ++++++++++++++++ .../include/asic_reg/nbio/nbio_7_4_0_smn.h | 12 ++++++ .../include/asic_reg/nbio/nbio_7_4_sh_mask.h | 43 +++++++++++++++++++ 5 files changed, 98 insertions(+)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/4 drm/amdgpu: add ras error query count interface for nbio
Add the interface query_ras_error_count for nbio.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 ++ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 6 ++++++ 2 files changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h +2 -0
@@ -81,6 +81,8 @@ struct amdgpu_nbio_funcs {void (*handle_ras_err_event_athub_intr_no_bifring)(struct amdgpu_device *adev);int (*init_ras_controller_interrupt)(struct amdgpu_device *adev);int (*init_ras_err_event_athub_interrupt)(struct amdgpu_device *adev); +void (*query_ras_error_count)(struct amdgpu_device *adev, +void *ras_error_status);int (*ras_late_init)(struct amdgpu_device *adev); };
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +6 -0
@@ -473,6 +473,11 @@ static int nbio_v7_4_init_ras_err_event_athub_interrupt (struct amdgpu_device *areturn 0 ; } +static void nbio_v7_4_query_ras_error_count (struct amdgpu_device *adev, +void *ras_error_status) +{ +} +const struct amdgpu_nbio_funcs nbio_v7_4_funcs = { .get_hdp_flush_req_offset = nbio_v7_4_get_hdp_flush_req_offset, .get_hdp_flush_done_offset = nbio_v7_4_get_hdp_flush_done_offset,
@@ -498,5 +503,6 @@ const struct amdgpu_nbio_funcs nbio_v7_4_funcs = { .handle_ras_err_event_athub_intr_no_bifring = nbio_v7_4_handle_ras_err_event_athub_intr_no_bifring, .init_ras_controller_interrupt = nbio_v7_4_init_ras_controller_interrupt, .init_ras_err_event_athub_interrupt = nbio_v7_4_init_ras_err_event_athub_interrupt, + .query_ras_error_count = nbio_v7_4_query_ras_error_count, .ras_late_init = amdgpu_nbio_ras_late_init, };
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/4 drm/amdgpu: support pcie bif ras query and inject
In reply to a message not in the archiveCall pcie bif ras query/inject in amdgpu ras.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +5 -0
@@ -654,6 +654,10 @@ int amdgpu_ras_error_query(struct amdgpu_device *adev,if (adev->mmhub_funcs->query_ras_error_count) adev->mmhub_funcs->query_ras_error_count (adev, &err_data);break ; +case AMDGPU_RAS_BLOCK__PCIE_BIF : +if (adev->nbio.funcs->query_ras_error_count) + adev->nbio.funcs->query_ras_error_count (adev, &err_data); +break ;default :break ; }
@@ -703,6 +707,7 @@ int amdgpu_ras_error_inject(struct amdgpu_device *adev,case AMDGPU_RAS_BLOCK__UMC :case AMDGPU_RAS_BLOCK__MMHUB :case AMDGPU_RAS_BLOCK__XGMI_WAFL : +case AMDGPU_RAS_BLOCK__PCIE_BIF : ret =psp_ras_trigger_error (&adev->psp, &block_info);break ;default :
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/4 drm/amdgpu: add pcie bif ras related registers
In reply to a message not in the archiveThese registers will be accessed for querying ras errors.
--- .../include/asic_reg/nbio/nbio_7_4_0_smn.h | 12 ++++++ .../include/asic_reg/nbio/nbio_7_4_sh_mask.h | 43 +++++++++++++++++++ 2 files changed, 55 insertions(+)
drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h +12 -0
@@ -22,6 +22,9 @@#ifndef _nbio_7_4_0_SMN_HEADER#define _nbio_7_4_0_SMN_HEADER +// addressBlock: nbio_nbif0_bif_ras_bif_ras_regblk +// base address: 0x10100000 +#define smnBIFL_RAS_CENTRAL_STATUS 0x10139040#define smnNBIF_MGCG_CTRL_LCLK 0x1013a21c#define smnCPM_CONTROL 0x11180460
@@ -53,4 +56,13 @@#define smnPCIE_RX_NUM_NAK 0x11180038#define smnPCIE_RX_NUM_NAK_GENERATED 0x1118003c +// addressBlock: nbio_iohub_nb_misc_misc_cfgdec +// base address: 0x13a10000 +#define smnIOHC_INTERRUPT_EOI 0x13a10120 + +// addressBlock: nbio_iohub_nb_rascfg_ras_cfgdec +// base address: 0x13a20000 +#define smnRAS_GLOBAL_STATUS_LO 0x13a20020 +#define smnRAS_GLOBAL_STATUS_HI 0x13a20024 +#endif // _nbio_7_4_0_SMN_HEADER
drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_sh_mask.h +43 -0
47 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/4 drm/amdgpu: implement ras query function for pcie bif
In reply to a message not in the archiveras error query funtionality implementation
--- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 30 ++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +30 -0
@@ -476,6 +476,36 @@ static int nbio_v7_4_init_ras_err_event_athub_interrupt (struct amdgpu_device *astatic void nbio_v7_4_query_ras_error_count (struct amdgpu_device *adev,void *ras_error_status) { +uint32_t global_sts, central_sts, int_eoi; +uint32_t corr, fatal, non_fatal; +struct ras_err_data *err_data = (struct ras_err_data *)ras_error_status; + + global_sts =RREG32_PCIE (smnRAS_GLOBAL_STATUS_LO); + corr =REG_GET_FIELD (global_sts,RAS_GLOBAL_STATUS_LO , ParityErrCorr); + fatal =REG_GET_FIELD (global_sts,RAS_GLOBAL_STATUS_LO , ParityErrFatal); + non_fatal =REG_GET_FIELD (global_sts,RAS_GLOBAL_STATUS_LO , + ParityErrNonFatal); + +if (corr) + err_data->ce_count++; +if (fatal) + err_data->ue_count++; + +if (corr || fatal || non_fatal) { + central_sts =RREG32_PCIE (smnBIFL_RAS_CENTRAL_STATUS); +/* clear error status register */ +WREG32_PCIE (smnRAS_GLOBAL_STATUS_LO, global_sts); + +if (REG_GET_FIELD (central_sts,BIFL_RAS_CENTRAL_STATUS , + BIFL_RasContller_Intr_Recv)) { +/* clear interrupt status register */ +WREG32_PCIE (smnBIFL_RAS_CENTRAL_STATUS, central_sts); + int_eoi =RREG32_PCIE (smnIOHC_INTERRUPT_EOI); + int_eoi =REG_SET_FIELD (int_eoi, +IOHC_INTERRUPT_EOI ,SMI_EOI ,1 ); +WREG32_PCIE (smnIOHC_INTERRUPT_EOI, int_eoi); + } + } }const struct amdgpu_nbio_funcs nbio_v7_4_funcs = {
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Zhang, Hawking
Reviewed-by Hawking ZhangRE: [PATCH 4/4] drm/amdgpu: implement ras query function for pcie bif
Series is
Regards,
Hawking
-----Original Message-----
From: Chen, Guchun <[email protected]>
Sent: 2019年9月11日 11:21
To: [email protected]; Zhang, Hawking <[email protected]>; Li, Dennis <[email protected]>; Zhou1, Tao <[email protected]>; Deucher, Alexander <[email protected]>
Cc: Li, Candice <[email protected]>; Chen, Guchun <[email protected]>; Zhou1, Tao <[email protected]>
Subject: [PATCH 4/4] drm/amdgpu: implement ras query function for pcie bif
ras error query funtionality implementation
--- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 30 ++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +31 -1
@@ -476,6 +476,36 @@ static int nbio_v7_4_init_ras_err_event_athub_interrupt (struct amdgpu_device *a static void nbio_v7_4_query_ras_error_count(struct amdgpu_device *adev, void *ras_error_status) { +uint32_t global_sts, central_sts, int_eoi; +uint32_t corr, fatal, non_fatal; +struct ras_err_data *err_data = (struct ras_err_data +*)ras_error_status; + + global_sts =RREG32_PCIE (smnRAS_GLOBAL_STATUS_LO); + corr =REG_GET_FIELD (global_sts,RAS_GLOBAL_STATUS_LO , ParityErrCorr); + fatal =REG_GET_FIELD (global_sts,RAS_GLOBAL_STATUS_LO , ParityErrFatal); + non_fatal =REG_GET_FIELD (global_sts,RAS_GLOBAL_STATUS_LO , + ParityErrNonFatal); + +if (corr) + err_data->ce_count++; +if (fatal) + err_data->ue_count++; + +if (corr || fatal || non_fatal) { + central_sts =RREG32_PCIE (smnBIFL_RAS_CENTRAL_STATUS); +/* clear error status register */ +WREG32_PCIE (smnRAS_GLOBAL_STATUS_LO, global_sts); + +if (REG_GET_FIELD (central_sts,BIFL_RAS_CENTRAL_STATUS , + BIFL_RasContller_Intr_Recv)) { +/* clear interrupt status register */ +WREG32_PCIE (smnBIFL_RAS_CENTRAL_STATUS, central_sts); + int_eoi =RREG32_PCIE (smnIOHC_INTERRUPT_EOI); + int_eoi =REG_SET_FIELD (int_eoi, +IOHC_INTERRUPT_EOI ,SMI_EOI ,1 ); +WREG32_PCIE (smnIOHC_INTERRUPT_EOI, int_eoi); + } + } }const struct amdgpu_nbio_funcs nbio_v7_4_funcs = { --
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx