Merge "msm: ipa: set the property for caching the entries in IOMMU" (2db3dae4) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/platform/msm/ipa/ipa_v3/ipa.c

+31 −9

Original line number	Diff line number	Diff line
		@@ -6407,7 +6407,8 @@ static int ipa_smmu_wlan_cb_probe(struct device *dev)
		}

		IPADBG("WLAN CB PROBE mapping retrieved\n");

		cb->is_cache_coherent = of_property_read_bool(dev->of_node,
		"dma-coherent");
		cb->dev = dev;
		cb->valid = true;

		@@ -6515,6 +6516,8 @@ static int ipa_smmu_uc_cb_probe(struct device *dev)

		IPADBG("UC CB PROBE mapping retrieved\n");

		cb->is_cache_coherent = of_property_read_bool(dev->of_node,
		"dma-coherent");
		cb->dev = dev;
		cb->valid = true;

		@@ -6605,6 +6608,8 @@ static int ipa_smmu_ap_cb_probe(struct device *dev)

		IPADBG("AP CB PROBE mapping retrieved\n");

		cb->is_cache_coherent = of_property_read_bool(dev->of_node,
		"dma-coherent");
		cb->dev = dev;
		cb->valid = true;

		@@ -6739,7 +6744,8 @@ static int ipa_smmu_11ad_cb_probe(struct device *dev)
		IPAERR("could not get iommu domain\n");
		return -EINVAL;
		}

		cb->is_cache_coherent = of_property_read_bool(dev->of_node,
		"dma-coherent");
		cb->dev = dev;
		cb->valid = true;

		@@ -7119,24 +7125,28 @@ int ipa3_register_ipa_ready_cb(void (ipa_ready_cb)(void ), void *user_data)
		int ipa3_iommu_map(struct iommu_domain *domain,
		unsigned long iova, phys_addr_t paddr, size_t size, int prot)
		{
		struct ipa_smmu_cb_ctx *ap_cb = ipa3_get_smmu_ctx(IPA_SMMU_CB_AP);
		struct ipa_smmu_cb_ctx *uc_cb = ipa3_get_smmu_ctx(IPA_SMMU_CB_UC);
		struct ipa_smmu_cb_ctx *cb = NULL;

		IPADBG_LOW("domain =0x%pK iova 0x%lx\n", domain, iova);
		IPADBG_LOW("paddr =0x%pa size 0x%x\n", &paddr, (u32)size);

		/* make sure no overlapping */
		if (domain == ipa3_get_smmu_domain()) {
		if (iova >= ap_cb->va_start && iova < ap_cb->va_end) {
		cb = ipa3_get_smmu_ctx(IPA_SMMU_CB_AP);
		if (iova >= cb->va_start && iova < cb->va_end) {
		IPAERR("iommu AP overlap addr 0x%lx\n", iova);
		ipa_assert();
		return -EFAULT;
		}
		} else if (domain == ipa3_get_wlan_smmu_domain() \|\|
		domain == ipa3_get_11ad_smmu_domain()) {
		/* wlan\11ad is one time map */
		} else if (domain == ipa3_get_wlan_smmu_domain()) {
		/* wlan is one time map */
		cb = ipa3_get_smmu_ctx(IPA_SMMU_CB_WLAN);
		} else if (domain == ipa3_get_11ad_smmu_domain()) {
		/* 11ad is one time map */
		cb = ipa3_get_smmu_ctx(IPA_SMMU_CB_11AD);
		} else if (domain == ipa3_get_uc_smmu_domain()) {
		if (iova >= uc_cb->va_start && iova < uc_cb->va_end) {
		cb = ipa3_get_smmu_ctx(IPA_SMMU_CB_UC);
		if (iova >= cb->va_start && iova < cb->va_end) {
		IPAERR("iommu uC overlap addr 0x%lx\n", iova);
		ipa_assert();
		return -EFAULT;
		@@ -7147,6 +7157,18 @@ int ipa3_iommu_map(struct iommu_domain *domain,
		return -EFAULT;
		}

		if (cb == NULL) {
		IPAERR("Unexpected cb turning NULL for domain 0x%pK\n", domain);
		ipa_assert();
		}

		/*
		* IOMMU_CACHE is needed to make the entries cachable
		* if cache coherency is enabled in dtsi.
		*/
		if (cb->is_cache_coherent)
		prot \|= IOMMU_CACHE;

		return iommu_map(domain, iova, paddr, size, prot);
		}

drivers/platform/msm/ipa/ipa_v3/ipa_i.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -458,6 +458,7 @@ struct ipa_smmu_cb_ctx {
		u32 va_size;
		u32 va_end;
		bool shared;
		bool is_cache_coherent;
		};

		/**