From: Jeff Johnson <quic_jjohnson@quicinc.com>
To: Aditya Kumar Singh <quic_adisi@quicinc.com>,
<ath11k@lists.infradead.org>
Cc: <linux-wireless@vger.kernel.org>, <johannes@sipsolutions.net>
Subject: Re: [PATCH v2 2/3] wifi: ath11k: fix CAC running state during virtual interface start
Date: Tue, 12 Sep 2023 10:51:17 -0700 [thread overview]
Message-ID: <e9e13813-83bf-4c1c-b0d0-36661f2935ff@quicinc.com> (raw)
In-Reply-To: <20230912051857.2284-3-quic_adisi@quicinc.com>
On 9/11/2023 10:18 PM, Aditya Kumar Singh wrote:
> Currently channel definition's primary channel's DFS CAC time
> as well as primary channel's state i.e usable are used to set
> the CAC_RUNNING flag for the ath11k radio structure. However,
> this is wrong since certain channel definition are possbile
> where primary channel may not be a DFS channel but, secondary
> channel is a DFS channel. For example - channel 36 with 160 MHz
> bandwidth.
> In such cases, the flag will not be set which is wrong.
>
> Fix this issue by using cfg80211_chandef_dfs_usable() function
> from cfg80211 which return trues if at least one channel is in
> usable state.
>
> While at it, modify the CAC running debug log message to print
> the CAC time as well in milli-seconds.
>
> Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
>
> Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> ---
> drivers/net/wireless/ath/ath11k/mac.c | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
> index c071bf5841af..6b5f032197ff 100644
> --- a/drivers/net/wireless/ath/ath11k/mac.c
> +++ b/drivers/net/wireless/ath/ath11k/mac.c
> @@ -5,6 +5,7 @@
> */
>
> #include <net/mac80211.h>
> +#include <net/cfg80211.h>
> #include <linux/etherdevice.h>
> #include <linux/bitfield.h>
> #include <linux/inetdevice.h>
> @@ -7193,6 +7194,7 @@ ath11k_mac_vdev_start_restart(struct ath11k_vif *arvif,
> struct wmi_vdev_start_req_arg arg = {};
> const struct cfg80211_chan_def *chandef = &ctx->def;
> int ret = 0;
> + unsigned int dfs_cac_time;
>
> lockdep_assert_held(&ar->conf_mutex);
>
> @@ -7272,20 +7274,21 @@ ath11k_mac_vdev_start_restart(struct ath11k_vif *arvif,
> ath11k_dbg(ab, ATH11K_DBG_MAC, "vdev %pM started, vdev_id %d\n",
> arvif->vif->addr, arvif->vdev_id);
>
> - /* Enable CAC Flag in the driver by checking the channel DFS cac time,
> - * i.e dfs_cac_ms value which will be valid only for radar channels
> - * and state as NL80211_DFS_USABLE which indicates CAC needs to be
> + /* Enable CAC Flag in the driver by checking the all sub-channel's DFS
> + * state as NL80211_DFS_USABLE which indicates CAC needs to be
> * done before channel usage. This flags is used to drop rx packets.
> * during CAC.
> */
> /* TODO Set the flag for other interface types as required */
> - if (arvif->vdev_type == WMI_VDEV_TYPE_AP &&
> - chandef->chan->dfs_cac_ms &&
> - chandef->chan->dfs_state == NL80211_DFS_USABLE) {
> + if (arvif->vdev_type == WMI_VDEV_TYPE_AP && ctx->radar_enabled &&
> + cfg80211_chandef_dfs_usable(ar->hw->wiphy, chandef)) {
> set_bit(ATH11K_CAC_RUNNING, &ar->dev_flags);
> + dfs_cac_time = cfg80211_chandef_dfs_cac_time(ar->hw->wiphy,
> + chandef);
> ath11k_dbg(ab, ATH11K_DBG_MAC,
> - "CAC Started in chan_freq %d for vdev %d\n",
> - arg.channel.freq, arg.vdev_id);
> + "CAC (for %u ms) Started in center_freq %d center_freq1 %d for vdev %d\n",
> + dfs_cac_time, arg.channel.freq, chandef->center_freq1,
> + arg.vdev_id);
> }
>
> ret = ath11k_mac_set_txbf_conf(arvif);
--
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k
next prev parent reply other threads:[~2023-09-12 17:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-12 5:18 [PATCH v2 0/3] wifi: ath11k: fix CAC running state Aditya Kumar Singh
2023-09-12 5:18 ` [PATCH v2 1/3] wifi: cfg80211: export DFS CAC time and usable state helper functions Aditya Kumar Singh
2023-09-12 17:50 ` Jeff Johnson
2023-09-13 9:28 ` Johannes Berg
2023-09-13 10:16 ` Aditya Kumar Singh
2023-09-13 10:17 ` Johannes Berg
2023-09-12 5:18 ` [PATCH v2 2/3] wifi: ath11k: fix CAC running state during virtual interface start Aditya Kumar Singh
2023-09-12 17:51 ` Jeff Johnson [this message]
2023-10-05 6:23 ` Kalle Valo
2023-09-12 5:18 ` [PATCH v2 3/3] wifi: ath11k: fix Tx power value during active CAC Aditya Kumar Singh
2023-09-12 17:52 ` Jeff Johnson
2023-10-03 14:31 ` Kalle Valo
2023-10-04 2:09 ` Aditya Kumar Singh
2023-10-04 4:54 ` Kalle Valo
2023-10-04 4:54 ` Aditya Kumar Singh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e9e13813-83bf-4c1c-b0d0-36661f2935ff@quicinc.com \
--to=quic_jjohnson@quicinc.com \
--cc=ath11k@lists.infradead.org \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=quic_adisi@quicinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).