drm/amdgpu: add mmhub ras_late_init callback function (v2)

The function will be called in late init phase to do mmhub
ras init

v2: check ras_late_init function pointer before invoking the
function

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h
index 2d75ecfa199b61bbe1fd5192c2c42254b6bcf72f..df04c718dfab935799dc4740eb2d9e60776be5fa 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h
@@ -23,6 +23,7 @@
 
 struct amdgpu_mmhub_funcs {
        void (*ras_init)(struct amdgpu_device *adev);
+       int (*ras_late_init)(struct amdgpu_device *adev);
        void (*query_ras_error_count)(struct amdgpu_device *adev,
                                        void *ras_error_status);
 };

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 007c2ba75ac189d1b23b8d1f130a5ce680f1a9cb..b4eead9a0f6b2cebb511a406b13c57f22888ff24 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -766,7 +766,6 @@ static int gmc_v9_0_ecc_late_init(void *handle)
 {
        int r;
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-       struct ras_ih_if mmhub_ih_info;
        struct ras_fs_if umc_fs_info = {
                .sysfs_name = "umc_err_count",
                .debugfs_name = "umc_err_inject",
@@ -774,10 +773,6 @@ static int gmc_v9_0_ecc_late_init(void *handle)
        struct ras_ih_if umc_ih_info = {
                .cb = gmc_v9_0_process_ras_data_cb,
        };
-       struct ras_fs_if mmhub_fs_info = {
-               .sysfs_name = "mmhub_err_count",
-               .debugfs_name = "mmhub_err_inject",
-       };
 
        if (!adev->gmc.umc_ras_if) {
                adev->gmc.umc_ras_if = kmalloc(sizeof(struct ras_common_if), GFP_KERNEL);
@@ -801,29 +796,16 @@ static int gmc_v9_0_ecc_late_init(void *handle)
                        goto umc_late_fini;
        }
 
-       if (!adev->gmc.mmhub_ras_if) {
-               adev->gmc.mmhub_ras_if = kmalloc(sizeof(struct ras_common_if), GFP_KERNEL);
-               if (!adev->gmc.mmhub_ras_if)
-                       return -ENOMEM;
-               adev->gmc.mmhub_ras_if->block = AMDGPU_RAS_BLOCK__MMHUB;
-               adev->gmc.mmhub_ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;
-               adev->gmc.mmhub_ras_if->sub_block_index = 0;
-               strcpy(adev->gmc.mmhub_ras_if->name, "mmhub");
+       if (adev->mmhub_funcs->ras_late_init) {
+               r = adev->mmhub_funcs->ras_late_init(adev);
+               if (r)
+                       return r;
        }
-       mmhub_ih_info.head = mmhub_fs_info.head = *adev->gmc.mmhub_ras_if;
-       r = amdgpu_ras_late_init(adev, adev->gmc.mmhub_ras_if,
-                                &mmhub_fs_info, &mmhub_ih_info);
-       if (r)
-               goto mmhub_late_fini;
-
        return 0;
-mmhub_late_fini:
-       amdgpu_ras_late_fini(adev, adev->gmc.mmhub_ras_if, &mmhub_ih_info);
 umc_late_fini:
        amdgpu_ras_late_fini(adev, adev->gmc.umc_ras_if, &umc_ih_info);
 free:
        kfree(adev->gmc.umc_ras_if);
-       kfree(adev->gmc.mmhub_ras_if);
        return r;
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
index 04cd4b6f95d48882bbe1e2289701deeeb88b7578..af15f4b8e3ad812b6a23f9f91d5a11b8b2a8fecd 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
@@ -31,6 +31,7 @@
 #include "vega10_enum.h"
 
 #include "soc15_common.h"
+#include "amdgpu_ras.h"
 
 #define mmDAGB0_CNTL_MISC2_RV 0x008f
 #define mmDAGB0_CNTL_MISC2_RV_BASE_IDX 0
@@ -615,6 +616,35 @@ static void mmhub_v1_0_query_ras_error_count(struct amdgpu_device *adev,
        }
 }
 
+static int mmhub_v1_0_ras_late_init(struct amdgpu_device *adev)
+{
+       int r;
+       struct ras_ih_if mmhub_ih_info = {
+               .cb = NULL,
+       };
+       struct ras_fs_if mmhub_fs_info = {
+               .sysfs_name = "mmhub_err_count",
+               .debugfs_name = "mmhub_err_inject",
+       };
+
+       if (!adev->gmc.mmhub_ras_if) {
+               adev->gmc.mmhub_ras_if = kmalloc(sizeof(struct ras_common_if), GFP_KERNEL);
+               if (!adev->gmc.mmhub_ras_if)
+                       return -ENOMEM;
+               adev->gmc.mmhub_ras_if->block = AMDGPU_RAS_BLOCK__MMHUB;
+               adev->gmc.mmhub_ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;
+               adev->gmc.mmhub_ras_if->sub_block_index = 0;
+               strcpy(adev->gmc.mmhub_ras_if->name, "mmhub");
+       }
+       mmhub_ih_info.head = mmhub_fs_info.head = *adev->gmc.mmhub_ras_if;
+       r = amdgpu_ras_late_init(adev, adev->gmc.mmhub_ras_if,
+                                &mmhub_fs_info, &mmhub_ih_info);
+       if (r)
+               kfree(adev->gmc.mmhub_ras_if);
+       return r;
+}
+
 const struct amdgpu_mmhub_funcs mmhub_v1_0_funcs = {
+       .ras_late_init = mmhub_v1_0_ras_late_init,
        .query_ras_error_count = mmhub_v1_0_query_ras_error_count,
 };