Patch "PCI: Limit config space size for Netronome NFP4000" has been added to the 3.14-stable tree

This is a note to let you know that I've just added the patch titled

PCI: Limit config space size for Netronome NFP4000

to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
pci-limit-config-space-size-for-netronome-nfp4000.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Simon Horman <[email protected]>
Date: Fri, 11 Dec 2015 11:30:12 +0900
Subject: PCI: Limit config space size for Netronome NFP4000

From: Simon Horman <[email protected]>

commit c2e771b02792d222cbcd9617fe71482a64f52647 upstream.

Like the NFP6000, the NFP4000 as an erratum where reading/writing to PCI config space addresses above 0x600 can cause the NFP to generate PCIe completion timeouts.

Limit the NFP4000's PF's config space size to 0x600 bytes as is already done for the NFP6000.

The NFP4000's VF is 0x6004 (PCI_DEVICE_ID_NETRONOME_NFP6000_VF), the same device ID as the NFP6000's VF. Thus, its config space is already limited by the existing use of quirk_nfp6000().

---
 drivers/pci/quirks.c |    1 +
 1 file changed, 1 insertion(+)

@@ -296,6 +296,7 @@ static void quirk_nfp6000(struct pci_dev
 {
 	dev->cfg_size = 0x600;
 }
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NETRONOME,	PCI_DEVICE_ID_NETRONOME_NFP4000,	quirk_nfp6000);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NETRONOME,	PCI_DEVICE_ID_NETRONOME_NFP6000,	quirk_nfp6000);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NETRONOME,	PCI_DEVICE_ID_NETRONOME_NFP6000_VF,	quirk_nfp6000);
 

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/pci-limit-config-space-size-for-netronome-nfp6000-family.patch queue-3.14/pci-add-netronome-nfp4000-pf-device-id.patch queue-3.14/pci-support-pcie-devices-with-short-cfg_size.patch queue-3.14/pci-add-netronome-vendor-and-device-ids.patch queue-3.14/pci-limit-config-space-size-for-netronome-nfp4000.patch