78 lines
2.8 KiB
Diff
78 lines
2.8 KiB
Diff
From 0d9a9d2de5e05ddcfd2a420e7529e5eb93c4a905 Mon Sep 17 00:00:00 2001
|
|
From: Kamal Heib <kheib@redhat.com>
|
|
Date: Mon, 20 Apr 2026 14:56:33 -0400
|
|
Subject: [PATCH] net/mlx5: Use common mlx5_same_hw_devs function
|
|
|
|
JIRA: https://redhat.atlassian.net/browse/RHEL-169055
|
|
|
|
commit 211de28b1caf51581ba5e0978e83213db4f488c6
|
|
Author: Mark Bloch <mbloch@nvidia.com>
|
|
Date: Thu Oct 23 12:16:56 2025 +0300
|
|
|
|
net/mlx5: Use common mlx5_same_hw_devs function
|
|
|
|
Refactor duplicate hardware device comparison code to use the common
|
|
mlx5_same_hw_devs() function instead of reimplementing system GUID
|
|
comparison logic in multiple places.
|
|
|
|
This cleanup eliminates code duplication in:
|
|
- Bridge representor device comparison.
|
|
- TC hardware device comparison.
|
|
|
|
Using the centralized function improves maintainability and ensures
|
|
consistent behavior across the driver.
|
|
|
|
Signed-off-by: Mark Bloch <mbloch@nvidia.com>
|
|
Reviewed-by: Shay Drori <shayd@nvidia.com>
|
|
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
|
|
Link: https://patch.msgid.link/1761211020-925651-2-git-send-email-tariqt@nvidia.com
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
|
|
Signed-off-by: Kamal Heib <kheib@redhat.com>
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c
|
|
index 9d1c677814e0..87a2ad69526d 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c
|
|
@@ -30,15 +30,11 @@ static bool mlx5_esw_bridge_dev_same_hw(struct net_device *dev, struct mlx5_eswi
|
|
{
|
|
struct mlx5e_priv *priv = netdev_priv(dev);
|
|
struct mlx5_core_dev *mdev, *esw_mdev;
|
|
- u64 system_guid, esw_system_guid;
|
|
|
|
mdev = priv->mdev;
|
|
esw_mdev = esw->dev;
|
|
|
|
- system_guid = mlx5_query_nic_system_image_guid(mdev);
|
|
- esw_system_guid = mlx5_query_nic_system_image_guid(esw_mdev);
|
|
-
|
|
- return system_guid == esw_system_guid;
|
|
+ return mlx5_same_hw_devs(mdev, esw_mdev);
|
|
}
|
|
|
|
static struct net_device *
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
|
index 7a34a502f97f..45d004c7b0dd 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
|
|
@@ -3614,15 +3614,11 @@ static bool same_port_devs(struct mlx5e_priv *priv, struct mlx5e_priv *peer_priv
|
|
bool mlx5e_same_hw_devs(struct mlx5e_priv *priv, struct mlx5e_priv *peer_priv)
|
|
{
|
|
struct mlx5_core_dev *fmdev, *pmdev;
|
|
- u64 fsystem_guid, psystem_guid;
|
|
|
|
fmdev = priv->mdev;
|
|
pmdev = peer_priv->mdev;
|
|
|
|
- fsystem_guid = mlx5_query_nic_system_image_guid(fmdev);
|
|
- psystem_guid = mlx5_query_nic_system_image_guid(pmdev);
|
|
-
|
|
- return (fsystem_guid == psystem_guid);
|
|
+ return mlx5_same_hw_devs(fmdev, pmdev);
|
|
}
|
|
|
|
static int
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|