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

Commit 8f2ea1fd authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[POWERPC] Fix initialization and usage of dma_mask 



powerpc has a couple of bugs in the usage of dma_masks that tend to
break when drivers explicitly try to set a 32-bit mask for example.

First, the code that generates the pci devices from the OF device-tree
doesn't initialize the mask properly, then our implementation of
set_dma_mask() was trying to validate the -previous- mask value, not the
one passed in as an argument.

This fixes these problems.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 939e60f6

arch/powerpc/kernel/pci_64.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -313,6 +313,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, 




	dev->current_state = 4;		/* unknown power state */

	dev->current_state = 4;		/* unknown power state */

	dev->error_state = pci_channel_io_normal;

	dev->error_state = pci_channel_io_normal;

	dev->dma_mask = 0xffffffff;





	if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {

	if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {

		/* a PCI-PCI bridge */

		/* a PCI-PCI bridge */

include/asm-powerpc/dma-mapping.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -95,7 +95,7 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask) 
		return -EIO;

		return -EIO;

	if (dma_ops->set_dma_mask != NULL)

	if (dma_ops->set_dma_mask != NULL)

		return dma_ops->set_dma_mask(dev, dma_mask);

		return dma_ops->set_dma_mask(dev, dma_mask);

	if (!dev->dma_mask || !dma_supported(dev, *dev->dma_mask))

	if (!dev->dma_mask || !dma_supported(dev, dma_mask))

		return -EIO;

		return -EIO;

	*dev->dma_mask = dma_mask;

	*dev->dma_mask = dma_mask;

	return 0;

	return 0;