* Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask
2018-07-18 22:08 [PATCH] powerpc/ps3: Set driver coherent_dma_mask Geoff Levand
@ 2018-07-19 6:46 ` Takashi Iwai
2018-07-19 6:54 ` Greg KH
2018-07-19 6:55 ` Greg KH
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Takashi Iwai @ 2018-07-19 6:46 UTC (permalink / raw)
To: Geoff Levand
Cc: Michael Ellerman, Jaroslav Kysela, Alan Stern,
linuxppc-dev@lists.ozlabs.org, linux-usb
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 <noring@nocrew.org>
> Signed-off-by: Geoff Levand <geoff@infradead.org>
For sound bits,
Reviewed-by: Takashi Iwai <tiwai@suse.de>
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
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask
2018-07-19 6:46 ` Takashi Iwai
@ 2018-07-19 6:54 ` Greg KH
0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2018-07-19 6:54 UTC (permalink / raw)
To: Takashi Iwai
Cc: Geoff Levand, Michael Ellerman, Jaroslav Kysela, Alan Stern,
linuxppc-dev@lists.ozlabs.org, linux-usb
On Thu, Jul 19, 2018 at 08:46:45AM +0200, Takashi Iwai wrote:
> 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 <noring@nocrew.org>
> > Signed-off-by: Geoff Levand <geoff@infradead.org>
>
> For sound bits,
> Reviewed-by: Takashi Iwai <tiwai@suse.de>
Thanks, I'll take this through the USB tree then.
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask
2018-07-18 22:08 [PATCH] powerpc/ps3: Set driver coherent_dma_mask Geoff Levand
2018-07-19 6:46 ` Takashi Iwai
@ 2018-07-19 6:55 ` Greg KH
2018-07-19 11:28 ` Michael Ellerman
2018-07-19 14:33 ` Alan Stern
2018-07-23 15:11 ` Michael Ellerman
3 siblings, 1 reply; 9+ messages in thread
From: Greg KH @ 2018-07-19 6:55 UTC (permalink / raw)
To: Geoff Levand
Cc: Alan Stern, Takashi Iwai, Jaroslav Kysela, Michael Ellerman,
linux-usb, linuxppc-dev@lists.ozlabs.org
On Wed, Jul 18, 2018 at 03:08:33PM -0700, 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 <noring@nocrew.org>
> Signed-off-by: Geoff Levand <geoff@infradead.org>
> ---
> Hi Michael,
>
> This just silences some warnings. Can you take it through the powerpc
> tree?
Oops, nevermind, it should go through the ppc tree. Here's my ack:
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask
2018-07-19 6:55 ` Greg KH
@ 2018-07-19 11:28 ` Michael Ellerman
0 siblings, 0 replies; 9+ messages in thread
From: Michael Ellerman @ 2018-07-19 11:28 UTC (permalink / raw)
To: Greg KH, Geoff Levand
Cc: Alan Stern, Takashi Iwai, Jaroslav Kysela, linux-usb,
linuxppc-dev@lists.ozlabs.org
Greg KH <gregkh@linuxfoundation.org> writes:
> On Wed, Jul 18, 2018 at 03:08:33PM -0700, 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 <noring@nocrew.org>
>> Signed-off-by: Geoff Levand <geoff@infradead.org>
>> ---
>> Hi Michael,
>>
>> This just silences some warnings. Can you take it through the powerpc
>> tree?
>
> Oops, nevermind, it should go through the ppc tree. Here's my ack:
>
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
OK thanks, I'll take it.
cheers
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask
2018-07-18 22:08 [PATCH] powerpc/ps3: Set driver coherent_dma_mask Geoff Levand
2018-07-19 6:46 ` Takashi Iwai
2018-07-19 6:55 ` Greg KH
@ 2018-07-19 14:33 ` Alan Stern
2018-07-19 14:53 ` Geoff Levand
2018-07-23 15:11 ` Michael Ellerman
3 siblings, 1 reply; 9+ messages in thread
From: Alan Stern @ 2018-07-19 14:33 UTC (permalink / raw)
To: Geoff Levand
Cc: Takashi Iwai, Jaroslav Kysela, Michael Ellerman, linux-usb,
linuxppc-dev@lists.ozlabs.org
On Wed, 18 Jul 2018, 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 <noring@nocrew.org>
> Signed-off-by: Geoff Levand <geoff@infradead.org>
> ---
> 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);
What is the reason for changing a static initialization to a dynamic
one? As far as I can see, the patch touches four lines of code but the
only real difference is addition of a single line (and removal of a
comment).
> 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);
Same here.
Alan Stern
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask
2018-07-19 14:33 ` Alan Stern
@ 2018-07-19 14:53 ` Geoff Levand
2018-07-19 15:00 ` Alan Stern
0 siblings, 1 reply; 9+ messages in thread
From: Geoff Levand @ 2018-07-19 14:53 UTC (permalink / raw)
To: Alan Stern
Cc: Takashi Iwai, Jaroslav Kysela, Michael Ellerman, linux-usb,
linuxppc-dev@lists.ozlabs.org
Hi Alan,
On 07/19/2018 07:33 AM, Alan Stern wrote:
> On Wed, 18 Jul 2018, Geoff Levand wrote:
>
>> 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);
>
> What is the reason for changing a static initialization to a dynamic
> one? As far as I can see, the patch touches four lines of code but the
> only real difference is addition of a single line (and removal of a
> comment).
I thought it would be better if all the setting was done in
one place, that's the only reason.
-Geoff
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask
2018-07-19 14:53 ` Geoff Levand
@ 2018-07-19 15:00 ` Alan Stern
0 siblings, 0 replies; 9+ messages in thread
From: Alan Stern @ 2018-07-19 15:00 UTC (permalink / raw)
To: Geoff Levand
Cc: Takashi Iwai, Jaroslav Kysela, Michael Ellerman, linux-usb,
linuxppc-dev@lists.ozlabs.org
On Thu, 19 Jul 2018, Geoff Levand wrote:
> Hi Alan,
>
> On 07/19/2018 07:33 AM, Alan Stern wrote:
> > On Wed, 18 Jul 2018, Geoff Levand wrote:
> >
> >> 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);
> >
> > What is the reason for changing a static initialization to a dynamic
> > one? As far as I can see, the patch touches four lines of code but the
> > only real difference is addition of a single line (and removal of a
> > comment).
>
> I thought it would be better if all the setting was done in
> one place, that's the only reason.
All right; in that case (for the EHCI and OHCI pieces):
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Alan Stern
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: powerpc/ps3: Set driver coherent_dma_mask
2018-07-18 22:08 [PATCH] powerpc/ps3: Set driver coherent_dma_mask Geoff Levand
` (2 preceding siblings ...)
2018-07-19 14:33 ` Alan Stern
@ 2018-07-23 15:11 ` Michael Ellerman
3 siblings, 0 replies; 9+ messages in thread
From: Michael Ellerman @ 2018-07-23 15:11 UTC (permalink / raw)
To: Geoff Levand, Alan Stern, Takashi Iwai, Jaroslav Kysela
Cc: linux-usb, linuxppc-dev@lists.ozlabs.org
On Wed, 2018-07-18 at 22:08:33 UTC, 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 <noring@nocrew.org>
> Signed-off-by: Geoff Levand <geoff@infradead.org>
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/48e91846865cd61bfdb701eb737de2
cheers
^ permalink raw reply [flat|nested] 9+ messages in thread