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

Commit d62230be authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: open IPA config space in AP/wlan CBs"

parents 5383b7a2 03fccd39
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
@@ -3872,6 +3872,16 @@ static int ipa_smmu_wlan_cb_probe(struct device *dev)
		return ret;
	}

	IPAERR("map IPA region to WLAN_CB IOMMU\n");
	ret = iommu_map(cb->iommu, 0x680000, 0x680000,
			0x64000,
			IOMMU_READ | IOMMU_WRITE | IOMMU_DEVICE);
	if (ret) {
		IPAERR("map IPA to WLAN_CB IOMMU failed ret=%d\n",
			ret);
		return ret;
	}

	cb->valid = true;

	return 0;
@@ -3947,6 +3957,16 @@ static int ipa_smmu_ap_cb_probe(struct device *dev)
		return -EPROBE_DEFER;
	}

	IPAERR("map IPA region to AP_CB IOMMU\n");
	result = iommu_map(cb->mapping->domain, 0x680000, 0x680000,
		0x64000,
			IOMMU_READ | IOMMU_WRITE | IOMMU_DEVICE);
	if (result) {
		IPAERR("map IPA region to AP_CB IOMMU failed ret=%d\n",
			result);
		return result;
	}

	if (smmu_disable_htw) {
		if (iommu_domain_set_attr(cb->mapping->domain,
				DOMAIN_ATTR_COHERENT_HTW_DISABLE,