From patchwork Sat Sep 15 03:05:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 1461351 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 B2F26DFFD0 for ; Sat, 15 Sep 2012 03:15:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751255Ab2IODPD (ORCPT ); Fri, 14 Sep 2012 23:15:03 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:33180 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756507Ab2IODNj (ORCPT ); Fri, 14 Sep 2012 23:13:39 -0400 Received: by mail-pb0-f46.google.com with SMTP id rr13so6509443pbb.19 for ; Fri, 14 Sep 2012 20:13:39 -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=qjBOsJPZfaOmBvFHfmtROwMO0mNf1Ys4C2SQqkLyzDU=; b=kk0Np3U8xwyKaFLnrpbQscunxcXdhCTAK8RFZ/G7aBoyqu35pZQ08LCnNYO+H416sa LFM2D6JV41gin/4FTQqVVYs2F5qlEUaCA4DY20RhN2XWKp3XWwQPmeH74QCOEFu2XjgJ pGiXo/fVltL5J4pudd2qV0D/ZHnOPrEDY2mhg6s8DGv+wKdnteFU+rXiIImjnuKlJw5k 9L1yQ15zkeNCcxWuvpQ5Ue3QxNO4pvOBhSqk04NCLSuN0Gk4EkzFtwRrE7DQvvVSCx3i RcfLuXFh6JWnqKNzC9E+e8yBZQfyTLSnFcn9ZLKV3USKcWnOoKkljn2nYc0p/B+eaRQl mS4A== Received: by 10.68.230.232 with SMTP id tb8mr8129290pbc.19.1347678819034; Fri, 14 Sep 2012 20:13:39 -0700 (PDT) Received: from localhost.localdomain ([221.221.18.122]) by mx.google.com with ESMTPS id jz10sm2092777pbc.8.2012.09.14.20.13.32 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Sep 2012 20:13:38 -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 7/9] PCI/acpiphp: update ACPI hotplug slot information when PCI hotplug happens Date: Sat, 15 Sep 2012 11:05:10 +0800 Message-Id: <1347678312-11124-8-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 Currently the acpiphp driver fails to update hotplug slot information under several conditions, such as: 1) The bridge device is removed through /sys/bus/pci/devices/.../remove 2) The bridge device is added/removed by PCI hotplug driver other than the acpiphp driver itself. For example, if an IO expansion box with ACPI hotplug slots available is hot-added by the pciehp driver, all ACPI hotplug slots won't be discovered by the acpiphp driver. So hook the BUS_NOTIFY_ADD_DEVICE/BUS_NOTIFY_DEL_DEVICE events to update ACPI hotplug slot information when PCI hotplug event happens. Signed-off-by: Jiang Liu Signed-off-by: Yijing Wang --- drivers/pci/hotplug/acpiphp_glue.c | 64 ++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 3 deletions(-) diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 7be4ca5..1fb0eb7 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -61,6 +61,7 @@ static void handle_hotplug_event_bridge (acpi_handle, u32, void *); static void acpiphp_sanitize_bus(struct pci_bus *bus); static void acpiphp_set_hpp_values(struct pci_bus *bus); static void handle_hotplug_event_func(acpi_handle handle, u32 type, void *context); +static struct acpiphp_bridge *acpiphp_handle_to_bridge(acpi_handle handle); /* callback routine to check for the existence of a pci dock device */ static acpi_status @@ -382,7 +383,7 @@ static inline void config_p2p_bridge_flags(struct acpiphp_bridge *bridge) /* allocate and initialize host bridge data structure */ -static void add_host_bridge(acpi_handle *handle) +static void add_host_bridge(acpi_handle handle) { struct acpiphp_bridge *bridge; struct acpi_pci_root *root = acpi_pci_find_root(handle); @@ -399,12 +400,14 @@ static void add_host_bridge(acpi_handle *handle) init_bridge_misc(bridge); } - /* allocate and initialize PCI-to-PCI bridge data structure */ -static void add_p2p_bridge(acpi_handle *handle) +static void add_p2p_bridge(acpi_handle handle) { struct acpiphp_bridge *bridge; + if (acpiphp_handle_to_bridge(handle)) + return; + bridge = kzalloc(sizeof(struct acpiphp_bridge), GFP_KERNEL); if (bridge == NULL) { err("out of memory\n"); @@ -1405,6 +1408,58 @@ find_root_bridges(acpi_handle handle, u32 lvl, void *context, void **rv) return AE_OK ; } +static void acpiphp_hp_notify_add(struct pci_dev *dev) +{ + acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev); + + if (!dev->subordinate || !handle) + return; + + /* check if this bridge has ejectable slots */ + if (detect_ejectable_slots(handle) > 0) { + dbg("found PCI-to-PCI bridge at PCI %s\n", pci_name(dev)); + add_p2p_bridge(handle); + } +} + +static void acpiphp_hp_notify_del(struct pci_dev *dev) +{ + struct acpiphp_bridge *bridge, *tmp; + struct pci_bus *bus = dev->subordinate; + + if (!bus) + return; + + list_for_each_entry_safe(bridge, tmp, &bridge_list, list) + if (bridge->pci_bus == bus) { + cleanup_bridge(bridge); + break; + } +} + +static int acpi_pci_hp_notify_fn(struct notifier_block *nb, + unsigned long event, void *data) +{ + struct device *dev = data; + + switch (event) { + case BUS_NOTIFY_ADD_DEVICE: + acpiphp_hp_notify_add(to_pci_dev(dev)); + break; + case BUS_NOTIFY_DEL_DEVICE: + acpiphp_hp_notify_del(to_pci_dev(dev)); + break; + default: + return NOTIFY_DONE; + } + + return NOTIFY_OK; +} + +static struct notifier_block acpi_pci_hp_notifier = { + .notifier_call = &acpi_pci_hp_notify_fn, +}; + static struct acpi_pci_driver acpi_pci_hp_driver = { .add = add_bridge, .remove = remove_bridge, @@ -1425,6 +1480,8 @@ int __init acpiphp_glue_init(void) else acpi_pci_register_driver(&acpi_pci_hp_driver); + bus_register_notifier(&pci_bus_type, &acpi_pci_hp_notifier); + return 0; } @@ -1436,6 +1493,7 @@ int __init acpiphp_glue_init(void) */ void acpiphp_glue_exit(void) { + bus_unregister_notifier(&pci_bus_type, &acpi_pci_hp_notifier); acpi_pci_unregister_driver(&acpi_pci_hp_driver); }