[PATCH 0/2] PCI: Limit config space size for Netronome NFP4000

[PATCH 0/2] PCI: Limit config space size for Netronome NFP4000

[Simon Horman]

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.

This short series extends usage quirk_nfp6000, which handles the above
problem by limiting config space size to 0x600 bytes, to the NFP4000.

Compile tested on top of the pci/misc branch.

Simon Horman (2):
  PCI: Add Netronome NFP4000 device ID
  PCI: Limit config space size for Netronome NFP4000

 drivers/pci/quirks.c    | 1 +
 include/linux/pci_ids.h | 1 +
 2 files changed, 2 insertions(+)

-- 
2.1.4

[PATCH 1/2] PCI: Add Netronome NFP4000 device ID

[Simon Horman]

This is the device ID for the PF of the NFP4000.
The device ID for the VF, 0x6003, is already present
as PCI_DEVICE_ID_NETRONOME_NFP6000_VF.

Signed-off-by: Simon Horman <simon.horman@netronome.com>
---
 include/linux/pci_ids.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 526e2c12ae59..37f05cb1dfd6 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2498,6 +2498,7 @@
 #define PCI_VENDOR_ID_NETRONOME		0x19ee
 #define PCI_DEVICE_ID_NETRONOME_NFP3200	0x3200
 #define PCI_DEVICE_ID_NETRONOME_NFP3240	0x3240
+#define PCI_DEVICE_ID_NETRONOME_NFP4000	0x4000
 #define PCI_DEVICE_ID_NETRONOME_NFP6000	0x6000
 #define PCI_DEVICE_ID_NETRONOME_NFP6000_VF	0x6003
 
-- 
2.1.4

[PATCH 2/2] PCI: Limit config space size for Netronome NFP4000

[Simon Horman]

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.

Signed-off-by: Simon Horman <simon.horman@netronome.com>
---
 drivers/pci/quirks.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 83e93d7ca4b9..8b13b41257b8 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -295,6 +295,7 @@ static void quirk_nfp6000(struct pci_dev *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);
 
-- 
2.1.4

Re: [PATCH 0/2] PCI: Limit config space size for Netronome NFP4000

[Bjorn Helgaas]

On Fri, Dec 11, 2015 at 11:30:10AM +0900, Simon Horman wrote:
> 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.
> 
> This short series extends usage quirk_nfp6000, which handles the above
> problem by limiting config space size to 0x600 bytes, to the NFP4000.
> 
> Compile tested on top of the pci/misc branch.
> 
> Simon Horman (2):
>   PCI: Add Netronome NFP4000 device ID
>   PCI: Limit config space size for Netronome NFP4000
> 
>  drivers/pci/quirks.c    | 1 +
>  include/linux/pci_ids.h | 1 +
>  2 files changed, 2 insertions(+)

Applied to pci/misc for v4.5, thanks, Simon.