[<prev] [next>] [day] [month] [year] [list]
Message-ID: <4AF39377.3000305@mellanox.co.il>
Date: Fri, 06 Nov 2009 05:09:43 +0200
From: Yevgeny Petrilin <yevgenyp@...lanox.co.il>
To: rdreier@...co.com
CC: linux-rdma@...r.kernel.org, netdev@...r.kernel.org,
liranl@...lanox.co.il, tziporet@...lanox.co.il,
yevgenyp@...lanox.co.il
Subject: [PATCH 15/25 v2] mlx4_core: multi-function interface setup
From: Liran Liss <liranl@...lanox.co.il>
Master verifies hw healthiness.
Interface drivers are only supported on slaves.
Signed-off-by: Liran Liss <liranl@...lanox.co.il>
Signed-off-by: Yevgeny Petrilin <yevgenyp@...lanox.co.il>
---
drivers/net/mlx4/intf.c | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/drivers/net/mlx4/intf.c b/drivers/net/mlx4/intf.c
index 0e7eb10..f5f4523 100644
--- a/drivers/net/mlx4/intf.c
+++ b/drivers/net/mlx4/intf.c
@@ -88,8 +88,11 @@ int mlx4_register_interface(struct mlx4_interface *intf)
mutex_lock(&intf_mutex);
list_add_tail(&intf->list, &intf_list);
- list_for_each_entry(priv, &dev_list, dev_list)
- mlx4_add_device(intf, priv);
+ list_for_each_entry(priv, &dev_list, dev_list) {
+ /* CX1: master cannot run interfaces */
+ if (!mlx4_is_master(&priv->dev))
+ mlx4_add_device(intf, priv);
+ }
mutex_unlock(&intf_mutex);
@@ -135,11 +138,14 @@ int mlx4_register_device(struct mlx4_dev *dev)
mutex_lock(&intf_mutex);
list_add_tail(&priv->dev_list, &dev_list);
- list_for_each_entry(intf, &intf_list, list)
- mlx4_add_device(intf, priv);
-
+ /* CX1: master cannot run interfaces */
+ if (!mlx4_is_master(dev)) {
+ list_for_each_entry(intf, &intf_list, list)
+ mlx4_add_device(intf, priv);
+ }
mutex_unlock(&intf_mutex);
- mlx4_start_catas_poll(dev);
+ if (!mlx4_is_slave(dev))
+ mlx4_start_catas_poll(dev);
return 0;
}
@@ -149,7 +155,8 @@ void mlx4_unregister_device(struct mlx4_dev *dev)
struct mlx4_priv *priv = mlx4_priv(dev);
struct mlx4_interface *intf;
- mlx4_stop_catas_poll(dev);
+ if (!mlx4_is_slave(dev))
+ mlx4_stop_catas_poll(dev);
mutex_lock(&intf_mutex);
list_for_each_entry(intf, &intf_list, list)
--
1.5.3.7
From: Liran Liss <liranl@...lanox.co.il>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists