From: Alex Williamson <alex.williamson@redhat.com>
To: bhelgaas@google.com, linux-pci@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH v2 3/8] pci: Add pci_hp_reset_slot
Date: Tue, 07 May 2013 20:57:53 -0600 [thread overview]
Message-ID: <20130508025753.30771.43656.stgit@bling.home> (raw)
In-Reply-To: <20130508025339.30771.61937.stgit@bling.home>
Provide an interface to get to hotplug controller reset_slot callback
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
drivers/pci/hotplug/pci_hotplug_core.c | 24 ++++++++++++++++++++++++
include/linux/pci_hotplug.h | 8 ++++++++
2 files changed, 32 insertions(+)
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index 202f4a9..1d0fee4 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -537,6 +537,29 @@ int __must_check pci_hp_change_slot_info(struct hotplug_slot *hotplug,
return 0;
}
+/**
+ * pci_hp_reset_slot - reset slot
+ *
+ * @hotplug: pointer to hotplug slot to reset
+ * @probe: reset slot (0) or just probe
+ *
+ * Returns 0 if successful, anything else for an error.
+ */
+int pci_hp_reset_slot(struct hotplug_slot *hotplug, int probe)
+{
+ int result = -ENOTTY;
+
+ if (!hotplug || !try_module_get(hotplug->ops->owner))
+ return result;
+
+ if (hotplug->ops->reset_slot)
+ result = hotplug->ops->reset_slot(hotplug, probe);
+
+ module_put(hotplug->ops->owner);
+
+ return result;
+}
+
static int __init pci_hotplug_init (void)
{
int result;
@@ -570,3 +593,4 @@ MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
EXPORT_SYMBOL_GPL(__pci_hp_register);
EXPORT_SYMBOL_GPL(pci_hp_deregister);
EXPORT_SYMBOL_GPL(pci_hp_change_slot_info);
+EXPORT_SYMBOL_GPL(pci_hp_reset_slot);
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
index 0d3a604..d771cee 100644
--- a/include/linux/pci_hotplug.h
+++ b/include/linux/pci_hotplug.h
@@ -135,6 +135,14 @@ extern int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *pbus,
extern int pci_hp_deregister(struct hotplug_slot *slot);
extern int __must_check pci_hp_change_slot_info (struct hotplug_slot *slot,
struct hotplug_slot_info *info);
+#ifdef CONFIG_HOTPLUG_PCI
+int pci_hp_reset_slot(struct hotplug_slot *slot, int probe);
+#else
+static inline int pci_hp_reset_slot(struct hotplug_slot *slot, int probe)
+{
+ return -ENOTTY;
+}
+#endif
/* use a define to avoid include chaining to get THIS_MODULE & friends */
#define pci_hp_register(slot, pbus, devnr, name) \
next prev parent reply other threads:[~2013-05-08 2:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-08 2:57 [PATCH v2 0/8] pci: bus and slot reset interface Alex Williamson
2013-05-08 2:57 ` [PATCH v2 1/8] pci: Create pci_reset_bridge_secondary_bus() Alex Williamson
2013-05-08 19:14 ` Don Dutile
2013-05-08 19:30 ` Alex Williamson
2013-05-08 2:57 ` [PATCH v2 2/8] pci: Add hotplug_slot_ops.reset_slot() Alex Williamson
2013-05-08 2:57 ` Alex Williamson [this message]
2013-05-10 21:46 ` [PATCH v2 3/8] pci: Add pci_hp_reset_slot Alex Williamson
2013-05-08 2:58 ` [PATCH v2 4/8] pci: Implement reset_slot for pciehp Alex Williamson
2013-05-08 2:58 ` [PATCH v2 5/8] pci: Add reset_slot option to pci_dev_reset Alex Williamson
2013-05-08 2:58 ` [PATCH v2 6/8] pci: Split out pci_dev lock/unlock and save/restore Alex Williamson
2013-05-08 2:58 ` [PATCH v2 7/8] pci: Add slot and bus reset interfaces Alex Williamson
2013-05-08 2:58 ` [PATCH v2 8/8] pci: Wake-up devices before save for reset Alex Williamson
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=20130508025753.30771.43656.stgit@bling.home \
--to=alex.williamson@redhat.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--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).