Skip to contentSkip to conversation

drm/amdgpu: Add ras supported check for register_ras_block

PATCH NAK yipechai 4 participants 5 messages Jan 12, 2022 – Jan 13, 2022

Subsystems (2)
lore
Share & tools
lore

yipechai

author
#0 lore raw

PATCH v2 1/2 drm/amdgpu: Add ras supported check for register_ras_block

Add ras supported check for register_ras_block.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +3 -0
index b1bedfd4febc..614ae8455c9f 100644
@@ -2757,6 +2757,9 @@ int amdgpu_ras_register_ras_block(struct amdgpu_device *adev,
 	if (!adev || !ras_block_obj)
 		return -EINVAL;
 
+	if (!amdgpu_ras_asic_supported(adev))
+		return 0;
+
 	INIT_LIST_HEAD(&ras_block_obj->node);
 	list_add_tail(&ras_block_obj->node, &adev->ras_list);
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH v2 2/2 drm/amdgpu: No longer insert ras blocks into ras_list if it already exists in ras_list

No longer insert ras blocks into ras_list if it already exists in ras_list.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +8 -0
index 614ae8455c9f..d208fde509de 100644
@@ -2754,12 +2754,20 @@ int amdgpu_ras_reset_gpu(struct amdgpu_device *adev)
 int amdgpu_ras_register_ras_block(struct amdgpu_device *adev,
 		struct amdgpu_ras_block_object* ras_block_obj)
 {
+	struct amdgpu_ras_block_object *obj, *tmp;
 	if (!adev || !ras_block_obj)
 		return -EINVAL;
 
 	if (!amdgpu_ras_asic_supported(adev))
 		return 0;
 
+	/* If the ras object is in ras_list, don't add it again */
+	list_for_each_entry_safe(obj, tmp, &adev->ras_list, node) {
+		if (obj == ras_block_obj) {
+			return 0;
+		}
+	}
+
 	INIT_LIST_HEAD(&ras_block_obj->node);
 	list_add_tail(&ras_block_obj->node, &adev->ras_list);
 
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH V2 2/2] drm/amdgpu: No longer insert ras blocks into ras_list if it already exists in ras_list

NAK.

This patch should be reverted.

We need to figure out why the block is being added and fix this there.

Regards,
Luben

Quoted 32 lines · yipechai

No longer insert ras blocks into ras_list if it already exists in ras_list.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +8 -0
index 614ae8455c9f..d208fde509de 100644
@@ -2754,12 +2754,20 @@ int amdgpu_ras_reset_gpu(struct amdgpu_device *adev)
 int amdgpu_ras_register_ras_block(struct amdgpu_device *adev,
 		struct amdgpu_ras_block_object* ras_block_obj)
 {
+	struct amdgpu_ras_block_object *obj, *tmp;
 	if (!adev || !ras_block_obj)
 		return -EINVAL;
 
 	if (!amdgpu_ras_asic_supported(adev))
 		return 0;
 
+	/* If the ras object is in ras_list, don't add it again */
+	list_for_each_entry_safe(obj, tmp, &adev->ras_list, node) {
+		if (obj == ras_block_obj) {
+			return 0;
+		}
+	}
+
 	INIT_LIST_HEAD(&ras_block_obj->node);
 	list_add_tail(&ras_block_obj->node, &adev->ras_list);
 
#3 lore raw
In reply to yipechai
Quoted 12 lines · yipechai

Add ras supported check for register_ras_block.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +++
  1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0 -0
index b1bedfd4febc..614ae8455c9f 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c int amdgpu_ras_register_ras_block(struct amdgpu_device *adev, · line 2762

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +3 -0
@@ -2757,6 +2757,9 @@ int amdgpu_ras_register_ras_block(struct amdgpu_device *adev,
  	if (!adev || !ras_block_obj)
  		return -EINVAL;
 
+	if (!amdgpu_ras_asic_supported(adev))
+		return 0;
+

Why to do this check here? This check can be done prior and IP's ras block can be set to NULL so that this function itself won't be called.

Thanks,
Lijo

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0 -0
  	INIT_LIST_HEAD(&ras_block_obj->node);
  	list_add_tail(&ras_block_obj->node, &adev->ras_list);
 
Reviewed-by on v2 1/2
#4 lore raw
In reply to yipechai

[AMD Official Use Only]

The series is:

Quoted 35 lines

-----Original Message-----
From: Chai, Thomas <[email protected]>
Sent: Wednesday, January 12, 2022 6:39 PM
To: [email protected]
Cc: Chai, Thomas <[email protected]>; Zhang, Hawking <[email protected]>; Zhou1, Tao <[email protected]>; Clements, John <[email protected]>; Chai, Thomas <[email protected]>
Subject: [PATCH V2 1/2] drm/amdgpu: Add ras supported check for register_ras_block

Add ras supported check for register_ras_block.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +3 -1
index b1bedfd4febc..614ae8455c9f 100644
@@ -2757,6 +2757,9 @@ int amdgpu_ras_register_ras_block(struct
 amdgpu_device *adev,
 	if (!adev || !ras_block_obj)
 		return -EINVAL;
 
+	if (!amdgpu_ras_asic_supported(adev))
+		return 0;
+
 	INIT_LIST_HEAD(&ras_block_obj->node);
 	list_add_tail(&ras_block_obj->node, &adev->ras_list);
 
--

2.25.1