Merge "msm: ipa3: Change the hw version check for tethered stats"

This commit is contained in:
qctecmdr
2020-05-06 00:02:59 -07:00
zatwierdzone przez Gerrit - the friendly Code Review server
2 zmienionych plików z 8 dodań i 8 usunięć

Wyświetl plik

@@ -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

Wyświetl plik

@@ -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