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

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

Merge "ARM: dts: msm: Bypass SMMU S1 support for AP/USB CB for SDM845"

parents 77cdf89f 9e96c724

arch/arm64/boot/dts/qcom/sdm845.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -2710,6 +2710,7 @@ 


		ipa_smmu_ap: ipa_smmu_ap {

			compatible = "qcom,ipa-smmu-ap-cb";

			qcom,smmu-s1-bypass;

			iommus = <&apps_smmu 0x720 0x0>;

			qcom,iova-mapping = <0x20000000 0x40000000>;

			qcom,additional-mapping =

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

+10 −2
Original line number Diff line number Diff line
@@ -4646,8 +4646,8 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p, 
		for (i = 0; i < IPA_SMMU_CB_MAX; i++)

			ipa3_ctx->s1_bypass_arr[i] = true;

	} else {

		for (i = 0; i < IPA_SMMU_CB_MAX; i++)

			ipa3_ctx->s1_bypass_arr[i] = smmu_info.s1_bypass_arr[i];

		ipa3_ctx->s1_bypass_arr[IPA_SMMU_CB_AP] =

			smmu_info.s1_bypass_arr[IPA_SMMU_CB_AP];

	}



	ipa3_ctx->ipa_wrapper_base = resource_p->ipa_mem_base;
@@ -5506,6 +5506,8 @@ static int ipa_smmu_wlan_cb_probe(struct device *dev) 


	if (of_property_read_bool(dev->of_node, "qcom,smmu-s1-bypass")) {

		smmu_info.s1_bypass_arr[IPA_SMMU_CB_WLAN] = true;

		ipa3_ctx->s1_bypass_arr[IPA_SMMU_CB_WLAN] = true;



		if (iommu_domain_set_attr(cb->iommu,

					DOMAIN_ATTR_S1_BYPASS,

					&bypass)) {
@@ -5516,6 +5518,8 @@ static int ipa_smmu_wlan_cb_probe(struct device *dev) 
		IPADBG("WLAN SMMU S1 BYPASS\n");

	} else {

		smmu_info.s1_bypass_arr[IPA_SMMU_CB_WLAN] = false;

		ipa3_ctx->s1_bypass_arr[IPA_SMMU_CB_WLAN] = false;



		if (iommu_domain_set_attr(cb->iommu,

					DOMAIN_ATTR_ATOMIC,

					&atomic_ctx)) {
@@ -5630,6 +5634,8 @@ static int ipa_smmu_uc_cb_probe(struct device *dev) 


	if (of_property_read_bool(dev->of_node, "qcom,smmu-s1-bypass")) {

		smmu_info.s1_bypass_arr[IPA_SMMU_CB_UC] = true;

		ipa3_ctx->s1_bypass_arr[IPA_SMMU_CB_UC] = true;



		if (iommu_domain_set_attr(cb->mapping->domain,

			DOMAIN_ATTR_S1_BYPASS,

			&bypass)) {
@@ -5641,6 +5647,8 @@ static int ipa_smmu_uc_cb_probe(struct device *dev) 
		IPADBG("UC SMMU S1 BYPASS\n");

	} else {

		smmu_info.s1_bypass_arr[IPA_SMMU_CB_UC] = false;

		ipa3_ctx->s1_bypass_arr[IPA_SMMU_CB_UC] = false;



		if (iommu_domain_set_attr(cb->mapping->domain,

			DOMAIN_ATTR_ATOMIC,

			&atomic_ctx)) {