@@ -365,7 +365,8 @@ struct ath11k_vif {
struct ieee80211_chanctx_conf chanctx;
struct ath11k_arp_ns_offload arp_ns_offload;
struct ath11k_rekey_data rekey_data;
-
+ u64 tbtt_offset;
+ struct work_struct update_bcn_template_work;
#ifdef CONFIG_ATH11K_DEBUGFS
struct dentry *debugfs_twt;
#endif /* CONFIG_ATH11K_DEBUGFS */
@@ -1437,6 +1437,7 @@ static void ath11k_mac_set_vif_params(struct ath11k_vif *arvif,
{
struct ieee80211_mgmt *mgmt;
u8 *ies;
+ u64 adjusted_tsf;
ies = bcn->data + ieee80211_get_hdrlen_from_skb(bcn);
mgmt = (struct ieee80211_mgmt *)bcn->data;
@@ -1453,6 +1454,15 @@ static void ath11k_mac_set_vif_params(struct ath11k_vif *arvif,
arvif->wpaie_present = true;
else
arvif->wpaie_present = false;
+
+ /* Make the TSF offset negative so beacons in the same
+ * staggered batch have the same TSF.
+ */
+ if (arvif->tbtt_offset) {
+ adjusted_tsf = cpu_to_le64(0ULL - arvif->tbtt_offset);
+ memcpy(&mgmt->u.beacon.timestamp, &adjusted_tsf, sizeof(adjusted_tsf));
+ }
+
}
static int ath11k_mac_setup_bcn_tmpl_ema(struct ath11k_vif *arvif)
@@ -6173,9 +6183,11 @@ static void ath11k_mac_op_tx(struct ieee80211_hw *hw,
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
struct ieee80211_key_conf *key = info->control.hw_key;
struct ath11k_sta *arsta = NULL;
+ struct ieee80211_mgmt *mgmt;
u32 info_flags = info->flags;
bool is_prb_rsp;
int ret;
+ u64 adjusted_tsf;
memset(skb_cb, 0, sizeof(*skb_cb));
skb_cb->vif = vif;
@@ -6189,6 +6201,12 @@ static void ath11k_mac_op_tx(struct ieee80211_hw *hw,
skb_cb->flags |= ATH11K_SKB_HW_80211_ENCAP;
} else if (ieee80211_is_mgmt(hdr->frame_control)) {
is_prb_rsp = ieee80211_is_probe_resp(hdr->frame_control);
+ if (is_prb_rsp && arvif->tbtt_offset) {
+ mgmt = (struct ieee80211_mgmt *)skb->data;
+ adjusted_tsf = cpu_to_le64(0ULL - arvif->tbtt_offset);
+ memcpy(&mgmt->u.probe_resp.timestamp, &adjusted_tsf,
+ sizeof(adjusted_tsf));
+ }
ret = ath11k_mac_mgmt_tx(ar, skb, is_prb_rsp);
if (ret) {
ath11k_warn(ar->ab, "failed to queue management frame %d\n",
@@ -6400,6 +6418,22 @@ static int ath11k_mac_op_start(struct ieee80211_hw *hw)
return ret;
}
+static void ath11k_update_bcn_template_work(struct work_struct *work)
+{
+ struct ath11k_vif *arvif = container_of(work, struct ath11k_vif,
+ update_bcn_template_work);
+ struct ath11k *ar = arvif->ar;
+ int ret = 0;
+
+ mutex_lock(&ar->conf_mutex);
+ if (arvif->is_up)
+ ret = ath11k_mac_setup_bcn_tmpl(arvif);
+ mutex_unlock(&ar->conf_mutex);
+ if (ret)
+ ath11k_warn(ar->ab, "failed to submit beacon template for vdev_id : %d ret : %d\n",
+ arvif->vdev_id, ret);
+}
+
static void ath11k_mac_op_stop(struct ieee80211_hw *hw)
{
struct ath11k *ar = hw->priv;
@@ -6761,6 +6795,7 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,
INIT_LIST_HEAD(&arvif->list);
INIT_DELAYED_WORK(&arvif->connection_loss_work,
ath11k_mac_vif_sta_connection_loss_work);
+ INIT_WORK(&arvif->update_bcn_template_work, ath11k_update_bcn_template_work);
for (i = 0; i < ARRAY_SIZE(arvif->bitrate_mask.control); i++) {
arvif->bitrate_mask.control[i].legacy = 0xffffffff;
@@ -6986,6 +7021,7 @@ static void ath11k_mac_op_remove_interface(struct ieee80211_hw *hw,
int i;
cancel_delayed_work_sync(&arvif->connection_loss_work);
+ cancel_work_sync(&arvif->update_bcn_template_work);
mutex_lock(&ar->conf_mutex);
@@ -8521,6 +8521,104 @@ static void ath11k_wmi_gtk_offload_status_event(struct ath11k_base *ab,
kfree(tb);
}
+static int ath11k_wmi_tbtt_offset_subtlv_parser(struct ath11k_base *ab, u16 tag,
+ u16 len, const void *ptr,
+ void *data)
+{
+ int ret = 0;
+ struct ath11k *ar;
+ u64 tx_delay = 0;
+ struct wmi_tbtt_offset_info *tbtt_offset_info;
+ struct ieee80211_chanctx_conf *conf;
+ struct ath11k_vif *arvif;
+
+ tbtt_offset_info = (struct wmi_tbtt_offset_info *)ptr;
+
+ rcu_read_lock();
+ ar = ath11k_mac_get_ar_by_vdev_id(ab, tbtt_offset_info->vdev_id);
+ if (!ar) {
+ ath11k_warn(ab, "ar not found, vdev_id %d\n", tbtt_offset_info->vdev_id);
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ arvif = ath11k_mac_get_arvif(ar, tbtt_offset_info->vdev_id);
+ if (!arvif) {
+ ath11k_warn(ab, "arvif not found, vdev_id %d\n",
+ tbtt_offset_info->vdev_id);
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ if (arvif->vdev_type != WMI_VDEV_TYPE_AP) {
+ ret = 0;
+ goto exit;
+ }
+
+ arvif->tbtt_offset = tbtt_offset_info->tbtt_offset;
+ conf = rcu_dereference(arvif->vif->bss_conf.chanctx_conf);
+ if (conf && conf->def.chan->band == NL80211_BAND_2GHZ) {
+ /* 1Mbps Beacon: */
+ /* 144 us ( LPREAMBLE) + 48 (PLCP Header)
+ * + 192 (1Mbps, 24 ytes)
+ * = 384 us + 2us(MAC/BB DELAY
+ */
+ tx_delay = 386;
+ } else if (conf && (conf->def.chan->band == NL80211_BAND_5GHZ ||
+ conf->def.chan->band == NL80211_BAND_6GHZ)) {
+ /* 6Mbps Beacon: */
+ /* 20(lsig)+2(service)+32(6mbps, 24 bytes)
+ * = 54us + 2us(MAC/BB DELAY)
+ */
+ tx_delay = 56;
+ }
+ arvif->tbtt_offset -= tx_delay;
+
+ ieee80211_queue_work(ar->hw, &arvif->update_bcn_template_work);
+exit:
+ rcu_read_unlock();
+ return ret;
+}
+
+static int ath11k_wmi_tbtt_offset_event_parser(struct ath11k_base *ab,
+ u16 tag, u16 len,
+ const void *ptr, void *data)
+{
+ int ret = 0;
+
+ ath11k_dbg(ab, ATH11K_DBG_WMI, "wmi tbtt offset event tag 0x%x of len %d rcvd\n",
+ tag, len);
+
+ switch (tag) {
+ case WMI_TAG_TBTT_OFFSET_EXT_EVENT:
+ break;
+ case WMI_TAG_ARRAY_STRUCT:
+ ret = ath11k_wmi_tlv_iter(ab, ptr, len,
+ ath11k_wmi_tbtt_offset_subtlv_parser,
+ data);
+ break;
+ default:
+ ath11k_warn(ab, "Received invalid tag for wmi tbtt offset event\n");
+ ret = -EINVAL;
+ break;
+ }
+
+ return ret;
+}
+
+static void ath11k_wmi_event_tbttoffset_update(struct ath11k_base *ab, struct sk_buff *skb)
+{
+ struct wmi_tbtt_offset_info tbtt_offset_info;
+ int ret;
+
+ ret = ath11k_wmi_tlv_iter(ab, skb->data, skb->len,
+ ath11k_wmi_tbtt_offset_event_parser,
+ &tbtt_offset_info);
+ if (ret) {
+ ath11k_warn(ab, "failed to parse tbtt tlv %d\n", ret);
+ }
+}
+
static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb)
{
struct wmi_cmd_hdr *cmd_hdr;
@@ -8627,8 +8725,10 @@ static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb)
case WMI_TWT_ADD_DIALOG_EVENTID:
ath11k_wmi_twt_add_dialog_event(ab, skb);
break;
- /* add Unsupported events here */
case WMI_TBTTOFFSET_EXT_UPDATE_EVENTID:
+ ath11k_wmi_event_tbttoffset_update(ab, skb);
+ break;
+ /* add Unsupported events here */
case WMI_PEER_OPER_MODE_CHANGE_EVENTID:
case WMI_TWT_ENABLE_EVENTID:
case WMI_TWT_DISABLE_EVENTID:
@@ -4541,6 +4541,24 @@ struct wmi_pdev_bss_chan_info_event {
u32 pdev_id;
} __packed;
+struct wmi_tbtt_offset_info {
+ u32 vdev_id;
+ u32 tbtt_offset;
+ u32 tbtt_qtime_low_us;
+ u32 tbtt_qtime_high_us;
+} __packed;
+
+struct wmi_tbtt_offset_event {
+ u32 num_vdevs;
+} __packed;
+
+struct wmi_tbtt_offset_ev_arg {
+ u32 vdev_id;
+ u32 tbtt_offset;
+ u32 tbtt_qtime_low_us;
+ u32 tbtt_qtime_high_us;
+} __packed;
+
#define WMI_VDEV_INSTALL_KEY_COMPL_STATUS_SUCCESS 0
struct wmi_vdev_install_key_compl_event {
In ath11k AP, the TSF timestamp mod the beacon interval does not vary and is close to 0. It is expected to be around 384us for 2 GHz and 54us for 5 GHz/6 GHz. The value of the TSF timer at TBTT is a multiple of the beacon interval, while the value of the TSF timestamp in the beacon accounts for medium access delay and physical implementation-specific delays through the PHY, which could cause the value of the TSF timestamp mod the beacon interval to vary. An AP sending a beacon frame shall set the value of the beacon frame’s timestamp so that it equals the value of the STA’s TSF timer at the time that the data symbol containing the first bit of the timestamp is transmitted to the PHY plus the transmitting STA’s delays through its local PHY from the MAC-PHY interface to its interface with the WM. In ath11k the physical implementation-specific delays were not accounted for TSF timer and it resulted in incorrent TSF timer values. Add the physical implementation-specific delays in the TSF of beacon template and probe response, so that the TSF holds proper values in the beacon and probe response. tx delay for 5 GHz/6 GHz: 20(lsig)+2(service)+32(6mbps, 24 bytes) = 54us + 2us(MAC/BB DELAY) tx delay for 2.4 GHz: 144 us (LPREAMBLE) + 48 (PLCP Header) + 192 (1Mbps, 24 bytes) = 384 us + 2us(MAC/BB DELAY) Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.4.0.1-00192-QCAHKSWPL_SILICONZ-1 Signed-off-by: Hari Chandrakanthan <quic_haric@quicinc.com> --- v2: Fixed warning : no previous prototype for 'ath11k_wmi_event_tbttoffset_update' Reported-by: kernel test robot <lkp@intel.com> --- drivers/net/wireless/ath/ath11k/core.h | 3 +- drivers/net/wireless/ath/ath11k/mac.c | 36 ++++++++++++ drivers/net/wireless/ath/ath11k/wmi.c | 102 ++++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath11k/wmi.h | 18 ++++++ 4 files changed, 157 insertions(+), 2 deletions(-)