Merge "iommu/arm-smmu: Move arm_iommu_put_cookie() to the SMMU driver" (b862fdd2) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm64/mm/dma-mapping.c

+9 −22

Original line number	Diff line number	Diff line
		@@ -1056,18 +1056,14 @@ iommu_init_mapping(struct device dev, struct dma_iommu_mapping mapping)
		static int arm_iommu_get_dma_cookie(struct device *dev,
		struct dma_iommu_mapping *mapping)
		{
		int s1_bypass = 0, is_fast = 0;
		int is_fast = 0;
		int err = 0;

		mutex_lock(&iommu_dma_init_mutex);

		iommu_domain_get_attr(mapping->domain, DOMAIN_ATTR_S1_BYPASS,
		&s1_bypass);
		iommu_domain_get_attr(mapping->domain, DOMAIN_ATTR_FAST, &is_fast);

		if (s1_bypass)
		mapping->ops = &arm64_swiotlb_dma_ops;
		else if (is_fast)
		if (is_fast)
		err = fast_smmu_init_mapping(dev, mapping);
		else
		err = iommu_init_mapping(dev, mapping);
		@@ -1076,20 +1072,6 @@ static int arm_iommu_get_dma_cookie(struct device *dev,
		return err;
		}

		void arm_iommu_put_dma_cookie(struct iommu_domain *domain)
		{
		int s1_bypass = 0, is_fast = 0;

		iommu_domain_get_attr(domain, DOMAIN_ATTR_S1_BYPASS,
		&s1_bypass);
		iommu_domain_get_attr(domain, DOMAIN_ATTR_FAST, &is_fast);

		if (is_fast)
		fast_smmu_put_dma_cookie(domain);
		else if (!s1_bypass)
		iommu_put_dma_cookie(domain);
		}

		/*
		* Checks for "qcom,iommu-dma-addr-pool" property.
		* If not present, leaves dma_addr and dma_size unmodified.
		@@ -1135,17 +1117,22 @@ static void arm_iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size)
		struct iommu_domain *domain;
		struct iommu_group *group;
		struct dma_iommu_mapping mapping = {0};
		int s1_bypass;

		group = dev->iommu_group;
		if (!group)
		return;

		arm_iommu_get_dma_window(dev, &dma_base, &size);

		domain = iommu_get_domain_for_dev(dev);
		if (!domain)
		return;

		iommu_domain_get_attr(domain, DOMAIN_ATTR_S1_BYPASS, &s1_bypass);
		if (s1_bypass)
		return;

		arm_iommu_get_dma_window(dev, &dma_base, &size);

		/* Allow iommu-debug to call arch_setup_dma_ops to reconfigure itself */
		if (domain->type != IOMMU_DOMAIN_DMA &&
		!of_device_is_compatible(dev->of_node, "iommu-debug-test")) {

drivers/iommu/arm-smmu.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -2252,6 +2252,20 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type)
		return &smmu_domain->domain;
		}

		static void arm_smmu_put_dma_cookie(struct iommu_domain *domain)
		{
		int s1_bypass = 0, is_fast = 0;

		iommu_domain_get_attr(domain, DOMAIN_ATTR_S1_BYPASS,
		&s1_bypass);
		iommu_domain_get_attr(domain, DOMAIN_ATTR_FAST, &is_fast);

		if (is_fast)
		fast_smmu_put_dma_cookie(domain);
		else if (!s1_bypass)
		iommu_put_dma_cookie(domain);
		}

		static void arm_smmu_domain_free(struct iommu_domain *domain)
		{
		struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
		@@ -2260,7 +2274,7 @@ static void arm_smmu_domain_free(struct iommu_domain *domain)
		* Free the domain resources. We assume that all devices have
		* already been detached.
		*/
		arm_iommu_put_dma_cookie(domain);
		arm_smmu_put_dma_cookie(domain);
		arm_smmu_destroy_domain_context(domain);
		kfree(smmu_domain);
		}