summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Rustad <mark.d.rustad@intel.com>2015-07-13 11:40:07 -0700
committerLuis Henriques <luis.henriques@canonical.com>2015-09-28 10:21:32 +0100
commit2623fa68ac0b0d0d8981560ec7a87a5ba00c61a0 (patch)
tree84177db9a966db02106f4061f4f04846cd5f10e1
parente7d8e6d04599775fa338de7d59092e2027d8dee1 (diff)
downloadlinux-stable-2623fa68ac0b0d0d8981560ec7a87a5ba00c61a0.tar.gz
linux-stable-2623fa68ac0b0d0d8981560ec7a87a5ba00c61a0.tar.bz2
linux-stable-2623fa68ac0b0d0d8981560ec7a87a5ba00c61a0.zip
PCI: Add VPD function 0 quirk for Intel Ethernet devices
commit 7aa6ca4d39edf01f997b9e02cf6d2fdeb224f351 upstream. Set the PCI_DEV_FLAGS_VPD_REF_F0 flag on all Intel Ethernet device functions other than function 0, so that on multi-function devices, we will always read VPD from function 0 instead of from the other functions. [bhelgaas: changelog] Signed-off-by: Mark Rustad <mark.d.rustad@intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Alexander Duyck <alexander.h.duyck@redhat.com> Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
-rw-r--r--drivers/pci/quirks.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 6948f2379e16..91181b5ff437 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1883,6 +1883,15 @@ static void quirk_netmos(struct pci_dev *dev)
DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_NETMOS, PCI_ANY_ID,
PCI_CLASS_COMMUNICATION_SERIAL, 8, quirk_netmos);
+static void quirk_f0_vpd_link(struct pci_dev *dev)
+{
+ if (!dev->multifunction || !PCI_FUNC(dev->devfn))
+ return;
+ dev->dev_flags |= PCI_DEV_FLAGS_VPD_REF_F0;
+}
+DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_INTEL, PCI_ANY_ID,
+ PCI_CLASS_NETWORK_ETHERNET, 8, quirk_f0_vpd_link);
+
static void quirk_e100_interrupt(struct pci_dev *dev)
{
u16 command, pmcsr;