Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10938604 authored by Ariel Elior's avatar Ariel Elior Committed by David S. Miller
Browse files

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: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60cde81f

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

+6 −4
Original line number Diff line number Diff line
@@ -1932,20 +1932,22 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param, 


	/* SRIOV can be enabled only with MSIX */

	if (int_mode_param == BNX2X_INT_MODE_MSI ||

	    int_mode_param == BNX2X_INT_MODE_INTX)

	    int_mode_param == BNX2X_INT_MODE_INTX) {

		BNX2X_ERR("Forced MSI/INTx mode is incompatible with SRIOV\n");

		return 0;

	}



	err = -EIO;

	/* verify ari is enabled */

	if (!bnx2x_ari_enabled(bp->pdev)) {

		BNX2X_ERR("ARI not supported, SRIOV can not be enabled\n");

		return err;

		BNX2X_ERR("ARI not supported (check pci bridge ARI forwarding), SRIOV can not be enabled\n");

		return 0;

	}



	/* verify igu is in normal mode */

	if (CHIP_INT_MODE_IS_BC(bp)) {

		BNX2X_ERR("IGU not normal mode,  SRIOV can not be enabled\n");

		return err;

		return 0;

	}



	/* allocate the vfs database */