Commit 5a032c8d authored by John Crispin's avatar John Crispin Committed by Kalle Valo
Browse files

ath11k: add WMI calls required for handling BSS color 



If the he_operation field of the beacon sets a BSS color, we need to inform
the FW of the settings. This patch adds the WMI command handlers required
to do so.

Signed-off-by: default avatarJohn Crispin <john@phrozen.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 107560d8

drivers/net/wireless/ath/ath11k/wmi.c

+78 −0
Original line number Diff line number Diff line
@@ -2707,6 +2707,84 @@ ath11k_wmi_send_obss_spr_cmd(struct ath11k *ar, u32 vdev_id, 
	return ret;

}



int

ath11k_wmi_send_obss_color_collision_cfg_cmd(struct ath11k *ar, u32 vdev_id,

					     u8 bss_color, u32 period,

					     bool enable)

{

	struct ath11k_pdev_wmi *wmi = ar->wmi;

	struct ath11k_base *ab = wmi->wmi_ab->ab;

	struct wmi_obss_color_collision_cfg_params_cmd *cmd;

	struct sk_buff *skb;

	int ret, len;



	len = sizeof(*cmd);



	skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, len);

	if (!skb)

		return -ENOMEM;



	cmd = (struct wmi_obss_color_collision_cfg_params_cmd *)skb->data;

	cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG,

				     WMI_TAG_OBSS_COLOR_COLLISION_DET_CONFIG) |

			  FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE);

	cmd->vdev_id = vdev_id;

	cmd->evt_type = enable ? ATH11K_OBSS_COLOR_COLLISION_DETECTION :

				 ATH11K_OBSS_COLOR_COLLISION_DETECTION_DISABLE;

	cmd->current_bss_color = bss_color;

	cmd->detection_period_ms = period;

	cmd->scan_period_ms = ATH11K_BSS_COLOR_COLLISION_SCAN_PERIOD_MS;

	cmd->free_slot_expiry_time_ms = 0;

	cmd->flags = 0;



	ath11k_dbg(ar->ab, ATH11K_DBG_WMI,

		   "wmi_send_obss_color_collision_cfg id %d type %d bss_color %d detect_period %d scan_period %d\n",

		   cmd->vdev_id, cmd->evt_type, cmd->current_bss_color,

		   cmd->detection_period_ms, cmd->scan_period_ms);



	ret = ath11k_wmi_cmd_send(wmi, skb,

				  WMI_OBSS_COLOR_COLLISION_DET_CONFIG_CMDID);

	if (ret) {

		ath11k_warn(ab, "Failed to send WMI_OBSS_COLOR_COLLISION_DET_CONFIG_CMDID");

		dev_kfree_skb(skb);

	}

	return ret;

}



int ath11k_wmi_send_bss_color_change_enable_cmd(struct ath11k *ar, u32 vdev_id,

						bool enable)

{

	struct ath11k_pdev_wmi *wmi = ar->wmi;

	struct ath11k_base *ab = wmi->wmi_ab->ab;

	struct wmi_bss_color_change_enable_params_cmd *cmd;

	struct sk_buff *skb;

	int ret, len;



	len = sizeof(*cmd);



	skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, len);

	if (!skb)

		return -ENOMEM;



	cmd = (struct wmi_bss_color_change_enable_params_cmd *)skb->data;

	cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_BSS_COLOR_CHANGE_ENABLE) |

			  FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE);

	cmd->vdev_id = vdev_id;

	cmd->enable = enable ? 1 : 0;



	ath11k_dbg(ar->ab, ATH11K_DBG_WMI,

		   "wmi_send_bss_color_change_enable id %d enable %d\n",

		   cmd->vdev_id, cmd->enable);



	ret = ath11k_wmi_cmd_send(wmi, skb,

				  WMI_BSS_COLOR_CHANGE_ENABLE_CMDID);

	if (ret) {

		ath11k_warn(ab, "Failed to send WMI_TWT_DIeABLE_CMDID");

		dev_kfree_skb(skb);

	}

	return ret;

}



static void

ath11k_fill_band_to_mac_param(struct ath11k_base  *soc,

			      struct wmi_host_pdev_band_to_mac *band_to_mac)

drivers/net/wireless/ath/ath11k/wmi.h

+31 −0
Original line number Diff line number Diff line
@@ -488,6 +488,7 @@ enum wmi_tlv_cmd_id { 
	WMI_SAR_LIMITS_CMDID,

	WMI_OBSS_SCAN_ENABLE_CMDID = WMI_TLV_CMD(WMI_GRP_OBSS_OFL),

	WMI_OBSS_SCAN_DISABLE_CMDID,

	WMI_OBSS_COLOR_COLLISION_DET_CONFIG_CMDID,

	WMI_LPI_MGMT_SNOOPING_CONFIG_CMDID = WMI_TLV_CMD(WMI_GRP_LPI),

	WMI_LPI_START_SCAN_CMDID,

	WMI_LPI_STOP_SCAN_CMDID,
@@ -4620,6 +4621,30 @@ struct wmi_obss_spatial_reuse_params_cmd { 
	u32 vdev_id;

} __packed;



#define ATH11K_BSS_COLOR_COLLISION_SCAN_PERIOD_MS		200

#define ATH11K_OBSS_COLOR_COLLISION_DETECTION_DISABLE		0

#define ATH11K_OBSS_COLOR_COLLISION_DETECTION			1



#define ATH11K_BSS_COLOR_COLLISION_DETECTION_STA_PERIOD_MS	10000

#define ATH11K_BSS_COLOR_COLLISION_DETECTION_AP_PERIOD_MS	5000



struct wmi_obss_color_collision_cfg_params_cmd {

	u32 tlv_header;

	u32 vdev_id;

	u32 flags;

	u32 evt_type;

	u32 current_bss_color;

	u32 detection_period_ms;

	u32 scan_period_ms;

	u32 free_slot_expiry_time_ms;

} __packed;



struct wmi_bss_color_change_enable_params_cmd {

	u32 tlv_header;

	u32 vdev_id;

	u32 enable;

} __packed;



struct target_resource_config {

	u32 num_vdevs;

	u32 num_peers;
@@ -4814,4 +4839,10 @@ int ath11k_wmi_send_twt_enable_cmd(struct ath11k *ar, u32 pdev_id); 
int ath11k_wmi_send_twt_disable_cmd(struct ath11k *ar, u32 pdev_id);

int ath11k_wmi_send_obss_spr_cmd(struct ath11k *ar, u32 vdev_id,

				 struct ieee80211_he_obss_pd *he_obss_pd);

int ath11k_wmi_send_obss_color_collision_cfg_cmd(struct ath11k *ar, u32 vdev_id,

						 u8 bss_color, u32 period,

						 bool enable);

int ath11k_wmi_send_bss_color_change_enable_cmd(struct ath11k *ar, u32 vdev_id,

						bool enable);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE