From patchwork Fri Jul 5 02:57:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 257041 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 2CF8A2C02E9 for ; Fri, 5 Jul 2013 13:02:19 +1000 (EST) Received: from e39.co.us.ibm.com (e39.co.us.ibm.com [32.97.110.160]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e39.co.us.ibm.com", Issuer "GeoTrust SSL CA" (not verified)) by ozlabs.org (Postfix) with ESMTPS id D59352C0590 for ; Fri, 5 Jul 2013 12:59:05 +1000 (EST) Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 4 Jul 2013 20:59:03 -0600 Received: from d01dlp03.pok.ibm.com (9.56.250.168) by e39.co.us.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 4 Jul 2013 20:59:01 -0600 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 0A0D1C90073 for ; Thu, 4 Jul 2013 22:58:59 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r652vcVM170706 for ; Thu, 4 Jul 2013 22:57:38 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r652vcFY027788 for ; Thu, 4 Jul 2013 23:57:38 -0300 Received: from shangw ([9.125.28.142]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r652vb4T027733; Thu, 4 Jul 2013 23:57:37 -0300 Received: by shangw (Postfix, from userid 1000) id F10FA301D0B; Fri, 5 Jul 2013 10:57:35 +0800 (CST) From: Gavin Shan To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 1/8] PCI: Add pcibios_stop_dev() Date: Fri, 5 Jul 2013 10:57:27 +0800 Message-Id: <1372993054-25730-2-git-send-email-shangw@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1372993054-25730-1-git-send-email-shangw@linux.vnet.ibm.com> References: <1372993054-25730-1-git-send-email-shangw@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13070502-3620-0000-0000-00000366C3CB Cc: Bjorn Helgaas , Gavin Shan , linux-pci@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" When stopping and removing one specific PCI device, the platform might need take some actions. One example is that EEH already had eeh cache and eeh device attached to the PCI device, and we need release eeh cache and device during the time. The patch introduces hook pcibios_stop_dev() for the purpose. Cc: Bjorn Helgaas Cc: linux-pci@vger.kernel.org Signed-off-by: Gavin Shan --- drivers/pci/probe.c | 4 ++++ drivers/pci/remove.c | 2 ++ include/linux/pci.h | 1 + 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 70f10fa..7167dc4 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1669,6 +1669,10 @@ void __weak pcibios_remove_bus(struct pci_bus *bus) { } +void __weak pcibios_stop_dev(struct pci_dev *dev) +{ +} + struct pci_bus *pci_create_root_bus(struct device *parent, int bus, struct pci_ops *ops, void *sysdata, struct list_head *resources) { diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 8fc54b7..e329efc 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -21,6 +21,8 @@ static void pci_stop_dev(struct pci_dev *dev) { pci_pme_active(dev, false); + pcibios_stop_dev(dev); + if (dev->is_added) { pci_proc_detach_device(dev); pci_remove_sysfs_dev_files(dev); diff --git a/include/linux/pci.h b/include/linux/pci.h index 3a24e4f..40df783 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -696,6 +696,7 @@ int no_pci_devices(void); void pcibios_resource_survey_bus(struct pci_bus *bus); void pcibios_add_bus(struct pci_bus *bus); void pcibios_remove_bus(struct pci_bus *bus); +void pcibios_stop_dev(struct pci_dev *dev); void pcibios_fixup_bus(struct pci_bus *); int __must_check pcibios_enable_device(struct pci_dev *, int mask); /* Architecture specific versions may override this (weak) */