Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f7e0bab authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Michael Ellerman
Browse files

powerpc/iommu: Allow bypass-only for DMA 



POWER8 and newer support a bypass mode which maps all host memory to
PCI buses so an IOMMU table is not always required. However if we fail to
create such a table, the DMA setup fails and the kernel does not boot.

This skips the 32bit DMA setup check if the bypass is selected.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20190718051139.74787-3-aik@ozlabs.ru
parent 56090a39

arch/powerpc/kernel/dma-iommu.c

+5 −6
Original line number Diff line number Diff line
@@ -122,18 +122,17 @@ int dma_iommu_dma_supported(struct device *dev, u64 mask) 
{

	struct iommu_table *tbl = get_iommu_table_base(dev);



	if (!tbl) {

		dev_info(dev, "Warning: IOMMU dma not supported: mask 0x%08llx"

			", table unavailable\n", mask);

		return 0;

	}



	if (dev_is_pci(dev) && dma_iommu_bypass_supported(dev, mask)) {

		dev->archdata.iommu_bypass = true;

		dev_dbg(dev, "iommu: 64-bit OK, using fixed ops\n");

		return 1;

	}



	if (!tbl) {

		dev_err(dev, "Warning: IOMMU dma not supported: mask 0x%08llx, table unavailable\n", mask);

		return 0;

	}



	if (tbl->it_offset > (mask >> tbl->it_page_shift)) {

		dev_info(dev, "Warning: IOMMU offset too big for device mask\n");

		dev_info(dev, "mask: 0x%08llx, table offset: 0x%08lx\n",