From patchwork Sat Sep 15 03:05:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 184067 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 8C3CF2C0085 for ; Sat, 15 Sep 2012 13:15:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756440Ab2IODNf (ORCPT ); Fri, 14 Sep 2012 23:13:35 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:64718 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755911Ab2IODM5 (ORCPT ); Fri, 14 Sep 2012 23:12:57 -0400 Received: by dady13 with SMTP id y13so2794684dad.19 for ; Fri, 14 Sep 2012 20:12:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=7rI/5ErxmvnHqd6Af99njMHdZQSxcg1oSVXxgmJquvs=; b=Wle4FFXnXo4hq0F3+7hDY+JVZQKwYc0/TW1xcAOF7doqwbf6rGkLcoYUzPQF+oJU1u dDORpq5BCeVhi/LWROGltmJUZ4FAzjRJzc/3s/YFIb01K5PtXqchf1GgHUgnlLvywL0Z yarvhCwUWL9WTqd4h4ahVB4dOp00E9ygJDuYkmqe0R7oQuw8YmUxMVqeSLQLzIC3t2/U 6L97tQ6GauyqrChnzyrmXNLcC9Hij4GaquWUXWzz71KxCejEWRPrvzFEjeAAOZ+TIeU8 b+QI4m1eC2OV3zODrNtZK7B/0W3SswGvXN6bVZ147VYv74nrzXP4WgRH6MN3XbaBlj/p Q+mA== Received: by 10.66.90.38 with SMTP id bt6mr6924001pab.53.1347678776513; Fri, 14 Sep 2012 20:12:56 -0700 (PDT) Received: from localhost.localdomain ([221.221.18.122]) by mx.google.com with ESMTPS id jz10sm2092777pbc.8.2012.09.14.20.12.43 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Sep 2012 20:12:49 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas Cc: Tony Luck , Jiang Liu , Yinghai Lu , Kenji Kaneshige , Yijing Wang , Jiang Liu , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v2 2/9] PCI: split registration of PCI bus devices into two stages Date: Sat, 15 Sep 2012 11:05:05 +0800 Message-Id: <1347678312-11124-3-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347678312-11124-1-git-send-email-jiang.liu@huawei.com> References: <1347678312-11124-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org When handling BUS_NOTIFY_ADD_DEVICE event for a PCI bridge device, the notification handler can't hold reference count to the new PCI bus because the device object for the new bus (pci_dev->subordinate->dev) hasn't been initialized yet. Split the registration of PCI bus device into two stages as below, so that the event handler could hold reference count to the new PCI bus when handling BUS_NOTIFY_ADD_DEVICE event. 1) device_initialize(&pci_dev->dev) 2) device_initialize(&pci_dev->subordinate->dev) 3) notify BUS_NOTIFY_ADD_DEVICE event for pci_dev 4) device_add(&pci_dev->dev) 5) device_add(&pci_dev->subordinate->dev) Signed-off-by: Jiang Liu --- drivers/pci/bus.c | 2 +- drivers/pci/probe.c | 3 ++- drivers/pci/remove.c | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 4b0970b..11a5c28 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -189,7 +189,7 @@ int pci_bus_add_child(struct pci_bus *bus) if (bus->bridge) bus->dev.parent = bus->bridge; - retval = device_register(&bus->dev); + retval = device_add(&bus->dev); if (retval) return retval; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 5dbad03..ddc8f7f 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -464,6 +464,7 @@ static struct pci_bus * pci_alloc_bus(void) INIT_LIST_HEAD(&b->resources); b->max_bus_speed = PCI_SPEED_UNKNOWN; b->cur_bus_speed = PCI_SPEED_UNKNOWN; + device_initialize(&b->dev); } return b; } @@ -1672,7 +1673,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, b->dev.class = &pcibus_class; b->dev.parent = b->bridge; dev_set_name(&b->dev, "%04x:%02x", pci_domain_nr(b), bus); - error = device_register(&b->dev); + error = device_add(&b->dev); if (error) goto class_dev_reg_err; diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 37b9407..86a4636 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -48,11 +48,11 @@ void pci_remove_bus(struct pci_bus *bus) list_del(&bus->node); pci_bus_release_busn_res(bus); up_write(&pci_bus_sem); - if (!bus->is_added) - return; - - pci_remove_legacy_files(bus); - device_unregister(&bus->dev); + if (bus->is_added) { + pci_remove_legacy_files(bus); + device_del(&bus->dev); + } + put_device(&bus->dev); } EXPORT_SYMBOL(pci_remove_bus);