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

Commit 128b4a0e authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc/macio: Add dma_parms support to macio 



This adds dma_parms to macio devices and initializes them with
default values. This will allow pata_macio to setup the appropriate
max segment size for the block layer.

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

arch/powerpc/include/asm/macio.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ struct macio_dev 
	struct macio_bus	*bus;		/* macio bus this device is on */

	struct macio_dev	*media_bay;	/* Device is part of a media bay */

	struct of_device	ofdev;

	struct device_dma_parameters dma_parms; /* ide needs that */

	int			n_resources;

	struct resource		resource[MACIO_DEV_COUNT_RESOURCES];

	int			n_interrupts;

drivers/macintosh/macio_asic.c

+5 −0
Original line number Diff line number Diff line
@@ -379,6 +379,11 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip, 
	dev->ofdev.dev.parent = parent;

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

	dev->ofdev.dev.release = macio_release_dev;

	dev->ofdev.dev.dma_parms = &dev->dma_parms;



	/* Standard DMA paremeters */

	dma_set_max_seg_size(&dev->ofdev.dev, 65536);

	dma_set_seg_boundary(&dev->ofdev.dev, 0xffffffff);



#ifdef CONFIG_PCI

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