From patchwork Sun May 26 15:53:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 246421 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 BBC1C2C0096 for ; Mon, 27 May 2013 02:00:18 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754652Ab3EZP7S (ORCPT ); Sun, 26 May 2013 11:59:18 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:42605 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754055Ab3EZP7O (ORCPT ); Sun, 26 May 2013 11:59:14 -0400 Received: by mail-pd0-f171.google.com with SMTP id z11so5831939pdj.16 for ; Sun, 26 May 2013 08:59:14 -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=a357Scfj+ojRJx2iysxhrI3/ut7vrp3Sg3SRlUtnOoQ=; b=f5+tLxj8bgktcSUJDBRj2HNWyI6BcuFYqvHqYdvldqsgNmOx6Xa3f/is0SpHHx9qQW roP2j3fCqZ5DVmvsE2lXAG7WEGZiY8q3B1fxnyhNIw3FNSPJ40XpvfeWWE15Sve4UU2v uDrwOwJaCq2Hpz6lSN+SgRrkRjg9fAab8I++/G+RYZCSSAtc9Y5aUKxDZuCBSGv5p2ay GNx9NRUIb9ROQBTwzachnhi8waT4aUYp0EgZ1cB8pKR9HEbwP9+V/Fbuj7lBOB0G6cJP eRIzo1Ntte03tcgM2Mb4ps5vXW4stb8iQkznYNsGfFmBDRzvyCC5X6KjrKJNOovl7Tdm tACw== X-Received: by 10.66.87.5 with SMTP id t5mr26940585paz.169.1369583954333; Sun, 26 May 2013 08:59:14 -0700 (PDT) Received: from localhost.localdomain ([111.196.197.202]) by mx.google.com with ESMTPSA id ze11sm26603189pab.22.2013.05.26.08.59.08 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 May 2013 08:59:13 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Yinghai Lu Cc: Jiang Liu , "Rafael J . Wysocki" , Greg Kroah-Hartman , Gu Zheng , Toshi Kani , Myron Stowe , Yijing Wang , Jiang Liu , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Joerg Roedel , Ingo Molnar , Donald Dutile , Hannes Reinecke , "Li, Zhen-Hua" , iommu@lists.linux-foundation.org Subject: [PATCH v3, part2 17/20] PCI, iommu: use hotplug-safe iterators to walk PCI buses Date: Sun, 26 May 2013 23:53:14 +0800 Message-Id: <1369583597-3801-18-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1369583597-3801-1-git-send-email-jiang.liu@huawei.com> References: <1369583597-3801-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 Enhance iommu drviers to use hotplug-safe iterators to walk PCI buses. Signed-off-by: Jiang Liu Cc: Joerg Roedel Cc: Ingo Molnar Cc: Donald Dutile Cc: Hannes Reinecke Cc: "Li, Zhen-Hua" Cc: iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org --- drivers/iommu/amd_iommu.c | 4 +++- drivers/iommu/dmar.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 21d02b0..eef7a7e 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -352,6 +352,7 @@ static int init_iommu_group(struct device *dev) struct iommu_dev_data *dev_data; struct iommu_group *group; struct pci_dev *dma_pdev; + struct pci_bus *b = NULL; int ret; group = iommu_group_get(dev); @@ -388,7 +389,7 @@ static int init_iommu_group(struct device *dev) * the alias. Be careful to also test the parent device if * we think the alias is the root of the group. */ - bus = pci_find_bus(0, alias >> 8); + b = bus = pci_get_bus(0, alias >> 8); if (!bus) goto use_group; @@ -408,6 +409,7 @@ static int init_iommu_group(struct device *dev) dma_pdev = get_isolation_root(pci_dev_get(to_pci_dev(dev))); use_pdev: ret = use_pdev_iommu_group(dma_pdev, dev); + pci_bus_put(b); pci_dev_put(dma_pdev); return ret; use_group: diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index a7967ce..7162787 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -67,12 +67,12 @@ static void __init dmar_register_drhd_unit(struct dmar_drhd_unit *drhd) static int __init dmar_parse_one_dev_scope(struct acpi_dmar_device_scope *scope, struct pci_dev **dev, u16 segment) { - struct pci_bus *bus; + struct pci_bus *b, *bus; struct pci_dev *pdev = NULL; struct acpi_dmar_pci_path *path; int count; - bus = pci_find_bus(segment, scope->bus); + b = bus = pci_get_bus(segment, scope->bus); path = (struct acpi_dmar_pci_path *)(scope + 1); count = (scope->length - sizeof(struct acpi_dmar_device_scope)) / sizeof(struct acpi_dmar_pci_path); @@ -97,6 +97,8 @@ static int __init dmar_parse_one_dev_scope(struct acpi_dmar_device_scope *scope, count --; bus = pdev->subordinate; } + pci_bus_put(b); + if (!pdev) { pr_warn("Device scope device [%04x:%02x:%02x.%02x] not found\n", segment, scope->bus, path->dev, path->fn);