mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 22:54:01 +00:00
Code Issues Releases Wiki Activity

powerpc/dma: remove get_pci_dma_ops

Browse source 
This function is only used by the Cell iommu code, which can keep track
if it is using the iommu internally just as good.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Christoph Hellwig 2019-02-13 08:01:18 +01:00 committed by Michael Ellerman
parent e72849827a
commit 7c1013b487
3 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/include/asm/pci.h
View file

@ -52,10 +52,8 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
extern void set_pci_dma_ops(const struct dma_map_ops *dma_ops); extern void set_pci_dma_ops(const struct dma_map_ops *dma_ops);
extern const struct dma_map_ops *get_pci_dma_ops(void);
#else /* CONFIG_PCI */ #else /* CONFIG_PCI */
#define set_pci_dma_ops(d) #define set_pci_dma_ops(d)
#define get_pci_dma_ops() NULL
#endif #endif
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64

6
arch/powerpc/kernel/pci-common.c
View file

@ -69,12 +69,6 @@ void set_pci_dma_ops(const struct dma_map_ops *dma_ops)
pci_dma_ops = dma_ops; pci_dma_ops = dma_ops;
} }
const struct dma_map_ops *get_pci_dma_ops(void)
{
return pci_dma_ops;
}
EXPORT_SYMBOL(get_pci_dma_ops);
/* /*
* This function should run under locking protection, specifically * This function should run under locking protection, specifically
* hose_spinlock. * hose_spinlock.

17
arch/powerpc/platforms/cell/iommu.c
View file

@ -544,6 +544,7 @@ static struct cbe_iommu *cell_iommu_for_node(int nid)
static unsigned long cell_dma_nommu_offset; static unsigned long cell_dma_nommu_offset;
static unsigned long dma_iommu_fixed_base; static unsigned long dma_iommu_fixed_base;
static bool cell_iommu_enabled;
/* iommu_fixed_is_weak is set if booted with iommu_fixed=weak */ /* iommu_fixed_is_weak is set if booted with iommu_fixed=weak */
bool iommu_fixed_is_weak; bool iommu_fixed_is_weak;
@ -572,16 +573,14 @@ static u64 cell_iommu_get_fixed_address(struct device *dev);
static void cell_dma_dev_setup(struct device *dev) static void cell_dma_dev_setup(struct device *dev)
{ {
if (get_pci_dma_ops() == &dma_iommu_ops) { if (cell_iommu_enabled) {
u64 addr = cell_iommu_get_fixed_address(dev); u64 addr = cell_iommu_get_fixed_address(dev);
if (addr != OF_BAD_ADDR) if (addr != OF_BAD_ADDR)
set_dma_offset(dev, addr + dma_iommu_fixed_base); set_dma_offset(dev, addr + dma_iommu_fixed_base);
set_iommu_table_base(dev, cell_get_iommu_table(dev)); set_iommu_table_base(dev, cell_get_iommu_table(dev));
} else if (get_pci_dma_ops() == &dma_nommu_ops) {
set_dma_offset(dev, cell_dma_nommu_offset);
} else { } else {
BUG(); set_dma_offset(dev, cell_dma_nommu_offset);
} }
} }
@ -599,11 +598,11 @@ static int cell_of_bus_notify(struct notifier_block *nb, unsigned long action,
if (action != BUS_NOTIFY_ADD_DEVICE) if (action != BUS_NOTIFY_ADD_DEVICE)
return 0; return 0;
/* We use the PCI DMA ops */ if (cell_iommu_enabled)
dev->dma_ops = get_pci_dma_ops(); dev->dma_ops = &dma_iommu_ops;
else
dev->dma_ops = &dma_nommu_ops;
cell_dma_dev_setup(dev); cell_dma_dev_setup(dev);
return 0; return 0;
} }
@ -1093,7 +1092,7 @@ static int __init cell_iommu_init(void)
done: done:
/* Setup default PCI iommu ops */ /* Setup default PCI iommu ops */
set_pci_dma_ops(&dma_iommu_ops); set_pci_dma_ops(&dma_iommu_ops);
cell_iommu_enabled = true;
bail: bail:
/* Register callbacks on OF platform device addition/removal /* Register callbacks on OF platform device addition/removal
* to handle linking them to the right DMA operations * to handle linking them to the right DMA operations