drm/amd/ras: add error handling for seqno operations

Add error handling for seqno operations.

Signed-off-by: YiPeng Chai <YiPeng.Chai@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/ras/ras_mgr/amdgpu_ras_mgr.c b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
index 79976e322b556dc17e674772f8b97a50342980fc..c12e756b4ef067dcad934b4fc8707be00bfc1308 100644 (file)
--- a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
+++ b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
@@ -498,8 +498,10 @@ uint64_t amdgpu_ras_mgr_gen_ras_event_seqno(struct amdgpu_device *adev,
        if ((seqno_type == RAS_SEQNO_TYPE_DE) ||
            (seqno_type == RAS_SEQNO_TYPE_POISON_CONSUMPTION)) {
                ret = ras_core_put_seqno(ras_mgr->ras_core, seqno_type, seq_no);
-               if (ret)
+               if (ret) {
                        RAS_DEV_WARN(adev, "There are too many ras interrupts!");
+                       return 0;
+               }
        }
 
        return seq_no;

diff --git a/drivers/gpu/drm/amd/ras/rascore/ras_core.c b/drivers/gpu/drm/amd/ras/rascore/ras_core.c
index 49b3aa7489ff4366242dbd0806a3280eb7f539d1..62d124a3eeac279b22f7756cc5a6926fcff2f0b7 100644 (file)
--- a/drivers/gpu/drm/amd/ras/rascore/ras_core.c
+++ b/drivers/gpu/drm/amd/ras/rascore/ras_core.c
@@ -196,9 +196,9 @@ uint64_t ras_core_gen_seqno(struct ras_core_context *ras_core,
 {
        uint64_t seqno = 0;
 
-       if (ras_core->sys_fn &&
-               ras_core->sys_fn->gen_seqno)
-               ras_core->sys_fn->gen_seqno(ras_core, type, &seqno);
+       if (ras_core->sys_fn && ras_core->sys_fn->gen_seqno &&
+           ras_core->sys_fn->gen_seqno(ras_core, type, &seqno))
+               return 0;
 
        return seqno;
 }