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

Commit c32398e5 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm: dma_mapping: Support for DOMAIN_ATTR_S1_BYPASS attribute"

parents ad4d15b5 56dc6075

arch/arm/mm/dma-mapping.c

+8 −2
Original line number Diff line number Diff line
@@ -2332,11 +2332,15 @@ int arm_iommu_attach_device(struct device *dev, 
			    struct dma_iommu_mapping *mapping)

{

	int err;

	int s1_bypass = 0;



	err = __arm_iommu_attach_device(dev, mapping);

	if (err)

		return err;



	iommu_domain_get_attr(mapping->domain, DOMAIN_ATTR_S1_BYPASS,

					&s1_bypass);

	if (!s1_bypass)

		set_dma_ops(dev, &iommu_ops);

	return 0;

}
@@ -2352,6 +2356,7 @@ EXPORT_SYMBOL_GPL(arm_iommu_attach_device); 
void arm_iommu_detach_device(struct device *dev)

{

	struct dma_iommu_mapping *mapping;

	int s1_bypass = 0;



	mapping = to_dma_iommu_mapping(dev);

	if (!mapping) {
@@ -2362,6 +2367,7 @@ void arm_iommu_detach_device(struct device *dev) 
	iommu_detach_device(mapping->domain, dev);

	kref_put(&mapping->kref, release_iommu_mapping);

	to_dma_iommu_mapping(dev) = NULL;

	if (!s1_bypass)

		set_dma_ops(dev, NULL);



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