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

Commit 3514141a authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc/pmac: Fix DMA ops for MacIO devices 



The macio_dev's created to map devices inside the MacIO ASICs
don't have proper dma_ops. This causes crashes on some machines
since the SCSI code calls dma_map_* on our behalf using the
device we hang from.

This fixes it by copying the parent PCI device dma_ops into
the macio_dev when creating it.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 850f6ac3

drivers/macintosh/macio_asic.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -378,6 +378,17 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip, 
	dev->ofdev.dev.bus = &macio_bus_type;

	dev->ofdev.dev.bus = &macio_bus_type;

	dev->ofdev.dev.release = macio_release_dev;

	dev->ofdev.dev.release = macio_release_dev;





#ifdef CONFIG_PCI

	/* Set the DMA ops to the ones from the PCI device, this could be

	 * fishy if we didn't know that on PowerMac it's always direct ops

	 * or iommu ops that will work fine

	 */

	dev->ofdev.dev.archdata.dma_ops =

		chip->lbus.pdev->dev.archdata.dma_ops;

	dev->ofdev.dev.archdata.dma_data =

		chip->lbus.pdev->dev.archdata.dma_data;

#endif /* CONFIG_PCI */



#ifdef DEBUG

#ifdef DEBUG

	printk("preparing mdev @%p, ofdev @%p, dev @%p, kobj @%p\n",

	printk("preparing mdev @%p, ofdev @%p, dev @%p, kobj @%p\n",

	       dev, &dev->ofdev, &dev->ofdev.dev, &dev->ofdev.dev.kobj);

	       dev, &dev->ofdev, &dev->ofdev.dev, &dev->ofdev.dev.kobj);