From 5d133c8bbde6b4209f5f5023e9010b9b976bf92a Mon Sep 17 00:00:00 2001 From: sivakanth reddy vaka Date: Mon, 21 Oct 2019 20:15:35 +0530 Subject: [PATCH] msm: ipa3: Change the hw version check for tethered stats Added Changes to support hw tethered stats only when wdi3 over gsi support is present. Change-Id: I5ab7cf9772d88f31c36553902e60b090d437bbc8 Signed-off-by: sivakanth reddy vaka Signed-off-by: Chaitanya Pratapa --- drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c | 10 +++++----- drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c b/drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c index 4587984fd843..43fb44687ff1 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_hw_stats.c @@ -36,7 +36,7 @@ int ipa_hw_stats_init(void) teth_stats_init->prod_mask = ( IPA_CLIENT_BIT_32(IPA_CLIENT_MHI_PRIME_TETH_PROD) | IPA_CLIENT_BIT_32(IPA_CLIENT_USB_PROD)); - if (ipa3_ctx->ipa_hw_type == IPA_HW_v4_5) + if (ipa3_ctx->ipa_wdi3_over_gsi) teth_stats_init->prod_mask |= IPA_CLIENT_BIT_32(IPA_CLIENT_WLAN2_PROD); else @@ -57,7 +57,7 @@ int ipa_hw_stats_init(void) teth_stats_init->dst_ep_mask[ep_index] = IPA_CLIENT_BIT_32(IPA_CLIENT_USB_CONS); - if (ipa3_ctx->ipa_hw_type == IPA_HW_v4_5) + if (ipa3_ctx->ipa_wdi3_over_gsi) teth_stats_init->dst_ep_mask[ep_index] |= IPA_CLIENT_BIT_32(IPA_CLIENT_WLAN2_CONS); else @@ -78,7 +78,7 @@ int ipa_hw_stats_init(void) IPA_CLIENT_BIT_32(IPA_CLIENT_Q6_WAN_PROD) | IPA_CLIENT_BIT_32(IPA_CLIENT_USB_PROD)); - if (ipa3_ctx->ipa_hw_type == IPA_HW_v4_5) + if (ipa3_ctx->ipa_wdi3_over_gsi) teth_stats_init->prod_mask |= IPA_CLIENT_BIT_32(IPA_CLIENT_WLAN2_PROD); else @@ -102,7 +102,7 @@ int ipa_hw_stats_init(void) teth_stats_init->dst_ep_mask[ep_index] = IPA_CLIENT_BIT_32(IPA_CLIENT_USB_CONS); - if (ipa3_ctx->ipa_hw_type == IPA_HW_v4_5) + if (ipa3_ctx->ipa_wdi3_over_gsi) teth_stats_init->dst_ep_mask[ep_index] |= IPA_CLIENT_BIT_32(IPA_CLIENT_WLAN2_CONS); else @@ -131,7 +131,7 @@ int ipa_hw_stats_init(void) teth_stats_init->dst_ep_mask[ep_index] = IPA_CLIENT_BIT_32(IPA_CLIENT_USB_CONS); - if (ipa3_ctx->ipa_hw_type == IPA_HW_v4_5) + if (ipa3_ctx->ipa_wdi3_over_gsi) teth_stats_init->dst_ep_mask[ep_index] |= IPA_CLIENT_BIT_32(IPA_CLIENT_WLAN2_CONS); else diff --git a/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c b/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c index 924e5648c8b3..f19ebac7f339 100644 --- a/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c +++ b/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c @@ -3483,7 +3483,7 @@ static int rmnet_ipa3_query_tethering_stats_hw( } } - if (ipa3_ctx_get_type(IPA_HW_TYPE) == IPA_HW_v4_5) + if (ipa3_ctx->ipa_wdi3_over_gsi) wlan_client = IPA_CLIENT_WLAN2_CONS; else wlan_client = IPA_CLIENT_WLAN1_CONS; @@ -3566,7 +3566,7 @@ static int rmnet_ipa3_query_tethering_stats_hw( return rc; } - if (ipa3_ctx->ipa_hw_type == IPA_HW_v4_5) + if (ipa3_ctx->ipa_wdi3_over_gsi) wlan_client = IPA_CLIENT_WLAN2_CONS; else wlan_client = IPA_CLIENT_WLAN1_CONS; @@ -3691,7 +3691,7 @@ skip_nlo_stats: /* query WLAN UL stats */ memset(con_stats, 0, sizeof(struct ipa_quota_stats_all)); - if (ipa3_ctx_get_type(IPA_HW_TYPE) == IPA_HW_v4_5) + if (ipa3_ctx->ipa_wdi3_over_gsi) rc = ipa_query_teth_stats(IPA_CLIENT_WLAN2_PROD, con_stats, reset); else