From: Christoph Hellwig <hch@lst.de>
To: Bjorn Helgaas <bhelgaas@google.com>,
Giovanni Cabiddu <giovanni.cabiddu@intel.com>,
Salvatore Benedetto <salvatore.benedetto@intel.com>,
Mike Marciniszyn <mike.marciniszyn@intel.com>,
Dennis Dalessandro <dennis.dalessandro@intel.com>,
Derek Chickles <derek.chickles@caviumnetworks.com>,
Satanand Burla <satananda.burla@caviumnetworks.com>,
Felix Manlunas <felix.manlunas@caviumnetworks.com>,
Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: linux-pci@vger.kernel.org, qat-linux@intel.com,
linux-crypto@vger.kernel.org, linux-rdma@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/7] PCI: call pcie_flr from reset_chelsio_generic_dev
Date: Fri, 14 Apr 2017 21:11:27 +0200 [thread overview]
Message-ID: <20170414191131.14286-4-hch@lst.de> (raw)
In-Reply-To: <20170414191131.14286-1-hch@lst.de>
Instead of copy & pasting and old version of the code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/quirks.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 8195ca294ee5..715ed8c08fa3 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3750,20 +3750,7 @@ static int reset_chelsio_generic_dev(struct pci_dev *dev, int probe)
PCI_MSIX_FLAGS_ENABLE |
PCI_MSIX_FLAGS_MASKALL);
- /*
- * Start of pcie_flr() code sequence. This reset code is a copy of
- * the guts of pcie_flr() because that's not an exported function.
- */
-
- if (!pci_wait_for_pending_transaction(dev))
- dev_err(&dev->dev, "transaction is not cleared; proceeding with reset anyway\n");
-
- pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_BCR_FLR);
- msleep(100);
-
- /*
- * End of pcie_flr() code sequence.
- */
+ pcie_flr(dev);
/*
* Restore the configuration information (BAR values, etc.) including
--
2.11.0
next prev parent reply other threads:[~2017-04-14 19:14 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-14 19:11 export pcie_flr and remove copies of it in drivers V2 Christoph Hellwig
2017-04-14 19:11 ` [PATCH 1/7] PCI: export pcie_flr Christoph Hellwig
2017-04-14 19:11 ` [PATCH 2/7] PCI: call pcie_flr from reset_intel_82599_sfp_virtfn Christoph Hellwig
2017-04-14 19:11 ` Christoph Hellwig [this message]
2017-04-14 19:11 ` [PATCH 4/7] ixgbe: use pcie_flr instead of duplicating it Christoph Hellwig
2017-04-14 19:11 ` [PATCH 5/7] IB/hfi1: " Christoph Hellwig
2017-04-24 14:16 ` Byczkowski, Jakub
2017-04-24 14:35 ` Christoph Hellwig
2017-04-24 20:00 ` Dennis Dalessandro
2017-04-25 17:00 ` Doug Ledford
2017-04-25 19:39 ` Bjorn Helgaas
2017-04-26 22:10 ` Jeff Kirsher
2017-04-27 6:47 ` Christoph Hellwig
2017-04-27 16:49 ` Bjorn Helgaas
2017-04-14 19:11 ` [PATCH 6/7] crypto: qat: " Christoph Hellwig
2017-04-14 19:11 ` [PATCH 7/7] liquidio: " Christoph Hellwig
2017-04-25 1:53 ` Felix Manlunas
2017-04-18 18:36 ` export pcie_flr and remove copies of it in drivers V2 Bjorn Helgaas
2017-04-19 5:37 ` Leon Romanovsky
2017-04-19 16:40 ` Leon Romanovsky
-- strict thread matches above, loose matches on Subject: below --
2017-04-13 14:53 export pcie_flr and remove copies of it in drivers Christoph Hellwig
2017-04-13 14:53 ` [PATCH 3/7] PCI: call pcie_flr from reset_chelsio_generic_dev Christoph Hellwig
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=20170414191131.14286-4-hch@lst.de \
--to=hch@lst.de \
--cc=bhelgaas@google.com \
--cc=dennis.dalessandro@intel.com \
--cc=derek.chickles@caviumnetworks.com \
--cc=felix.manlunas@caviumnetworks.com \
--cc=giovanni.cabiddu@intel.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=mike.marciniszyn@intel.com \
--cc=netdev@vger.kernel.org \
--cc=qat-linux@intel.com \
--cc=raghu.vatsavayi@caviumnetworks.com \
--cc=salvatore.benedetto@intel.com \
--cc=satananda.burla@caviumnetworks.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).