ath10k: enable radar detection in secondary segment
PATCH 1/1 ath10k: enable radar detection in secondary segment
From: Lei Wang <[email protected]>
Enable radar detection in secondary segment for VHT160 and VHT80+80 mode on DFS channels. Otherwise, when injecting radar pulse in the secondary segment, the DUT can't detect radar pulse.
Tested: qca9984 with firmware ver 10.4-3.10-00047
--- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 6 ++--- drivers/net/wireless/ath/ath10k/wmi.c | 39 ++++++++++++++++++++++--------- drivers/net/wireless/ath/ath10k/wmi.h | 5 ++-- 3 files changed, 34 insertions(+), 16 deletions(-)
drivers/net/wireless/ath/ath10k/wmi-tlv.c +3 -3
@@ -2123,7 +2123,7 @@ static int ath10k_wmi_tlv_op_get_vdev_subtype(struct ath10k *ar, tlv->tag =__cpu_to_le16 (WMI_TLV_TAG_STRUCT_CHANNEL ); tlv->len =__cpu_to_le16 (sizeof (*ch)); ch = (void *)tlv->value; -ath10k_wmi_put_wmi_channel (ch, &arg->channel); +ath10k_wmi_put_wmi_channel (ar, ch, &arg->channel); ptr +=sizeof (*tlv); ptr +=sizeof (*ch);
@@ -2763,7 +2763,7 @@ static void *ath10k_wmi_tlv_put_wmm(void *ptr, tlv->len =__cpu_to_le16 (sizeof (*ci)); ci = (void *)tlv->value; -ath10k_wmi_put_wmi_channel (ci, ch); +ath10k_wmi_put_wmi_channel (ar, ci, ch); chans +=sizeof (*tlv); chans +=sizeof (*ci);
@@ -3450,7 +3450,7 @@ static u32 ath10k_wmi_tlv_prepare_peer_qos(u8 uapsd_queues, u8 sp) tlv->tag =__cpu_to_le16 (WMI_TLV_TAG_STRUCT_CHANNEL ); tlv->len =__cpu_to_le16 (sizeof (*chan)); chan = (void *)tlv->value; -ath10k_wmi_put_wmi_channel (chan, &chan_arg[i]); +ath10k_wmi_put_wmi_channel (ar, chan, &chan_arg[i]); ptr +=sizeof (*tlv); ptr +=sizeof (*chan);
drivers/net/wireless/ath/ath10k/wmi.c +28 -11
@@ -1694,10 +1694,11 @@ .bw160 = WMI_10_2_PEER_160MHZ, }; -void ath10k_wmi_put_wmi_channel (struct wmi_channel *ch, +void ath10k_wmi_put_wmi_channel (struct ath10k *ar,struct wmi_channel *ch,const struct wmi_channel_arg *arg) {u32 flags =0 ; +struct ieee80211_channel *chan =NULL ;memset (ch,0 ,sizeof (*ch));
@@ -1717,20 +1718,36 @@ void ath10k_wmi_put_wmi_channel(struct wmi_channel *ch, ch->band_center_freq2 =0 ; ch->mhz =__cpu_to_le32 (arg->freq); ch->band_center_freq1 =__cpu_to_le32 (arg->band_center_freq1); -if (arg->mode ==MODE_11AC_VHT80_80 ) +if (arg->mode ==MODE_11AC_VHT80_80 ) { ch->band_center_freq2 =__cpu_to_le32 (arg->band_center_freq2); + chan =ieee80211_get_channel (ar->hw->wiphy, + arg->band_center_freq2 -10 ); + }if (arg->mode ==MODE_11AC_VHT160 ) { -if (arg->freq > arg->band_center_freq1) - ch->band_center_freq1 = -__cpu_to_le32 (arg->band_center_freq1 +40 ); -else - ch->band_center_freq1 = -__cpu_to_le32 (arg->band_center_freq1 -40 ); +u32 band_center_freq1; +u32 band_center_freq2; + +if (arg->freq > arg->band_center_freq1) { + band_center_freq1 = arg->band_center_freq1 +40 ; + band_center_freq2 = arg->band_center_freq1 -40 ; + }else { + band_center_freq1 = arg->band_center_freq1 -40 ; + band_center_freq2 = arg->band_center_freq1 +40 ; + } + ch->band_center_freq1 = +__cpu_to_le32 (band_center_freq1); +/* Minus 10 to get a defined 5G channel frequency*/ + chan =ieee80211_get_channel (ar->hw->wiphy, + band_center_freq2 -10 ); +/* The center frequency of the entire VHT160 */ ch->band_center_freq2 =__cpu_to_le32 (arg->band_center_freq1); } +if (chan && chan->flags &IEEE80211_CHAN_RADAR ) + flags |=WMI_CHAN_FLAG_DFS_CFREQ2 ; + ch->min_power = arg->min_power; ch->max_power = arg->max_power; ch->reg_power = arg->max_reg_power;
@@ -7176,7 +7193,7 @@ void ath10k_wmi_start_scan_init(struct ath10k *ar,memcpy (cmd->ssid.ssid, arg->ssid, arg->ssid_len); } -ath10k_wmi_put_wmi_channel (&cmd->chan, &arg->channel); +ath10k_wmi_put_wmi_channel (ar, &cmd->chan, &arg->channel); ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi vdev %s id 0x%x flags: 0x%0X, freq %d, mode %d, ch_flags: 0x%0X, max_power: %d\n",
@@ -7548,7 +7565,7 @@ void ath10k_wmi_start_scan_init(struct ath10k *ar, ch = &arg->channels[i]; ci = &cmd->chan_info[i]; -ath10k_wmi_put_wmi_channel (ci, ch); +ath10k_wmi_put_wmi_channel (ar, ci, ch); }return skb;
@@ -8952,7 +8969,7 @@ static u32 ath10k_wmi_prepare_peer_qos(u8 uapsd_queues, u8 sp)for (i =0 ; i < cap->peer_chan_len; i++) { chan = (struct wmi_channel *)&peer_cap->peer_chan_list[i]; -ath10k_wmi_put_wmi_channel (chan, &chan_arg[i]); +ath10k_wmi_put_wmi_channel (ar, chan, &chan_arg[i]); } ath10k_dbg(ar, ATH10K_DBG_WMI,
drivers/net/wireless/ath/ath10k/wmi.h +3 -2
@@ -2094,7 +2094,8 @@ enum wmi_channel_change_cause {/* Indicate reason for channel switch */ #define WMI_CHANNEL_CHANGE_CAUSE_CSA (1 << 13) - +/* DFS required on channel for 2nd segment of VHT160 and VHT80+80*/ +#define WMI_CHAN_FLAG_DFS_CFREQ2 (1 << 15)#define WMI_MAX_SPATIAL_STREAM 3/* default max ss */ /* HT Capabilities*/
@@ -7351,7 +7352,7 @@ void ath10k_wmi_put_start_scan_common(struct wmi_start_scan_common *cmn, const struct wmi_start_scan_arg *arg);void ath10k_wmi_set_wmm_param (struct wmi_wmm_params *params,const struct wmi_wmm_params_arg *arg); -void ath10k_wmi_put_wmi_channel (struct wmi_channel *ch, +void ath10k_wmi_put_wmi_channel (struct ath10k *ar,struct wmi_channel *ch,const struct wmi_channel_arg *arg);int ath10k_wmi_start_scan_verify (const struct wmi_start_scan_arg *arg);
Signature · 1 line
1.9.1
Quoted 10 lines · Sowmiya Sree Elavalagan
From: Lei Wang <[email protected]>
Enable radar detection in secondary segment for VHT160 and VHT80+80 mode on DFS channels. Otherwise, when injecting radar pulse in the secondary segment, the DUT can't detect radar pulse.
Tested: qca9984 with firmware ver 10.4-3.10-00047
Signed-off-by Lei Wang <[email protected]>Signed-off-by Sowmiya Sree Elavalagan <[email protected]>
Failed to apply:
error: patch failed: drivers/net/wireless/ath/ath10k/wmi.c:1717
error: drivers/net/wireless/ath/ath10k/wmi.c: patch does not apply stg import: Diff does not apply cleanly
Patch set to Changes Requested.
Signature · 8 lines
https://patchwork.kernel.org/patch/11458405/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 13 lines · Kalle Valo
Quoted 10 lines · Sowmiya Sree Elavalagan
From: Lei Wang <[email protected]>
Enable radar detection in secondary segment for VHT160 and VHT80+80 mode on DFS channels. Otherwise, when injecting radar pulse in the secondary segment, the DUT can't detect radar pulse.
Tested: qca9984 with firmware ver 10.4-3.10-00047
Signed-off-by Lei Wang <[email protected]>Signed-off-by Sowmiya Sree Elavalagan <[email protected]>
Quoted 7 lines
Failed to apply:
error: patch failed:
drivers/net/wireless/ath/ath10k/wmi.c:1717
error:drivers/net/wireless/ath/ath10k/wmi.c: patch does not apply stg import: Diff does not apply cleanlyPatch set to Changes Requested.
I guess this depends on "ath10k: enable VHT160 and VHT80+80 modes"? If that's the case then you should submit them in the same patchset to make the dependency clear.
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 21 lines · Kalle Valo
Quoted 19 lines · Kalle Valo
Quoted 10 lines · Sowmiya Sree Elavalagan
From: Lei Wang <[email protected]>
Enable radar detection in secondary segment for VHT160 and VHT80+80 mode on DFS channels. Otherwise, when injecting radar pulse in the secondary segment, the DUT can't detect radar pulse.
Tested: qca9984 with firmware ver 10.4-3.10-00047
Signed-off-by Lei Wang <[email protected]>Signed-off-by Sowmiya Sree Elavalagan <[email protected]>Failed to apply:
error: patch failed:
drivers/net/wireless/ath/ath10k/wmi.c:1717
error:drivers/net/wireless/ath/ath10k/wmi.c: patch does not apply stg import: Diff does not apply cleanly
Quoted 5 lines
Quoted 1 line
Patch set to Changes Requested.
I guess this depends on "ath10k: enable VHT160 and VHT80+80 modes"? If that's the case then you should submit them in the same patchset to make the dependency clear.
Yes, this patch is dependent on ath10k: enable VHT160 and VHT80+80 modes. Sure will update and send.
Thanks,
Sowmiya Sree
Quoted 10 lines · Sowmiya Sree Elavalagan
From: Lei Wang <[email protected]>
Enable radar detection in secondary segment for VHT160 and VHT80+80 mode on DFS channels. Otherwise, when injecting radar pulse in the secondary segment, the DUT can't detect radar pulse.
Tested: qca9984 with firmware ver 10.4-3.10-00047
Signed-off-by Lei Wang <[email protected]>Signed-off-by Sowmiya Sree Elavalagan <[email protected]>
Failed to apply:
error: patch failed: drivers/net/wireless/ath/ath10k/wmi.c:1717
error: drivers/net/wireless/ath/ath10k/wmi.c: patch does not apply stg import: Diff does not apply cleanly
Patch set to Changes Requested.
Signature · 3 lines
https://patchwork.kernel.org/patch/11458405/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches