diff mbox series

[for-next,3/5] IB/hfi1: Limit VNIC use of SDMA engines to the available count

Message ID 20181128181920.30921.12422.stgit@scvm10.sc.intel.com (mailing list archive)
State Accepted
Commit dd6c6a5a2e1e7be615c81ca6d44c2e89e22cb463
Delegated to: Jason Gunthorpe
Headers show
Series IB/hfi1: Random fixes for driver to land in for-next | expand

Commit Message

Dennis Dalessandro Nov. 28, 2018, 6:19 p.m. UTC 
From: Michael J. Ruhl <michael.j.ruhl@intel.com>

VNIC assumes that all SDMA engines have been configured for use.
This is not necessarily true (i.e. if the count was constrained
by the module parameter).

Update VNICs usage to use the configured count, rather than the
hardware count.

Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Reviewed-by: Gary Leshner <gary.s.leshner@intel.com>
Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
---
 drivers/infiniband/hw/hfi1/vnic_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/drivers/infiniband/hw/hfi1/vnic_main.c b/drivers/infiniband/hw/hfi1/vnic_main.c
index c9876d9..a922db5 100644
--- a/drivers/infiniband/hw/hfi1/vnic_main.c
+++ b/drivers/infiniband/hw/hfi1/vnic_main.c
@@ -816,14 +816,14 @@  struct net_device *hfi1_vnic_alloc_rn(struct ib_device *device,
 
 	size = sizeof(struct opa_vnic_rdma_netdev) + sizeof(*vinfo);
 	netdev = alloc_netdev_mqs(size, name, name_assign_type, setup,
-				  chip_sdma_engines(dd), dd->num_vnic_contexts);
+				  dd->num_sdma, dd->num_vnic_contexts);
 	if (!netdev)
 		return ERR_PTR(-ENOMEM);
 
 	rn = netdev_priv(netdev);
 	vinfo = opa_vnic_dev_priv(netdev);
 	vinfo->dd = dd;
-	vinfo->num_tx_q = chip_sdma_engines(dd);
+	vinfo->num_tx_q = dd->num_sdma;
 	vinfo->num_rx_q = dd->num_vnic_contexts;
 	vinfo->netdev = netdev;
 	rn->free_rdma_netdev = hfi1_vnic_free_rn;