[POWERPC] Have celleb use its own dma_direct_offset variable
Rather than using the global variable, have celleb use its own variable to store the direct DMA 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>
This commit is contained in:
parent
f5d67bd5ec
commit
15c60cc472
|
@ -52,6 +52,8 @@ static int __init find_dma_window(u64 *io_space_id, u64 *ioid,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static unsigned long celleb_dma_direct_offset;
|
||||||
|
|
||||||
static void __init celleb_init_direct_mapping(void)
|
static void __init celleb_init_direct_mapping(void)
|
||||||
{
|
{
|
||||||
u64 lpar_addr, io_addr;
|
u64 lpar_addr, io_addr;
|
||||||
|
@ -69,13 +71,13 @@ static void __init celleb_init_direct_mapping(void)
|
||||||
ioid, DMA_FLAGS);
|
ioid, DMA_FLAGS);
|
||||||
}
|
}
|
||||||
|
|
||||||
dma_direct_offset = dma_base;
|
celleb_dma_direct_offset = dma_base;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void celleb_dma_dev_setup(struct device *dev)
|
static void celleb_dma_dev_setup(struct device *dev)
|
||||||
{
|
{
|
||||||
dev->archdata.dma_ops = get_pci_dma_ops();
|
dev->archdata.dma_ops = get_pci_dma_ops();
|
||||||
dev->archdata.dma_data = (void *)dma_direct_offset;
|
dev->archdata.dma_data = (void *)celleb_dma_direct_offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void celleb_pci_dma_dev_setup(struct pci_dev *pdev)
|
static void celleb_pci_dma_dev_setup(struct pci_dev *pdev)
|
||||||
|
|
Loading…
Reference in a new issue