diff options
| author | Jack Morgenstein <jackm@dev.mellanox.co.il> | 2012-08-03 08:40:58 +0000 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2012-09-30 20:33:44 -0700 |
| commit | 3806d08cf6c42193c10c4963ca2d68f56a088668 (patch) | |
| tree | e483b3f75cdad15363d932aef701ae3f17e81ffc /drivers/infiniband | |
| parent | 47605df953985c2b792ac9f3ddf70d270b89adb8 (diff) | |
| download | linux-3806d08cf6c42193c10c4963ca2d68f56a088668.tar.gz | |
IB/mlx4: Create paravirt contexts for VFs when master IB driver initializes
When we have VFs and PFs on same host, the VFs are activated within
the mlx4_core module before the mlx4_ib kernel module is loaded.
When the mlx4_ib module initializes the PF (master), it now creates
MAD paravirtualization contexts for any VFs that already active.
Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/mad.c | 3 | ||||
| -rw-r--r-- | drivers/infiniband/hw/mlx4/main.c | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c index 658a622791fb..21a794152d15 100644 --- a/drivers/infiniband/hw/mlx4/mad.c +++ b/drivers/infiniband/hw/mlx4/mad.c @@ -1652,6 +1652,9 @@ static int create_pv_resources(struct ib_device *ibdev, int slave, int port, { int ret, cq_size; + if (ctx->state != DEMUX_PV_STATE_DOWN) + return -EEXIST; + ctx->state = DEMUX_PV_STATE_STARTING; /* have QP0 only on port owner, and only if link layer is IB */ if (ctx->slave == mlx4_master_func_num(to_mdev(ctx->ib_dev)->dev) && diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c index e849347ef99a..718ec6b2bad2 100644 --- a/drivers/infiniband/hw/mlx4/main.c +++ b/drivers/infiniband/hw/mlx4/main.c @@ -74,6 +74,8 @@ struct update_gid_work { int port; }; +static void do_slave_init(struct mlx4_ib_dev *ibdev, int slave, int do_init); + static struct workqueue_struct *wq; static void init_query_mad(struct ib_smp *mad) @@ -1470,6 +1472,15 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) if (mlx4_is_mfunc(ibdev->dev)) init_pkeys(ibdev); + /* create paravirt contexts for any VFs which are active */ + if (mlx4_is_master(ibdev->dev)) { + for (j = 0; j < MLX4_MFUNC_MAX; j++) { + if (j == mlx4_master_func_num(ibdev->dev)) + continue; + if (mlx4_is_slave_active(ibdev->dev, j)) + do_slave_init(ibdev, j, 1); + } + } return ibdev; err_notif: |