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

Commit 547d69c4 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/iommu-debug: Set DOMAIN_ATTR_ATOMIC during profiling" into msm-4.8

parents 6529900a 679567c9
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ static void iommu_debug_device_profiling(struct seq_file *s, struct device *dev)
	struct iommu_domain *domain;
	unsigned long iova = 0x10000;
	phys_addr_t paddr = 0xa000;
	int atomic_domain = 1;

	domain = iommu_domain_alloc(&platform_bus_type);
	if (!domain) {
@@ -470,6 +471,13 @@ static void iommu_debug_device_profiling(struct seq_file *s, struct device *dev)
		return;
	}

	if (iommu_domain_set_attr(domain, DOMAIN_ATTR_ATOMIC,
				  &atomic_domain)) {
		seq_printf(s, "Couldn't set atomic_domain to %d\n",
			   atomic_domain);
		goto out_domain_free;
	}

	if (iommu_attach_device(domain, dev)) {
		seq_puts(s,
			 "Couldn't attach new domain to device. Is it already attached?\n");