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

Commit 01939add authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: dma_mapping: Support DOMAIN_ATTR_S1_BYPASS"

parents e540653a 094f19f7

arch/arm64/mm/dma-mapping.c

+6 −1
Original line number Diff line number Diff line
@@ -1583,13 +1583,18 @@ int arm_iommu_attach_device(struct device *dev, 
			    struct dma_iommu_mapping *mapping)

{

	int err;

	int s1_bypass = 0;



	err = iommu_attach_device(mapping->domain, dev);

	if (err)

		return err;



	iommu_domain_get_attr(mapping->domain, DOMAIN_ATTR_S1_BYPASS,

					&s1_bypass);



	kref_get(&mapping->kref);

	dev->archdata.mapping = mapping;

	if (!s1_bypass)

		set_dma_ops(dev, &iommu_ops);



	pr_debug("Attached IOMMU controller to %s device.\n", dev_name(dev));