mt76: fix rounding issues on converting per-chain and combined txpower
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/3 mt76: fix rounding issues on converting per-chain and combined txpower
Unify code converting between the different txpower values. Always add/remove the combined txpower delta before dividing half-dB values.
Also fix the combined txpower delta values. The correct half-dB delta for 3 chains is 9, not 8.
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 20 ++----------------- drivers/net/wireless/mediatek/mt76/mt76.h | 7 +++++++ .../net/wireless/mediatek/mt76/mt7615/init.c | 17 ++-------------- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 7 ++++--- 4 files changed, 15 insertions(+), 36 deletions(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +2 -18
@@ -1051,25 +1051,9 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif, {struct mt76_phy *phy = hw->priv;int n_chains =hweight8 (phy->antenna_mask); +int delta =mt76_tx_power_nss_delta (n_chains); - *dbm =DIV_ROUND_UP (phy->txpower_cur,2 ); - -/* convert from per-chain power to combined -* output power -*/ -switch (n_chains) { -case 4 : - *dbm +=6 ; -break ; -case 3 : - *dbm +=4 ; -break ; -case 2 : - *dbm +=3 ; -break ; -default : -break ; - } + *dbm =DIV_ROUND_UP (phy->txpower_cur + delta,2 );return 0 ; }
drivers/net/wireless/mediatek/mt76/mt76.h +7 -0
@@ -755,6 +755,13 @@ static inline bool mt76_is_skb_pktid(u8 pktid)return pktid >=MT_PACKET_ID_FIRST ; } +static inline u8 mt76_tx_power_nss_delta (u8 nss) +{ +static const u8 nss_delta[4 ] = {0 ,6 ,9 ,12 }; + +return nss_delta[nss -1 ]; +} +void mt76_rx (struct mt76_dev *dev,enum mt76_rxq_id q,struct sk_buff *skb);void mt76_tx (struct mt76_phy *dev,struct ieee80211_sta *sta,struct mt76_wcid *wcid,struct sk_buff *skb);
drivers/net/wireless/mediatek/mt76/mt7615/init.c +2 -15
@@ -269,6 +269,7 @@ mt7615_init_txpower(struct mt7615_dev *dev,int i, n_chains =hweight8 (dev->mphy.antenna_mask), target_chains;u8 *eep = (u8 *)dev->mt76.eeprom.data;enum nl80211_band band = sband->band; +int delta =mt76_tx_power_nss_delta (n_chains); target_chains =mt7615_ext_pa_enabled (dev, band) ?1 : n_chains;for (i =0 ; i < sband->n_channels; i++) {
@@ -283,21 +284,7 @@ mt7615_init_txpower(struct mt7615_dev *dev, target_power =max (target_power, eep[index]); } - target_power =DIV_ROUND_UP (target_power,2 ); -switch (n_chains) { -case 4 : - target_power +=6 ; -break ; -case 3 : - target_power +=4 ; -break ; -case 2 : - target_power +=3 ; -break ; -default : -break ; - } - + target_power =DIV_ROUND_UP (target_power + delta,2 ); chan->max_power =min_t (int, chan->max_reg_power, target_power); chan->orig_mpwr = target_power;
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +4 -3
@@ -1595,14 +1595,14 @@ int mt7615_mcu_rdd_send_pattern(struct mt7615_dev *dev)static void mt7615_mcu_set_txpower_sku (struct mt7615_phy *phy,u8 *sku) { -static const u8 nss_delta[4 ] = {0 ,6 ,8 ,12 };struct mt76_phy *mphy = phy->mt76;struct ieee80211_hw *hw = mphy->hw;int n_chains =hweight8 (mphy->antenna_mask);int tx_power;int i; - tx_power = hw->conf.power_level *2 - nss_delta[n_chains -1 ]; + tx_power = hw->conf.power_level *2 - +mt76_tx_power_nss_delta (n_chains); mphy->txpower_cur = tx_power;for (i =0 ; i <MT_SKU_1SS_DELTA ; i++)
@@ -1612,7 +1612,8 @@ static void mt7615_mcu_set_txpower_sku(struct mt7615_phy *phy, u8 *sku)int delta =0 ;if (i < n_chains -1 ) - delta = nss_delta[n_chains -1 ] - nss_delta[i]; + delta =mt76_tx_power_nss_delta (n_chains) - +mt76_tx_power_nss_delta (i +1 ); sku[MT_SKU_1SS_DELTA + i] = delta; } }
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 2/3 mt76: mt7615: rework rx phy index handling
Overwriting the RMAC_CHFREQ register is not reliable enough, as the firmware could potentially write it again.
Since there is no PHY index indication in the rx info, we need to use another way:
If both PHYs are using different channels, find the PHY where chfreq matches the register value.
The only corner case remaining is when both PHYs are using the same channel. In that case, the per-packet noise value on the primary PHY will have information belonging to the chains of the secondary PHY from the previous received packet of that PHY. The secondary PHY will set noise to 0 for extra chains.
--- .../net/wireless/mediatek/mt76/mt7615/mac.c | 111 +++++++++++------- .../net/wireless/mediatek/mt76/mt7615/mac.h | 5 + .../net/wireless/mediatek/mt76/mt7615/main.c | 7 +- .../wireless/mediatek/mt76/mt7615/mt7615.h | 2 +- 4 files changed, 75 insertions(+), 50 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +68 -43
@@ -169,36 +169,32 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;struct mt76_phy *mphy = &dev->mt76.phy;struct mt7615_phy *phy = &dev->phy; +struct mt7615_phy *phy2 = dev->mt76.phy2 ? dev->mt76.phy2->priv :NULL ;struct ieee80211_supported_band *sband;struct ieee80211_hdr *hdr;__le32 *rxd = (__le32 *)skb->data;u32 rxd0 =le32_to_cpu (rxd[0 ]);u32 rxd1 =le32_to_cpu (rxd[1 ]);u32 rxd2 =le32_to_cpu (rxd[2 ]); +__le32 rxd12 = rxd[12 ];bool unicast, remove_pad, insert_ccmp_hdr = false; +int phy_idx;int i, idx;u8 chfreq;memset (status,0 ,sizeof (*status)); chfreq =FIELD_GET (MT_RXD1_NORMAL_CH_FREQ , rxd1); -if (!(chfreq &MT_CHFREQ_VALID )) -return -EINVAL ; - -if (chfreq &MT_CHFREQ_DBDC_IDX ) { - mphy = dev->mt76.phy2; -if (!mphy) -return -EINVAL ; - - phy = mphy->priv; - status->ext_phy = true; - } - -if ((chfreq &MT_CHFREQ_SEQ ) != phy->chfreq_seq) -return -EINVAL ; - -if (!test_bit (MT76_STATE_RUNNING , &mphy->state)) -return -EINVAL ; +if (!phy2) + phy_idx =0 ; +else if (phy2->chfreq == phy->chfreq) + phy_idx =-1 ; +else if (phy->chfreq == chfreq) + phy_idx =0 ; +else if (phy2->chfreq == chfreq) + phy_idx =1 ; +else + phy_idx =-1 ; unicast = (rxd1 &MT_RXD1_NORMAL_ADDR_TYPE ) ==MT_RXD1_NORMAL_U2M ; idx =FIELD_GET (MT_RXD2_NORMAL_WLAN_IDX , rxd2);
@@ -214,13 +210,6 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)spin_unlock_bh (&dev->sta_poll_lock); } - status->freq = mphy->chandef.chan->center_freq; - status->band = mphy->chandef.chan->band; -if (status->band ==NL80211_BAND_5GHZ ) - sband = &mphy->sband_5g.sband; -else - sband = &mphy->sband_2g.sband; -if (rxd2 &MT_RXD2_NORMAL_FCS_ERR ) status->flag |=RX_FLAG_FAILED_FCS_CRC ;
@@ -234,28 +223,11 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb) status->flag |=RX_FLAG_MMIC_STRIPPED |RX_FLAG_MIC_STRIPPED ; } -if (!(rxd2 & (MT_RXD2_NORMAL_NON_AMPDU_SUB | -MT_RXD2_NORMAL_NON_AMPDU ))) { - status->flag |=RX_FLAG_AMPDU_DETAILS ; - -/* all subframes of an A-MPDU have the same timestamp */ -if (phy->rx_ampdu_ts != rxd[12 ]) { -if (!++phy->ampdu_ref) - phy->ampdu_ref++; - } - phy->rx_ampdu_ts = rxd[12 ]; - - status->ampdu_ref = phy->ampdu_ref; - } - remove_pad = rxd1 &MT_RXD1_NORMAL_HDR_OFFSET ;if (rxd2 &MT_RXD2_NORMAL_MAX_LEN_ERROR )return -EINVAL ; -if (!sband->channels) -return -EINVAL ; - rxd +=4 ;if (rxd0 &MT_RXD0_NORMAL_GROUP_4 ) { rxd +=4 ;
@@ -287,6 +259,59 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)return -EINVAL ; } +if (rxd0 &MT_RXD0_NORMAL_GROUP_3 ) { +u32 rxdg5 =le32_to_cpu (rxd[5 ]); + +/* +* If both PHYs are on the same channel and we don't have a WCID, +* we need to figure out which PHY this packet was received on. +* On the primary PHY, the noise value for the chains belonging to the +* second PHY will be set to the noise value of the last packet from +* that PHY. +*/ +if (phy_idx <0 ) { +int first_chain =ffs (phy2->chainmask) -1 ; + + phy_idx = ((rxdg5 >> (first_chain *8 )) &0xff ) ==0 ; + } + } + +if (phy_idx ==1 && phy2) { + mphy = dev->mt76.phy2; + phy = phy2; + status->ext_phy = true; + } + +if (chfreq != phy->chfreq) +return -EINVAL ; + + status->freq = mphy->chandef.chan->center_freq; + status->band = mphy->chandef.chan->band; +if (status->band ==NL80211_BAND_5GHZ ) + sband = &mphy->sband_5g.sband; +else + sband = &mphy->sband_2g.sband; + +if (!test_bit (MT76_STATE_RUNNING , &mphy->state)) +return -EINVAL ; + +if (!sband->channels) +return -EINVAL ; + +if (!(rxd2 & (MT_RXD2_NORMAL_NON_AMPDU_SUB | +MT_RXD2_NORMAL_NON_AMPDU ))) { + status->flag |=RX_FLAG_AMPDU_DETAILS ; + +/* all subframes of an A-MPDU have the same timestamp */ +if (phy->rx_ampdu_ts != rxd12) { +if (!++phy->ampdu_ref) + phy->ampdu_ref++; + } + phy->rx_ampdu_ts = rxd12; + + status->ampdu_ref = phy->ampdu_ref; + } +if (rxd0 &MT_RXD0_NORMAL_GROUP_3 ) {u32 rxdg0 =le32_to_cpu (rxd[0 ]);u32 rxdg1 =le32_to_cpu (rxd[1 ]);
@@ -340,14 +365,14 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb) status->enc_flags |=RX_ENC_FLAG_STBC_MASK * stbc; - status->chains = dev->mphy.antenna_mask; + status->chains = mphy->antenna_mask; status->chain_signal[0 ] =to_rssi (MT_RXV4_RCPI0 , rxdg3); status->chain_signal[1 ] =to_rssi (MT_RXV4_RCPI1 , rxdg3); status->chain_signal[2 ] =to_rssi (MT_RXV4_RCPI2 , rxdg3); status->chain_signal[3 ] =to_rssi (MT_RXV4_RCPI3 , rxdg3); status->signal = status->chain_signal[0 ]; -for (i =1 ; i <hweight8 (dev->mphy.antenna_mask); i++) { +for (i =1 ; i <hweight8 (mphy->antenna_mask); i++) {if (!(status->chains &BIT (i)))continue ;
drivers/net/wireless/mediatek/mt76/mt7615/mac.h +5 -0
@@ -103,6 +103,11 @@ enum rx_pkt_type {#define MT_RXV4_RCPI1 GENMASK(15, 8)#define MT_RXV4_RCPI0 GENMASK(7, 0) +#define MT_RXV6_NF3 GENMASK(31, 24) +#define MT_RXV6_NF2 GENMASK(23, 16) +#define MT_RXV6_NF1 GENMASK(15, 8) +#define MT_RXV6_NF0 GENMASK(7, 0) +enum tx_header_format {MT_HDR_FORMAT_802_3 ,MT_HDR_FORMAT_CMD ,
drivers/net/wireless/mediatek/mt76/mt7615/main.c +1 -6
@@ -229,7 +229,6 @@ static int mt7615_set_channel(struct mt7615_phy *phy)mutex_lock (&dev->mt76.mutex);set_bit (MT76_RESET , &phy->mt76->state); - phy->chfreq_seq = (phy->chfreq_seq +1 ) &MT_CHFREQ_SEQ ; phy->dfs_state =-1 ;mt76_set_channel (phy->mt76);
@@ -237,11 +236,6 @@ static int mt7615_set_channel(struct mt7615_phy *phy)if (ret) goto out; -mt76_wr (dev,MT_CHFREQ (ext_phy), -MT_CHFREQ_VALID | - (ext_phy *MT_CHFREQ_DBDC_IDX ) | - phy->chfreq_seq); -mt7615_mac_set_timing (phy); ret =mt7615_dfs_init_radar_detector (phy);mt7615_mac_cca_stats_reset (phy);
@@ -249,6 +243,7 @@ static int mt7615_set_channel(struct mt7615_phy *phy)mt7615_mac_reset_counters (dev); phy->noise =0 ; + phy->chfreq =mt76_rr (dev,MT_CHFREQ (ext_phy)); out:clear_bit (MT76_RESET , &phy->mt76->state);
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +1 -1
@@ -134,7 +134,7 @@ struct mt7615_phy {s16 coverage_class;u8 slottime; -u8 chfreq_seq; +u8 chfreq;u8 rdd_state;int dfs_state;
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 3/3 mt76: do not set HOST_BROADCAST_PS_BUFFERING for mt7615
In reply to Felix Fietkaumt7615 handles powersave buffering in firmware
--- drivers/net/wireless/mediatek/mt76/mac80211.c | 1 - drivers/net/wireless/mediatek/mt76/mt7603/init.c | 1 + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mac80211.c +0 -1
@@ -295,7 +295,6 @@ mt76_phy_init(struct mt76_dev *dev, struct ieee80211_hw *hw)ieee80211_hw_set (hw,SIGNAL_DBM );ieee80211_hw_set (hw,PS_NULLFUNC_STACK ); -ieee80211_hw_set (hw,HOST_BROADCAST_PS_BUFFERING );ieee80211_hw_set (hw,AMPDU_AGGREGATION );ieee80211_hw_set (hw,SUPPORTS_RC_TABLE );ieee80211_hw_set (hw,SUPPORT_FAST_XMIT );
drivers/net/wireless/mediatek/mt76/mt7603/init.c +1 -0
@@ -557,6 +557,7 @@ int mt7603_register_device(struct mt7603_dev *dev) wiphy->n_iface_combinations =ARRAY_SIZE (if_comb);ieee80211_hw_set (hw,TX_STATUS_NO_AMPDU_LEN ); +ieee80211_hw_set (hw,HOST_BROADCAST_PS_BUFFERING );/* init led callbacks */ if (IS_ENABLED (CONFIG_MT76_LEDS )) {
drivers/net/wireless/mediatek/mt76/mt76x02_util.c +1 -0
@@ -181,6 +181,7 @@ void mt76x02_init_device(struct mt76x02_dev *dev) hw->vif_data_size =sizeof (struct mt76x02_vif );ieee80211_hw_set (hw,SUPPORTS_HT_CCK_RATES ); +ieee80211_hw_set (hw,HOST_BROADCAST_PS_BUFFERING ); dev->mt76.global_wcid.idx =255 ; dev->mt76.global_wcid.hw_key_idx =-1 ;
Signature · 1 line
2.24.0