From 1f2104b73398c406e96988e067c6ee20483f2760 Mon Sep 17 00:00:00 2001 From: Namita Nair Date: Thu, 20 Jul 2023 14:12:35 -0700 Subject: [PATCH] Revert "qcacmn: Initialize ipa_mapped to 1 in soc attach" This reverts Change-Id: Idcb86db99f522959b639865f77178cd47a234277. Change-Id: I3084631103fa3e1937605af5ed5e14b8348cef57 CRs-Fixed: 3569762 --- dp/wifi3.0/dp_ipa.c | 4 +++- dp/wifi3.0/dp_main.c | 3 --- ipa/core/src/wlan_ipa_core.c | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dp/wifi3.0/dp_ipa.c b/dp/wifi3.0/dp_ipa.c index 0b10df4079..b187148111 100644 --- a/dp/wifi3.0/dp_ipa.c +++ b/dp/wifi3.0/dp_ipa.c @@ -3466,9 +3466,11 @@ QDF_STATUS dp_ipa_enable_pipes(struct cdp_soc_t *soc_hdl, uint8_t pdev_id, qdf_atomic_set(&soc->ipa_pipes_enabled, 1); DP_IPA_EP_SET_TX_DB_PA(soc, ipa_res); - if (!ipa_config_is_opt_wifi_dp_enabled()) + if (!ipa_config_is_opt_wifi_dp_enabled()) { dp_ipa_handle_rx_buf_pool_smmu_mapping(soc, pdev, true, __func__, __LINE__); + qdf_atomic_set(&soc->ipa_mapped, 1); + } result = qdf_ipa_wdi_enable_pipes(hdl); if (result) { diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index 33f8199e92..95b7be0484 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -13570,9 +13570,6 @@ dp_soc_attach(struct cdp_ctrl_objmgr_psoc *ctrl_psoc, dp_soc_set_def_pdev(soc); dp_soc_set_qref_debug_list(soc); - if (!ipa_config_is_opt_wifi_dp_enabled()) - qdf_atomic_set(&soc->ipa_mapped, 1); - dp_info("Mem stats: DMA = %u HEAP = %u SKB = %u", qdf_dma_mem_stats_read(), qdf_heap_mem_stats_read(), diff --git a/ipa/core/src/wlan_ipa_core.c b/ipa/core/src/wlan_ipa_core.c index e5672fb2e0..77e45a1da3 100644 --- a/ipa/core/src/wlan_ipa_core.c +++ b/ipa/core/src/wlan_ipa_core.c @@ -4390,6 +4390,8 @@ QDF_STATUS wlan_ipa_setup(struct wlan_ipa_priv *ipa_ctx, qdf_mutex_create(&ipa_ctx->ipa_lock); qdf_atomic_init(&ipa_ctx->deinit_in_prog); + cdp_ipa_set_smmu_mapped(ipa_ctx->dp_soc, 0); + status = wlan_ipa_wdi_setup_rm(ipa_ctx); if (status != QDF_STATUS_SUCCESS) goto fail_setup_rm;