drm/amdgpu: drop xmgi23 error query/reset support
authorHawking Zhang <Hawking.Zhang@amd.com>
Thu, 10 Mar 2022 07:53:04 +0000 (15:53 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 15 Mar 2022 18:34:26 +0000 (14:34 -0400)
xgmi_ras is only initialized when host to GPU interface
is PCIE. in such case, xgmi23 is disabled and protected
by security firmware. Host access will results to
security violation

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c

index 05c0d6e..1b108d0 100644 (file)
@@ -34,7 +34,6 @@
 
 #include "amdgpu_reset.h"
 
-#define smnPCS_XGMI23_PCS_ERROR_STATUS   0x11a01210
 #define smnPCS_XGMI3X16_PCS_ERROR_STATUS 0x11a0020c
 #define smnPCS_GOPX1_PCS_ERROR_STATUS    0x12200210
 
@@ -69,17 +68,6 @@ static const int wafl_pcs_err_status_reg_arct[] = {
        smnPCS_GOPX1_0_PCS_GOPX1_PCS_ERROR_STATUS + 0x100000,
 };
 
-static const int xgmi23_pcs_err_status_reg_aldebaran[] = {
-       smnPCS_XGMI23_PCS_ERROR_STATUS,
-       smnPCS_XGMI23_PCS_ERROR_STATUS + 0x100000,
-       smnPCS_XGMI23_PCS_ERROR_STATUS + 0x200000,
-       smnPCS_XGMI23_PCS_ERROR_STATUS + 0x300000,
-       smnPCS_XGMI23_PCS_ERROR_STATUS + 0x400000,
-       smnPCS_XGMI23_PCS_ERROR_STATUS + 0x500000,
-       smnPCS_XGMI23_PCS_ERROR_STATUS + 0x600000,
-       smnPCS_XGMI23_PCS_ERROR_STATUS + 0x700000
-};
-
 static const int xgmi3x16_pcs_err_status_reg_aldebaran[] = {
        smnPCS_XGMI3X16_PCS_ERROR_STATUS,
        smnPCS_XGMI3X16_PCS_ERROR_STATUS + 0x100000,
@@ -797,9 +785,6 @@ static void amdgpu_xgmi_reset_ras_error_count(struct amdgpu_device *adev)
                                         xgmi_pcs_err_status_reg_vg20[i]);
                break;
        case CHIP_ALDEBARAN:
-               for (i = 0; i < ARRAY_SIZE(xgmi23_pcs_err_status_reg_aldebaran); i++)
-                       pcs_clear_status(adev,
-                                        xgmi23_pcs_err_status_reg_aldebaran[i]);
                for (i = 0; i < ARRAY_SIZE(xgmi3x16_pcs_err_status_reg_aldebaran); i++)
                        pcs_clear_status(adev,
                                         xgmi3x16_pcs_err_status_reg_aldebaran[i]);
@@ -900,13 +885,6 @@ static void amdgpu_xgmi_query_ras_error_count(struct amdgpu_device *adev,
                }
                break;
        case CHIP_ALDEBARAN:
-               /* check xgmi23 pcs error */
-               for (i = 0; i < ARRAY_SIZE(xgmi23_pcs_err_status_reg_aldebaran); i++) {
-                       data = RREG32_PCIE(xgmi23_pcs_err_status_reg_aldebaran[i]);
-                       if (data)
-                               amdgpu_xgmi_query_pcs_error_status(adev,
-                                               data, &ue_cnt, &ce_cnt, true);
-               }
                /* check xgmi3x16 pcs error */
                for (i = 0; i < ARRAY_SIZE(xgmi3x16_pcs_err_status_reg_aldebaran); i++) {
                        data = RREG32_PCIE(xgmi3x16_pcs_err_status_reg_aldebaran[i]);