From patchwork Fri Sep 21 03:44:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 1489221 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 2BB22DF28C for ; Fri, 21 Sep 2012 03:46:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754076Ab2IUDqo (ORCPT ); Thu, 20 Sep 2012 23:46:44 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:7543 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754020Ab2IUDqo (ORCPT ); Thu, 20 Sep 2012 23:46:44 -0400 Received: from 172.24.2.119 (EHLO szxeml214-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id APH96228; Fri, 21 Sep 2012 11:46:36 +0800 (CST) Received: from SZXEML412-HUB.china.huawei.com (10.82.67.91) by szxeml214-edg.china.huawei.com (172.24.2.29) with Microsoft SMTP Server (TLS) id 14.1.323.3; Fri, 21 Sep 2012 11:44:54 +0800 Received: from localhost (10.135.76.84) by szxeml412-hub.china.huawei.com (10.82.67.91) with Microsoft SMTP Server id 14.1.323.3; Fri, 21 Sep 2012 11:44:49 +0800 From: Yijing Wang To: Bjorn Helgaas , Huang Ying , Chen Gong CC: , Hanjun Guo , , Yijing Wang Subject: [PATCH v4 3/5] PCI/AER: clean all untracked pci_ops_aer when rmmod aer_inject Date: Fri, 21 Sep 2012 11:44:14 +0800 Message-ID: <1348199056-7696-4-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 In-Reply-To: <1348199056-7696-1-git-send-email-wangyijing@huawei.com> References: <1348199056-7696-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.135.76.84] X-CFilter-Loop: Reflected Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org When we do hot plug for pci devices that were injected aer errors, some newly created child buses' pci_ops will be assigned to pci_ops_aer. Aer_inject module will not track these pci_ops_aer(not list in pci_bus_ops_list),so we should clean all of these when rmmod aer_inject module. Signed-off-by: Yijing Wang Signed-off-by: Huang Ying Reviewed-by: Huang Ying --- drivers/pci/pcie/aer/aer_inject.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c index 0123120..e04cf24 100644 --- a/drivers/pci/pcie/aer/aer_inject.c +++ b/drivers/pci/pcie/aer/aer_inject.c @@ -299,6 +299,29 @@ static void pci_bus_ops_init(struct pci_bus_ops *bus_ops, bus_ops->ops = ops; } +static void pci_clean_child_aer_ops(struct pci_bus *bus) +{ + struct pci_bus *child; + + list_for_each_entry(child, &bus->children, node) { + if (child->ops == &pci_ops_aer) + pci_bus_set_ops(child, bus->ops); + pci_clean_child_aer_ops(child); + } +} + +/* find pci_ops_aer from root bus, and replace it by parent bus's pci_ops. + * pci_ops of root bus won't be pci_ops_aer here*/ +static void clean_untracked_pci_ops_aer(void) +{ + struct pci_bus_ops *bus_ops; + + list_for_each_entry(bus_ops, &pci_bus_ops_list, list) { + if (pci_is_root_bus(bus_ops->bus)) + pci_clean_child_aer_ops(bus_ops->bus); + } +} + static int pci_bus_set_aer_ops(struct pci_bus *bus) { struct pci_ops *ops; @@ -560,6 +583,7 @@ static void __exit aer_inject_exit(void) while ((bus_ops = pci_bus_ops_get(bus_ops))) pci_bus_set_ops(bus_ops->bus, bus_ops->ops); + clean_untracked_pci_ops_aer(); while ((bus_ops = pci_bus_ops_pop())) kfree(bus_ops);