From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [2/6] iommu/of: Use device_iommu_mapped() From: Joerg Roedel Message-Id: <20181211134343.10664-3-joro@8bytes.org> Date: Tue, 11 Dec 2018 14:43:39 +0100 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 List-ID: RnJvbTogSm9lcmcgUm9lZGVsIDxqcm9lZGVsQHN1c2UuZGU+CgpVc2UgVXNlIGRldmljZV9pb21t dV9tYXBwZWQoKSB0byBjaGVjayBpZiB0aGUgZGV2aWNlIGlzCmFscmVhZHkgbWFwcGVkIGJ5IGFu IElPTU1VLgoKQWNrZWQtYnk6IFJvYmluIE11cnBoeSA8cm9iaW4ubXVycGh5QGFybS5jb20+ClNp Z25lZC1vZmYtYnk6IEpvZXJnIFJvZWRlbCA8anJvZWRlbEBzdXNlLmRlPgotLS0KIGRyaXZlcnMv aW9tbXUvb2ZfaW9tbXUuYyB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwg MSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW9tbXUvb2ZfaW9tbXUuYyBiL2Ry aXZlcnMvaW9tbXUvb2ZfaW9tbXUuYwppbmRleCBjNWRkNjMwNzI1MjkuLmJmY2YxMzk1MDNmMCAx MDA2NDQKLS0tIGEvZHJpdmVycy9pb21tdS9vZl9pb21tdS5jCisrKyBiL2RyaXZlcnMvaW9tbXUv b2ZfaW9tbXUuYwpAQCAtMjIwLDcgKzIyMCw3IEBAIGNvbnN0IHN0cnVjdCBpb21tdV9vcHMgKm9m X2lvbW11X2NvbmZpZ3VyZShzdHJ1Y3QgZGV2aWNlICpkZXYsCiAJICogSWYgd2UgaGF2ZSByZWFz b24gdG8gYmVsaWV2ZSB0aGUgSU9NTVUgZHJpdmVyIG1pc3NlZCB0aGUgaW5pdGlhbAogCSAqIGFk ZF9kZXZpY2UgY2FsbGJhY2sgZm9yIGRldiwgcmVwbGF5IGl0IHRvIGdldCB0aGluZ3MgaW4gb3Jk ZXIuCiAJICovCi0JaWYgKG9wcyAmJiBvcHMtPmFkZF9kZXZpY2UgJiYgZGV2LT5idXMgJiYgIWRl di0+aW9tbXVfZ3JvdXApCisJaWYgKG9wcyAmJiBvcHMtPmFkZF9kZXZpY2UgJiYgZGV2LT5idXMg JiYgIWRldmljZV9pb21tdV9tYXBwZWQoZGV2KSkKIAkJZXJyID0gb3BzLT5hZGRfZGV2aWNlKGRl dik7CiAKIAkvKiBJZ25vcmUgYWxsIG90aGVyIGVycm9ycyBhcGFydCBmcm9tIEVQUk9CRV9ERUZF UiAqLwo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joerg Roedel 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> References: <20181211134343.10664-1-joro@8bytes.org> Return-path: In-Reply-To: <20181211134343.10664-1-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org 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 List-Id: linux-acpi@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