From: okaya@codeaurora.org (Sinan Kaya)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V3 5/6] PCI: Add a return type for pci_reset_bridge_secondary_bus()
Date: Tue, 2 Jan 2018 12:00:22 -0500 [thread overview]
Message-ID: <1514912423-13341-6-git-send-email-okaya@codeaurora.org> (raw)
In-Reply-To: <1514912423-13341-1-git-send-email-okaya@codeaurora.org>
Getting ready to return an error from pci_reset_bridge_secondary_bus() when
device is unreachable.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
drivers/pci/pci.c | 4 +++-
include/linux/pci.h | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 09eae93..eae04aa 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -4157,9 +4157,11 @@ void __weak pcibios_reset_secondary_bus(struct pci_dev *dev)
* Use the bridge control register to assert reset on the secondary bus.
* Devices on the secondary bus are left in power-on state.
*/
-void pci_reset_bridge_secondary_bus(struct pci_dev *dev)
+int pci_reset_bridge_secondary_bus(struct pci_dev *dev)
{
pcibios_reset_secondary_bus(dev);
+
+ return 0;
}
EXPORT_SYMBOL_GPL(pci_reset_bridge_secondary_bus);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 0c1335a..dbd2ad2 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1094,7 +1094,7 @@ int pcie_get_minimum_link(struct pci_dev *dev, enum pci_bus_speed *speed,
int pci_try_reset_bus(struct pci_bus *bus);
void pci_reset_secondary_bus(struct pci_dev *dev);
void pcibios_reset_secondary_bus(struct pci_dev *dev);
-void pci_reset_bridge_secondary_bus(struct pci_dev *dev);
+int pci_reset_bridge_secondary_bus(struct pci_dev *dev);
void pci_update_resource(struct pci_dev *dev, int resno);
int __must_check pci_assign_resource(struct pci_dev *dev, int i);
int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align);
--
1.9.1
next prev parent reply other threads:[~2018-01-02 17:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-02 17:00 [PATCH V3 0/6] PCI: handle CRS response following Hot Reset and D3hot->D0 Sinan Kaya
2018-01-02 17:00 ` [PATCH V3 1/6] PCI: Protect restore with device lock to be consistent Sinan Kaya
2018-01-02 17:00 ` [PATCH V3 2/6] PCI: Handle FLR failure and allow other reset types Sinan Kaya
2018-01-02 17:00 ` [PATCH V3 3/6] PCI: Make pci_flr_wait() generic and rename to pci_dev_wait() Sinan Kaya
2018-01-02 17:00 ` [PATCH V3 4/6] PCI: Wait device ready after pci_pm_reset() Sinan Kaya
2018-01-02 17:00 ` Sinan Kaya [this message]
2018-01-02 17:00 ` [PATCH V3 6/6] PCI: Add device wait after slot and bus reset Sinan Kaya
2018-02-25 22:25 ` [PATCH V3 0/6] PCI: handle CRS response following Hot Reset and D3hot->D0 Sinan Kaya
2018-02-27 20:15 ` 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=1514912423-13341-6-git-send-email-okaya@codeaurora.org \
--to=okaya@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.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).