evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iommu/amd: Get rid of device_dma_ops_init()

Browse source 
With device intialization done in the add_device call-back
now there is no reason for this function anymore.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Joerg Roedel 2015-05-28 18:41:43 +02:00
parent 07ee86948c
commit 343e9cac9c
1 changed files with 1 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
drivers/iommu/amd_iommu.c
View file

@ -2268,6 +2268,7 @@ static int amd_iommu_add_device(struct device *dev)
ret = iommu_init_device(dev); ret = iommu_init_device(dev);
if (ret == -ENOTSUPP) { if (ret == -ENOTSUPP) {
iommu_ignore_device(dev); iommu_ignore_device(dev);
dev->archdata.dma_ops = &nommu_dma_ops;
goto out; goto out;
} }
init_iommu_group(dev); init_iommu_group(dev);
@ -2840,36 +2841,6 @@ static struct dma_map_ops amd_iommu_dma_ops = {
.dma_supported = amd_iommu_dma_supported, .dma_supported = amd_iommu_dma_supported,
}; };
static unsigned device_dma_ops_init(void)
{
struct iommu_dev_data *dev_data;
struct pci_dev *pdev = NULL;
unsigned unhandled = 0;
for_each_pci_dev(pdev) {
if (!check_device(&pdev->dev)) {
iommu_ignore_device(&pdev->dev);
unhandled += 1;
continue;
}
dev_data = get_dev_data(&pdev->dev);
if (!dev_data->passthrough)
pdev->dev.archdata.dma_ops = &amd_iommu_dma_ops;
else
pdev->dev.archdata.dma_ops = &nommu_dma_ops;
}
return unhandled;
}
/*
* The function which clues the AMD IOMMU driver into dma_ops.
*/
void __init amd_iommu_init_api(void) void __init amd_iommu_init_api(void)
{ {
bus_set_iommu(&pci_bus_type, &amd_iommu_ops); bus_set_iommu(&pci_bus_type, &amd_iommu_ops);
@ -2877,18 +2848,9 @@ void __init amd_iommu_init_api(void)
int __init amd_iommu_init_dma_ops(void) int __init amd_iommu_init_dma_ops(void)
{ {
int unhandled;
iommu_detected = 1; iommu_detected = 1;
swiotlb = 0; swiotlb = 0;
/* Make the driver finally visible to the drivers */
unhandled = device_dma_ops_init();
if (unhandled && max_pfn > MAX_DMA32_PFN) {
/* There are unhandled devices - initialize swiotlb for them */
swiotlb = 1;
}
amd_iommu_stats_init(); amd_iommu_stats_init();
if (amd_iommu_unmap_flush) if (amd_iommu_unmap_flush)