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

Commit fa11cb3d authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher
Browse files

i40e: Make sure to be in VEB mode if SRIOV is enabled at probe 



If SRIOV is enabled we need to be in VEB mode not VEPA mode at probe.
This fixes an NPAR bug when SRIOV is enabled in the BIOS.

Change-ID: Ibf006abafd9a0ca3698ec24848cd771cf345cbbc
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Tested-by: default avatarJim Young <james.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent fc60861e

drivers/net/ethernet/intel/i40e/i40e_main.c

+17 −3
Original line number Diff line number Diff line
@@ -8756,9 +8756,14 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type, 
					 __func__);

				return NULL;

			}

			/* We come up by default in VEPA mode */

			/* We come up by default in VEPA mode if SRIOV is not

			 * already enabled, in which case we can't force VEPA

			 * mode.

			 */

			if (!(pf->flags & I40E_FLAG_VEB_MODE_ENABLED)) {

				veb->bridge_mode = BRIDGE_MODE_VEPA;

				pf->flags &= ~I40E_FLAG_VEB_MODE_ENABLED;

			}

			i40e_config_bridge_mode(veb);

		}

		for (i = 0; i < I40E_MAX_VEB && !veb; i++) {
@@ -9869,6 +9874,15 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_switch_setup;

	}



#ifdef CONFIG_PCI_IOV

	/* prep for VF support */

	if ((pf->flags & I40E_FLAG_SRIOV_ENABLED) &&

	    (pf->flags & I40E_FLAG_MSIX_ENABLED) &&

	    !test_bit(__I40E_BAD_EEPROM, &pf->state)) {

		if (pci_num_vf(pdev))

			pf->flags |= I40E_FLAG_VEB_MODE_ENABLED;

	}

#endif

	err = i40e_setup_pf_switch(pf, false);

	if (err) {

		dev_info(&pdev->dev, "setup_pf_switch failed: %d\n", err);