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: Mathias Nyman Message-Id: <3d5b3bb3-b119-7798-4c26-910782ef1bdf@linux.intel.com> Date: Mon, 17 Dec 2018 13:21:43 +0200 To: Joerg Roedel , 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 , 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: T24gMTEuMTIuMjAxOCAxNTo0MywgSm9lcmcgUm9lZGVsIHdyb3RlOgo+IEZyb206IEpvZXJnIFJv ZWRlbCA8anJvZWRlbEBzdXNlLmRlPgo+IAo+IFJlcGxhY2UgdGhlIGRldi0+aW9tbXVfZ3JvdXAg Y2hlY2sgd2l0aCBhIHByb3BlciBmdW5jdGlvbgo+IGNhbGwgdGhhdCBiZXR0ZXIgcmVwcmVuc2Vu dHMgaXRzIHB1cnBvc2UuCj4gCj4gQ2M6IE1hdGhpYXMgTnltYW4gPG1hdGhpYXMubnltYW5AaW50 ZWwuY29tPgo+IEFja2VkLWJ5OiBSb2JpbiBNdXJwaHkgPHJvYmluLm11cnBoeUBhcm0uY29tPgo+ IFNpZ25lZC1vZmYtYnk6IEpvZXJnIFJvZWRlbCA8anJvZWRlbEBzdXNlLmRlPgo+IC0tLQo+ICAg ZHJpdmVycy91c2IvaG9zdC94aGNpLmMgfCAyICstCj4gICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNl cnRpb24oKyksIDEgZGVsZXRpb24oLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvaG9z dC94aGNpLmMgYi9kcml2ZXJzL3VzYi9ob3N0L3hoY2kuYwo+IGluZGV4IGRhZTNiZTFiOWM4Zi4u OGVhY2QyZWQ0MTJiIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdXNiL2hvc3QveGhjaS5jCj4gKysr IGIvZHJpdmVycy91c2IvaG9zdC94aGNpLmMKPiBAQCAtMjQ0LDcgKzI0NCw3IEBAIHN0YXRpYyB2 b2lkIHhoY2lfemVyb182NGJfcmVncyhzdHJ1Y3QgeGhjaV9oY2QgKnhoY2kpCj4gICAJICogYW4g aW9tbXUuIERvaW5nIGFueXRoaW5nIHdoZW4gdGhlcmUgaXMgbm8gaW9tbXUgaXMgZGVmaW5pdGVs eQo+ICAgCSAqIHVuc2FmZS4uLgo+ICAgCSAqLwo+IC0JaWYgKCEoeGhjaS0+cXVpcmtzICYgWEhD SV9aRVJPXzY0Ql9SRUdTKSB8fCAhZGV2LT5pb21tdV9ncm91cCkKPiArCWlmICghKHhoY2ktPnF1 aXJrcyAmIFhIQ0lfWkVST182NEJfUkVHUykgfHwgIWRldmljZV9pb21tdV9tYXBwZWQoZGV2KSkK PiAgIAkJcmV0dXJuOwo+ICAgCj4gICAJeGhjaV9pbmZvKHhoY2ksICJaZXJvaW5nIDY0Yml0IGJh c2UgcmVnaXN0ZXJzLCBleHBlY3RpbmcgZmF1bHRcbiIpOwo+IAoKQWNrZWQtYnk6IE1hdGhpYXMg TnltYW4gPG1hdGhpYXMubnltYW5AbGludXguaW50ZWwuY29tPgo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathias Nyman Subject: Re: [PATCH 5/6] xhci: Use device_iommu_mapped() Date: Mon, 17 Dec 2018 13:21:43 +0200 Message-ID: <3d5b3bb3-b119-7798-4c26-910782ef1bdf@linux.intel.com> References: <20181211134343.10664-1-joro@8bytes.org> <20181211134343.10664-6-joro@8bytes.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20181211134343.10664-6-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Joerg Roedel , iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: Mathias Nyman , Greg Kroah-Hartman , Sam Bobroff , Benjamin Herrenschmidt , Russell Currey , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sudeep Holla , linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Vinod Koul , jroedel-l3A5Bk7waGM@public.gmane.org, oohall-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, Michael Ellerman , dmaengine-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Paul Mackerras , Dan Williams , linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-acpi@vger.kernel.org On 11.12.2018 15:43, Joerg Roedel wrote: > 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"); > Acked-by: Mathias Nyman From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D176C43444 for ; Mon, 17 Dec 2018 11:17:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 56B162133F for ; Mon, 17 Dec 2018 11:17:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731713AbeLQLRw (ORCPT ); Mon, 17 Dec 2018 06:17:52 -0500 Received: from mga12.intel.com ([192.55.52.136]:3770 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726982AbeLQLRw (ORCPT ); Mon, 17 Dec 2018 06:17:52 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Dec 2018 03:17:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,365,1539673200"; d="scan'208";a="102121114" Received: from mattu-haswell.fi.intel.com (HELO [10.237.72.164]) ([10.237.72.164]) by orsmga008.jf.intel.com with ESMTP; 17 Dec 2018 03:17:45 -0800 Subject: Re: [PATCH 5/6] xhci: Use device_iommu_mapped() To: Joerg Roedel , 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 , 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 References: <20181211134343.10664-1-joro@8bytes.org> <20181211134343.10664-6-joro@8bytes.org> From: Mathias Nyman Message-ID: <3d5b3bb3-b119-7798-4c26-910782ef1bdf@linux.intel.com> Date: Mon, 17 Dec 2018 13:21:43 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20181211134343.10664-6-joro@8bytes.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11.12.2018 15:43, Joerg Roedel wrote: > 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"); > Acked-by: Mathias Nyman