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

Commit 97e0d98d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa3: fix the mhip smmu unmap issue"

parents b7dc11c3 6cd22421

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

+5 −5
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static void ipa_mpm_smmu_unmap(dma_addr_t carved_iova, int sz, int dir, 


		cb->next_addr -= size_p;

		dma_unmap_single(ipa3_ctx->pdev, ap_cb_iova,

			IPA_MPM_RING_TOTAL_SIZE, dir);

			size_p, dir);

	} else {

		dma_unmap_single(ipa3_ctx->pdev, ap_cb_iova,

			IPA_MPM_RING_TOTAL_SIZE, dir);
@@ -1268,12 +1268,12 @@ static void ipa_mpm_clean_mhip_chan(int mhi_idx, 
	if (IPA_CLIENT_IS_PROD(mhip_client)) {

		ipa_mpm_smmu_unmap(

			ipa_mpm_ctx->md[mhi_idx].dl_prod_ring.er_pa,

			IPA_MPM_PAGE_SIZE, dir,

			PAGE_SIZE, dir,

			ipa_mpm_ctx->md[mhi_idx].dl_prod_ring.ap_iova_er);



		ipa_mpm_smmu_unmap(

			ipa_mpm_ctx->md[mhi_idx].dl_prod_ring.tr_pa,

			IPA_MPM_PAGE_SIZE, dir,

			PAGE_SIZE, dir,

			ipa_mpm_ctx->md[mhi_idx].dl_prod_ring.ap_iova_tr);



		if (ipa_mpm_ctx->md[mhi_idx].dl_prod_ring.er_va) {
@@ -1293,11 +1293,11 @@ static void ipa_mpm_clean_mhip_chan(int mhi_idx, 
	} else {

		ipa_mpm_smmu_unmap(

			ipa_mpm_ctx->md[mhi_idx].ul_prod_ring.tr_pa,

			IPA_MPM_PAGE_SIZE, dir,

			PAGE_SIZE, dir,

			ipa_mpm_ctx->md[mhi_idx].dl_prod_ring.ap_iova_tr);

		ipa_mpm_smmu_unmap(

			ipa_mpm_ctx->md[mhi_idx].ul_prod_ring.er_pa,

			IPA_MPM_PAGE_SIZE, dir,

			PAGE_SIZE, dir,

			ipa_mpm_ctx->md[mhi_idx].ul_prod_ring.ap_iova_er);



		ipa_mpm_ctx->md[mhi_idx].ul_prod_ring.tr_pa = 0;