ath9k: Add p2p go NoA attribute

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 6487c4769af4e9f2481370a45bbcbc2fd50d91bb..02f30980c31abe1358e8d283787ecb5817827d28 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -362,6 +362,8 @@ struct ath_chanctx_sched {
        enum ath_chanctx_state state;
 
        u32 next_tbtt;
+       u32 switch_start_time;
+       unsigned int offchannel_duration;
        unsigned int channel_switch_time;
 };
 
@@ -472,6 +474,11 @@ struct ath_vif {
 
        /* P2P Client */
        struct ieee80211_noa_data noa;
+
+       /* P2P GO */
+       u8 noa_index;
+       u32 offchannel_start;
+       u32 offchannel_duration;
 };
 
 struct ath9k_vif_iter_data {

diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 5b1689cf029ad86c033ca08ad1ba89a3d8065d04..85a40d749e20f9020430d8a9c119bc327ba16f5c 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -108,6 +108,40 @@ static void ath9k_beacon_setup(struct ath_softc *sc, struct ieee80211_vif *vif,
        ath9k_hw_set_txdesc(ah, bf->bf_desc, &info);
 }
 
+static void ath9k_beacon_add_noa(struct ath_softc *sc, struct ath_vif *avp,
+                                struct sk_buff *skb)
+{
+       static const u8 noa_ie_hdr[] = {
+               WLAN_EID_VENDOR_SPECIFIC,       /* type */
+               0,                              /* length */
+               0x50, 0x6f, 0x9a,               /* WFA OUI */
+               0x09,                           /* P2P subtype */
+               0x0c,                           /* Notice of Absence */
+               0x00,                           /* LSB of little-endian len */
+               0x00,                           /* MSB of little-endian len */
+       };
+
+       struct ieee80211_p2p_noa_attr *noa;
+       int noa_len = 2 + sizeof(struct ieee80211_p2p_noa_desc);
+       u8 *hdr;
+
+       if (!avp->offchannel_duration)
+               return;
+
+       hdr = skb_put(skb, sizeof(noa_ie_hdr));
+       memcpy(hdr, noa_ie_hdr, sizeof(noa_ie_hdr));
+       hdr[1] = sizeof(noa_ie_hdr) + noa_len - 2;
+       hdr[7] = noa_len;
+
+       noa = (void *) skb_put(skb, noa_len);
+       memset(noa, 0, noa_len);
+
+       noa->index = avp->noa_index;
+       noa->desc[0].count = 1;
+       noa->desc[0].duration = cpu_to_le32(avp->offchannel_duration);
+       noa->desc[0].start_time = cpu_to_le32(avp->offchannel_start);
+}
+
 static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw,
                                             struct ieee80211_vif *vif)
 {
@@ -155,6 +189,9 @@ static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw,
                hdr->seq_ctrl |= cpu_to_le16(sc->tx.seq_no);
        }
 
+       if (vif->p2p)
+               ath9k_beacon_add_noa(sc, avp, skb);
+
        bf->bf_buf_addr = dma_map_single(sc->dev, skb->data,
                                         skb->len, DMA_TO_DEVICE);
        if (unlikely(dma_mapping_error(sc->dev, bf->bf_buf_addr))) {

diff --git a/drivers/net/wireless/ath/ath9k/channel.c b/drivers/net/wireless/ath/ath9k/channel.c
index 503b7766e12e7a4a9ac1a11e0e51ba51293159de..364a55502b7d683d62c3407affbac41d2ec9998e 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/channel.c
+++ b/drivers/net/wireless/ath/ath9k/channel.c
@@ -270,6 +270,8 @@ void ath_chanctx_work(struct work_struct *work)
        sc->cur_chan->stopped = false;
        sc->next_chan = NULL;
        sc->sched.state = ATH_CHANCTX_STATE_IDLE;
+       sc->sched.offchannel_duration = 0;
+
        spin_unlock_bh(&sc->chan_lock);
 
        if (sc->sc_ah->chip_fullsleep ||
@@ -326,6 +328,12 @@ void ath_chanctx_switch(struct ath_softc *sc, struct ath_chanctx *ctx,
        sc->next_chan = ctx;
        if (chandef)
                ctx->chandef = *chandef;
+
+       if (sc->next_chan == &sc->offchannel.chan) {
+               sc->sched.offchannel_duration =
+                       TU_TO_USEC(sc->offchannel.duration) +
+                       sc->sched.channel_switch_time;
+       }
        spin_unlock_bh(&sc->chan_lock);
        ieee80211_queue_work(sc->hw, &sc->chanctx_work);
 }
@@ -377,17 +385,40 @@ void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif,
                       enum ath_chanctx_event ev)
 {
        struct ath_hw *ah = sc->sc_ah;
+       struct ath_vif *avp = NULL;
        u32 tsf_time;
+       bool noa_changed = false;
+
+       if (vif)
+               avp = (struct ath_vif *) vif->drv_priv;
 
        spin_lock_bh(&sc->chan_lock);
 
        switch (ev) {
        case ATH_CHANCTX_EVENT_BEACON_PREPARE:
+               if (avp->offchannel_duration)
+                       avp->offchannel_duration = 0;
+
                if (sc->sched.state != ATH_CHANCTX_STATE_WAIT_FOR_BEACON)
                        break;
 
                sc->sched.beacon_pending = true;
                sc->sched.next_tbtt = REG_READ(ah, AR_NEXT_TBTT_TIMER);
+
+               /* defer channel switch by a quarter beacon interval */
+               tsf_time = TU_TO_USEC(sc->cur_chan->beacon.beacon_interval);
+               tsf_time = sc->sched.next_tbtt + tsf_time / 4;
+               sc->sched.switch_start_time = tsf_time;
+
+               if (sc->sched.offchannel_duration) {
+                       noa_changed = true;
+                       avp->offchannel_start = tsf_time;
+                       avp->offchannel_duration =
+                               sc->sched.offchannel_duration;
+               }
+
+               if (noa_changed)
+                       avp->noa_index++;
                break;
        case ATH_CHANCTX_EVENT_BEACON_SENT:
                if (!sc->sched.beacon_pending)
@@ -397,12 +428,10 @@ void ath_chanctx_event(struct ath_softc *sc, struct ieee80211_vif *vif,
                if (sc->sched.state != ATH_CHANCTX_STATE_WAIT_FOR_BEACON)
                        break;
 
-               /* defer channel switch by a quarter beacon interval */
-               tsf_time = TU_TO_USEC(sc->cur_chan->beacon.beacon_interval);
-               tsf_time = sc->sched.next_tbtt + tsf_time / 4;
                sc->sched.state = ATH_CHANCTX_STATE_WAIT_FOR_TIMER;
-               ath9k_hw_gen_timer_start(ah, sc->p2p_ps_timer, tsf_time,
-                               1000000);
+               ath9k_hw_gen_timer_start(ah, sc->p2p_ps_timer,
+                                        sc->sched.switch_start_time,
+                                        1000000);
                break;
        case ATH_CHANCTX_EVENT_TSF_TIMER:
                if (sc->sched.state != ATH_CHANCTX_STATE_WAIT_FOR_TIMER)

diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 1ff1a75f4fed9c91adde95a0b6d8fd253dbf1a68..66a9dc3a536931b919bf99746c858a15c2071339 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -754,6 +754,8 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
                        hw->wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN;
                        hw->wiphy->max_remain_on_channel_duration = 10000;
                        hw->chanctx_data_size = sizeof(void *);
+                       hw->extra_beacon_tailroom =
+                               sizeof(struct ieee80211_p2p_noa_attr) + 9;
                }
        }