Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1504397

[PATCH 3.10 04/16] PCI: Limit config space size for Netronome NFP6000 family

Show all headers | View raw

From: "Jason S. McMullan" <jason.mcmullan@netronome.com>

commit 9f33a2ae59f24452c1076749deb615bccd435ca9 upstream.

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

Limit the NFP6000's config space size to 0x600 bytes.

Signed-off-by: Jason S. McMullan <jason.mcmullan@netronome.com>
[simon: edited changelog]
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
---
 drivers/pci/quirks.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 390e409..df1030c 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -292,6 +292,17 @@ static void quirk_citrine(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IBM,	PCI_DEVICE_ID_IBM_CITRINE,	quirk_citrine);
 
+/*
+ * This chip can cause bus lockups if config addresses above 0x600
+ * are read or written.
+ */
+static void quirk_nfp6000(struct pci_dev *dev)
+{
+	dev->cfg_size = 0x600;
+}
+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);
+
 /*  On IBM Crocodile ipr SAS adapters, expand BAR to system page size */
 static void quirk_extend_bar_to_page(struct pci_dev *dev)
 {
-- 
2.8.0.rc2.1.gbe9624a

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 3.10 00/16] 3.10.104-stable review Willy Tarreau <w@1wt.eu> - 2016-10-20 01:00 +0200
  [PATCH 3.10 15/16] xen-netback: ref count shared rings Willy Tarreau <w@1wt.eu> - 2016-10-20 01:00 +0200
  [PATCH 3.10 02/16] PCI: Support PCIe devices with short cfg_size Willy Tarreau <w@1wt.eu> - 2016-10-20 01:00 +0200
  [PATCH 3.10 06/16] PCI: Limit config space size for Netronome NFP4000 Willy Tarreau <w@1wt.eu> - 2016-10-20 01:00 +0200
  [PATCH 3.10 05/16] PCI: Add Netronome NFP4000 PF device ID Willy Tarreau <w@1wt.eu> - 2016-10-20 01:00 +0200
  [PATCH 3.10 08/16] megaraid_sas: Fix probing cards without io port Willy Tarreau <w@1wt.eu> - 2016-10-20 01:00 +0200
  [PATCH 3.10 10/16] staging: comedi: daqboard2000: bug fix board type matching code Willy Tarreau <w@1wt.eu> - 2016-10-20 01:00 +0200
  [PATCH 3.10 04/16] PCI: Limit config space size for Netronome NFP6000 family Willy Tarreau <w@1wt.eu> - 2016-10-20 01:00 +0200
  [PATCH 3.10 09/16] crypto: nx - off by one bug in nx_of_update_msc() Willy Tarreau <w@1wt.eu> - 2016-10-20 01:00 +0200
  [PATCH 3.10 12/16] mm: thp: fix SMP race condition between THP page fault and MADV_DONTNEED Willy Tarreau <w@1wt.eu> - 2016-10-20 01:00 +0200

csiph-web