From 8cb85b52b3f81ce70f97ec1a199caf43d7b0d3bc Mon Sep 17 00:00:00 2001 From: Ashok Vuyyuru Date: Wed, 19 Aug 2020 17:07:47 +0530 Subject: [PATCH] msm: ipa4: Disable uc monitoring stats for holi target In holi target due uC memory constraints uC monitoring stats not support. So disabling the sending monitor command to uC. Change-Id: I34e319118287fcd82876344bd85ab53c50cf5651 Signed-off-by: Ashok Vuyyuru --- drivers/platform/msm/ipa/ipa_v3/ipa_client.c | 3 ++- drivers/platform/msm/ipa/ipa_v3/ipa_uc_wdi.c | 9 ++++++--- drivers/platform/msm/ipa/ipa_v3/ipa_utils.c | 3 ++- drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c | 3 ++- drivers/platform/msm/ipa/test/ipa_test_hw_stats.c | 3 ++- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_client.c b/drivers/platform/msm/ipa/ipa_v3/ipa_client.c index ea349e49d297..c6113f541ecf 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_client.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_client.c @@ -270,7 +270,8 @@ static void ipa3_start_gsi_debug_monitor(u32 clnt_hdl) /* start uC gsi dbg stats monitor */ if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5 && - ipa3_ctx->ipa_hw_type != IPA_HW_v4_7) { + ipa3_ctx->ipa_hw_type != IPA_HW_v4_7 && + ipa3_ctx->ipa_hw_type != IPA_HW_v4_11) { switch (client_type) { case IPA_CLIENT_MHI_PRIME_TETH_PROD: gsi_info = &ipa3_ctx->gsi_info[IPA_HW_PROTOCOL_MHIP]; diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_uc_wdi.c b/drivers/platform/msm/ipa/ipa_v3/ipa_uc_wdi.c index 5237c80cd950..1c627357e96b 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_uc_wdi.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_uc_wdi.c @@ -2115,7 +2115,8 @@ int ipa3_disconnect_gsi_wdi_pipe(u32 clnt_hdl) else IPADBG("uc_wdi_ctx.stats_notify already null\n"); if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5 && - ipa3_ctx->ipa_hw_type != IPA_HW_v4_7) + ipa3_ctx->ipa_hw_type != IPA_HW_v4_7 && + ipa3_ctx->ipa_hw_type != IPA_HW_v4_11) ipa3_uc_debug_stats_dealloc(IPA_HW_PROTOCOL_WDI); IPADBG("client (ep: %d) disconnected\n", clnt_hdl); @@ -2510,7 +2511,8 @@ int ipa3_resume_gsi_wdi_pipe(u32 clnt_hdl) pcmd_t = &ipa3_ctx->gsi_info[IPA_HW_PROTOCOL_WDI]; /* start uC gsi dbg stats monitor */ if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5 && - ipa3_ctx->ipa_hw_type != IPA_HW_v4_7) { + ipa3_ctx->ipa_hw_type != IPA_HW_v4_7 && + ipa3_ctx->ipa_hw_type != IPA_HW_v4_11) { if (IPA_CLIENT_IS_PROD(ep->client)) { pcmd_t->ch_id_info[0].ch_id = ep->gsi_chan_hdl; @@ -2688,7 +2690,8 @@ retry_gsi_stop: pcmd_t = &ipa3_ctx->gsi_info[IPA_HW_PROTOCOL_WDI]; /* stop uC gsi dbg stats monitor */ if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5 && - ipa3_ctx->ipa_hw_type != IPA_HW_v4_7) { + ipa3_ctx->ipa_hw_type != IPA_HW_v4_7 && + ipa3_ctx->ipa_hw_type != IPA_HW_v4_11) { if (IPA_CLIENT_IS_PROD(ep->client)) { pcmd_t->ch_id_info[0].ch_id = 0xff; diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c b/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c index dcc276e9c527..b56a23a68b61 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c @@ -8340,7 +8340,8 @@ static int __ipa3_stop_gsi_channel(u32 clnt_hdl) /* stop uC gsi dbg stats monitor */ if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5 && - ipa3_ctx->ipa_hw_type != IPA_HW_v4_7) { + ipa3_ctx->ipa_hw_type != IPA_HW_v4_7 && + ipa3_ctx->ipa_hw_type != IPA_HW_v4_11) { switch (client_type) { case IPA_CLIENT_MHI_PRIME_TETH_PROD: gsi_info = &ipa3_ctx->gsi_info[IPA_HW_PROTOCOL_MHIP]; diff --git a/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c b/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c index c9cf5d6d96bf..924f81497546 100644 --- a/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c +++ b/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c @@ -3186,7 +3186,8 @@ static int rmnet_ipa3_set_data_quota_wifi(struct wan_ioctl_set_data_quota *data) IPAWANDBG("iface name %s, quota %lu\n", data->interface_name, (unsigned long) data->quota_mbytes); - if (ipa3_ctx_get_type(IPA_HW_TYPE) >= IPA_HW_v4_5) { + if (ipa3_ctx_get_type(IPA_HW_TYPE) >= IPA_HW_v4_5 && + ipa3_ctx_get_type(IPA_HW_TYPE) != IPA_HW_v4_11) { IPADBG("use ipa-uc for quota\n"); rc = ipa3_uc_quota_monitor(data->set_quota); } else { diff --git a/drivers/platform/msm/ipa/test/ipa_test_hw_stats.c b/drivers/platform/msm/ipa/test/ipa_test_hw_stats.c index 2bc7ec1e8e54..775cbf10775e 100644 --- a/drivers/platform/msm/ipa/test/ipa_test_hw_stats.c +++ b/drivers/platform/msm/ipa/test/ipa_test_hw_stats.c @@ -737,7 +737,8 @@ static int ipa_test_hw_stats_set_uc_event_ring(void *priv) /* set uc event ring */ IPA_UT_INFO("========set uc event ring ========\n"); - if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5) { + if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5 && + ipa3_ctx->ipa_hw_type != IPA_HW_v4_11) { if (ipa3_ctx->uc_ctx.uc_loaded && !ipa3_ctx->uc_ctx.uc_event_ring_valid) { if (ipa3_uc_setup_event_ring()) {