From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756237Ab3EASnb (ORCPT ); Wed, 1 May 2013 14:43:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20037 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756053Ab3EASnQ (ORCPT ); Wed, 1 May 2013 14:43:16 -0400 Subject: [RFC PATCH 3/8] pci: Add pci_hp_reset_slot To: bhelgaas@google.com From: Alex Williamson Cc: linux-kernel@vger.kernel.org Date: Wed, 01 May 2013 12:43:14 -0600 Message-ID: <20130501184314.28515.97741.stgit@bling.home> In-Reply-To: <20130501181828.28515.68783.stgit@bling.home> References: <20130501181828.28515.68783.stgit@bling.home> User-Agent: StGit/0.16 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Provide an interface to get to hotplug controller reset_slot callback Signed-off-by: Alex Williamson --- 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 ec20f74..a63e9c3 100644 --- a/drivers/pci/hotplug/pci_hotplug_core.c +++ b/drivers/pci/hotplug/pci_hotplug_core.c @@ -528,6 +528,29 @@ int 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; @@ -561,3 +584,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 bd32109..e59f797 100644 --- a/include/linux/pci_hotplug.h +++ b/include/linux/pci_hotplug.h @@ -135,6 +135,14 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *pbus, int nr, int pci_hp_deregister(struct hotplug_slot *slot); 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) \