drm/amdgpu/mmhub: switch to amdgpu_mmhub_ras_late_init helper function

amdgpu_mmhub_ras_late_init is used to init mmhub specfic
ras debugfs/sysfs node and mmhub specific interrupt handler.
It can be shared among mmhub generations

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>

diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile
index 42e2c1f57152d7233d529c3ea8a81d22e18b1d53..62a9b051c10987ba5ff8324976a310bb93469315 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -53,7 +53,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \
        amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \
        amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \
        amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \
-       amdgpu_gmc.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \
+       amdgpu_gmc.o amdgpu_mmhub.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \
        amdgpu_vm_sdma.o amdgpu_pmu.o amdgpu_discovery.o amdgpu_ras_eeprom.o smu_v11_0_i2c.o
 
 amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c
new file mode 100644 (file)
index 0000000..99ef6b1
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2019 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "amdgpu.h"
+#include "amdgpu_ras.h"
+
+int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev)
+{
+       int r;
+       struct ras_ih_if ih_info = {
+               .cb = NULL,
+       };
+       struct ras_fs_if 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");
+       }
+       ih_info.head = fs_info.head = *adev->gmc.mmhub_ras_if;
+       r = amdgpu_ras_late_init(adev, adev->gmc.mmhub_ras_if,
+                                &fs_info, &ih_info);
+       if (r || !amdgpu_ras_is_supported(adev, adev->gmc.mmhub_ras_if->block)) {
+               kfree(adev->gmc.mmhub_ras_if);
+               adev->gmc.mmhub_ras_if = NULL;
+       }
+
+       return r;
+}

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h
index df04c718dfab935799dc4740eb2d9e60776be5fa..685e54e58700a63ce88a2d6117d39ca00c4276f3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h
@@ -28,5 +28,7 @@ struct amdgpu_mmhub_funcs {
                                        void *ras_error_status);
 };
 
+int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev);
+
 #endif
 

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
index 9916a333d9dcf997d129e9a2b16b5b85ee10d1d4..b9d6c0bfa594382fb8310378a9572208cdb20802 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
@@ -616,37 +616,7 @@ 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 || !amdgpu_ras_is_supported(adev, adev->gmc.mmhub_ras_if->block)) {
-               kfree(adev->gmc.mmhub_ras_if);
-               adev->gmc.mmhub_ras_if = NULL;
-       }
-       return r;
-}
-
 const struct amdgpu_mmhub_funcs mmhub_v1_0_funcs = {
-       .ras_late_init = mmhub_v1_0_ras_late_init,
+       .ras_late_init = amdgpu_mmhub_ras_late_init,
        .query_ras_error_count = mmhub_v1_0_query_ras_error_count,
 };