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: powerpc/ps3: Set driver coherent_dma_mask From: Takashi Iwai Message-Id: Date: Thu, 19 Jul 2018 08:46:45 +0200 To: Geoff Levand Cc: Michael Ellerman , Jaroslav Kysela , Alan Stern , "linuxppc-dev@lists.ozlabs.org" , linux-usb@vger.kernel.org List-ID: T24gVGh1LCAxOSBKdWwgMjAxOCAwMDowODozMyArMDIwMCwKR2VvZmYgTGV2YW5kIHdyb3RlOgo+ IAo+IFNldCB0aGUgY29oZXJlbnRfZG1hX21hc2sgZm9yIHRoZSBQUzMgZWhjaSwgb2hjaSwgYW5k IHNuZCBkZXZpY2VzLgo+IAo+IFNpbGVuY2VzIFdBUk5fT05fT05DRSBtZXNzYWdlcyBlbWl0dGVk IGJ5IHRoZSBkbWFfYWxsb2NfYXR0cnMoKSByb3V0aW5lLgo+IAo+IFJlcG9ydGVkLWJ5OiBGcmVk cmlrIE5vcmluZyA8bm9yaW5nQG5vY3Jldy5vcmc+Cj4gU2lnbmVkLW9mZi1ieTogR2VvZmYgTGV2 YW5kIDxnZW9mZkBpbmZyYWRlYWQub3JnPgoKRm9yIHNvdW5kIGJpdHMsCiAgUmV2aWV3ZWQtYnk6 IFRha2FzaGkgSXdhaSA8dGl3YWlAc3VzZS5kZT4KCgp0aGFua3MsCgpUYWthc2hpCgo+IC0tLQo+ IEhpIE1pY2hhZWwsCj4gCj4gVGhpcyBqdXN0IHNpbGVuY2VzIHNvbWUgd2FybmluZ3MuICBDYW4g eW91IHRha2UgaXQgdGhyb3VnaCB0aGUgcG93ZXJwYwo+IHRyZWU/Cj4gCj4gLUdlb2ZmCj4gCj4g Cj4gIGRyaXZlcnMvdXNiL2hvc3QvZWhjaS1wczMuYyB8IDYgKysrKy0tCj4gIGRyaXZlcnMvdXNi L2hvc3Qvb2hjaS1wczMuYyB8IDYgKysrKy0tCj4gIHNvdW5kL3BwYy9zbmRfcHMzLmMgICAgICAg ICB8IDUgKysrKysKPiAgMyBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCA0IGRlbGV0 aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9ob3N0L2VoY2ktcHMzLmMgYi9k cml2ZXJzL3VzYi9ob3N0L2VoY2ktcHMzLmMKPiBpbmRleCA4YzczMzQ5MmQ4ZmUuLjQ1NGQ4YzYy NGEzZiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL3VzYi9ob3N0L2VoY2ktcHMzLmMKPiArKysgYi9k cml2ZXJzL3VzYi9ob3N0L2VoY2ktcHMzLmMKPiBAQCAtODYsNyArODYsNyBAQCBzdGF0aWMgaW50 IHBzM19laGNpX3Byb2JlKHN0cnVjdCBwczNfc3lzdGVtX2J1c19kZXZpY2UgKmRldikKPiAgCWlu dCByZXN1bHQ7Cj4gIAlzdHJ1Y3QgdXNiX2hjZCAqaGNkOwo+ICAJdW5zaWduZWQgaW50IHZpcnE7 Cj4gLQlzdGF0aWMgdTY0IGR1bW15X21hc2sgPSBETUFfQklUX01BU0soMzIpOwo+ICsJc3RhdGlj IHU2NCBkdW1teV9tYXNrOwo+ICAKPiAgCWlmICh1c2JfZGlzYWJsZWQoKSkgewo+ICAJCXJlc3Vs dCA9IC1FTk9ERVY7Cj4gQEAgLTEzMSw3ICsxMzEsOSBAQCBzdGF0aWMgaW50IHBzM19laGNpX3By b2JlKHN0cnVjdCBwczNfc3lzdGVtX2J1c19kZXZpY2UgKmRldikKPiAgCQlnb3RvIGZhaWxfaXJx Owo+ICAJfQo+ICAKPiAtCWRldi0+Y29yZS5kbWFfbWFzayA9ICZkdW1teV9tYXNrOyAvKiBGSVhN RTogZm9yIGltcHJvcGVyIHVzYiBjb2RlICovCj4gKwlkdW1teV9tYXNrID0gRE1BX0JJVF9NQVNL KDMyKTsKPiArCWRldi0+Y29yZS5kbWFfbWFzayA9ICZkdW1teV9tYXNrOwo+ICsJZG1hX3NldF9j b2hlcmVudF9tYXNrKCZkZXYtPmNvcmUsIGR1bW15X21hc2spOwo+ICAKPiAgCWhjZCA9IHVzYl9j cmVhdGVfaGNkKCZwczNfZWhjaV9oY19kcml2ZXIsICZkZXYtPmNvcmUsIGRldl9uYW1lKCZkZXYt PmNvcmUpKTsKPiAgCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2hvc3Qvb2hjaS1wczMuYyBi L2RyaXZlcnMvdXNiL2hvc3Qvb2hjaS1wczMuYwo+IGluZGV4IDIwYTIzZDc5NWFkZi4uMzk1Zjlk M2JjODQ5IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdXNiL2hvc3Qvb2hjaS1wczMuYwo+ICsrKyBi L2RyaXZlcnMvdXNiL2hvc3Qvb2hjaS1wczMuYwo+IEBAIC02OSw3ICs2OSw3IEBAIHN0YXRpYyBp bnQgcHMzX29oY2lfcHJvYmUoc3RydWN0IHBzM19zeXN0ZW1fYnVzX2RldmljZSAqZGV2KQo+ICAJ aW50IHJlc3VsdDsKPiAgCXN0cnVjdCB1c2JfaGNkICpoY2Q7Cj4gIAl1bnNpZ25lZCBpbnQgdmly cTsKPiAtCXN0YXRpYyB1NjQgZHVtbXlfbWFzayA9IERNQV9CSVRfTUFTSygzMik7Cj4gKwlzdGF0 aWMgdTY0IGR1bW15X21hc2s7Cj4gIAo+ICAJaWYgKHVzYl9kaXNhYmxlZCgpKSB7Cj4gIAkJcmVz dWx0ID0gLUVOT0RFVjsKPiBAQCAtMTE1LDcgKzExNSw5IEBAIHN0YXRpYyBpbnQgcHMzX29oY2lf cHJvYmUoc3RydWN0IHBzM19zeXN0ZW1fYnVzX2RldmljZSAqZGV2KQo+ICAJCWdvdG8gZmFpbF9p cnE7Cj4gIAl9Cj4gIAo+IC0JZGV2LT5jb3JlLmRtYV9tYXNrID0gJmR1bW15X21hc2s7IC8qIEZJ WE1FOiBmb3IgaW1wcm9wZXIgdXNiIGNvZGUgKi8KPiArCWR1bW15X21hc2sgPSBETUFfQklUX01B U0soMzIpOwo+ICsJZGV2LT5jb3JlLmRtYV9tYXNrID0gJmR1bW15X21hc2s7Cj4gKwlkbWFfc2V0 X2NvaGVyZW50X21hc2soJmRldi0+Y29yZSwgZHVtbXlfbWFzayk7Cj4gIAo+ICAJaGNkID0gdXNi X2NyZWF0ZV9oY2QoJnBzM19vaGNpX2hjX2RyaXZlciwgJmRldi0+Y29yZSwgZGV2X25hbWUoJmRl di0+Y29yZSkpOwo+ICAKPiBkaWZmIC0tZ2l0IGEvc291bmQvcHBjL3NuZF9wczMuYyBiL3NvdW5k L3BwYy9zbmRfcHMzLmMKPiBpbmRleCAzNmYzNGY0MzRlY2IuLmFiZTAzMWM5ZDU5MiAxMDA2NDQK PiAtLS0gYS9zb3VuZC9wcGMvc25kX3BzMy5jCj4gKysrIGIvc291bmQvcHBjL3NuZF9wczMuYwo+ IEBAIC05MzAsNiArOTMwLDcgQEAgc3RhdGljIGludCBzbmRfcHMzX2RyaXZlcl9wcm9iZShzdHJ1 Y3QgcHMzX3N5c3RlbV9idXNfZGV2aWNlICpkZXYpCj4gIHsKPiAgCWludCBpLCByZXQ7Cj4gIAl1 NjQgbHBhcl9hZGRyLCBscGFyX3NpemU7Cj4gKwlzdGF0aWMgdTY0IGR1bW15X21hc2s7Cj4gIAo+ ICAJaWYgKFdBUk5fT04oIWZpcm13YXJlX2hhc19mZWF0dXJlKEZXX0ZFQVRVUkVfUFMzX0xWMSkp KQo+ICAJCXJldHVybiAtRU5PREVWOwo+IEBAIC05NzAsNiArOTcxLDEwIEBAIHN0YXRpYyBpbnQg c25kX3BzM19kcml2ZXJfcHJvYmUoc3RydWN0IHBzM19zeXN0ZW1fYnVzX2RldmljZSAqZGV2KQo+ ICAJCWdvdG8gY2xlYW5fbW1pbzsKPiAgCX0KPiAgCj4gKwlkdW1teV9tYXNrID0gRE1BX0JJVF9N QVNLKDMyKTsKPiArCWRldi0+Y29yZS5kbWFfbWFzayA9ICZkdW1teV9tYXNrOwo+ICsJZG1hX3Nl dF9jb2hlcmVudF9tYXNrKCZkZXYtPmNvcmUsIGR1bW15X21hc2spOwo+ICsKPiAgCXNuZF9wczNf YXVkaW9fc2V0X2Jhc2VfYWRkcihkZXYtPmRfcmVnaW9uLT5idXNfYWRkcik7Cj4gIAo+ICAJLyog Q09ORklHX1NORF9QUzNfREVGQVVMVF9TVEFSVF9ERUxBWSAqLwo+IC0tIAo+IDIuMTQuMQo+IAo+ Ci0tLQpUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDogc2VuZCB0aGUgbGluZSAidW5zdWJz Y3JpYmUgbGludXgtdXNiIiBpbgp0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZn ZXIua2VybmVsLm9yZwpNb3JlIG1ham9yZG9tbyBpbmZvIGF0ICBodHRwOi8vdmdlci5rZXJuZWwu b3JnL21ham9yZG9tby1pbmZvLmh0bWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41WPgt6ZzvzDqCB for ; Thu, 19 Jul 2018 16:46:50 +1000 (AEST) Date: Thu, 19 Jul 2018 08:46:45 +0200 Message-ID: From: Takashi Iwai To: "Geoff Levand" Cc: "Michael Ellerman" , "Jaroslav Kysela" , "Alan Stern" , "linuxppc-dev@lists.ozlabs.org" , Subject: Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask In-Reply-To: <068ebcfa-7cd0-bd06-42e7-577a4624f0b0@infradead.org> References: <068ebcfa-7cd0-bd06-42e7-577a4624f0b0@infradead.org> MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Thu, 19 Jul 2018 00:08:33 +0200, Geoff Levand wrote: > > Set the coherent_dma_mask for the PS3 ehci, ohci, and snd devices. > > Silences WARN_ON_ONCE messages emitted by the dma_alloc_attrs() routine. > > Reported-by: Fredrik Noring > Signed-off-by: Geoff Levand For sound bits, Reviewed-by: Takashi Iwai thanks, Takashi > --- > Hi Michael, > > This just silences some warnings. Can you take it through the powerpc > tree? > > -Geoff > > > drivers/usb/host/ehci-ps3.c | 6 ++++-- > drivers/usb/host/ohci-ps3.c | 6 ++++-- > sound/ppc/snd_ps3.c | 5 +++++ > 3 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c > index 8c733492d8fe..454d8c624a3f 100644 > --- a/drivers/usb/host/ehci-ps3.c > +++ b/drivers/usb/host/ehci-ps3.c > @@ -86,7 +86,7 @@ static int ps3_ehci_probe(struct ps3_system_bus_device *dev) > int result; > struct usb_hcd *hcd; > unsigned int virq; > - static u64 dummy_mask = DMA_BIT_MASK(32); > + static u64 dummy_mask; > > if (usb_disabled()) { > result = -ENODEV; > @@ -131,7 +131,9 @@ static int ps3_ehci_probe(struct ps3_system_bus_device *dev) > goto fail_irq; > } > > - dev->core.dma_mask = &dummy_mask; /* FIXME: for improper usb code */ > + dummy_mask = DMA_BIT_MASK(32); > + dev->core.dma_mask = &dummy_mask; > + dma_set_coherent_mask(&dev->core, dummy_mask); > > hcd = usb_create_hcd(&ps3_ehci_hc_driver, &dev->core, dev_name(&dev->core)); > > diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c > index 20a23d795adf..395f9d3bc849 100644 > --- a/drivers/usb/host/ohci-ps3.c > +++ b/drivers/usb/host/ohci-ps3.c > @@ -69,7 +69,7 @@ static int ps3_ohci_probe(struct ps3_system_bus_device *dev) > int result; > struct usb_hcd *hcd; > unsigned int virq; > - static u64 dummy_mask = DMA_BIT_MASK(32); > + static u64 dummy_mask; > > if (usb_disabled()) { > result = -ENODEV; > @@ -115,7 +115,9 @@ static int ps3_ohci_probe(struct ps3_system_bus_device *dev) > goto fail_irq; > } > > - dev->core.dma_mask = &dummy_mask; /* FIXME: for improper usb code */ > + dummy_mask = DMA_BIT_MASK(32); > + dev->core.dma_mask = &dummy_mask; > + dma_set_coherent_mask(&dev->core, dummy_mask); > > hcd = usb_create_hcd(&ps3_ohci_hc_driver, &dev->core, dev_name(&dev->core)); > > diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c > index 36f34f434ecb..abe031c9d592 100644 > --- a/sound/ppc/snd_ps3.c > +++ b/sound/ppc/snd_ps3.c > @@ -930,6 +930,7 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev) > { > int i, ret; > u64 lpar_addr, lpar_size; > + static u64 dummy_mask; > > if (WARN_ON(!firmware_has_feature(FW_FEATURE_PS3_LV1))) > return -ENODEV; > @@ -970,6 +971,10 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev) > goto clean_mmio; > } > > + dummy_mask = DMA_BIT_MASK(32); > + dev->core.dma_mask = &dummy_mask; > + dma_set_coherent_mask(&dev->core, dummy_mask); > + > snd_ps3_audio_set_base_addr(dev->d_region->bus_addr); > > /* CONFIG_SND_PS3_DEFAULT_START_DELAY */ > -- > 2.14.1 > >