[PATCH 3/7] PCI: call pcie_flr from reset_chelsio_generic_dev

From	Christoph Hellwig <hch@lst.de>
Newsgroups	linux.kernel
Subject	[PATCH 3/7] PCI: call pcie_flr from reset_chelsio_generic_dev
Date	2017-04-14 21:20 +0200
Message-ID	<tweVd-50g-29@gated-at.bofh.it> (permalink)
References	<tweVc-50g-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

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

Thread

[PATCH 3/7] PCI: call pcie_flr from reset_chelsio_generic_dev Christoph Hellwig <hch@lst.de> - 2017-04-14 21:20 +0200

csiph-web