Commit 35146ead authored by Shivaprasad G Bhat's avatar Shivaprasad G Bhat Committed by Michael Ellerman
Browse files

powerpc/iommu: Move dev_has_iommu_table() to iommu.c 



Move function dev_has_iommu_table() to powerpc/kernel/iommu.c
as it is going to be used by machine specific iommu code as
well in subsequent patches.

Signed-off-by: default avatarShivaprasad G Bhat <sbhat@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/171923274748.1397.6274953248403106679.stgit@linux.ibm.com
parent 4ba2fdff

arch/powerpc/include/asm/iommu.h

+6 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ extern long iommu_tce_xchg_no_kill(struct mm_struct *mm, 
		enum dma_data_direction *direction);

extern void iommu_tce_kill(struct iommu_table *tbl,

		unsigned long entry, unsigned long pages);

int dev_has_iommu_table(struct device *dev, void *data);



#else

static inline void iommu_register_group(struct iommu_table_group *table_group,
@@ -235,6 +236,11 @@ static inline int iommu_add_device(struct iommu_table_group *table_group, 
{

	return 0;

}



static inline int dev_has_iommu_table(struct device *dev, void *data)

{

	return 0;

}

#endif /* !CONFIG_IOMMU_API */



u64 dma_iommu_get_required_mask(struct device *dev);

arch/powerpc/kernel/eeh.c

+0 −16
Original line number Diff line number Diff line
@@ -1273,22 +1273,6 @@ EXPORT_SYMBOL(eeh_dev_release); 


#ifdef CONFIG_IOMMU_API



static int dev_has_iommu_table(struct device *dev, void *data)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct pci_dev **ppdev = data;



	if (!dev)

		return 0;



	if (device_iommu_mapped(dev)) {

		*ppdev = pdev;

		return 1;

	}



	return 0;

}



/**

 * eeh_iommu_group_to_pe - Convert IOMMU group to EEH PE

 * @group: IOMMU group

arch/powerpc/kernel/iommu.c

+17 −0
Original line number Diff line number Diff line
@@ -988,6 +988,23 @@ unsigned long iommu_direction_to_tce_perm(enum dma_data_direction dir) 
EXPORT_SYMBOL_GPL(iommu_direction_to_tce_perm);



#ifdef CONFIG_IOMMU_API



int dev_has_iommu_table(struct device *dev, void *data)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct pci_dev **ppdev = data;



	if (!dev)

		return 0;



	if (device_iommu_mapped(dev)) {

		*ppdev = pdev;

		return 1;

	}



	return 0;

}



/*

 * SPAPR TCE API

 */