diff options
| author | Jack Morgenstein <jackm@dev.mellanox.co.il> | 2012-06-19 11:21:41 +0300 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2012-07-10 09:57:06 -0700 |
| commit | 2aca1172c2f5b27fbc37297574f716c1c15f4153 (patch) | |
| tree | 8f6eb799bb0fa1c172ea45773d9d1c41ca934c87 /drivers/net | |
| parent | 00f5ce99dc6ee46c3113393cc8fa12173f9bbcd7 (diff) | |
| download | op-kernel-dev-2aca1172c2f5b27fbc37297574f716c1c15f4153.zip op-kernel-dev-2aca1172c2f5b27fbc37297574f716c1c15f4153.tar.gz | |
net/mlx4_core: Initialize IB port capabilities for all slaves
With IB SR-IOV, each slave has its own separate copy of the port
capabilities flags. For example, the master can run a subnet manager
(which causes the IsSM bit to be set in the master's port
capabilities) without affecting the port capabilities seen by the
slaves (the IsSM bit will be seen as cleared in the slaves).
Also add a static inline mlx4_master_func_num() to enhance readability
of the code.
Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/main.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index a0313de..83afb15 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -1477,6 +1477,17 @@ static int mlx4_setup_hca(struct mlx4_dev *dev) "with caps = 0\n", port, err); dev->caps.ib_port_def_cap[port] = ib_port_default_caps; + /* initialize per-slave default ib port capabilities */ + if (mlx4_is_master(dev)) { + int i; + for (i = 0; i < dev->num_slaves; i++) { + if (i == mlx4_master_func_num(dev)) + continue; + priv->mfunc.master.slave_state[i].ib_cap_mask[port] = + ib_port_default_caps; + } + } + if (mlx4_is_mfunc(dev)) dev->caps.port_ib_mtu[port] = IB_MTU_2048; else |
