drm/amdkfd: Fix updating IO links during device removal

The logic to update the IO links when a KFD device
is removed was not correct as it would miss updating
the proximity domain values for some nodes where the
node_from and node_to both were greater values than the
proximity domain value of the KFD device being removed
from topology.

Fixes: 46d18d510d7831 ("drm/amdkfd: Cleanup IO links during KFD device removal")
Signed-off-by: Mukul Joshi <mukul.joshi@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 8b7710b4d3edd206460d9b4a2d51abbb4ddfd81f..4283afd60fa59ad04d1f723122079a5b0cf56dd0 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -1534,13 +1534,13 @@ static void kfd_topology_update_io_links(int proximity_domain)
                                list_del(&iolink->list);
                                dev->io_link_count--;
                                dev->node_props.io_links_count--;
-                       } else if (iolink->node_from > proximity_domain) {
-                               iolink->node_from--;
-                       } else if (iolink->node_to > proximity_domain) {
-                               iolink->node_to--;
+                       } else {
+                               if (iolink->node_from > proximity_domain)
+                                       iolink->node_from--;
+                               if (iolink->node_to > proximity_domain)
+                                       iolink->node_to--;
                        }
                }
-
        }
 }