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

Commit bded64a7 authored Jul 21, 2010 by Andy Gospodarek Committed by David S. Miller Jul 21, 2010

ixgbe/igb: catch invalid VF settings



Some ixgbe cards put an invalid VF device ID in the PCIe SR-IOV
capability.  The ixgbe driver is only valid for PFs or non SR-IOV
hardware.  It seems that the same problem could occur on igb hardware as
well, so if we discover we are trying to initialize a VF in ixbge_probe
or igb_probe, print an error and exit.

Based on a patch for ixgbe from Chris Wright <chrisw@sous-sol.org>.

Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Cc: Chris Wright <chrisw@sous-sol.org>
Acked-by: Chris Wright <chrisw@sous-sol.org>
Acked-by: Greg Rose <gregory.v.rose@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0577589c

drivers/net/igb/igb_main.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -1722,6 +1722,15 @@ static int __devinit igb_probe(struct pci_dev *pdev,
		u16 eeprom_apme_mask = IGB_EEPROM_APME;
		u32 part_num;

		/* Catch broken hardware that put the wrong VF device ID in
		* the PCIe SR-IOV capability.
		*/
		if (pdev->is_virtfn) {
		WARN(1, KERN_ERR "%s (%hx:%hx) should not be a VF!\n",
		pci_name(pdev), pdev->vendor, pdev->device);
		return -EINVAL;
		}

		err = pci_enable_device_mem(pdev);
		if (err)
		return err;

drivers/net/ixgbe/ixgbe_main.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -6492,6 +6492,15 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
		#endif
		u32 part_num, eec;

		/* Catch broken hardware that put the wrong VF device ID in
		* the PCIe SR-IOV capability.
		*/
		if (pdev->is_virtfn) {
		WARN(1, KERN_ERR "%s (%hx:%hx) should not be a VF!\n",
		pci_name(pdev), pdev->vendor, pdev->device);
		return -EINVAL;
		}

		err = pci_enable_device_mem(pdev);
		if (err)
		return err;