From: Willy Tarreau <w@1wt.eu>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Simon Horman <simon.horman@netronome.com>,
Bjorn Helgaas <bhelgaas@google.com>, Willy Tarreau <w@1wt.eu>
Subject: [PATCH 3.10 06/16] PCI: Limit config space size for Netronome NFP4000
Date: Thu, 20 Oct 2016 00:49:30 +0200 [thread overview]
Message-ID: <1476917380-28311-7-git-send-email-w@1wt.eu> (raw)
In-Reply-To: <1476917380-28311-1-git-send-email-w@1wt.eu>
From: Simon Horman <simon.horman@netronome.com>
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().
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 | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index df1030c..a663715 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -300,6 +300,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.8.0.rc2.1.gbe9624a
next prev parent reply other threads:[~2016-10-19 22:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-19 22:49 [PATCH 3.10 00/16] 3.10.104-stable review Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 01/16] Revert "powerpc/tm: Always reclaim in start_thread() for exec() class syscalls" Willy Tarreau
2016-10-20 3:07 ` Guenter Roeck
2016-10-20 6:12 ` Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 02/16] PCI: Support PCIe devices with short cfg_size Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 03/16] PCI: Add Netronome vendor and device IDs Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 04/16] PCI: Limit config space size for Netronome NFP6000 family Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 05/16] PCI: Add Netronome NFP4000 PF device ID Willy Tarreau
2016-10-19 22:49 ` Willy Tarreau [this message]
2016-10-19 22:49 ` [PATCH 3.10 07/16] aacraid: Check size values after double-fetch from user Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 08/16] megaraid_sas: Fix probing cards without io port Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 09/16] crypto: nx - off by one bug in nx_of_update_msc() Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 10/16] staging: comedi: daqboard2000: bug fix board type matching code Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 11/16] ACPI / sysfs: fix error code in get_status() Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 12/16] mm: thp: fix SMP race condition between THP page fault and MADV_DONTNEED Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 13/16] MIPS: KVM: Check for pfn noslot case Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 14/16] security: let security modules use PTRACE_MODE_* with bitmasks Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 15/16] xen-netback: ref count shared rings Willy Tarreau
2016-10-19 22:49 ` [PATCH 3.10 16/16] mm: remove gup_flags FOLL_WRITE games from __get_user_pages() Willy Tarreau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476917380-28311-7-git-send-email-w@1wt.eu \
--to=w@1wt.eu \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=simon.horman@netronome.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®