add support for ack timeout estimation in ath9k driver

Add ath9k_enable_dynack() method to enable ack timeout estimation algorithm. Moreover disable dynack if the coverage class has been configured

Signed-off-by Lorenzo Bianconi <[email protected]>

---
 drivers/net/wireless/ath/ath9k/main.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

drivers/net/wireless/ath/ath9k/main.c +30 -0

index e6ac8d2..52ca884 100644
@@ -1970,6 +1970,14 @@ static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)
 	mutex_lock(&sc->mutex);
 	ah->coverage_class = coverage_class;
 
+	if (ah->dynack.enabled) {
+		u32 rfilt;
+
+		ah->dynack.enabled = false;
+		rfilt = ath_calcrxfilter(sc);
+		ath9k_hw_setrxfilter(ah, rfilt);
+	}
+
 	ath9k_ps_wakeup(sc);
 	ath9k_hw_init_global_settings(ah);
 	ath9k_ps_restore(sc);

@@ -1977,6 +1985,28 @@ static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)
 	mutex_unlock(&sc->mutex);
 }
 
+#ifdef CONFIG_ATH9K_DYNACK
+static int ath9k_enable_dynack(struct ieee80211_hw *hw)
+{
+	u32 rfilt;
+	struct ath_softc *sc = hw->priv;
+	struct ath_hw *ah = sc->sc_ah;
+
+	if (config_enabled(CONFIG_ATH9K_TX99))
+		return -EOPNOTSUPP;
+
+	if (!ah->dynack.enabled) {
+		ath_dynack_reset(ah);
+
+		ah->dynack.enabled = true;
+		rfilt = ath_calcrxfilter(sc);
+		ath9k_hw_setrxfilter(ah, rfilt);
+	}
+
+	return 0;
+}
+#endif
+
 static bool ath9k_has_tx_pending(struct ath_softc *sc)
 {
 	int i, npend = 0;

Quoted 57 lines

Add ath9k_enable_dynack() method to enable ack timeout estimation algorithm. Moreover disable dynack if the coverage class has been configured

Signed-off-by Lorenzo Bianconi <[email protected]>

---
 drivers/net/wireless/ath/ath9k/main.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

drivers/net/wireless/ath/ath9k/main.c +30 -0

index e6ac8d2..52ca884 100644
@@ -1970,6 +1970,14 @@ static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)
      mutex_lock(&sc->mutex);
      ah->coverage_class = coverage_class;
 
+     if (ah->dynack.enabled) {
+             u32 rfilt;
+
+             ah->dynack.enabled = false;
+             rfilt = ath_calcrxfilter(sc);
+             ath9k_hw_setrxfilter(ah, rfilt);
+     }
+
      ath9k_ps_wakeup(sc);
      ath9k_hw_init_global_settings(ah);
      ath9k_ps_restore(sc);

@@ -1977,6 +1985,28 @@ static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)
      mutex_unlock(&sc->mutex);
 }
 
+#ifdef CONFIG_ATH9K_DYNACK
+static int ath9k_enable_dynack(struct ieee80211_hw *hw)
+{
+     u32 rfilt;
+     struct ath_softc *sc = hw->priv;
+     struct ath_hw *ah = sc->sc_ah;
+
+     if (config_enabled(CONFIG_ATH9K_TX99))
+             return -EOPNOTSUPP;
+
+     if (!ah->dynack.enabled) {
+             ath_dynack_reset(ah);
+
+             ah->dynack.enabled = true;
+             rfilt = ath_calcrxfilter(sc);
+             ath9k_hw_setrxfilter(ah, rfilt);
+     }
+
+     return 0;
+}
+#endif
+
 static bool ath9k_has_tx_pending(struct ath_softc *sc)
 {
      int i, npend = 0;

drivers/net/wireless/ath/ath9k/main.c struct ieee80211_ops ath9k_ops = { · line 2688

Quoted 8 lines

drivers/net/wireless/ath/ath9k/main.c +4 -0

@@ -2651,4 +2681,8 @@ struct ieee80211_ops ath9k_ops = {
 #endif
      .sw_scan_start      = ath9k_sw_scan_start,
      .sw_scan_complete   = ath9k_sw_scan_complete,
+
+#ifdef CONFIG_ATH9K_DYNACK
+     .enable_dynack      = ath9k_enable_dynack,
+#endif
 };

CC drivers/net/wireless/ath/ath9k/main.o
drivers/net/wireless/ath/ath9k/main.c:2690:2: error: unknown field ?enable_dynack? specified in initializer
.enable_dynack = ath9k_enable_dynack,
^
drivers/net/wireless/ath/ath9k/main.c:2690:2: warning: initialization from incompatible pointer type [enabled by default] drivers/net/wireless/ath/ath9k/main.c:2690:2: warning: (near initialization for ?ath9k_ops.get_stats?) [enabled by default] make[3]: *** [drivers/net/wireless/ath/ath9k/main.o] Error 1
make[2]: *** [drivers/net/wireless/ath/ath9k] Error 2
make[1]: *** [drivers/net/wireless/ath] Error 2
make: *** [drivers/net/wireless/] Error 2

Missing a header file change?

John
--
John W. Linville Someday the world will need a hero, and you
linville at tuxdriver.com might be all we have. Be ready.

Hi John,

Quoted 78 lines · Lorenzo Bianconi

Quoted 57 lines

Add ath9k_enable_dynack() method to enable ack timeout estimation algorithm. Moreover disable dynack if the coverage class has been configured

Signed-off-by Lorenzo Bianconi <[email protected]>

---
 drivers/net/wireless/ath/ath9k/main.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

drivers/net/wireless/ath/ath9k/main.c +30 -0

index e6ac8d2..52ca884 100644
@@ -1970,6 +1970,14 @@ static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)
      mutex_lock(&sc->mutex);
      ah->coverage_class = coverage_class;
 
+     if (ah->dynack.enabled) {
+             u32 rfilt;
+
+             ah->dynack.enabled = false;
+             rfilt = ath_calcrxfilter(sc);
+             ath9k_hw_setrxfilter(ah, rfilt);
+     }
+
      ath9k_ps_wakeup(sc);
      ath9k_hw_init_global_settings(ah);
      ath9k_ps_restore(sc);

@@ -1977,6 +1985,28 @@ static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)
      mutex_unlock(&sc->mutex);
 }
 
+#ifdef CONFIG_ATH9K_DYNACK
+static int ath9k_enable_dynack(struct ieee80211_hw *hw)
+{
+     u32 rfilt;
+     struct ath_softc *sc = hw->priv;
+     struct ath_hw *ah = sc->sc_ah;
+
+     if (config_enabled(CONFIG_ATH9K_TX99))
+             return -EOPNOTSUPP;
+
+     if (!ah->dynack.enabled) {
+             ath_dynack_reset(ah);
+
+             ah->dynack.enabled = true;
+             rfilt = ath_calcrxfilter(sc);
+             ath9k_hw_setrxfilter(ah, rfilt);
+     }
+
+     return 0;
+}
+#endif
+
 static bool ath9k_has_tx_pending(struct ath_softc *sc)
 {
      int i, npend = 0;

drivers/net/wireless/ath/ath9k/main.c struct ieee80211_ops ath9k_ops = { · line 2688

Quoted 8 lines

drivers/net/wireless/ath/ath9k/main.c +4 -0

@@ -2651,4 +2681,8 @@ struct ieee80211_ops ath9k_ops = {
 #endif
      .sw_scan_start      = ath9k_sw_scan_start,
      .sw_scan_complete   = ath9k_sw_scan_complete,
+
+#ifdef CONFIG_ATH9K_DYNACK
+     .enable_dynack      = ath9k_enable_dynack,
+#endif
 };

CC drivers/net/wireless/ath/ath9k/main.o
drivers/net/wireless/ath/ath9k/main.c:2690:2: error: unknown field ?enable_dynack? specified in initializer
.enable_dynack = ath9k_enable_dynack,
^
drivers/net/wireless/ath/ath9k/main.c:2690:2: warning: initialization from incompatible pointer type [enabled by default] drivers/net/wireless/ath/ath9k/main.c:2690:2: warning: (near initialization for ?ath9k_ops.get_stats?) [enabled by default] make[3]: *** [drivers/net/wireless/ath/ath9k/main.o] Error 1
make[2]: *** [drivers/net/wireless/ath/ath9k] Error 2
make[1]: *** [drivers/net/wireless/ath] Error 2
make: *** [drivers/net/wireless/] Error 2

Quoted 2 lines

Missing a header file change?

The function pointer is defined in "configure ack timeout estimation algorithm through mac80211 stack" patchset sent on linux-wireless. Anyway I will send patchset v3 to take Johannes's hint.

Quoted 83 lines

Hi John,

Quoted 80 lines · Lorenzo Bianconi

Quoted 57 lines

Add ath9k_enable_dynack() method to enable ack timeout estimation algorithm. Moreover disable dynack if the coverage class has been configured

Signed-off-by Lorenzo Bianconi <[email protected]>

---
 drivers/net/wireless/ath/ath9k/main.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

drivers/net/wireless/ath/ath9k/main.c +30 -0

index e6ac8d2..52ca884 100644
@@ -1970,6 +1970,14 @@ static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)
      mutex_lock(&sc->mutex);
      ah->coverage_class = coverage_class;
 
+     if (ah->dynack.enabled) {
+             u32 rfilt;
+
+             ah->dynack.enabled = false;
+             rfilt = ath_calcrxfilter(sc);
+             ath9k_hw_setrxfilter(ah, rfilt);
+     }
+
      ath9k_ps_wakeup(sc);
      ath9k_hw_init_global_settings(ah);
      ath9k_ps_restore(sc);

@@ -1977,6 +1985,28 @@ static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)
      mutex_unlock(&sc->mutex);
 }
 
+#ifdef CONFIG_ATH9K_DYNACK
+static int ath9k_enable_dynack(struct ieee80211_hw *hw)
+{
+     u32 rfilt;
+     struct ath_softc *sc = hw->priv;
+     struct ath_hw *ah = sc->sc_ah;
+
+     if (config_enabled(CONFIG_ATH9K_TX99))
+             return -EOPNOTSUPP;
+
+     if (!ah->dynack.enabled) {
+             ath_dynack_reset(ah);
+
+             ah->dynack.enabled = true;
+             rfilt = ath_calcrxfilter(sc);
+             ath9k_hw_setrxfilter(ah, rfilt);
+     }
+
+     return 0;
+}
+#endif
+
 static bool ath9k_has_tx_pending(struct ath_softc *sc)
 {
      int i, npend = 0;

drivers/net/wireless/ath/ath9k/main.c struct ieee80211_ops ath9k_ops = { · line 2688

Quoted 8 lines

drivers/net/wireless/ath/ath9k/main.c +4 -0

@@ -2651,4 +2681,8 @@ struct ieee80211_ops ath9k_ops = {
 #endif
      .sw_scan_start      = ath9k_sw_scan_start,
      .sw_scan_complete   = ath9k_sw_scan_complete,
+
+#ifdef CONFIG_ATH9K_DYNACK
+     .enable_dynack      = ath9k_enable_dynack,
+#endif
 };

CC drivers/net/wireless/ath/ath9k/main.o
drivers/net/wireless/ath/ath9k/main.c:2690:2: error: unknown field ?enable_dynack? specified in initializer
.enable_dynack = ath9k_enable_dynack,
^
drivers/net/wireless/ath/ath9k/main.c:2690:2: warning: initialization from incompatible pointer type [enabled by default] drivers/net/wireless/ath/ath9k/main.c:2690:2: warning: (near initialization for ?ath9k_ops.get_stats?) [enabled by default] make[3]: *** [drivers/net/wireless/ath/ath9k/main.o] Error 1
make[2]: *** [drivers/net/wireless/ath/ath9k] Error 2
make[1]: *** [drivers/net/wireless/ath] Error 2
make: *** [drivers/net/wireless/] Error 2

Missing a header file change?

Quoted 3 lines

The function pointer is defined in "configure ack timeout estimation algorithm through mac80211 stack" patchset sent on linux-wireless. Anyway I will send patchset v3 to take Johannes's hint.

Perhaps you should post them all together, or keep this series as RFC until the other one gets merged?

--
John W. Linville Someday the world will need a hero, and you
linville at tuxdriver.com might be all we have. Be ready.

This patchset adds support for estimation of the ack timeout (dynack) in ath9k driver. Ath9k dynack computes the ack timeout based on ack frame RX timestamp, TX frame timestamp and frame duration.

Ath9k dynack has been tested in indoor environment using AR9223/AR9280 chipset (running 3.16.0-rc5 kernel) and on 9Km PtoP link using AR9280 chipset (running OpenWRT trunk, compat-wireless-2014-05-22)

Changes since RFCv2:
- disable dynack by default
- add ath9k_enable_dynack() method to enable ack timeout estimation algorithm
- remove dynack entry from ath9k debugfs

Changes since RFCv1:
- use ISC license instead of GPLv2 one
- use an inline method instead of a macro for EWMA calculation
- use powers of two weights in EWMA calculation
- fix typos
- add ath_dynack_node_init/ath_dynack_node_deinit methods
- use different logic to enable/disable dynack processing

Lorenzo Bianconi (10):
ath9k: export methods related to ack timeout estimation
ath9k: add duration field to ath_tx_status
ath9k: add dynamic ack timeout estimation
ath9k: add config for (en|dis)abling ack timeout estimation
ath9k: do not overwrite ack timeout estimation
ath9k: add sampling methods for (tx|rx) timestamp
ath9k: enable control frame reception
ath9k: add debugfs support for dynack
ath9k: add ath9k_enable_dynack() method
ath9k: initialize ath_node linked list

drivers/net/wireless/ath/ath.h              |   2 +
drivers/net/wireless/ath/ath9k/Kconfig      |   7 +
drivers/net/wireless/ath/ath9k/Makefile     |   3 +
drivers/net/wireless/ath/ath9k/ar9002_mac.c |   7 +
drivers/net/wireless/ath/ath9k/ar9003_mac.c |   9 +
drivers/net/wireless/ath/ath9k/ath9k.h      |   3 +
drivers/net/wireless/ath/ath9k/debug.c      |  28 +++
drivers/net/wireless/ath/ath9k/dynack.c     | 345 ++++++++++++++++++++++++++++
drivers/net/wireless/ath/ath9k/dynack.h     |  96 ++++++++
drivers/net/wireless/ath/ath9k/hw.c         |  16 +-
drivers/net/wireless/ath/ath9k/hw.h         |   7 +
drivers/net/wireless/ath/ath9k/mac.h        |   1 +
drivers/net/wireless/ath/ath9k/main.c       |  38 +++
drivers/net/wireless/ath/ath9k/recv.c       |   7 +-
drivers/net/wireless/ath/ath9k/xmit.c       |   5 +
15 files changed, 570 insertions(+), 4 deletions(-)

create mode 100644 drivers/net/wireless/ath/ath9k/dynack.c create mode 100644 drivers/net/wireless/ath/ath9k/dynack.h

Signature · 1 line

1.9.1