From 00c2ec29825ceadc6ab23b350759292ffc432338 Mon Sep 17 00:00:00 2001 From: Srikanth Marepalli Date: Tue, 27 Sep 2022 00:33:25 +0530 Subject: [PATCH 1/4] qcacld-3.0: Print the TX AMPDU in the LL Stats request debug log In LL Stats request handler the rx_ampdu is wrongly printed as tx_ampdu. Rectified the debug log to print both the tx_ampdu and rx_ampdu. Change-Id: I00df3da79a0aed95cda76edb7e3f80409c6abf75 CRs-Fixed: 3254595 --- core/hdd/src/wlan_hdd_debugfs_llstat.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/hdd/src/wlan_hdd_debugfs_llstat.c b/core/hdd/src/wlan_hdd_debugfs_llstat.c index 6b8e4fc2a113..22470b65692d 100644 --- a/core/hdd/src/wlan_hdd_debugfs_llstat.c +++ b/core/hdd/src/wlan_hdd_debugfs_llstat.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -115,11 +116,17 @@ void hdd_debugfs_process_iface_stats(struct hdd_adapter *adapter, ll_stats.len += len; len = scnprintf(buffer, DEBUGFS_LLSTATS_BUF_SIZE - ll_stats.len, - "\nac_type: %d, tx_mpdu: %u, rx_mpdu: %u, tx_mcast: %u, rx_mcast: %u, rx_ampdu: %u tx_ampdu: %u, mpdu_lost: %u, retries: %u, retries_short: %u, retries_long: %u, contention_time: min-%u max-%u avg-%u, contention num samples: %u, tx_pending_msdu: %u", + "\nac_type: %d, tx_mpdu: %u, rx_mpdu: %u, " + "tx_mcast: %u, rx_mcast: %u, tx_ampdu: %u, " + "rx_ampdu: %u, mpdu_lost: %u, retries: %u, " + "retries_short: %u, retries_long: %u, " + "contention_time: min-%u max-%u avg-%u, " + "contention num samples: %u, " + "tx_pending_msdu: %u", ac_stats->ac_type, ac_stats->tx_mpdu, ac_stats->rx_mpdu, ac_stats->tx_mcast, ac_stats->rx_mcast, - ac_stats->rx_ampdu, ac_stats->rx_ampdu, + ac_stats->tx_ampdu, ac_stats->rx_ampdu, ac_stats->mpdu_lost, ac_stats->retries, ac_stats->retries_short, ac_stats->retries_long, ac_stats->contention_time_min, From 380df088c858fabafff0ba52510965c09cb0cb7b Mon Sep 17 00:00:00 2001 From: Madan Koyyalamudi Date: Tue, 11 Oct 2022 07:54:06 -0700 Subject: [PATCH 2/4] Release 2.0.8.31I Release 2.0.8.31I Change-Id: Ic57d969dd12d859478a12b61219a43cd54e24ce1 CRs-Fixed: 774533 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 66b95e232b1b..70aa364c1c91 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -32,9 +32,9 @@ #define QWLAN_VERSION_MAJOR 2 #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 8 -#define QWLAN_VERSION_EXTRA "H" +#define QWLAN_VERSION_EXTRA "I" #define QWLAN_VERSION_BUILD 31 -#define QWLAN_VERSIONSTR "2.0.8.31H" +#define QWLAN_VERSIONSTR "2.0.8.31I" #endif /* QWLAN_VERSION_H */ From 3bdab6cf8344e59f64d9b4b5f589c712492b1049 Mon Sep 17 00:00:00 2001 From: Ashish Date: Thu, 20 Jan 2022 21:37:15 +0530 Subject: [PATCH 3/4] qcacld-3.0: Resume all components in case of suspend failure Currently if driver suspends all the components and after that if host suspends fails it does not resume all the suspended components which leads in failure of the operations from these components. In current issue driver suspends all the components and it fails to suspend dp rx refill thread and because of which host suspend fails. Driver suspends scan component as well as part of all component suspend which is leading scan requests failures. TO address above issue, resume all components in case of suspend failure. Change-Id: I693049a0c4089eb440f459ed3a066e741e8594fe CRs-Fixed: 3311567 --- core/hdd/src/wlan_hdd_power.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 45266d6e689d..df9f54dc88d2 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -2351,7 +2351,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, if (ucfg_ipa_suspend(hdd_ctx->pdev)) { hdd_err("IPA not ready to suspend!"); wlan_hdd_inc_suspend_stats(hdd_ctx, SUSPEND_FAIL_IPA); - return -EAGAIN; + goto resume_all_components; } /* Suspend control path scheduler */ @@ -2436,6 +2436,9 @@ resume_ol_rx: hdd_ctx->is_scheduler_suspended = false; resume_tx: hdd_resume_wlan(); +resume_all_components: + ucfg_pmo_resume_all_components(hdd_ctx->psoc, QDF_SYSTEM_SUSPEND); + return -ETIME; } From 0de83ae84153e62f60a2625e51be205d76fe996f Mon Sep 17 00:00:00 2001 From: Madan Koyyalamudi Date: Tue, 18 Oct 2022 07:12:19 -0700 Subject: [PATCH 4/4] Release 2.0.8.31J Release 2.0.8.31J Change-Id: I1aa87130f3fa2218300dd706067b9287f8595357 CRs-Fixed: 774533 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 70aa364c1c91..4e28b018aad0 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -32,9 +32,9 @@ #define QWLAN_VERSION_MAJOR 2 #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 8 -#define QWLAN_VERSION_EXTRA "I" +#define QWLAN_VERSION_EXTRA "J" #define QWLAN_VERSION_BUILD 31 -#define QWLAN_VERSIONSTR "2.0.8.31I" +#define QWLAN_VERSIONSTR "2.0.8.31J" #endif /* QWLAN_VERSION_H */