STBC work for ath9k*
cover STBC work for ath9k*
This serie of patches is about support for STBC on ath9k chips. It will add STBC Tx to ath9k-htc and allow tracing Rx packets. Radiotap part of this patch set based on Wojciech Dubowik work. Currently this values seems to be not compatible with STBC draft for radiotap:
http://www.radiotap.org/suggested-fields/MCS%20extension%20for%20STBC%20and%20Ness
but compatible with wireshark (thx Wojciech):
http://code.wireshark.org/git/?p=wireshark;a=blob;f=epan/dissectors/packet-ieee80211-radiotap-defs.h;h=e0b9a6a0098b3b8ada30cacb75e6ff5009284d3a;hb=HEAD#l280
Oleksij Rempel (4):
ath9k_htc: add STBC TX support
mac80211: add STBC RX flag for radiotap
ath9k: remove useless flag conversation.
ath9k: check for Rx-STBC flag and pass it to ieee80211
drivers/net/wireless/ath/ath9k/ar9003_mac.c | 5 +++-- drivers/net/wireless/ath/ath9k/htc.h | 2 ++ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 3 +++ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 4 ++++ drivers/net/wireless/ath/ath9k/mac.c | 14 ++++++++++---- drivers/net/wireless/ath/ath9k/mac.h | 4 +++- drivers/net/wireless/ath/ath9k/recv.c | 5 +---- include/net/ieee80211_radiotap.h | 2 ++ include/net/mac80211.h | 2 ++ net/mac80211/main.c | 3 ++- net/mac80211/rx.c | 2 ++ net/mac80211/status.c | 3 ++- 12 files changed, 36 insertions(+), 13 deletions(-)
Signature · 1 line
1.8.1.2
PATCH 1/4 ath9k_htc: add STBC TX support
current firmware will enable STBC_TX, only if other peer support it. This patch provide ht_peer_caps to firmware.
FW versions 1.3, 1.4 should be able to work with it. Tested on ar7010+ar9280 and ar7010+ar9287.
--- drivers/net/wireless/ath/ath9k/htc.h | 2 ++ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 3 +++ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 4 ++++ 3 files changed, 9 insertions(+)
drivers/net/wireless/ath/ath9k/htc.h +2 -0
@@ -142,6 +142,8 @@ struct ath9k_htc_target_aggr {#define WLAN_RC_40_FLAG 0x02#define WLAN_RC_SGI_FLAG 0x04#define WLAN_RC_HT_FLAG 0x08 +#define WLAN_RC_TX_STBC_FLAG 0x20/* TX STBC */ +#define WLAN_RC_RX_STBC_FLAG 0xC0/* RX STBC ,2 bits */ struct ath9k_htc_rateset {u8 rs_nrates;
drivers/net/wireless/ath/ath9k/htc_drv_init.c +3 -0
@@ -517,6 +517,9 @@ static void setup_ht_cap(struct ath9k_htc_priv *priv,ath_dbg (common,CONFIG ,"TX streams %d, RX streams: %d\n" , tx_streams, rx_streams); +if (tx_streams >=2 ) + ht_info->cap |=IEEE80211_HT_CAP_TX_STBC ; +if (tx_streams != rx_streams) { ht_info->mcs.tx_params |=IEEE80211_HT_MCS_TX_RX_DIFF ; ht_info->mcs.tx_params |= ((tx_streams - 1) <<
drivers/net/wireless/ath/ath9k/htc_drv_main.c +4 -0
@@ -623,6 +623,10 @@ static void ath9k_htc_setup_rate(struct ath9k_htc_priv *priv, trate->rates.ht_rates.rs_nrates = j; caps =WLAN_RC_HT_FLAG ; +if (sta->ht_cap.cap &IEEE80211_HT_CAP_RX_STBC ) + caps |=WLAN_RC_RX_STBC_FLAG ; +if (sta->ht_cap.cap &IEEE80211_HT_CAP_TX_STBC ) + caps |=WLAN_RC_TX_STBC_FLAG ;if (sta->ht_cap.mcs.rx_mask[1 ]) caps |=WLAN_RC_DS_FLAG ; if ((sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) &&
Signature · 1 line
1.8.1.2
PATCH 2/4 mac80211: add STBC flag for radiotap
In reply to Oleksij Rempel--- include/net/ieee80211_radiotap.h | 2 ++ include/net/mac80211.h | 2 ++ net/mac80211/main.c | 3 ++- net/mac80211/rx.c | 2 ++ net/mac80211/status.c | 3 ++- 5 files changed, 10 insertions(+), 2 deletions(-)
include/net/ieee80211_radiotap.h +2 -0
@@ -269,6 +269,7 @@ enum ieee80211_radiotap_type {#define IEEE80211_RADIOTAP_MCS_HAVE_GI 0x04#define IEEE80211_RADIOTAP_MCS_HAVE_FMT 0x08#define IEEE80211_RADIOTAP_MCS_HAVE_FEC 0x10 +#define IEEE80211_RADIOTAP_MCS_HAVE_STBC 0x20#define IEEE80211_RADIOTAP_MCS_BW_MASK 0x03#define IEEE80211_RADIOTAP_MCS_BW_20 0
@@ -278,6 +279,7 @@ enum ieee80211_radiotap_type {#define IEEE80211_RADIOTAP_MCS_SGI 0x04#define IEEE80211_RADIOTAP_MCS_FMT_GF 0x08#define IEEE80211_RADIOTAP_MCS_FEC_LDPC 0x10 +#define IEEE80211_RADIOTAP_MCS_STBC 0x20/* For IEEE80211_RADIOTAP_AMPDU_STATUS */ #define IEEE80211_RADIOTAP_AMPDU_REPORT_ZEROLEN 0x0001
include/net/mac80211.h +2 -0
@@ -805,6 +805,7 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)* on this subframe * @RX_FLAG_AMPDU_DELIM_CRC_KNOWN: The delimiter CRC field is known (the CRC * is stored in the @ampdu_delimiter_crc field) +* @RX_FLAG_STBC: STBC was used */ enum mac80211_rx_flags {RX_FLAG_MMIC_ERROR =BIT (0 ),
@@ -832,6 +833,7 @@ enum mac80211_rx_flags {RX_FLAG_80MHZ =BIT (23 ),RX_FLAG_80P80MHZ =BIT (24 ),RX_FLAG_160MHZ =BIT (25 ), + RX_FLAG_STBC = BIT(26), };/**
net/mac80211/main.c +2 -1
@@ -589,7 +589,8 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, local->hw.conf.short_frame_max_tx_count = wiphy->retry_short; local->hw.radiotap_mcs_details =IEEE80211_RADIOTAP_MCS_HAVE_MCS |IEEE80211_RADIOTAP_MCS_HAVE_GI | -IEEE80211_RADIOTAP_MCS_HAVE_BW ; +IEEE80211_RADIOTAP_MCS_HAVE_BW | +IEEE80211_RADIOTAP_MCS_HAVE_STBC ; local->hw.radiotap_vht_details =IEEE80211_RADIOTAP_VHT_KNOWN_GI |IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH ; local->hw.uapsd_queues =IEEE80211_DEFAULT_UAPSD_QUEUES ;
net/mac80211/rx.c +2 -0
@@ -267,6 +267,8 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, *pos |=IEEE80211_RADIOTAP_MCS_BW_40 ;if (status->flag &RX_FLAG_HT_GF ) *pos |=IEEE80211_RADIOTAP_MCS_FMT_GF ; +if (status->flag &RX_FLAG_STBC ) + *pos |=IEEE80211_RADIOTAP_MCS_STBC ; pos++; *pos++ = status->rate_idx; }
net/mac80211/status.c +2 -1
@@ -312,7 +312,8 @@ static void ieee80211_add_tx_radiotap_header(struct ieee80211_supported_band rthdr->it_present |=cpu_to_le32 (1 <<IEEE80211_RADIOTAP_MCS ); pos[0 ] =IEEE80211_RADIOTAP_MCS_HAVE_MCS |IEEE80211_RADIOTAP_MCS_HAVE_GI | -IEEE80211_RADIOTAP_MCS_HAVE_BW ; +IEEE80211_RADIOTAP_MCS_HAVE_BW | +IEEE80211_RADIOTAP_MCS_HAVE_STBC ;if (info->status.rates[0 ].flags &IEEE80211_TX_RC_SHORT_GI ) pos[1 ] |=IEEE80211_RADIOTAP_MCS_SGI ;if (info->status.rates[0 ].flags &IEEE80211_TX_RC_40_MHZ_WIDTH )
Signature · 1 line
1.8.1.2
Johannes Berg
maintainerPATCH 2/4 mac80211: add STBC flag for radiotap
include/net/ieee80211_radiotap.h enum ieee80211_radiotap_type { · line 272
Quoted 7 lines · Oleksij Rempel
include/net/ieee80211_radiotap.h +1
-0@@ -269,6 +269,7 @@ enum ieee80211_radiotap_type {#define IEEE80211_RADIOTAP_MCS_HAVE_GI 0x04#define IEEE80211_RADIOTAP_MCS_HAVE_FMT 0x08#define IEEE80211_RADIOTAP_MCS_HAVE_FEC 0x10 +#define IEEE80211_RADIOTAP_MCS_HAVE_STBC 0x20
Umm, need to do radiotap standardisation process, so NACK until then.
johannes
PATCH 2/4 mac80211: add STBC flag for radiotap
Am 29.04.2013 12:14, schrieb Johannes Berg:
Quoted 12 lines · Oleksij Rempel
include/net/ieee80211_radiotap.h enum ieee80211_radiotap_type { · line 272
Quoted 8 lines
include/net/ieee80211_radiotap.h +1
-0@@ -269,6 +269,7 @@ enum ieee80211_radiotap_type {#define IEEE80211_RADIOTAP_MCS_HAVE_GI 0x04#define IEEE80211_RADIOTAP_MCS_HAVE_FMT 0x08#define IEEE80211_RADIOTAP_MCS_HAVE_FEC 0x10 +#define IEEE80211_RADIOTAP_MCS_HAVE_STBC 0x20Umm, need to do radiotap standardisation process, so NACK until then.
Quoted 2 lines
johannes
Until i get response from radiotap list, is it possible to merge or review patches 1 and 3. They are independent from other patches.
Signature · 2 lines
Regards, Oleksij
PATCH 3/4 ath9k: remove useless flag conversation.
In reply to Oleksij Rempelsome flags used only outside of ath9k - In this case we can use "enum mac80211_rx_flags" and pass it upstream without extra conversation.
--- drivers/net/wireless/ath/ath9k/ar9003_mac.c | 5 +++-- drivers/net/wireless/ath/ath9k/mac.c | 11 +++++++---- drivers/net/wireless/ath/ath9k/mac.h | 1 + drivers/net/wireless/ath/ath9k/recv.c | 5 +---- 4 files changed, 12 insertions(+), 10 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_mac.c +3 -2
@@ -469,6 +469,7 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs, rxs->rs_status =0 ; rxs->rs_flags =0 ; + rxs->flag =0 ; rxs->rs_datalen = rxsp->status2 & AR_DataLen; rxs->rs_tstamp = rxsp->status3;
@@ -493,8 +494,8 @@ int ath9k_hw_process_rxdesc_edma(struct ath_hw *ah, struct ath_rx_status *rxs, rxs->rs_isaggr = (rxsp->status11 & AR_RxAggr) ?1 :0 ; rxs->rs_moreaggr = (rxsp->status11 & AR_RxMoreAggr) ?1 :0 ; rxs->rs_antenna = (MS (rxsp->status4, AR_RxAntenna) &0x7 ); - rxs->rs_flags = (rxsp->status4 &AR_GI ) ?ATH9K_RX_GI :0 ; - rxs->rs_flags |= (rxsp->status4 &AR_2040 ) ?ATH9K_RX_2040 :0 ; + rxs->flag |= (rxsp->status4 &AR_GI ) ?RX_FLAG_SHORT_GI :0 ; + rxs->flag |= (rxsp->status4 &AR_2040 ) ?RX_FLAG_40MHZ :0 ; rxs->evm0 = rxsp->status6; rxs->evm1 = rxsp->status7;
drivers/net/wireless/ath/ath9k/mac.c +7 -4
@@ -547,6 +547,7 @@ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds, rs->rs_status =0 ; rs->rs_flags =0 ; + rs->flag =0 ; rs->rs_datalen = ads.ds_rxstatus1 & AR_DataLen; rs->rs_tstamp = ads.AR_RcvTimestamp;
@@ -586,10 +587,12 @@ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds, rs->rs_moreaggr = (ads.ds_rxstatus8 & AR_RxMoreAggr) ?1 :0 ; rs->rs_antenna =MS (ads.ds_rxstatus3, AR_RxAntenna); - rs->rs_flags = - (ads.ds_rxstatus3 &AR_GI ) ?ATH9K_RX_GI :0 ; - rs->rs_flags |= - (ads.ds_rxstatus3 &AR_2040 ) ?ATH9K_RX_2040 :0 ; + +/* directly mapped flags for ieee80211_rx_status */ + rs->flag |= + (ads.ds_rxstatus3 &AR_GI ) ?RX_FLAG_SHORT_GI :0 ; + rs->flag |= + (ads.ds_rxstatus3 &AR_2040 ) ?RX_FLAG_40MHZ :0 ;if (ads.ds_rxstatus8 & AR_PreDelimCRCErr) rs->rs_flags |=ATH9K_RX_DELIM_CRC_PRE ;
drivers/net/wireless/ath/ath9k/mac.h +1 -0
@@ -149,6 +149,7 @@ struct ath_rx_status {u32 evm2;u32 evm3;u32 evm4; +u32 flag;/* see enum mac80211_rx_flags */ };struct ath_htc_rx_status {
drivers/net/wireless/ath/ath9k/recv.c +1 -4
@@ -868,10 +868,7 @@ static int ath9k_process_rate(struct ath_common *common,if (rx_stats->rs_rate &0x80 ) {/* HT rate */ rxs->flag |=RX_FLAG_HT ; -if (rx_stats->rs_flags &ATH9K_RX_2040 ) - rxs->flag |=RX_FLAG_40MHZ ; -if (rx_stats->rs_flags &ATH9K_RX_GI ) - rxs->flag |=RX_FLAG_SHORT_GI ; + rxs->flag |= rx_stats->flag; rxs->rate_idx = rx_stats->rs_rate &0x7f ;return 0 ; }
Signature · 1 line
1.8.1.2
PATCH 4/4 ath9k: check for Rx-STBC flag and pass it to ieee80211
In reply to Oleksij Rempel--- drivers/net/wireless/ath/ath9k/mac.c | 3 +++ drivers/net/wireless/ath/ath9k/mac.h | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/mac.c +3 -0
@@ -593,6 +593,9 @@ int ath9k_hw_rxprocdesc(struct ath_hw *ah, struct ath_desc *ds, (ads.ds_rxstatus3 &AR_GI ) ?RX_FLAG_SHORT_GI :0 ; rs->flag |= (ads.ds_rxstatus3 &AR_2040 ) ?RX_FLAG_40MHZ :0 ; +if (AR_SREV_9280_20_OR_LATER (ah)) + rs->flag |= + (ads.ds_rxstatus3 &AR_STBC ) ?RX_FLAG_STBC :0 ;if (ads.ds_rxstatus8 & AR_PreDelimCRCErr) rs->rs_flags |=ATH9K_RX_DELIM_CRC_PRE ;
drivers/net/wireless/ath/ath9k/mac.h +2 -1
@@ -534,7 +534,8 @@ struct ar5416_desc {#define AR_2040 0x00000002#define AR_Parallel40 0x00000004#define AR_Parallel40_S 2 -#define AR_RxStatusRsvd30 0x000000f8 +#define AR_STBC 0x00000008/* on ar9280 and later */ +#define AR_RxStatusRsvd30 0x000000f0#define AR_RxAntenna 0xffffff00#define AR_RxAntenna_S 8
Signature · 1 line
1.8.1.2