From: Yicong Yang <yangyicong@hisilicon.com>
To: <helgaas@kernel.org>, <kw@linux.com>, <linux-pci@vger.kernel.org>
Cc: <alex.williamson@redhat.com>, <prime.zeng@huawei.com>,
<yangyicong@hisilicon.com>, <linuxarm@huawei.dom>
Subject: [PATCH v2] PCI: Factor functions of PCI function reset
Date: Fri, 19 Mar 2021 17:25:18 +0800 [thread overview]
Message-ID: <1616145918-31356-1-git-send-email-yangyicong@hisilicon.com> (raw)
Previously we used pci_probe_reset_function() to probe whether a function
can be reset and use __pci_reset_function_locked() to perform a function
reset. These two functions have lots of common lines.
Factor the two functions and reduce the redundancy.
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
---
Change since v1:
- reword the comments a bit(Krzysztof)
- fix typos in the commit(Bjorn)
Link: https://lore.kernel.org/linux-pci/1605090123-14243-1-git-send-email-yangyicong@hisilicon.com/
drivers/pci/pci.c | 62 ++++++++++++++++-------------------------------------
drivers/pci/pci.h | 2 +-
drivers/pci/probe.c | 2 +-
3 files changed, 21 insertions(+), 45 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 16a1721..254bbe9 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -5055,9 +5055,11 @@ static void pci_dev_restore(struct pci_dev *dev)
}
/**
- * __pci_reset_function_locked - reset a PCI device function while holding
- * the @dev mutex lock.
+ * pci_probe_reset_function - check whether the device can be safely reset
+ * or reset a PCI device function while holding
+ * the @dev mutex lock.
* @dev: PCI device to reset
+ * @probe: Probe or not whether the device can be reset.
*
* Some devices allow an individual function to be reset without affecting
* other functions in the same device. The PCI device must be responsive
@@ -5071,10 +5073,11 @@ static void pci_dev_restore(struct pci_dev *dev)
* device including MSI, bus mastering, BARs, decoding IO and memory spaces,
* etc.
*
- * Returns 0 if the device function was successfully reset or negative if the
- * device doesn't support resetting a single function.
+ * Returns 0 if the device function can be reset or was successfully
+ * reset, otherwise negative if the device doesn't support resetting
+ * a single function.
*/
-int __pci_reset_function_locked(struct pci_dev *dev)
+int pci_probe_reset_function(struct pci_dev *dev, int probe)
{
int rc;
@@ -5088,61 +5091,34 @@ int __pci_reset_function_locked(struct pci_dev *dev)
* other error, we're also finished: this indicates that further
* reset mechanisms might be broken on the device.
*/
- rc = pci_dev_specific_reset(dev, 0);
+ rc = pci_dev_specific_reset(dev, probe);
if (rc != -ENOTTY)
return rc;
if (pcie_has_flr(dev)) {
+ if (probe)
+ return 0;
rc = pcie_flr(dev);
if (rc != -ENOTTY)
return rc;
}
- rc = pci_af_flr(dev, 0);
+ rc = pci_af_flr(dev, probe);
if (rc != -ENOTTY)
return rc;
- rc = pci_pm_reset(dev, 0);
+ rc = pci_pm_reset(dev, probe);
if (rc != -ENOTTY)
return rc;
- rc = pci_dev_reset_slot_function(dev, 0);
+ rc = pci_dev_reset_slot_function(dev, probe);
if (rc != -ENOTTY)
return rc;
- return pci_parent_bus_reset(dev, 0);
+
+ return pci_parent_bus_reset(dev, probe);
}
-EXPORT_SYMBOL_GPL(__pci_reset_function_locked);
-/**
- * pci_probe_reset_function - check whether the device can be safely reset
- * @dev: PCI device to reset
- *
- * Some devices allow an individual function to be reset without affecting
- * other functions in the same device. The PCI device must be responsive
- * to PCI config space in order to use this function.
- *
- * Returns 0 if the device function can be reset or negative if the
- * device doesn't support resetting a single function.
- */
-int pci_probe_reset_function(struct pci_dev *dev)
+int __pci_reset_function_locked(struct pci_dev *dev)
{
- int rc;
-
- might_sleep();
-
- rc = pci_dev_specific_reset(dev, 1);
- if (rc != -ENOTTY)
- return rc;
- if (pcie_has_flr(dev))
- return 0;
- rc = pci_af_flr(dev, 1);
- if (rc != -ENOTTY)
- return rc;
- rc = pci_pm_reset(dev, 1);
- if (rc != -ENOTTY)
- return rc;
- rc = pci_dev_reset_slot_function(dev, 1);
- if (rc != -ENOTTY)
- return rc;
-
- return pci_parent_bus_reset(dev, 1);
+ return pci_probe_reset_function(dev, 0);
}
+EXPORT_SYMBOL_GPL(__pci_reset_function_locked);
/**
* pci_reset_function - quiesce and reset a PCI device function
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index ef7c466..f349d48 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -39,7 +39,7 @@ enum pci_mmap_api {
int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vmai,
enum pci_mmap_api mmap_api);
-int pci_probe_reset_function(struct pci_dev *dev);
+int pci_probe_reset_function(struct pci_dev *dev, int probe);
int pci_bridge_secondary_bus_reset(struct pci_dev *dev);
int pci_bus_error_reset(struct pci_dev *dev);
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 953f15a..cc0c21d 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2404,7 +2404,7 @@ static void pci_init_capabilities(struct pci_dev *dev)
pcie_report_downtraining(dev);
- if (pci_probe_reset_function(dev) == 0)
+ if (pci_probe_reset_function(dev, 1) == 0)
dev->reset_fn = 1;
}
--
2.8.1
next reply other threads:[~2021-03-19 9:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 9:25 Yicong Yang [this message]
2021-03-19 17:09 ` [PATCH v2] PCI: Factor functions of PCI function reset Krzysztof Wilczyński
2021-03-22 11:56 ` Yicong Yang
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=1616145918-31356-1-git-send-email-yangyicong@hisilicon.com \
--to=yangyicong@hisilicon.com \
--cc=alex.williamson@redhat.com \
--cc=helgaas@kernel.org \
--cc=kw@linux.com \
--cc=linux-pci@vger.kernel.org \
--cc=linuxarm@huawei.dom \
--cc=prime.zeng@huawei.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).