From: Tal Alon Date: Sun, 20 Jul 2014 17:59:40 +0000 (+0300) Subject: mlx4_core: enable msi_x module parameter for SRIOV VFs to limit number MSI-X interrup... X-Git-Tag: v4.1.12-92~293^2~1^2~28 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=64842c60befdf4474768696a7272bd81305cb760;p=users%2Fjedix%2Flinux-maple.git mlx4_core: enable msi_x module parameter for SRIOV VFs to limit number MSI-X interrupts per VF Signed-off-by: Tal Alon (Ported from Mellanox OFED 2.4) Signed-off-by: Mukesh Kacker --- diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 1d12b67631743..f1a790a120bb2 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -69,7 +69,7 @@ MODULE_PARM_DESC(debug_level, "Enable debug tracing if > 0"); static int msi_x = 1; module_param(msi_x, int, 0444); -MODULE_PARM_DESC(msi_x, "0 - don't use MSI-X, 1 - use MSI-X, >1 - limit number of MSI-X irqs to msi_x (non-SRIOV only)"); +MODULE_PARM_DESC(msi_x, "0 - don't use MSI-X, 1 - use MSI-X, >1 - limit number of MSI-X irqs to msi_x"); #else /* CONFIG_PCI_MSI */ @@ -2600,7 +2600,7 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev) nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs, nreq); - if (msi_x > 1 && !mlx4_is_mfunc(dev)) + if (msi_x > 1) nreq = min_t(int, nreq, msi_x); entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);