Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48e91846 authored by Geoff Levand's avatar Geoff Levand Committed by Michael Ellerman
Browse files

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: default avatarFredrik Noring <noring@nocrew.org>
Signed-off-by: default avatarGeoff Levand <geoff@infradead.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent ef6cb5f1

drivers/usb/host/ehci-ps3.c

+4 −2
Original line number Diff line number Diff line
@@ -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));

drivers/usb/host/ohci-ps3.c

+4 −2
Original line number Diff line number Diff line
@@ -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));

sound/ppc/snd_ps3.c

+5 −0
Original line number Diff line number Diff line
@@ -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 */