From: Sinan Kaya <okaya@kernel.org>
To: linux-pci@vger.kernel.org
Cc: Sinan Kaya <okaya@kernel.org>, Bjorn Helgaas <bhelgaas@google.com>
Subject: [PATCH 2/4] PCI: Expose reset_type to users of pci_reset_function_locked()
Date: Sat, 8 Sep 2018 04:16:25 +0000 [thread overview]
Message-ID: <20180908041632.22252-2-okaya@kernel.org> (raw)
In-Reply-To: <20180908041632.22252-1-okaya@kernel.org>
Looking to have more control between the users of the API vs. what the API
can do internally. The new reset_type tells the PCI core about the bounds
of the request.
Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
drivers/pci/pci.c | 4 ++--
include/linux/pci.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index a6295f85a1bd..89c45effb4f4 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -4828,7 +4828,7 @@ EXPORT_SYMBOL_GPL(pci_reset_function);
* Returns 0 if the device function was successfully reset or negative if the
* device doesn't support resetting a single function.
*/
-int pci_reset_function_locked(struct pci_dev *dev)
+int pci_reset_function_locked(struct pci_dev *dev, u32 reset_type)
{
int rc;
@@ -4837,7 +4837,7 @@ int pci_reset_function_locked(struct pci_dev *dev)
pci_dev_save_and_disable(dev);
- rc = __pci_reset_function_locked(dev, PCI_RESET_ANY);
+ rc = __pci_reset_function_locked(dev, reset_type);
pci_dev_restore(dev);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 43d00e9e54f7..fa852ebdf197 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1124,7 +1124,7 @@ bool pcie_has_flr(struct pci_dev *dev);
int pcie_flr(struct pci_dev *dev);
int __pci_reset_function_locked(struct pci_dev *dev, u32 reset_type);
int pci_reset_function(struct pci_dev *dev, u32 reset_type);
-int pci_reset_function_locked(struct pci_dev *dev);
+int pci_reset_function_locked(struct pci_dev *dev, u32 reset_type);
int pci_try_reset_function(struct pci_dev *dev);
int pci_probe_reset_slot(struct pci_slot *slot);
int pci_probe_reset_bus(struct pci_bus *bus);
--
2.18.0
next prev parent reply other threads:[~2018-09-08 9:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-08 4:16 [PATCH 1/4] PCI: Expose reset_type to users of pci_reset_function() Sinan Kaya
2018-09-08 4:16 ` Sinan Kaya [this message]
2018-09-08 4:16 ` [PATCH 3/4] PCI: Expose reset type to users of pci_try_reset_function() Sinan Kaya
2018-09-08 4:16 ` [PATCH 4/4] PCI: Expose reset type to users of pci_probe_reset_function() Sinan Kaya
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=20180908041632.22252-2-okaya@kernel.org \
--to=okaya@kernel.org \
--cc=bhelgaas@google.com \
--cc=linux-pci@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;
as well as URLs for NNTP newsgroup(s).