Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp666346imu; Tue, 11 Dec 2018 05:45:30 -0800 (PST) X-Google-Smtp-Source: AFSGD/UJN1gLJzUCxPcNKWwNgkH3BtsF9tuhSKLTiJAvv8A8AKkB7EqUtzBYzHHX+a2qhs5aZVo4 X-Received: by 2002:a17:902:145:: with SMTP id 63mr16007701plb.256.1544535930357; Tue, 11 Dec 2018 05:45:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544535930; cv=none; d=google.com; s=arc-20160816; b=oZl8wOBWRqnHzwAQCcyrLHNPbhN42Ct+i74BBQKdBJ8KnQJ9OnO1jm5D42/kF89l3g RSjltW6SaURA0QKkdJpccAGPXehskzf0DfhyRDFGroJYFPngiF0bTAHoHVwS6zbtH7xn cPcsmQYNdkKqBjItBJn48eZrqwbYL9Zs9Jc48zWQv1DKgdBTmBaapD1rd0cUFoNOsOVX 0DcxBqWrJqpZSrG7REyKDPjo7gkQMqdL8sFakFrZu5D1RCIiQoQ9S8aw8L+BS9eC1Qar t+04iDWK7u4jD1Vwdv9bKF3vXC/+qDnMb0UE1/Yhjqv53YjY4z7mxRQ6WQphPKF2BVn4 8gpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=PbgQtf++52CLS57nF5QUE4JYyFEnqWzjEro7zPvFp9k=; b=CNYXYUSxH61IVH5jeMv+dyHUaC9stevY80pvhWlyudJgAk0st0RdLoEf2r7v6icUCv nxv+VWSfO7B1rD6coPpNFeyxIh5Ytj1+B5Prk9g/8QLG8hThH/Gb/xoFI6C5JkspnVB3 O4N4+gza9b2S8ANp6rt02vJhGhBzR0XtBXhJtM8EY1ge5LTk8kxiGA9qK3iRGE2T+bCS 62UvqciqBKvtzrSVX1jWztkg1iAoG9XMi6VoFzBN7dIxNjf1P0CSqlecljQIjvfqbccN 1i4MmsF6boGovnVqLO7+opwr+VWYt/gS9t6aki4Ge8r8xQp3JIkSc+ZOj/8C+y06K3yo pPvQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s36si12434309pld.46.2018.12.11.05.44.50; Tue, 11 Dec 2018 05:45:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726594AbeLKNnv (ORCPT + 99 others); Tue, 11 Dec 2018 08:43:51 -0500 Received: from 8bytes.org ([81.169.241.247]:53282 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726286AbeLKNnt (ORCPT ); Tue, 11 Dec 2018 08:43:49 -0500 Received: by theia.8bytes.org (Postfix, from userid 1000) id C824E387; Tue, 11 Dec 2018 14:43:46 +0100 (CET) From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: Russell Currey , Sam Bobroff , oohall@gmail.com, Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Dan Williams , Vinod Koul , Joerg Roedel , jroedel@suse.de, Mathias Nyman , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, dmaengine@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH 2/6] iommu/of: Use device_iommu_mapped() Date: Tue, 11 Dec 2018 14:43:39 +0100 Message-Id: <20181211134343.10664-3-joro@8bytes.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181211134343.10664-1-joro@8bytes.org> References: <20181211134343.10664-1-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joerg Roedel Use Use device_iommu_mapped() to check if the device is already mapped by an IOMMU. Acked-by: Robin Murphy Signed-off-by: Joerg Roedel --- drivers/iommu/of_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index c5dd63072529..bfcf139503f0 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -220,7 +220,7 @@ const struct iommu_ops *of_iommu_configure(struct device *dev, * If we have reason to believe the IOMMU driver missed the initial * add_device callback for dev, replay it to get things in order. */ - if (ops && ops->add_device && dev->bus && !dev->iommu_group) + if (ops && ops->add_device && dev->bus && !device_iommu_mapped(dev)) err = ops->add_device(dev); /* Ignore all other errors apart from EPROBE_DEFER */ -- 2.17.1