From: David Gibson <david@gibson.dropbear.id.au>
To: davem@davemloft.net, saeedm@mellanox.com, ogerlitz@mellanox.com,
tariqt@mellanox.com, bhelgaas@google.com, leon@kernel.org
Cc: linux-rdma@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, sbest@redhat.com,
alex.williamson@redhat.com, paulus@samba.org,
linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH] PCI: Add no-D3 quirk for Mellanox ConnectX-[45]
Date: Thu, 6 Dec 2018 15:19:51 +1100 [thread overview]
Message-ID: <20181206041951.22413-1-david@gibson.dropbear.id.au> (raw)
Mellanox ConnectX-5 IB cards (MT27800) seem to cause a call trace when
unbound from their regular driver and attached to vfio-pci in order to pass
them through to a guest.
This goes away if the disable_idle_d3 option is used, so it looks like a
problem with the hardware handling D3 state. To fix that more permanently,
use a device quirk to disable D3 state for these devices.
We do this by renaming the existing quirk_no_ata_d3() more generally and
attaching it to the ConnectX-[45] devices (0x15b3:0x1013).
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
drivers/pci/quirks.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 4700d24e5d55..add3f516ca12 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1315,23 +1315,24 @@ static void quirk_ide_samemode(struct pci_dev *pdev)
}
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_10, quirk_ide_samemode);
-/* Some ATA devices break if put into D3 */
-static void quirk_no_ata_d3(struct pci_dev *pdev)
+/* Some devices (including a number of ATA cards) break if put into D3 */
+static void quirk_no_d3(struct pci_dev *pdev)
{
pdev->dev_flags |= PCI_DEV_FLAGS_NO_D3;
}
+
/* Quirk the legacy ATA devices only. The AHCI ones are ok */
DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_ANY_ID,
- PCI_CLASS_STORAGE_IDE, 8, quirk_no_ata_d3);
+ PCI_CLASS_STORAGE_IDE, 8, quirk_no_d3);
DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_ATI, PCI_ANY_ID,
- PCI_CLASS_STORAGE_IDE, 8, quirk_no_ata_d3);
+ PCI_CLASS_STORAGE_IDE, 8, quirk_no_d3);
/* ALi loses some register settings that we cannot then restore */
DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_AL, PCI_ANY_ID,
- PCI_CLASS_STORAGE_IDE, 8, quirk_no_ata_d3);
+ PCI_CLASS_STORAGE_IDE, 8, quirk_no_d3);
/* VIA comes back fine but we need to keep it alive or ACPI GTM failures
occur when mode detecting */
DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_VIA, PCI_ANY_ID,
- PCI_CLASS_STORAGE_IDE, 8, quirk_no_ata_d3);
+ PCI_CLASS_STORAGE_IDE, 8, quirk_no_d3);
/*
* This was originally an Alpha-specific thing, but it really fits here.
@@ -3367,6 +3368,10 @@ static void mellanox_check_broken_intx_masking(struct pci_dev *pdev)
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX, PCI_ANY_ID,
mellanox_check_broken_intx_masking);
+/* Mellanox MT27800 (ConnectX-5) IB card seems to break with D3
+ * In particular this shows up when the device is bound to the vfio-pci driver */
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_MELLANOX, PCI_DEVICE_ID_MELLANOX_CONNECTX4, quirk_no_d3)
+
static void quirk_no_bus_reset(struct pci_dev *dev)
{
dev->dev_flags |= PCI_DEV_FLAGS_NO_BUS_RESET;
--
2.19.2
next reply other threads:[~2018-12-06 4:22 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-06 4:19 David Gibson [this message]
2018-12-06 6:45 ` [PATCH] PCI: Add no-D3 quirk for Mellanox ConnectX-[45] Leon Romanovsky
2018-12-11 2:31 ` David Gibson
2019-01-04 3:44 ` David Gibson
2019-01-05 17:51 ` Jason Gunthorpe
2019-01-05 22:43 ` Benjamin Herrenschmidt
2019-01-08 4:01 ` Jason Gunthorpe
2019-01-08 6:07 ` Leon Romanovsky
2019-01-09 5:09 ` Benjamin Herrenschmidt
2019-01-09 5:30 ` David Gibson
2019-01-09 6:32 ` Alexey Kardashevskiy
2019-01-09 7:25 ` Benjamin Herrenschmidt
2019-01-09 8:14 ` Alexey Kardashevskiy
2019-01-09 15:27 ` Jason Gunthorpe
2019-01-09 4:53 ` Alexey Kardashevskiy
2019-01-09 7:24 ` Benjamin Herrenschmidt
2019-01-09 8:20 ` Alexey Kardashevskiy
2018-12-11 14:01 ` Bjorn Helgaas
2018-12-12 0:22 ` David Gibson
2018-12-12 3:04 ` Bjorn Helgaas
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=20181206041951.22413-1-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=alex.williamson@redhat.com \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=paulus@samba.org \
--cc=saeedm@mellanox.com \
--cc=sbest@redhat.com \
--cc=tariqt@mellanox.com \
/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;
as well as URLs for NNTP newsgroup(s).