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

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

Merge "iommu: iommu-debug: Mark domain as debug domain"

parents 7f9d3ac8 edc52dcc

arch/arm64/boot/dts/qcom/msm-arm-smmu-sm8150-v2.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ 
		#iommu-cells = <2>;

		qcom,skip-init;

		qcom,use-3-lvl-tables;

		qcom,disable-atos;

		#global-interrupts = <1>;

		#size-cells = <1>;

		#address-cells = <1>;

drivers/iommu/iommu-debug.c

+4 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ static void iommu_debug_device_profiling(struct seq_file *s, struct device *dev, 
		}

	}



	domain->is_debug_domain = true;

	if (iommu_attach_group(domain, dev->iommu_group)) {

		seq_puts(s,

			 "Couldn't attach new domain to device. Is it already attached?\n");
@@ -551,6 +552,7 @@ static int iommu_debug_profiling_fast_dma_api_show(struct seq_file *s, 
		goto out_release_mapping;

	}



	mapping->domain->is_debug_domain = true;

	if (arm_iommu_attach_device(dev, mapping)) {

		seq_puts(s, "fast_smmu_attach_device failed\n");

		goto out_release_mapping;
@@ -1173,6 +1175,7 @@ static int __apply_to_new_mapping(struct seq_file *s, 
		goto out_release_mapping;

	}



	mapping->domain->is_debug_domain = true;

	if (arm_iommu_attach_device(dev, mapping))

		goto out_release_mapping;
@@ -1239,6 +1242,7 @@ static int iommu_debug_functional_arm_dma_api_show(struct seq_file *s, 
	if (!mapping)

		goto out;



	mapping->domain->is_debug_domain = true;

	if (arm_iommu_attach_device(dev, mapping))

		goto out_release_mapping;