From patchwork Wed May 8 02:57:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 242489 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 324882C00E4 for ; Wed, 8 May 2013 12:59:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756627Ab3EHC55 (ORCPT ); Tue, 7 May 2013 22:57:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64886 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756421Ab3EHC5z (ORCPT ); Tue, 7 May 2013 22:57:55 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r482vs0f010939 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 7 May 2013 22:57:54 -0400 Received: from bling.home (ovpn-113-58.phx2.redhat.com [10.3.113.58]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r482vsQ8012145; Tue, 7 May 2013 22:57:54 -0400 Subject: [PATCH v2 3/8] pci: Add pci_hp_reset_slot To: bhelgaas@google.com, linux-pci@vger.kernel.org From: Alex Williamson Cc: linux-kernel@vger.kernel.org Date: Tue, 07 May 2013 20:57:53 -0600 Message-ID: <20130508025753.30771.43656.stgit@bling.home> In-Reply-To: <20130508025339.30771.61937.stgit@bling.home> References: <20130508025339.30771.61937.stgit@bling.home> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@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(+) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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) \