From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rcsinet15.oracle.com ([148.87.113.117]:16824 "EHLO rcsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758280Ab2CFHPZ (ORCPT ); Tue, 6 Mar 2012 02:15:25 -0500 From: Yinghai Lu To: Jesse Barnes , x86 Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH 06/23] PCI: rescan with bus or bridge using callback method too Date: Mon, 5 Mar 2012 23:13:43 -0800 Message-Id: <1331018040-30725-7-git-send-email-yinghai@kernel.org> In-Reply-To: <1331018040-30725-1-git-send-email-yinghai@kernel.org> References: <1331018040-30725-1-git-send-email-yinghai@kernel.org> Sender: linux-pci-owner@vger.kernel.org List-ID: Just like removal. Because We could add new bus under the bridges... Signed-off-by: Yinghai Lu --- drivers/pci/pci-sysfs.c | 43 +++++++++++++++++++++++++++++++------------ 1 files changed, 31 insertions(+), 12 deletions(-) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 2049b2f..1794508 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -325,21 +325,31 @@ dev_rescan_store(struct device *dev, struct device_attribute *attr, return count; } +static void bridge_rescan_callback(struct device *dev) +{ + struct pci_dev *pdev = to_pci_dev(dev); + + mutex_lock(&pci_remove_rescan_mutex); + pci_rescan_bus_bridge_resize(pdev); + mutex_unlock(&pci_remove_rescan_mutex); +} + static ssize_t dev_bridge_rescan_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { + int ret = 0; unsigned long val; - struct pci_dev *pdev = to_pci_dev(dev); if (kstrtoul(buf, 0, &val) < 0) return -EINVAL; - if (val) { - mutex_lock(&pci_remove_rescan_mutex); - pci_rescan_bus_bridge_resize(pdev); - mutex_unlock(&pci_remove_rescan_mutex); - } + if (val) + ret = device_schedule_callback(dev, bridge_rescan_callback); + + if (ret) + count = ret; + return count; } @@ -375,21 +385,30 @@ remove_store(struct device *dev, struct device_attribute *dummy, return count; } +static void bus_rescan_callback(struct device *dev) +{ + struct pci_bus *bus = to_pci_bus(dev); + + mutex_lock(&pci_remove_rescan_mutex); + pci_rescan_bus(bus); + mutex_unlock(&pci_remove_rescan_mutex); +} static ssize_t dev_bus_rescan_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { + int ret = 0; unsigned long val; - struct pci_bus *bus = to_pci_bus(dev); if (strict_strtoul(buf, 0, &val) < 0) return -EINVAL; - if (val) { - mutex_lock(&pci_remove_rescan_mutex); - pci_rescan_bus(bus); - mutex_unlock(&pci_remove_rescan_mutex); - } + if (val) + ret = device_schedule_callback(dev, bus_rescan_callback); + + if (ret) + count = ret; + return count; } -- 1.7.7