diff options
| author | Jack Morgenstein <jackm@dev.mellanox.co.il> | 2011-12-13 04:17:16 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-13 13:56:08 -0500 |
| commit | d81c7186aa16a0da9e39961af6bad0c855a5d684 (patch) | |
| tree | 45c7845d64f2f06282781a6147d4d6bc0d70f95b /drivers/net/ethernet/mellanox/mlx4/intf.c | |
| parent | 2b8fb2867ca2736a715a88067fd0ec2904777cbe (diff) | |
| download | linux-d81c7186aa16a0da9e39961af6bad0c855a5d684.tar.gz linux-d81c7186aa16a0da9e39961af6bad0c855a5d684.tar.bz2 linux-d81c7186aa16a0da9e39961af6bad0c855a5d684.zip | |
mlx4_core: adjust catas operation for SRIOV mode
When running in SRIOV mode, driver should not automatically start/stop
the mlx4_core upon sensing an HCA internal error -- doing this disables/enables
sriov, which will cause the hypervisor to hang if there are running VMs with
attached VFs.
In addition, on VMs the catas process should not run at all, since the HCA
error buffer is not available to VMs in the BARs.
Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/intf.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/intf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c index ca6feb55bd94..b4e9f6f5cc04 100644 --- a/drivers/net/ethernet/mellanox/mlx4/intf.c +++ b/drivers/net/ethernet/mellanox/mlx4/intf.c @@ -142,7 +142,8 @@ int mlx4_register_device(struct mlx4_dev *dev) 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; } @@ -152,7 +153,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) |