ia64: IOMMU passthrough mode shouldn't trigger swiotlb init
Since commit 19943b0e30
('intel-iommu:
Unify hardware and software passthrough support'), hardware passthrough
mode will do the same as software passthrough mode was doing -- it'll
still use the IOMMU normally for devices which can't address all of
memory. This means that we don't need to bother with swiotlb.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
@@ -46,7 +46,7 @@ void __init swiotlb_dma_init(void)
|
|||||||
|
|
||||||
void __init pci_swiotlb_init(void)
|
void __init pci_swiotlb_init(void)
|
||||||
{
|
{
|
||||||
if (!iommu_detected || iommu_pass_through) {
|
if (!iommu_detected) {
|
||||||
#ifdef CONFIG_IA64_GENERIC
|
#ifdef CONFIG_IA64_GENERIC
|
||||||
swiotlb = 1;
|
swiotlb = 1;
|
||||||
printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");
|
printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");
|
||||||
|
Reference in New Issue
Block a user