Commit 7c1013b4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Michael Ellerman
Browse files

powerpc/dma: remove get_pci_dma_ops 



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: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent e7284982

arch/powerpc/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -52,10 +52,8 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 


#ifdef CONFIG_PCI

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 */

#define set_pci_dma_ops(d)

#define get_pci_dma_ops()	NULL

#endif



#ifdef CONFIG_PPC64

arch/powerpc/kernel/pci-common.c

+0 −6
Original line number Diff line number Diff line
@@ -69,12 +69,6 @@ void set_pci_dma_ops(const struct dma_map_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

 * hose_spinlock.

arch/powerpc/platforms/cell/iommu.c

+8 −9
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ static struct cbe_iommu *cell_iommu_for_node(int nid) 
static unsigned long cell_dma_nommu_offset;



static unsigned long dma_iommu_fixed_base;

static bool cell_iommu_enabled;



/* iommu_fixed_is_weak is set if booted with iommu_fixed=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)

{

	if (get_pci_dma_ops() == &dma_iommu_ops) {

	if (cell_iommu_enabled) {

		u64 addr = cell_iommu_get_fixed_address(dev);



		if (addr != OF_BAD_ADDR)

			set_dma_offset(dev, addr + dma_iommu_fixed_base);

		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 {

		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)

		return 0;



	/* We use the PCI DMA ops */

	dev->dma_ops = get_pci_dma_ops();



	if (cell_iommu_enabled)

		dev->dma_ops = &dma_iommu_ops;

	else

		dev->dma_ops = &dma_nommu_ops;

	cell_dma_dev_setup(dev);



	return 0;

}
@@ -1093,7 +1092,7 @@ static int __init cell_iommu_init(void) 
 done:

	/* Setup default PCI iommu ops */

	set_pci_dma_ops(&dma_iommu_ops);



	cell_iommu_enabled = true;

 bail:

	/* Register callbacks on OF platform device addition/removal

	 * to handle linking them to the right DMA operations

CRA Git | Maintained and supported by SUSTech CRA and CCSE