From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: Re: [RFC PATCH] USB: PCI: set 32bit DMA mask for PCI based USB controllers Date: Wed, 30 Jan 2019 08:40:59 +0100 Message-ID: <20190130074059.GA29458@lst.de> References: <1548831714-3706-1-git-send-email-guohanjun@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1548831714-3706-1-git-send-email-guohanjun@huawei.com> Sender: linux-kernel-owner@vger.kernel.org To: Hanjun Guo Cc: Greg Kroah-Hartman , Robin Murphy , Lorenzo Pieralisi , "Rafael J. Wysocki" , Bjorn Helgaas , Christoph Hellwig , linux-usb@vger.kernel.org, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linuxarm@huawei.com, John Garry , Jonathan Cameron , anthony.jebson@huawei.com, Hanjun Guo List-Id: linux-acpi@vger.kernel.org On Wed, Jan 30, 2019 at 03:01:54PM +0800, Hanjun Guo wrote: > This is the RFC version, I'm not sure this is the best solution, > comments are warmly welcomed. > > Thanks > Hanjun > > drivers/usb/core/hcd-pci.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c > index 0343246..a9c33e6 100644 > --- a/drivers/usb/core/hcd-pci.c > +++ b/drivers/usb/core/hcd-pci.c > @@ -188,6 +188,10 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) > if (pci_enable_device(dev) < 0) > return -ENODEV; > > + retval = dma_coerce_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32)); > + if (retval) > + return retval; dma_coerce_mask_and_coherent is only for platform devices (and I'm not sure it is a good idea to start with, but that is a different story). PCI device should have the dma_mask pointer set already, so you should use dma_set_mask_and_coherent here. 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: [RFC] USB: PCI: set 32bit DMA mask for PCI based USB controllers From: Christoph Hellwig Message-Id: <20190130074059.GA29458@lst.de> Date: Wed, 30 Jan 2019 08:40:59 +0100 To: Hanjun Guo Cc: Greg Kroah-Hartman , Robin Murphy , Lorenzo Pieralisi , "Rafael J. Wysocki" , Bjorn Helgaas , Christoph Hellwig , linux-usb@vger.kernel.org, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linuxarm@huawei.com, John Garry , Jonathan Cameron , anthony.jebson@huawei.com, Hanjun Guo List-ID: T24gV2VkLCBKYW4gMzAsIDIwMTkgYXQgMDM6MDE6NTRQTSArMDgwMCwgSGFuanVuIEd1byB3cm90 ZToKPiBUaGlzIGlzIHRoZSBSRkMgdmVyc2lvbiwgSSdtIG5vdCBzdXJlIHRoaXMgaXMgdGhlIGJl c3Qgc29sdXRpb24sCj4gY29tbWVudHMgYXJlIHdhcm1seSB3ZWxjb21lZC4KPiAKPiBUaGFua3MK PiBIYW5qdW4KPiAKPiAgZHJpdmVycy91c2IvY29yZS9oY2QtcGNpLmMgfCA0ICsrKysKPiAgMSBm aWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3Vz Yi9jb3JlL2hjZC1wY2kuYyBiL2RyaXZlcnMvdXNiL2NvcmUvaGNkLXBjaS5jCj4gaW5kZXggMDM0 MzI0Ni4uYTljMzNlNiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL3VzYi9jb3JlL2hjZC1wY2kuYwo+ ICsrKyBiL2RyaXZlcnMvdXNiL2NvcmUvaGNkLXBjaS5jCj4gQEAgLTE4OCw2ICsxODgsMTAgQEAg aW50IHVzYl9oY2RfcGNpX3Byb2JlKHN0cnVjdCBwY2lfZGV2ICpkZXYsIGNvbnN0IHN0cnVjdCBw Y2lfZGV2aWNlX2lkICppZCkKPiAgCWlmIChwY2lfZW5hYmxlX2RldmljZShkZXYpIDwgMCkKPiAg CQlyZXR1cm4gLUVOT0RFVjsKPiAgCj4gKwlyZXR2YWwgPSBkbWFfY29lcmNlX21hc2tfYW5kX2Nv aGVyZW50KCZkZXYtPmRldiwgRE1BX0JJVF9NQVNLKDMyKSk7Cj4gKwlpZiAocmV0dmFsKQo+ICsJ CXJldHVybiByZXR2YWw7CgpkbWFfY29lcmNlX21hc2tfYW5kX2NvaGVyZW50IGlzIG9ubHkgZm9y IHBsYXRmb3JtIGRldmljZXMgKGFuZCBJJ20Kbm90IHN1cmUgaXQgaXMgYSBnb29kIGlkZWEgdG8g c3RhcnQgd2l0aCwgYnV0IHRoYXQgaXMgYSBkaWZmZXJlbnQKc3RvcnkpLgoKUENJIGRldmljZSBz aG91bGQgaGF2ZSB0aGUgZG1hX21hc2sgcG9pbnRlciBzZXQgYWxyZWFkeSwgc28geW91IHNob3Vs ZAp1c2UgZG1hX3NldF9tYXNrX2FuZF9jb2hlcmVudCBoZXJlLgo=