Whenever the MAC detects a color collision or any of its associated station
detects one the FW will send out an event. Add the code to parse and handle
this event. and pass the data up to mac80211.
The FW does not provide an offload future such as the one used for CSA. The
CCA process is hence triggered via the beacon offload tx completion events
sent out by the FW.
Signed-off-by: John Crispin <[email protected]>
---
drivers/net/wireless/ath/ath11k/mac.c | 18 ++++++++
drivers/net/wireless/ath/ath11k/mac.h | 1 +
drivers/net/wireless/ath/ath11k/wmi.c | 60 +++++++++++++++++++++++++++
drivers/net/wireless/ath/ath11k/wmi.h | 14 +++++++
4 files changed, 93 insertions(+)
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index b3ae1a0bceb3..2b6f737819a2 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -802,6 +802,22 @@ static int ath11k_mac_setup_bcn_tmpl(struct ath11k_vif *arvif)
return ret;
}
+void ath11k_mac_bcn_tx_event(struct ath11k_vif *arvif)
+{
+ struct ieee80211_vif *vif = arvif->vif;
+
+ if (!vif->cca_active)
+ return;
+
+ if (ieee80211_cca_is_complete(vif)) {
+ ieee80211_cca_finish(vif);
+ return;
+ }
+
+ ieee80211_cca_update_counter(vif);
+ ath11k_mac_setup_bcn_tmpl(arvif);
+}
+
static void ath11k_control_beaconing(struct ath11k_vif *arvif,
struct ieee80211_bss_conf *info)
{
@@ -6043,6 +6059,8 @@ static int __ath11k_mac_register(struct ath11k *ar)
ar->hw->wiphy->features |= NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE |
NL80211_FEATURE_AP_SCAN;
+ ar->hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_BSS_COLOR;
+
ar->max_num_stations = TARGET_NUM_STATIONS;
ar->max_num_peers = TARGET_NUM_PEERS_PDEV;
diff --git a/drivers/net/wireless/ath/ath11k/mac.h b/drivers/net/wireless/ath/ath11k/mac.h
index 0607479774a9..55978744e170 100644
--- a/drivers/net/wireless/ath/ath11k/mac.h
+++ b/drivers/net/wireless/ath/ath11k/mac.h
@@ -146,4 +146,5 @@ int ath11k_mac_tx_mgmt_pending_free(int buf_id, void *skb, void *ctx);
u8 ath11k_mac_bw_to_mac80211_bw(u8 bw);
enum ath11k_supported_bw ath11k_mac_mac80211_bw_to_ath11k_bw(enum rate_info_bw bw);
enum hal_encrypt_type ath11k_dp_tx_get_encrypt_type(u32 cipher);
+void ath11k_mac_bcn_tx_event(struct ath11k_vif *arvif);
#endif
diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index 54bb07c6a7a9..19f7f1cd76f8 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -99,6 +99,8 @@ static const struct wmi_tlv_policy wmi_tlv_policies[] = {
= { .min_len = sizeof(struct wmi_pdev_ctl_failsafe_chk_event) },
[WMI_TAG_PEER_OPER_MODE_CHANGE_EVENT]
= { .min_len = sizeof(struct wmi_peer_oper_mode_change_event) },
+ [WMI_TAG_OBSS_COLOR_COLLISION_EVT]
+ = { .min_len = sizeof(struct wmi_obss_color_collision_event) },
};
#define PRIMAP(_hw_mode_) \
@@ -3035,6 +3037,52 @@ int ath11k_wmi_send_bss_color_change_enable_cmd(struct ath11k *ar, u32 vdev_id,
return ret;
}
+static void
+ath11k_wmi_obss_color_collision_event(struct ath11k_base *ab, struct sk_buff *skb)
+{
+ const void **tb;
+ const struct wmi_obss_color_collision_event *ev;
+ struct ath11k_vif *arvif;
+ int ret;
+
+ tb = ath11k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC);
+ if (IS_ERR(tb)) {
+ ret = PTR_ERR(tb);
+ ath11k_warn(ab, "failed to parse tlv: %d\n", ret);
+ return;
+ }
+
+ ev = tb[WMI_TAG_OBSS_COLOR_COLLISION_EVT];
+ if (!ev) {
+ ath11k_warn(ab, "failed to fetch obss color collision ev");
+ goto exit;
+ }
+
+ arvif = ath11k_mac_get_arvif_by_vdev_id(ab, ev->vdev_id);
+ switch (ev->evt_type) {
+ case WMI_BSS_COLOR_COLLISION_DETECTION:
+ break;
+ case WMI_BSS_COLOR_COLLISION_DISABLE:
+ case WMI_BSS_COLOR_FREE_SLOT_TIMER_EXPIRY:
+ case WMI_BSS_COLOR_FREE_SLOT_AVAILABLE:
+ return;
+ default:
+ ath11k_warn(ab, "received unknown obss color collision detetction event\n");
+ goto exit;
+ }
+
+ if (ev->obss_color_bitmap & BIT(arvif->vif->bss_conf.he_bss_color.color)) {
+ /* FW sometime sends out stray events. Ignore them if our color is free */
+ ieeee80211_obss_color_collision_notify(arvif->vif, ev->obss_color_bitmap);
+
+ ath11k_info(ab, "OBSS color collision detected vdev:%d, event:%d, bitmap:%08llx\n",
+ ev->vdev_id, ev->evt_type, ev->obss_color_bitmap);
+ }
+
+exit:
+ kfree(tb);
+}
+
static void
ath11k_fill_band_to_mac_param(struct ath11k_base *soc,
struct wmi_host_pdev_band_to_mac *band_to_mac)
@@ -5229,6 +5277,7 @@ static void ath11k_vdev_start_resp_event(struct ath11k_base *ab, struct sk_buff
static void ath11k_bcn_tx_status_event(struct ath11k_base *ab, struct sk_buff *skb)
{
+ struct ath11k_vif *arvif;
u32 vdev_id, tx_status;
if (ath11k_pull_bcn_tx_status_ev(ab, skb->data, skb->len,
@@ -5236,6 +5285,14 @@ static void ath11k_bcn_tx_status_event(struct ath11k_base *ab, struct sk_buff *s
ath11k_warn(ab, "failed to extract bcn tx status");
return;
}
+
+ arvif = ath11k_mac_get_arvif_by_vdev_id(ab, vdev_id);
+ if (!arvif) {
+ ath11k_warn(ab, "invalid vdev id %d in bcn_tx_status",
+ vdev_id);
+ return;
+ }
+ ath11k_mac_bcn_tx_event(arvif);
}
static void ath11k_vdev_stopped_event(struct ath11k_base *ab, struct sk_buff *skb)
@@ -6137,6 +6194,9 @@ static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb)
case WMI_PEER_OPER_MODE_CHANGE_EVENTID:
ath11k_wmi_peer_oper_mode_change_event(ab, skb);
break;
+ case WMI_OBSS_COLOR_COLLISION_DETECTION_EVENTID:
+ ath11k_wmi_obss_color_collision_event(ab, skb);
+ break;
/* add Unsupported events here */
case WMI_TBTTOFFSET_EXT_UPDATE_EVENTID:
case WMI_VDEV_DELETE_RESP_EVENTID:
diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index a845d56d3366..f240c16dd046 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -733,6 +733,7 @@ enum wmi_tlv_event_id {
WMI_MDNS_STATS_EVENTID = WMI_TLV_CMD(WMI_GRP_MDNS_OFL),
WMI_SAP_OFL_ADD_STA_EVENTID = WMI_TLV_CMD(WMI_GRP_SAP_OFL),
WMI_SAP_OFL_DEL_STA_EVENTID,
+ WMI_OBSS_COLOR_COLLISION_DETECTION_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_OBSS_OFL),
WMI_OCB_SET_CONFIG_RESP_EVENTID = WMI_TLV_CMD(WMI_GRP_OCB),
WMI_OCB_GET_TSF_TIMER_RESP_EVENTID,
WMI_DCC_GET_STATS_RESP_EVENTID,
@@ -4744,6 +4745,13 @@ struct wmi_obss_spatial_reuse_params_cmd {
#define ATH11K_BSS_COLOR_COLLISION_DETECTION_STA_PERIOD_MS 10000
#define ATH11K_BSS_COLOR_COLLISION_DETECTION_AP_PERIOD_MS 5000
+enum wmi_bss_color_collision {
+ WMI_BSS_COLOR_COLLISION_DISABLE = 0,
+ WMI_BSS_COLOR_COLLISION_DETECTION,
+ WMI_BSS_COLOR_FREE_SLOT_TIMER_EXPIRY,
+ WMI_BSS_COLOR_FREE_SLOT_AVAILABLE,
+};
+
struct wmi_obss_color_collision_cfg_params_cmd {
u32 tlv_header;
u32 vdev_id;
@@ -4761,6 +4769,12 @@ struct wmi_bss_color_change_enable_params_cmd {
u32 enable;
} __packed;
+struct wmi_obss_color_collision_event {
+ u32 vdev_id;
+ u32 evt_type;
+ u64 obss_color_bitmap;
+} __packed;
+
#define ATH11K_IPV4_TH_SEED_SIZE 5
#define ATH11K_IPV6_TH_SEED_SIZE 11
--
2.25.1
John Crispin <[email protected]> writes:
> Whenever the MAC detects a color collision or any of its associated station
> detects one the FW will send out an event. Add the code to parse and handle
> this event. and pass the data up to mac80211.
>
> The FW does not provide an offload future such as the one used for CSA. The
> CCA process is hence triggered via the beacon offload tx completion events
> sent out by the FW.
>
> Signed-off-by: John Crispin <[email protected]>
On what hardware and firmware did you test this? I'll add that to the
commit log.
> + if (ev->obss_color_bitmap & BIT(arvif->vif->bss_conf.he_bss_color.color)) {
> + /* FW sometime sends out stray events. Ignore them if our color is free */
> + ieeee80211_obss_color_collision_notify(arvif->vif, ev->obss_color_bitmap);
> +
> + ath11k_info(ab, "OBSS color collision detected vdev:%d, event:%d, bitmap:%08llx\n",
> + ev->vdev_id, ev->evt_type, ev->obss_color_bitmap);
> + }
Is this really something so important that we should print it to the
log? What should the user do after seeing this warning?
And warnings should be printed with ath11k_warn(), but maybe this should
be a debug message?
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
On 2020-06-17 08:00, John Crispin wrote:
> Whenever the MAC detects a color collision or any of its associated
> station
> detects one the FW will send out an event. Add the code to parse and
> handle
> this event. and pass the data up to mac80211.
>
> The FW does not provide an offload future such as the one used for CSA.
> The
> CCA process is hence triggered via the beacon offload tx completion
> events
> sent out by the FW.
>
[...]
> +static void
> +ath11k_wmi_obss_color_collision_event(struct ath11k_base *ab, struct
> sk_buff *skb)
> +{
> + const void **tb;
> + const struct wmi_obss_color_collision_event *ev;
> + struct ath11k_vif *arvif;
> + int ret;
> +
> + tb = ath11k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC);
> + if (IS_ERR(tb)) {
> + ret = PTR_ERR(tb);
> + ath11k_warn(ab, "failed to parse tlv: %d\n", ret);
> + return;
> + }
> +
> + ev = tb[WMI_TAG_OBSS_COLOR_COLLISION_EVT];
> + if (!ev) {
> + ath11k_warn(ab, "failed to fetch obss color collision ev");
> + goto exit;
> + }
> +
> + arvif = ath11k_mac_get_arvif_by_vdev_id(ab, ev->vdev_id);
> + switch (ev->evt_type) {
> + case WMI_BSS_COLOR_COLLISION_DETECTION:
> + break;
> + case WMI_BSS_COLOR_COLLISION_DISABLE:
> + case WMI_BSS_COLOR_FREE_SLOT_TIMER_EXPIRY:
> + case WMI_BSS_COLOR_FREE_SLOT_AVAILABLE:
> + return;
>
tb should be freed here.
-Rajkumar