diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2008-01-21 16:42:41 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-25 22:52:53 +1100 |
| commit | 110f95c9f082709c5a28a64c00bae819916e8578 (patch) | |
| tree | d3f4c888ddc4a7549c368a925364ade23b95b223 /arch | |
| parent | 9d5f49283b85d925f17fa07af5e4879465e179d6 (diff) | |
| download | op-kernel-dev-110f95c9f082709c5a28a64c00bae819916e8578.zip op-kernel-dev-110f95c9f082709c5a28a64c00bae819916e8578.tar.gz | |
[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 <michael@ellerman.id.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/cell/iommu.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index bceb5e1..9682b63 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); |
