diff options
| author | Santosh Rastapur <santosh@chelsio.com> | 2013-03-14 09:08:56 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-14 19:35:56 +0400 |
| commit | 7d6727cfe5815816466b94db5180b8d3ef08fbb0 (patch) | |
| tree | fb72cf07dd7083bbd5c79553a923bb49e44d96a9 /drivers/net/ethernet/chelsio | |
| parent | 3a7f85540d171963691b1f6322cef835515e4698 (diff) | |
| download | linux-7d6727cfe5815816466b94db5180b8d3ef08fbb0.tar.xz | |
cxgb4: Disable SR-IOV support for PF4-7 for T5
All T5 adapters will only support VFs on PF0-3 despite the ability of the
hardware to support them on PF4-7. This keeps our T4 and T5 adapters more
similar which simplifies host driver software.
Signed-off-by: Vipul Pandya <vipul@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/chelsio')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 8 | ||||
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 21 |
2 files changed, 10 insertions, 19 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h index 45b18bdbeab9..681804b30a3f 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h @@ -534,11 +534,11 @@ enum chip_type { #ifdef CONFIG_PCI_IOV -/* T4 - 4 PFs support SRIOV - * T5 - 8 PFs support SRIOV +/* T4 supports SRIOV on PF0-3 and T5 on PF0-7. However, the Serial + * Configuration initialization for T5 only has SR-IOV functionality enabled + * on PF0-3 in order to simplify everything. */ -#define NUM_OF_PF_WITH_SRIOV_T4 4 -#define NUM_OF_PF_WITH_SRIOV_T5 8 +#define NUM_OF_PF_WITH_SRIOV 4 #endif diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index c502e36ec269..a59bb231bea2 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -360,14 +360,13 @@ static bool vf_acls; module_param(vf_acls, bool, 0644); MODULE_PARM_DESC(vf_acls, "if set enable virtualization L2 ACL enforcement"); -/* Since T5 has more num of PFs, using NUM_OF_PF_WITH_SRIOV_T5 - * macro as num_vf array size +/* Configure the number of PCI-E Virtual Function which are to be instantiated + * on SR-IOV Capable Physical Functions. */ -static unsigned int num_vf[NUM_OF_PF_WITH_SRIOV_T5]; +static unsigned int num_vf[NUM_OF_PF_WITH_SRIOV]; module_param_array(num_vf, uint, NULL, 0644); -MODULE_PARM_DESC(num_vf, - "number of VFs for each of PFs 0-3 for T4 and PFs 0-7 for T5"); +MODULE_PARM_DESC(num_vf, "number of VFs for each of PFs 0-3"); #endif /* @@ -4633,10 +4632,8 @@ static int adap_init0_no_config(struct adapter *adapter, int reset) */ { int pf, vf; - int max_no_pf = is_t4(adapter->chip) ? NUM_OF_PF_WITH_SRIOV_T4 : - NUM_OF_PF_WITH_SRIOV_T5; - for (pf = 0; pf < max_no_pf; pf++) { + for (pf = 0; pf < ARRAY_SIZE(num_vf); pf++) { if (num_vf[pf] <= 0) continue; @@ -5483,9 +5480,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) struct port_info *pi; bool highdma = false; struct adapter *adapter = NULL; -#ifdef CONFIG_PCI_IOV - int max_no_pf; -#endif printk_once(KERN_INFO "%s - version %s\n", DRV_DESC, DRV_VERSION); @@ -5704,10 +5698,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) sriov: #ifdef CONFIG_PCI_IOV - max_no_pf = is_t4(adapter->chip) ? NUM_OF_PF_WITH_SRIOV_T4 : - NUM_OF_PF_WITH_SRIOV_T5; - - if (func < max_no_pf && num_vf[func] > 0) + if (func < ARRAY_SIZE(num_vf) && num_vf[func] > 0) if (pci_enable_sriov(pdev, num_vf[func]) == 0) dev_info(&pdev->dev, "instantiated %u virtual functions\n", |