From: Kang Yang <quic_kangyang@quicinc.com>
To: <ath12k@lists.infradead.org>
Cc: <linux-wireless@vger.kernel.org>, <quic_kangyang@quicinc.com>
Subject: [PATCH v6 10/11] wifi: ath12k: designating channel frequency for ROC scan
Date: Tue, 30 Jan 2024 12:03:02 +0800 [thread overview]
Message-ID: <20240130040303.370590-11-quic_kangyang@quicinc.com> (raw)
In-Reply-To: <20240130040303.370590-1-quic_kangyang@quicinc.com>
For P2P mode, the WLAN interface may be requested to remain on a
specific channel and then to send some management frames on that
channel. Now chananel frequency of wmi_mgmt_send_cmd is set as 0. As
a result, firmware may choose a default but wrong channel.
Fix it by assigning chanfreq field with the ROC channel frequency.
This change only applies to WCN7850, other chips are not affected.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1
Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>
---
v6: no change.
v5: no change.
v4: no change.
v3: no change.
v2: add Tested-on tag of QCN9274.
---
drivers/net/wireless/ath/ath12k/wmi.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c
index c4fe90b5ff32..5af69bce8997 100644
--- a/drivers/net/wireless/ath/ath12k/wmi.c
+++ b/drivers/net/wireless/ath/ath12k/wmi.c
@@ -732,6 +732,20 @@ static int ath12k_service_ready_event(struct ath12k_base *ab, struct sk_buff *sk
return 0;
}
+static u32 ath12k_wmi_mgmt_get_freq(struct ath12k *ar,
+ struct ieee80211_tx_info *info)
+{
+ struct ath12k_base *ab = ar->ab;
+ u32 freq = 0;
+
+ if (ab->hw_params->single_pdev_only &&
+ ar->scan.is_roc &&
+ (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN))
+ freq = ar->scan.roc_freq;
+
+ return freq;
+}
+
struct sk_buff *ath12k_wmi_alloc_skb(struct ath12k_wmi_base *wmi_ab, u32 len)
{
struct sk_buff *skb;
@@ -757,6 +771,7 @@ int ath12k_wmi_mgmt_send(struct ath12k *ar, u32 vdev_id, u32 buf_id,
{
struct ath12k_wmi_pdev *wmi = ar->wmi;
struct wmi_mgmt_send_cmd *cmd;
+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(frame);
struct wmi_tlv *frame_tlv;
struct sk_buff *skb;
u32 buf_len;
@@ -775,7 +790,7 @@ int ath12k_wmi_mgmt_send(struct ath12k *ar, u32 vdev_id, u32 buf_id,
sizeof(*cmd));
cmd->vdev_id = cpu_to_le32(vdev_id);
cmd->desc_id = cpu_to_le32(buf_id);
- cmd->chanfreq = 0;
+ cmd->chanfreq = cpu_to_le32(ath12k_wmi_mgmt_get_freq(ar, info));
cmd->paddr_lo = cpu_to_le32(lower_32_bits(ATH12K_SKB_CB(frame)->paddr));
cmd->paddr_hi = cpu_to_le32(upper_32_bits(ATH12K_SKB_CB(frame)->paddr));
cmd->frame_len = cpu_to_le32(frame->len);
--
2.34.1
next prev parent reply other threads:[~2024-01-30 4:03 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-30 4:02 [PATCH v6 00/11] wifi: ath12k: P2P support for WCN7850 Kang Yang
2024-01-30 4:02 ` [PATCH v6 01/11] wifi: ath12k: fix broken structure wmi_vdev_create_cmd Kang Yang
2024-01-30 16:48 ` Jeff Johnson
2024-02-05 15:46 ` Kalle Valo
2024-02-07 15:07 ` Kalle Valo
2024-01-30 4:02 ` [PATCH v6 02/11] wifi: ath12k: fix incorrect logic of calculating vdev_stats_id Kang Yang
2024-01-30 16:51 ` Jeff Johnson
2024-02-05 15:33 ` Kalle Valo
2024-01-30 4:02 ` [PATCH v6 03/11] wifi: ath12k: change interface combination for P2P mode Kang Yang
2024-01-30 16:52 ` Jeff Johnson
2024-01-30 4:02 ` [PATCH v6 04/11] wifi: ath12k: add P2P IE in beacon template Kang Yang
2024-01-30 17:02 ` Jeff Johnson
2024-02-05 16:24 ` Kalle Valo
2024-02-05 16:17 ` Kalle Valo
2024-02-05 16:35 ` Jeff Johnson
2024-02-06 9:52 ` Kalle Valo
2024-01-30 4:02 ` [PATCH v6 05/11] wifi: ath12k: implement handling of P2P NoA event Kang Yang
2024-01-30 17:14 ` Jeff Johnson
2024-02-02 13:53 ` Kalle Valo
2024-02-02 16:25 ` Jeff Johnson
2024-02-06 2:21 ` Kang Yang
2024-02-06 9:56 ` Kalle Valo
2024-02-06 16:11 ` Kalle Valo
2024-02-06 18:17 ` Kalle Valo
2024-02-07 17:43 ` Jeff Johnson
2024-02-07 4:36 ` Kang Yang
2024-01-30 4:02 ` [PATCH v6 06/11] wifi: ath12k: implement remain on channel for P2P mode Kang Yang
2024-01-30 17:16 ` Jeff Johnson
2024-01-30 4:02 ` [PATCH v6 07/11] wifi: ath12k: change WLAN_SCAN_PARAMS_MAX_IE_LEN from 256 to 512 Kang Yang
2024-01-30 17:19 ` Jeff Johnson
2024-01-30 4:03 ` [PATCH v6 08/11] wifi: ath12k: allow specific mgmt frame tx while vdev is not up Kang Yang
2024-01-30 17:23 ` Jeff Johnson
2024-02-06 16:24 ` Kalle Valo
2024-02-07 4:44 ` Kang Yang
2024-03-07 9:46 ` Kang Yang
2024-01-30 4:03 ` [PATCH v6 09/11] wifi: ath12k: move peer delete after vdev stop of station for WCN7850 Kang Yang
2024-01-30 17:24 ` Jeff Johnson
2024-01-30 4:03 ` Kang Yang [this message]
2024-01-30 17:24 ` [PATCH v6 10/11] wifi: ath12k: designating channel frequency for ROC scan Jeff Johnson
2024-01-30 4:03 ` [PATCH v6 11/11] wifi: ath12k: advertise P2P dev support for WCN7850 Kang Yang
2024-01-30 17:25 ` Jeff Johnson
2024-02-05 15:40 ` [PATCH v6 00/11] wifi: ath12k: P2P " Kalle Valo
2024-02-07 6:50 ` Kang Yang
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=20240130040303.370590-11-quic_kangyang@quicinc.com \
--to=quic_kangyang@quicinc.com \
--cc=ath12k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.