From patchwork Tue Aug 28 15:43:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 180515 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 EB40B2C009D for ; Wed, 29 Aug 2012 01:46:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753258Ab2H1Poc (ORCPT ); Tue, 28 Aug 2012 11:44:32 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:56281 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752900Ab2H1Poa (ORCPT ); Tue, 28 Aug 2012 11:44:30 -0400 Received: by mail-pb0-f46.google.com with SMTP id rr13so9582872pbb.19 for ; Tue, 28 Aug 2012 08:44:30 -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=UfH2yB1fKo7ZLrdpnbAy/eG4sgVcj4eWe2OLLEsxLow=; b=DZ0ewrWLBkxbD3RyyYPitwQC6QHar1G1QgEORrEUqbm0ROtu4ws0h5DeukRYxg1GRG rpYB9rOnvmTmhxCqI81lWtgVKmm1mMZeQFBe+nbkekDQVD0wFIDk/jLM+qJkKqNo8bJe pDaN6DgfuonG8EZiJ2xOGKmU5zdQau3KzEvvtFVXINT5aNi5pvrdw1WOZAjDIaiXyXG8 n6dy56PjZ07I/AL4n8+UiekodSGYRI3c9oSZnToVyOw2sMfEwm8EGCYhO7g/jrs3Xc3n LKnd9MFWvwJ9kJiKoNgEsM7ZarER5Vn92lJwkyVbCWuEafgQu9Y2X5d5QYXfPO80HYXP 2mmg== Received: by 10.68.129.131 with SMTP id nw3mr43577949pbb.43.1346168670478; Tue, 28 Aug 2012 08:44:30 -0700 (PDT) Received: from localhost.localdomain ([58.250.81.2]) by mx.google.com with ESMTPS id tq4sm17276577pbc.11.2012.08.28.08.44.21 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 28 Aug 2012 08:44:28 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Jes Sorensen , Tony Luck , Fenghua Yu Cc: Jiang Liu , Don Dutile , Yinghai Lu , Kenji Kaneshige , Yijing Wang , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH 1/5] PCI/IA64: simplify code by hotplug safe pci_get_domain_bus_and_slot() Date: Tue, 28 Aug 2012 23:43:54 +0800 Message-Id: <1346168638-32724-2-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346168638-32724-1-git-send-email-jiang.liu@huawei.com> References: <1346168638-32724-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 Following code has a race window between pci_find_bus() and pci_get_slot() if PCI hotplug operation happens between them which removes the pci_bus. So use PCI hotplug safe interface pci_get_domain_bus_and_slot() instead, which also reduces code complexity. struct pci_bus *pci_bus = pci_find_bus(domain, busno); struct pci_dev *pci_dev = pci_get_slot(pci_bus, devfn); Signed-off-by: Jiang Liu --- arch/ia64/sn/kernel/io_common.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c index fbb5f2f..8630875 100644 --- a/arch/ia64/sn/kernel/io_common.c +++ b/arch/ia64/sn/kernel/io_common.c @@ -229,7 +229,6 @@ void sn_pci_fixup_slot(struct pci_dev *dev, struct pcidev_info *pcidev_info, { int segment = pci_domain_nr(dev->bus); struct pcibus_bussoft *bs; - struct pci_bus *host_pci_bus; struct pci_dev *host_pci_dev; unsigned int bus_no, devfn; @@ -245,8 +244,7 @@ void sn_pci_fixup_slot(struct pci_dev *dev, struct pcidev_info *pcidev_info, bus_no = (pcidev_info->pdi_slot_host_handle >> 32) & 0xff; devfn = pcidev_info->pdi_slot_host_handle & 0xffffffff; - host_pci_bus = pci_find_bus(segment, bus_no); - host_pci_dev = pci_get_slot(host_pci_bus, devfn); + host_pci_dev = pci_get_domain_bus_and_slot(segment, bus_no, devfn); pcidev_info->host_pci_dev = host_pci_dev; pcidev_info->pdi_linux_pcidev = dev;