Skip to content

Commit 1093860

Browse files
Ariel Eliordavem330
authored andcommitted
bnx2x: missing ARI should not be lethal
If ARI forwarding flag is missing from the PCI bridge, remove SR-IOV support instead of failing the probe process. Signed-off-by: Ariel Elior <[email protected]> Signed-off-by: Yuval Mintz <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 60cde81 commit 1093860

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1932,20 +1932,22 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param,
19321932

19331933
/* SRIOV can be enabled only with MSIX */
19341934
if (int_mode_param == BNX2X_INT_MODE_MSI ||
1935-
int_mode_param == BNX2X_INT_MODE_INTX)
1935+
int_mode_param == BNX2X_INT_MODE_INTX) {
19361936
BNX2X_ERR("Forced MSI/INTx mode is incompatible with SRIOV\n");
1937+
return 0;
1938+
}
19371939

19381940
err = -EIO;
19391941
/* verify ari is enabled */
19401942
if (!bnx2x_ari_enabled(bp->pdev)) {
1941-
BNX2X_ERR("ARI not supported, SRIOV can not be enabled\n");
1942-
return err;
1943+
BNX2X_ERR("ARI not supported (check pci bridge ARI forwarding), SRIOV can not be enabled\n");
1944+
return 0;
19431945
}
19441946

19451947
/* verify igu is in normal mode */
19461948
if (CHIP_INT_MODE_IS_BC(bp)) {
19471949
BNX2X_ERR("IGU not normal mode, SRIOV can not be enabled\n");
1948-
return err;
1950+
return 0;
19491951
}
19501952

19511953
/* allocate the vfs database */

0 commit comments

Comments
 (0)