diff options
| author | Mark Rustad <mark.d.rustad@intel.com> | 2015-07-13 11:40:07 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-10-13 03:46:05 +0100 |
| commit | fb0a96829d377ecdb158436d21eb8c1cf2679deb (patch) | |
| tree | 9072bfd0bbdd720fe559a672800245a8ced2db54 | |
| parent | 6a3e55972f0d99abffc0432cb80b17c8c49822f0 (diff) | |
| download | kernel_samsung_smdk4412-fb0a96829d377ecdb158436d21eb8c1cf2679deb.zip kernel_samsung_smdk4412-fb0a96829d377ecdb158436d21eb8c1cf2679deb.tar.gz kernel_samsung_smdk4412-fb0a96829d377ecdb158436d21eb8c1cf2679deb.tar.bz2 | |
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>
[bwh: Backported to 3.2:
- Put the class check in the new function as there is no
DECLARE_PCI_FIXUP_CLASS_EARLY(
- Adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/pci/quirks.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 0def0b1..93be760 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -1941,6 +1941,15 @@ static void __devinit quirk_netmos(struct pci_dev *dev) } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NETMOS, PCI_ANY_ID, quirk_netmos); +static void quirk_f0_vpd_link(struct pci_dev *dev) +{ + if ((dev->class >> 8) != PCI_CLASS_NETWORK_ETHERNET || + !dev->multifunction || !PCI_FUNC(dev->devfn)) + return; + dev->dev_flags |= PCI_DEV_FLAGS_VPD_REF_F0; +} +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, quirk_f0_vpd_link); + static void __devinit quirk_e100_interrupt(struct pci_dev *dev) { u16 command, pmcsr; |