From 110f95c9f082709c5a28a64c00bae819916e8578 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Mon, 21 Jan 2008 16:42:41 +1100 Subject: [PATCH] [POWERPC] Set archdata.dma_data for direct DMA in cell_dma_dev_setup() Store the direct_dma_offset in each device's dma_data in the case where we're using the direct DMA ops. We need to make sure we setup the ppc_md.pci_dma_dev_setup() callback if we're using a non-zero offset. Signed-off-by: Michael Ellerman Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras --- arch/powerpc/platforms/cell/iommu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index bceb5e13da..9682b63dfc 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c @@ -496,9 +496,10 @@ static void cell_dma_dev_setup(struct device *dev) struct cbe_iommu *iommu; struct dev_archdata *archdata = &dev->archdata; - /* If we run without iommu, no need to do anything */ - if (get_pci_dma_ops() == &dma_direct_ops) + if (get_pci_dma_ops() == &dma_direct_ops) { + archdata->dma_data = (void *)dma_direct_offset; return; + } /* Current implementation uses the first window available in that * node's iommu. We -might- do something smarter later though it may @@ -690,6 +691,9 @@ static int __init cell_iommu_init_disabled(void) dma_direct_offset += base; + if (dma_direct_offset != 0) + ppc_md.pci_dma_dev_setup = cell_pci_dma_dev_setup; + printk("iommu: disabled, direct DMA offset is 0x%lx\n", dma_direct_offset); -- 2.39.5