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: [5/6] xhci: Use device_iommu_mapped() From: Joerg Roedel Message-Id: <20181211134343.10664-6-joro@8bytes.org> Date: Tue, 11 Dec 2018 14:43:42 +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+CgpSZXBsYWNlIHRoZSBkZXYtPmlv bW11X2dyb3VwIGNoZWNrIHdpdGggYSBwcm9wZXIgZnVuY3Rpb24KY2FsbCB0aGF0IGJldHRlciBy ZXByZW5zZW50cyBpdHMgcHVycG9zZS4KCkNjOiBNYXRoaWFzIE55bWFuIDxtYXRoaWFzLm55bWFu QGludGVsLmNvbT4KQWNrZWQtYnk6IFJvYmluIE11cnBoeSA8cm9iaW4ubXVycGh5QGFybS5jb20+ ClNpZ25lZC1vZmYtYnk6IEpvZXJnIFJvZWRlbCA8anJvZWRlbEBzdXNlLmRlPgotLS0KIGRyaXZl cnMvdXNiL2hvc3QveGhjaS5jIHwgMiArLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCsp LCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvaG9zdC94aGNpLmMgYi9k cml2ZXJzL3VzYi9ob3N0L3hoY2kuYwppbmRleCBkYWUzYmUxYjljOGYuLjhlYWNkMmVkNDEyYiAx MDA2NDQKLS0tIGEvZHJpdmVycy91c2IvaG9zdC94aGNpLmMKKysrIGIvZHJpdmVycy91c2IvaG9z dC94aGNpLmMKQEAgLTI0NCw3ICsyNDQsNyBAQCBzdGF0aWMgdm9pZCB4aGNpX3plcm9fNjRiX3Jl Z3Moc3RydWN0IHhoY2lfaGNkICp4aGNpKQogCSAqIGFuIGlvbW11LiBEb2luZyBhbnl0aGluZyB3 aGVuIHRoZXJlIGlzIG5vIGlvbW11IGlzIGRlZmluaXRlbHkKIAkgKiB1bnNhZmUuLi4KIAkgKi8K LQlpZiAoISh4aGNpLT5xdWlya3MgJiBYSENJX1pFUk9fNjRCX1JFR1MpIHx8ICFkZXYtPmlvbW11 X2dyb3VwKQorCWlmICghKHhoY2ktPnF1aXJrcyAmIFhIQ0lfWkVST182NEJfUkVHUykgfHwgIWRl dmljZV9pb21tdV9tYXBwZWQoZGV2KSkKIAkJcmV0dXJuOwogCiAJeGhjaV9pbmZvKHhoY2ksICJa ZXJvaW5nIDY0Yml0IGJhc2UgcmVnaXN0ZXJzLCBleHBlY3RpbmcgZmF1bHRcbiIpOwo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joerg Roedel Subject: [PATCH 5/6] xhci: Use device_iommu_mapped() Date: Tue, 11 Dec 2018 14:43:42 +0100 Message-ID: <20181211134343.10664-6-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 Replace the dev->iommu_group check with a proper function call that better reprensents its purpose. Cc: Mathias Nyman Acked-by: Robin Murphy Signed-off-by: Joerg Roedel --- drivers/usb/host/xhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index dae3be1b9c8f..8eacd2ed412b 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -244,7 +244,7 @@ static void xhci_zero_64b_regs(struct xhci_hcd *xhci) * an iommu. Doing anything when there is no iommu is definitely * unsafe... */ - if (!(xhci->quirks & XHCI_ZERO_64B_REGS) || !dev->iommu_group) + if (!(xhci->quirks & XHCI_ZERO_64B_REGS) || !device_iommu_mapped(dev)) return; xhci_info(xhci, "Zeroing 64bit base registers, expecting fault\n"); -- 2.17.1