drm/amdgpu: Replace tmp_adev with hive in amdgpu_pci_slot_reset
Subsystems (2)
PATCH 1/1 drm/amdgpu: Replace tmp_adev with hive in amdgpu_pci_slot_reset
Checking hive is more readable.
The following smatch warning:drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:6820 amdgpu_pci_slot_reset()
warn: iterator used outside loop: 'tmp_adev'
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -3
@@ -6784,8 +6784,8 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev)struct drm_device *dev =pci_get_drvdata (pdev);struct amdgpu_device *adev =drm_to_adev (dev);struct amdgpu_reset_context reset_context; -struct amdgpu_device *tmp_adev =NULL ; -struct amdgpu_hive_info *hive =NULL ; +struct amdgpu_device *tmp_adev; +struct amdgpu_hive_info *hive;struct list_head device_list;int r =0 , i;u32 memsize;
@@ -6846,7 +6846,7 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev)dev_info (adev->dev,"PCIe error recovery succeeded\n" ); }else {dev_err (adev->dev,"PCIe error recovery failed, err:%d\n" , r); -if (tmp_adev) { +if (hive) {list_for_each_entry (tmp_adev, &device_list, reset_list)amdgpu_device_unset_mp1_state (tmp_adev);amdgpu_device_unlock_reset_domain (adev->reset_domain);
Signature · 1 line
2.34.1
Am 09.04.25 um 15:39 schrieb Ce Sun:
Quoted 7 lines
Checking hive is more readable.
The following smatch warning:
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:6820amdgpu_pci_slot_reset()
warn: iterator used outside loop: 'tmp_adev'Fixes 8ba904f54148 ("drm/amdgpu: Multi-GPU DPC recovery support")
I think we should drop that. While the existing code didn't looked nice it would actually work as far as I can see.
Quoted 2 lines
Reported-by Dan Carpenter <[email protected]>Signed-off-by Ce Sun <[email protected]>
Apart from that Reviewed-by: Christian König <[email protected]>.
Regards,
Christian
Quoted 28 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-3@@ -6784,8 +6784,8 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev)struct drm_device *dev =pci_get_drvdata (pdev);struct amdgpu_device *adev =drm_to_adev (dev);struct amdgpu_reset_context reset_context; -struct amdgpu_device *tmp_adev =NULL ; -struct amdgpu_hive_info *hive =NULL ; +struct amdgpu_device *tmp_adev; +struct amdgpu_hive_info *hive;struct list_head device_list;int r =0 , i;u32 memsize;@@ -6846,7 +6846,7 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev)dev_info (adev->dev,"PCIe error recovery succeeded\n" ); }else {dev_err (adev->dev,"PCIe error recovery failed, err:%d\n" , r); -if (tmp_adev) { +if (hive) {list_for_each_entry (tmp_adev, &device_list, reset_list)amdgpu_device_unset_mp1_state (tmp_adev);amdgpu_device_unlock_reset_domain (adev->reset_domain);
Quoted 29 lines · Ce Sun
Checking hive is more readable.
The following smatch warning:
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:6820amdgpu_pci_slot_reset()
warn: iterator used outside loop: 'tmp_adev'Fixes 8ba904f54148 ("drm/amdgpu: Multi-GPU DPC recovery support")Reported-by Dan Carpenter <[email protected]>Signed-off-by Ce Sun <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-2@@ -6784,8 +6784,8 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev)struct drm_device *dev =pci_get_drvdata (pdev);struct amdgpu_device *adev =drm_to_adev (dev);struct amdgpu_reset_context reset_context; -struct amdgpu_device *tmp_adev =NULL ; -struct amdgpu_hive_info *hive =NULL ; +struct amdgpu_device *tmp_adev; +struct amdgpu_hive_info *hive;struct list_head device_list;int r =0 , i;u32 memsize;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev) · line 6849
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1@@ -6846,7 +6846,7 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev)dev_info (adev->dev,"PCIe error recovery succeeded\n" ); }else {dev_err (adev->dev,"PCIe error recovery failed, err:%d\n" , r); -if (tmp_adev) { +if (hive) {
This doesn't look correct. I think the original logic is to have a single device list or multi-device list when there is a hive. Now this skips the step for single device case.
Thanks,
Lijo
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0list_for_each_entry (tmp_adev, &device_list, reset_list)amdgpu_device_unset_mp1_state (tmp_adev);amdgpu_device_unlock_reset_domain (adev->reset_domain);
Quoted 33 lines · Lijo
Quoted 30 lines · Ce Sun
Checking hive is more readable.
The following smatch warning:
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:6820amdgpu_pci_slot_reset()
warn: iterator used outside loop: 'tmp_adev'Fixes 8ba904f54148 ("drm/amdgpu: Multi-GPU DPC recovery support")Reported-by Dan Carpenter <[email protected]>Signed-off-by Ce Sun <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-2@@ -6784,8 +6784,8 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev)struct drm_device *dev =pci_get_drvdata (pdev);struct amdgpu_device *adev =drm_to_adev (dev);struct amdgpu_reset_context reset_context; -struct amdgpu_device *tmp_adev =NULL ; -struct amdgpu_hive_info *hive =NULL ; +struct amdgpu_device *tmp_adev; +struct amdgpu_hive_info *hive;struct list_head device_list;int r =0 , i;u32 memsize;@@ -6846,7 +6846,7 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev)dev_info (adev->dev,"PCIe error recovery succeeded\n" );
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev) · line 6849
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1}else {dev_err (adev->dev,"PCIe error recovery failed, err:%d\n" , r); -if (tmp_adev) { +if (hive) {This doesn't look correct. I think the original logic is to have a single device list or multi-device list when there is a hive. Now this skips the step for single device case.
I don't know what the original intentions were, but what I know is that this code will behave exactly the same as the original code.
regards,
dan carpenter
Quoted 44 lines · Dan Carpenter
Quoted 33 lines · Lijo
Quoted 30 lines · Ce Sun
Checking hive is more readable.
The following smatch warning:
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:6820amdgpu_pci_slot_reset()
warn: iterator used outside loop: 'tmp_adev'Fixes 8ba904f54148 ("drm/amdgpu: Multi-GPU DPC recovery support")Reported-by Dan Carpenter <[email protected]>Signed-off-by Ce Sun <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-2@@ -6784,8 +6784,8 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev)struct drm_device *dev =pci_get_drvdata (pdev);struct amdgpu_device *adev =drm_to_adev (dev);struct amdgpu_reset_context reset_context; -struct amdgpu_device *tmp_adev =NULL ; -struct amdgpu_hive_info *hive =NULL ; +struct amdgpu_device *tmp_adev; +struct amdgpu_hive_info *hive;struct list_head device_list;int r =0 , i;u32 memsize;@@ -6846,7 +6846,7 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev)dev_info (adev->dev,"PCIe error recovery succeeded\n" );Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev) · line 6849
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1}else {dev_err (adev->dev,"PCIe error recovery failed, err:%d\n" , r); -if (tmp_adev) { +if (hive) {This doesn't look correct. I think the original logic is to have a single device list or multi-device list when there is a hive. Now this skips the step for single device case.
Quoted 3 lines
I don't know what the original intentions were, but what I know is that this code will behave exactly the same as the original code.
Yes, this correct with respect to the new patch. But the patch which triggered this warning actually broke the single device handling path.
Thanks,
Lijo
Quoted 3 lines
regards,
dan carpenter