Revert "powerpc/pseries/iommu: Don't use dma_iommu_ops on secure guests"
authorRam Pai <linuxram@us.ibm.com>
Mon, 16 Dec 2019 04:19:21 +0000 (15:19 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 6 Jan 2020 05:25:30 +0000 (16:25 +1100)
commitd862b44133b7a1d7de25288e09eabf4df415e971
treed393d687c93d4ee2683fde927c4e5f75ced7dc15
parent4a8e274e2d8cc5628d3027be0900e8835a2dfa7b
Revert "powerpc/pseries/iommu: Don't use dma_iommu_ops on secure guests"

This reverts commit edea902c1c1efb855f77e041f9daf1abe7a9768a.

At the time the change allowed direct DMA ops for secure VMs; however
since then we switched on using SWIOTLB backed with IOMMU (direct mapping)
and to make this work, we need dma_iommu_ops which handles all cases
including TCE mapping I/O pages in the presence of an IOMMU.

Fixes: edea902c1c1e ("powerpc/pseries/iommu: Don't use dma_iommu_ops on secure guests")
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
[aik: added "revert" and "fixes:"]
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Tested-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20191216041924.42318-2-aik@ozlabs.ru
arch/powerpc/platforms/pseries/iommu.c