Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask
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 = _mask; /* FIXME: for improper usb code */
> >> + dummy_mask = DMA_BIT_MASK(32);
> >> + dev->core.dma_mask = _mask;
> >> + dma_set_coherent_mask(>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
Alan Stern
Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask
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 = _mask; /* FIXME: for improper usb code */
>> +dummy_mask = DMA_BIT_MASK(32);
>> +dev->core.dma_mask = _mask;
>> +dma_set_coherent_mask(>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
Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask
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
> Signed-off-by: Geoff Levand
> ---
> 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 = _mask; /* FIXME: for improper usb code */
> + dummy_mask = DMA_BIT_MASK(32);
> + dev->core.dma_mask = _mask;
> + dma_set_coherent_mask(>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 = _mask; /* FIXME: for improper usb code */
> + dummy_mask = DMA_BIT_MASK(32);
> + dev->core.dma_mask = _mask;
> + dma_set_coherent_mask(>core, dummy_mask);
Same here.
Alan Stern
Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask
Greg KH 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 >> Signed-off-by: Geoff Levand >> --- >> 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 OK thanks, I'll take it. cheers
Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask
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 > Signed-off-by: Geoff Levand > --- > 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
Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask
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 > > Signed-off-by: Geoff Levand > > For sound bits, > Reviewed-by: Takashi Iwai Thanks, I'll take this through the USB tree then. greg k-h
Re: [PATCH] powerpc/ps3: Set driver coherent_dma_mask
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 = _mask; /* FIXME: for improper usb code */
> + dummy_mask = DMA_BIT_MASK(32);
> + dev->core.dma_mask = _mask;
> + dma_set_coherent_mask(>core, dummy_mask);
>
> hcd = usb_create_hcd(_ehci_hc_driver, >core,
> dev_name(>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 = _mask; /* FIXME: for improper usb code */
> + dummy_mask = DMA_BIT_MASK(32);
> + dev->core.dma_mask = _mask;
> + dma_set_coherent_mask(>core, dummy_mask);
>
> hcd = usb_create_hcd(_ohci_hc_driver, >core,
> dev_name(>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 = _mask;
> + dma_set_coherent_mask(>core, dummy_mask);
> +
> snd_ps3_audio_set_base_addr(dev->d_region->bus_addr);
>
> /* CONFIG_SND_PS3_DEFAULT_START_DELAY */
> --
> 2.14.1
>
>
[PATCH] powerpc/ps3: Set driver coherent_dma_mask
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
---
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 = _mask; /* FIXME: for improper usb code */
+ dummy_mask = DMA_BIT_MASK(32);
+ dev->core.dma_mask = _mask;
+ dma_set_coherent_mask(>core, dummy_mask);
hcd = usb_create_hcd(_ehci_hc_driver, >core,
dev_name(>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 = _mask; /* FIXME: for improper usb code */
+ dummy_mask = DMA_BIT_MASK(32);
+ dev->core.dma_mask = _mask;
+ dma_set_coherent_mask(>core, dummy_mask);
hcd = usb_create_hcd(_ohci_hc_driver, >core,
dev_name(>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 = _mask;
+ dma_set_coherent_mask(>core, dummy_mask);
+
snd_ps3_audio_set_base_addr(dev->d_region->bus_addr);
/* CONFIG_SND_PS3_DEFAULT_START_DELAY */
--
2.14.1
