summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArjun Vynipadath2018-05-14 09:54:43 +0200
committerDavid S. Miller2018-05-14 22:42:09 +0200
commit7cfac881660ac7b7229950e0a942201be63c15d1 (patch)
treeeb13e5cbb74f5e616d8187d693d8317aa21fef97
parentmlxsw: spectrum_span: Support LAG under mirror-to-gretap (diff)
downloadkernel-qcow2-linux-7cfac881660ac7b7229950e0a942201be63c15d1.tar.gz
kernel-qcow2-linux-7cfac881660ac7b7229950e0a942201be63c15d1.tar.xz
kernel-qcow2-linux-7cfac881660ac7b7229950e0a942201be63c15d1.zip
cxgb4: do not fail vf instatiation in slave mode
We no longer require a check for cxgb4 to be MASTER when configuring SRIOV, It was required when we had module parameter to instantiate vf. Signed-off-by: Arjun Vynipadath <arjun@chelsio.com> Signed-off-by: Casey Leedom <leedom@chelsio.com> Signed-off-by: Ganesh Goudar <ganeshgr@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 07baa5e1a8c5..130d1eed7993 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -5276,13 +5276,9 @@ static int cxgb4_iov_configure(struct pci_dev *pdev, int num_vfs)
u32 pcie_fw;
pcie_fw = readl(adap->regs + PCIE_FW_A);
- /* Check if cxgb4 is the MASTER and fw is initialized */
- if (num_vfs &&
- (!(pcie_fw & PCIE_FW_INIT_F) ||
- !(pcie_fw & PCIE_FW_MASTER_VLD_F) ||
- PCIE_FW_MASTER_G(pcie_fw) != CXGB4_UNIFIED_PF)) {
- dev_warn(&pdev->dev,
- "cxgb4 driver needs to be MASTER to support SRIOV\n");
+ /* Check if fw is initialized */
+ if (!(pcie_fw & PCIE_FW_INIT_F)) {
+ dev_warn(&pdev->dev, "Device not initialized\n");
return -EOPNOTSUPP;
}