carl9170: improve site survey
Christian Lamparter
maintainerThe hardware provides main and extension channel busy counters to monitor channel usage.
Survey data from wlan
frequency: 2412 MHz [in use]
noise: -85 dBm
channel active time: 1198041 ms
channel busy time: 57835 ms
extension channel busy time: 57213 ms
Survey data from wlan
frequency: 2417 MHz
noise: -86 dBm
channel active time: 0 ms
channel busy time: 0 ms
extension channel busy time: 0 ms...
Stehpen, do you know if the hardware has a counter which accumulates rx / tx air time like ath9k 0x80ec MAC_PCU_TX_FRAME_CNT? This will be needed for Automatic Channel Selection.
---
drivers/net/wireless/ath/carl9170/carl9170.h +13 -0
@@ -152,6 +152,7 @@ struct carl9170_sta_tid {#define CARL9170_TX_TIMEOUT 2500#define CARL9170_JANITOR_DELAY 128#define CARL9170_QUEUE_STUCK_TIMEOUT 5500 +#define CARL9170_STAT_WORK 30000#define CARL9170_NUM_TX_AGG_MAX 30
@@ -283,6 +284,7 @@ struct ar9170 {bool rx_stream;bool tx_stream;bool rx_filter; +bool hw_counters;unsigned int mem_blocks;unsigned int mem_block_size;unsigned int rx_size;
@@ -332,12 +334,23 @@ struct ar9170 {/* PHY */ struct ieee80211_channel *channel; +unsigned int num_channels;int noise[4 ];unsigned int chan_fail;unsigned int total_chan_fail;u8 heavy_clip;u8 ht_settings; +struct { +u64 active;/* usec */ +u64 main_busy;/* usec */ +u64 ext_busy;/* usec */ +u64 rx_total; +u64 rx_overrun; + } tally; +struct delayed_work stat_work; +struct survey_info *survey; +/* power calibration data */ u8 power_5G_leg[4 ];u8 power_2G_cck[4 ];
drivers/net/wireless/ath/carl9170/cmd.c +30 -0
@@ -165,6 +165,36 @@ int carl9170_bcn_ctrl(struct ar9170 *ar, const unsigned int vif_id,return __carl9170_exec_cmd (ar, cmd, true); } +int carl9170_collect_tally (struct ar9170 *ar) +{ +struct carl9170_tally_rsp tally; +struct survey_info *info; +unsigned int delta; +int err; + + err =carl9170_exec_cmd (ar,CARL9170_CMD_TALLY ,0 ,NULL , +sizeof (tally), (u8 *)&tally); +if (err) +return err; + + delta =le32_to_cpu (tally.active); + ar->tally.active += delta; + ar->tally.main_busy += delta -min (delta,le32_to_cpu (tally.main_free)); + ar->tally.ext_busy += delta -min (delta,le32_to_cpu (tally.ext_free)); + ar->tally.rx_total +=le32_to_cpu (tally.rx_total); + ar->tally.rx_overrun +=le32_to_cpu (tally.rx_overrun); + +if (ar->channel) { + info = &ar->survey[ar->channel->hw_value]; + + info->channel_time = ar->tally.active /1000 ; + info->channel_time_busy = ar->tally.main_busy /1000 ; + info->channel_time_ext_busy = ar->tally.ext_busy /1000 ; + } + +return 0 ; +} +int carl9170_powersave (struct ar9170 *ar,const bool ps) {struct carl9170_cmd *cmd;
drivers/net/wireless/ath/carl9170/cmd.h +1 -0
@@ -50,6 +50,7 @@ int carl9170_echo_test(struct ar9170 *ar, u32 v);int carl9170_reboot (struct ar9170 *ar);int carl9170_mac_reset (struct ar9170 *ar);int carl9170_powersave (struct ar9170 *ar,const bool power_on); +int carl9170_collect_tally (struct ar9170 *ar);int carl9170_bcn_ctrl (struct ar9170 *ar,const unsigned int vif_id,const u32 mode,const u32 addr,const u32 len);
drivers/net/wireless/ath/carl9170/fw.c +3 -0
@@ -266,6 +266,9 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)FIF_PROMISC_IN_BSS ; } +if (SUPP (CARL9170FW_HW_COUNTERS )) + ar->fw.hw_counters = true; +if (SUPP (CARL9170FW_WOL ))device_set_wakeup_enable (&ar->udev->dev, true);
drivers/net/wireless/ath/carl9170/fwcmd.h +10 -0
@@ -55,6 +55,7 @@ enum carl9170_cmd_oids {CARL9170_CMD_READ_TSF =0x06 ,CARL9170_CMD_RX_FILTER =0x07 ,CARL9170_CMD_WOL =0x08 , +CARL9170_CMD_TALLY =0x09 ,/* CAM */ CARL9170_CMD_EKEY = 0x10,
@@ -286,6 +287,14 @@ struct carl9170_tsf_rsp { } __packed;#define CARL9170_TSF_RSP_SIZE 8 +struct carl9170_tally_rsp { +__le32 active; +__le32 main_free; +__le32 ext_free; +__le32 rx_total; +__le32 rx_overrun; +} __packed; +struct carl9170_rsp {struct carl9170_cmd_head hdr;
@@ -300,6 +309,7 @@ struct carl9170_rsp {struct carl9170_gpio gpio;struct carl9170_tsf_rsp tsf;struct carl9170_psm psm; +struct carl9170_tally_rsp tally;u8 data[CARL9170_MAX_CMD_PAYLOAD_LEN ]; } __packed; } __packed__aligned(4) ;
drivers/net/wireless/ath/carl9170/fwdesc.h +3 -0
@@ -75,6 +75,9 @@ enum carl9170fw_feature_list {/* Firmware supports PSM in the 5GHZ Band */ CARL9170FW_FIXED_5GHZ_PSM , +/* HW (ANI, CCA, MIB) tally counters */ +CARL9170FW_HW_COUNTERS , +/* KEEP LAST */ __CARL9170FW_FEATURE_NUM };
drivers/net/wireless/ath/carl9170/main.c +103 -11
191 lines not on this page · raw message
drivers/net/wireless/ath/carl9170/phy.c +3 -4
@@ -1574,6 +1574,9 @@ int carl9170_get_noisefloor(struct ar9170 *ar) AR9170_PHY_EXT_CCA_MIN_PWR, phy_res[i + 2]), 8); } +if (ar->channel) + ar->survey[ar->channel->hw_value].noise = ar->noise[0 ]; +return 0 ; }
@@ -1766,10 +1769,6 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel, ar->chan_fail =0 ; } - err =carl9170_get_noisefloor (ar); -if (err) -return err; -if (ar->heavy_clip) { err =carl9170_write_reg (ar,AR9170_PHY_REG_HEAVY_CLIP_ENABLE ,0x200 | ar->heavy_clip);
Christian Lamparter
maintainerPATCH v2 1/1 carl9170: improve site survey
The firmware keeps track of channel usage. This data can be used by the automatic channel selection to find the best channel.
Survey data from wlan22
frequency: 2412 MHz [in use] noise: -86 dBm channel active time: 3339608 ms channel busy time: 270982 ms channel transmit time: 121515 ms Survey data from wlan22 frequency: 2417 MHz noise: -86 dBm channel active time: 70 ms channel busy time: 2 ms channel transmit time: 1 ms
...
---
drivers/net/wireless/ath/carl9170/carl9170.h +12 -0
@@ -152,6 +152,7 @@ struct carl9170_sta_tid {#define CARL9170_TX_TIMEOUT 2500#define CARL9170_JANITOR_DELAY 128#define CARL9170_QUEUE_STUCK_TIMEOUT 5500 +#define CARL9170_STAT_WORK 30000#define CARL9170_NUM_TX_AGG_MAX 30
@@ -283,6 +284,7 @@ struct ar9170 {bool rx_stream;bool tx_stream;bool rx_filter; +bool hw_counters;unsigned int mem_blocks;unsigned int mem_block_size;unsigned int rx_size;
@@ -332,11 +334,21 @@ struct ar9170 {/* PHY */ struct ieee80211_channel *channel; +unsigned int num_channels;int noise[4 ];unsigned int chan_fail;unsigned int total_chan_fail;u8 heavy_clip;u8 ht_settings; +struct { +u64 active;/* usec */ +u64 cca;/* usec */ +u64 tx_time;/* usec */ +u64 rx_total; +u64 rx_overrun; + } tally; +struct delayed_work stat_work; +struct survey_info *survey;/* power calibration data */ u8 power_5G_leg[4 ];
drivers/net/wireless/ath/carl9170/cmd.c +31 -0
@@ -165,6 +165,37 @@ int carl9170_bcn_ctrl(struct ar9170 *ar, const unsigned int vif_id,return __carl9170_exec_cmd (ar, cmd, true); } +int carl9170_collect_tally (struct ar9170 *ar) +{ +struct carl9170_tally_rsp tally; +struct survey_info *info; +unsigned int tick; +int err; + + err =carl9170_exec_cmd (ar,CARL9170_CMD_TALLY ,0 ,NULL , +sizeof (tally), (u8 *)&tally); +if (err) +return err; + + tick =le32_to_cpu (tally.tick); +if (tick) { + ar->tally.active +=le32_to_cpu (tally.active) / tick; + ar->tally.cca +=le32_to_cpu (tally.cca) / tick; + ar->tally.tx_time +=le32_to_cpu (tally.tx_time) / tick; + ar->tally.rx_total +=le32_to_cpu (tally.rx_total); + ar->tally.rx_overrun +=le32_to_cpu (tally.rx_overrun); + +if (ar->channel) { + info = &ar->survey[ar->channel->hw_value]; + + info->channel_time = ar->tally.active /1000 ; + info->channel_time_busy = ar->tally.cca /1000 ; + info->channel_time_tx = ar->tally.tx_time /1000 ; + } + } +return 0 ; +} +int carl9170_powersave (struct ar9170 *ar,const bool ps) {struct carl9170_cmd *cmd;
drivers/net/wireless/ath/carl9170/cmd.h +1 -0
@@ -50,6 +50,7 @@ int carl9170_echo_test(struct ar9170 *ar, u32 v);int carl9170_reboot (struct ar9170 *ar);int carl9170_mac_reset (struct ar9170 *ar);int carl9170_powersave (struct ar9170 *ar,const bool power_on); +int carl9170_collect_tally (struct ar9170 *ar);int carl9170_bcn_ctrl (struct ar9170 *ar,const unsigned int vif_id,const u32 mode,const u32 addr,const u32 len);
drivers/net/wireless/ath/carl9170/fw.c +3 -0
@@ -266,6 +266,9 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)FIF_PROMISC_IN_BSS ; } +if (SUPP (CARL9170FW_HW_COUNTERS )) + ar->fw.hw_counters = true; +if (SUPP (CARL9170FW_WOL ))device_set_wakeup_enable (&ar->udev->dev, true);
drivers/net/wireless/ath/carl9170/fwcmd.h +11 -0
@@ -55,6 +55,7 @@ enum carl9170_cmd_oids {CARL9170_CMD_READ_TSF =0x06 ,CARL9170_CMD_RX_FILTER =0x07 ,CARL9170_CMD_WOL =0x08 , +CARL9170_CMD_TALLY =0x09 ,/* CAM */ CARL9170_CMD_EKEY = 0x10,
@@ -286,6 +287,15 @@ struct carl9170_tsf_rsp { } __packed;#define CARL9170_TSF_RSP_SIZE 8 +struct carl9170_tally_rsp { +__le32 active; +__le32 cca; +__le32 tx_time; +__le32 rx_total; +__le32 rx_overrun; +__le32 tick; +} __packed; +struct carl9170_rsp {struct carl9170_cmd_head hdr;
@@ -300,6 +310,7 @@ struct carl9170_rsp {struct carl9170_gpio gpio;struct carl9170_tsf_rsp tsf;struct carl9170_psm psm; +struct carl9170_tally_rsp tally;u8 data[CARL9170_MAX_CMD_PAYLOAD_LEN ]; } __packed; } __packed__aligned(4) ;
drivers/net/wireless/ath/carl9170/fwdesc.h +3 -0
@@ -75,6 +75,9 @@ enum carl9170fw_feature_list {/* Firmware supports PSM in the 5GHZ Band */ CARL9170FW_FIXED_5GHZ_PSM , +/* HW (ANI, CCA, MIB) tally counters */ +CARL9170FW_HW_COUNTERS , +/* KEEP LAST */ __CARL9170FW_FEATURE_NUM };
drivers/net/wireless/ath/carl9170/hw.h +6 -0
@@ -222,6 +222,12 @@#define AR9170_MAC_REG_TX_BLOCKACKS (AR9170_MAC_REG_BASE + 0x6c0)#define AR9170_MAC_REG_NAV_COUNT (AR9170_MAC_REG_BASE + 0x6c4)#define AR9170_MAC_REG_BACKOFF_STATUS (AR9170_MAC_REG_BASE + 0x6c8) +#define AR9170_MAC_BACKOFF_CCA BIT(24) +#define AR9170_MAC_BACKOFF_TX_PEX BIT(25) +#define AR9170_MAC_BACKOFF_RX_PE BIT(26) +#define AR9170_MAC_BACKOFF_MD_READY BIT(27) +#define AR9170_MAC_BACKOFF_TX_PE BIT(28) +#define AR9170_MAC_REG_TX_RETRY (AR9170_MAC_REG_BASE + 0x6cc)#define AR9170_MAC_REG_TX_COMPLETE (AR9170_MAC_REG_BASE + 0x6d4)
drivers/net/wireless/ath/carl9170/main.c +103 -11
191 lines not on this page · raw message
drivers/net/wireless/ath/carl9170/phy.c +3 -4
@@ -1574,6 +1574,9 @@ int carl9170_get_noisefloor(struct ar9170 *ar) AR9170_PHY_EXT_CCA_MIN_PWR, phy_res[i + 2]), 8); } +if (ar->channel) + ar->survey[ar->channel->hw_value].noise = ar->noise[0 ]; +return 0 ; }
@@ -1766,10 +1769,6 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel, ar->chan_fail =0 ; } - err =carl9170_get_noisefloor (ar); -if (err) -return err; -if (ar->heavy_clip) { err =carl9170_write_reg (ar,AR9170_PHY_REG_HEAVY_CLIP_ENABLE ,0x200 | ar->heavy_clip);