summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/pci.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-08-13 09:25:09 +0200
committerTony Luck <tony.luck@intel.com>2019-08-16 11:33:57 -0700
commit974f83ec1e5afeeb4c9028feb74ffa4ee70e71b7 (patch)
tree79d9378ae00206cda4d2a41f2a79361b014c4fb5 /arch/ia64/include/asm/pci.h
parent16567ca85fce11e2a20f22404ed0ceb133c4408e (diff)
downloadlinux-974f83ec1e5afeeb4c9028feb74ffa4ee70e71b7.tar.gz
linux-974f83ec1e5afeeb4c9028feb74ffa4ee70e71b7.tar.bz2
linux-974f83ec1e5afeeb4c9028feb74ffa4ee70e71b7.zip
ia64: rework iommu probing
ia64 currently organizes the iommu probing along machves, which isn't very helpful. Instead just try to probe for Intel IOMMUs in mem_init as they are properly described in ACPI and if none was found initialize the swiotlb buffer. The HP SBA handling is then only done delayed when the actual hardware is probed. Only in the case that we actually found usable IOMMUs we then set up the DMA ops and free the not needed swiotlb buffer. This scheme gets rid of the need for the dma_init machvec operation, and the dig_vtd machvec. Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://lkml.kernel.org/r/20190813072514.23299-24-hch@lst.de Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/include/asm/pci.h')
-rw-r--r--arch/ia64/include/asm/pci.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index ef91b780a3f2..8c163d1d0189 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -69,7 +69,4 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
return channel ? isa_irq_to_vector(15) : isa_irq_to_vector(14);
}
-#ifdef CONFIG_INTEL_IOMMU
-extern void pci_iommu_alloc(void);
-#endif
#endif /* _ASM_IA64_PCI_H */