mt76: mt7915: add support for DT rate power limits
Subsystems (2)
Shayne Chen
reviewerPATCH v3 1/3 mt76: mt7915: add support for DT rate power limits
Enable to limit per-rate max txpower from DT.
---
v3:
- fix patch regression, sorry for the inconvenience
v2:
- subtract nss_delta from txpower_cur
- set txpower_cur to the return code of mt76_get_rate_power_limits
The series is based on Felix's https://patchwork.kernel.org/project/linux-wireless/list/?series=303913
--- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 44 ++++++++++++++++--- 1 file changed, 38 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +38 -6
@@ -3068,15 +3068,47 @@ int mt7915_mcu_set_sku(struct mt7915_phy *phy) .format_id = 4, .dbdc_idx = phy != &dev->phy, }; -int i; -s8 *delta; +struct mt76_power_limits limits_array; +s8 *delta, *la = (s8 *)&limits_array; +int i, idx, n_chains =hweight8 (mphy->antenna_mask); +int tx_power; delta = dev->rate_power[mphy->chandef.chan->band]; - mphy->txpower_cur = hw->conf.power_level *2 + - delta[MT7915_SKU_MAX_DELTA_IDX ]; + tx_power = hw->conf.power_level *2 - +mt76_tx_power_nss_delta (n_chains); -for (i =0 ; i <MT7915_SKU_RATE_NUM ; i++) - req.val[i] = hw->conf.power_level *2 + delta[i]; + tx_power =mt76_get_rate_power_limits (mphy, mphy->chandef.chan, + &limits_array, tx_power); + mphy->txpower_cur = tx_power; + +for (i =0 , idx =0 ; i <MAX_SKU_RATE_GROUP_NUM ; i++) { +const struct sku_group *sku = &mt7915_sku_groups[i]; +u32 offset = sku->offset[mphy->chandef.chan->band]; +u8 mcs_num = sku->len; +int j; + +if (i >=SKU_HT_BW20 && i <=SKU_VHT_BW160 ) { + mcs_num =10 ; + +if (i ==SKU_HT_BW20 || i ==SKU_VHT_BW20 ) + la = (s8 *)&limits_array +12 ; + } + +if (!offset) { + idx += sku->len; + la += mcs_num; +continue ; + } + +for (j =0 ; j <min_t (u8, mcs_num, sku->len); j++) { +s8 rate_power; + + rate_power = hw->conf.power_level *2 + delta[idx + j]; + req.val[idx + j] =min_t (s8, la[j], rate_power); + } + la += mcs_num; + idx += sku->len; + } return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_TX_POWER_FEATURE_CTRL,
Signature · 1 line
2.17.1
Shayne Chen
reviewerPATCH v3 2/3 mt76: mt7915: rework the flow of txpower setting
Clean up the flow of per-rate txpower limit setting to get rid of dulplicate work since it has already been handled by firmware, and set proper max_power based on different channels and regdomains.
--- .../wireless/mediatek/mt76/mt7915/debugfs.c | 34 ++--- .../wireless/mediatek/mt76/mt7915/eeprom.c | 138 ++++-------------- .../wireless/mediatek/mt76/mt7915/eeprom.h | 40 +---- .../net/wireless/mediatek/mt76/mt7915/init.c | 32 ++-- .../net/wireless/mediatek/mt76/mt7915/main.c | 2 +- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 29 ++-- .../wireless/mediatek/mt76/mt7915/mt7915.h | 10 +- .../net/wireless/mediatek/mt76/mt7915/pci.c | 25 ---- 8 files changed, 79 insertions(+), 231 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c +12 -22
@@ -300,8 +300,7 @@ mt7915_queues_read(struct seq_file *s, void *data) }static void -mt7915_puts_rate_txpower (struct seq_file *s,s8 *delta, -s8 txpower_cur,int band) +mt7915_puts_rate_txpower (struct seq_file *s,s8 txpower_cur,int band) {static const char *const sku_group_name[] = {"CCK" ,"OFDM" ,"HT20" ,"HT40" ,
@@ -309,24 +308,18 @@ mt7915_puts_rate_txpower(struct seq_file *s, s8 *delta,"RU26" ,"RU52" ,"RU106" ,"RU242/SU20" , "RU484/SU40", "RU996/SU80", "RU2x996/SU160" }; -s8 txpower[MT7915_SKU_RATE_NUM ]; +s8 txpower[161 ];int i, idx =0 ; -for (i =0 ; i <MT7915_SKU_RATE_NUM ; i++) - txpower[i] =DIV_ROUND_UP (txpower_cur + delta[i],2 ); +for (i =0 ; i <ARRAY_SIZE (txpower); i++) + txpower[i] =DIV_ROUND_UP (txpower_cur,2 ); -for (i =0 ; i <MAX_SKU_RATE_GROUP_NUM ; i++) { -const struct sku_group *sku = &mt7915_sku_groups[i]; -u32 offset = sku->offset[band]; - -if (!offset) { - idx += sku->len; -continue ; - } +for (i =0 ; i <ARRAY_SIZE (mt7915_sku_group_len); i++) { +u8 len = mt7915_sku_group_len[i];mt76_seq_puts_array (s, sku_group_name[i], - txpower + idx, sku->len); - idx += sku->len; + txpower + idx, len); + idx += len; } }
@@ -336,21 +329,18 @@ mt7915_read_rate_txpower(struct seq_file *s, void *data)struct mt7915_dev *dev =dev_get_drvdata (s->private);struct mt76_phy *mphy = &dev->mphy;enum nl80211_band band = mphy->chandef.chan->band; -s8 *delta = dev->rate_power[band]; -s8 txpower_base = mphy->txpower_cur - delta[MT7915_SKU_MAX_DELTA_IDX ]; +s8 txpower = mphy->txpower_cur;seq_puts (s,"Band 0:\n" ); -mt7915_puts_rate_txpower (s, delta, txpower_base, band); +mt7915_puts_rate_txpower (s, txpower, band);if (dev->mt76.phy2) { mphy = dev->mt76.phy2; band = mphy->chandef.chan->band; - delta = dev->rate_power[band]; - txpower_base = mphy->txpower_cur - - delta[MT7915_SKU_MAX_DELTA_IDX ]; + txpower = mphy->txpower_cur;seq_puts (s,"Band 1:\n" ); -mt7915_puts_rate_txpower (s, delta, txpower_base, band); +mt7915_puts_rate_txpower (s, txpower, band); }return 0 ;
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c +28 -110
148 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h +7 -33
@@ -17,6 +17,8 @@ enum mt7915_eeprom_field {MT_EE_MAC_ADDR =0x004 ,MT_EE_DDIE_FT_VERSION =0x050 ,MT_EE_WIFI_CONF =0x190 , +MT_EE_RATE_DELTA_2G =0x252 , +MT_EE_RATE_DELTA_5G =0x29d ,MT_EE_TX0_POWER_2G =0x2fc ,MT_EE_TX0_POWER_5G =0x34b , MT_EE_ADIE_FT_VERSION = 0x9a0,
@@ -30,6 +32,10 @@ enum mt7915_eeprom_field {#define MT_EE_WIFI_CONF_TSSI0_5G BIT(2)#define MT_EE_WIFI_CONF_TSSI1_5G BIT(4) +#define MT_EE_RATE_DELTA_MASK GENMASK(5, 0) +#define MT_EE_RATE_DELTA_SIGN BIT(6) +#define MT_EE_RATE_DELTA_EN BIT(7) +enum mt7915_eeprom_band {MT_EE_DUAL_BAND ,MT_EE_5GHZ ,
@@ -37,32 +43,6 @@ enum mt7915_eeprom_band { MT_EE_DBDC, }; -#define SKU_DELTA_VAL GENMASK(5, 0) -#define SKU_DELTA_ADD BIT(6) -#define SKU_DELTA_EN BIT(7) - -enum mt7915_sku_delta_group { -SKU_CCK_GROUP0 , -SKU_CCK_GROUP1 , - -SKU_OFDM_GROUP0 =0 , -SKU_OFDM_GROUP1 , -SKU_OFDM_GROUP2 , -SKU_OFDM_GROUP3 , -SKU_OFDM_GROUP4 , - -SKU_MCS_GROUP0 =0 , -SKU_MCS_GROUP1 , -SKU_MCS_GROUP2 , -SKU_MCS_GROUP3 , -SKU_MCS_GROUP4 , -SKU_MCS_GROUP5 , -SKU_MCS_GROUP6 , -SKU_MCS_GROUP7 , -SKU_MCS_GROUP8 , -SKU_MCS_GROUP9 , -}; -enum mt7915_sku_rate_group {SKU_CCK ,SKU_OFDM ,
@@ -82,12 +62,6 @@ enum mt7915_sku_rate_group { MAX_SKU_RATE_GROUP_NUM, }; -struct sku_group { -u8 len; -u16 offset[2 ]; -const u8 *delta_map; -}; -static inline int mt7915_get_channel_group (int channel) {
@@ -120,6 +94,6 @@ mt7915_tssi_enabled(struct mt7915_dev *dev, enum nl80211_band band) return eep[MT_EE_WIFI_CONF + 7] & MT_EE_WIFI_CONF_TSSI0_2G; } -extern const struct sku_group mt7915_sku_groups[]; +extern const u8 mt7915_sku_group_len[MAX_SKU_RATE_GROUP_NUM ];#endif
drivers/net/wireless/mediatek/mt76/mt7915/init.c +19 -13
@@ -77,10 +77,13 @@ static int mt7915_txbf_init(struct mt7915_dev *dev) }static void -mt7915_init_txpower_band (struct mt7915_dev *dev, -struct ieee80211_supported_band *sband) +mt7915_init_txpower (struct mt7915_dev *dev, +struct ieee80211_supported_band *sband) {int i, n_chains =hweight8 (dev->mphy.antenna_mask); +int nss_delta =mt76_tx_power_nss_delta (n_chains); +int pwr_delta =mt7915_eeprom_get_power_delta (dev, sband->band); +struct mt76_power_limits limits;for (i =0 ; i < sband->n_channels; i++) {struct ieee80211_channel *chan = &sband->channels[i];
@@ -94,20 +97,18 @@ mt7915_init_txpower_band(struct mt7915_dev *dev, target_power =max (target_power, val); } + target_power += pwr_delta; + target_power =mt76_get_rate_power_limits (&dev->mphy, chan, + &limits, + target_power); + target_power += nss_delta; + target_power =DIV_ROUND_UP (target_power,2 ); chan->max_power =min_t (int, chan->max_reg_power, - target_power /2 ); - chan->orig_mpwr = target_power /2 ; + target_power); + chan->orig_mpwr = target_power; } } -static void mt7915_init_txpower (struct mt7915_dev *dev) -{ -mt7915_init_txpower_band (dev, &dev->mphy.sband_2g.sband); -mt7915_init_txpower_band (dev, &dev->mphy.sband_5g.sband); - -mt7915_eeprom_init_sku (dev); -} -static void mt7915_init_work (struct work_struct *work) { struct mt7915_dev *dev = container_of(work, struct mt7915_dev,
@@ -115,7 +116,8 @@ static void mt7915_init_work(struct work_struct *work)mt7915_mcu_set_eeprom (dev);mt7915_mac_init (dev); -mt7915_init_txpower (dev); +mt7915_init_txpower (dev, &dev->mphy.sband_2g.sband); +mt7915_init_txpower (dev, &dev->mphy.sband_5g.sband);mt7915_txbf_init (dev); }
@@ -224,8 +226,12 @@ mt7915_regd_notifier(struct wiphy *wiphy,struct mt7915_phy *phy = mphy->priv;struct cfg80211_chan_def *chandef = &mphy->chandef; +memcpy (dev->mt76.alpha2, request->alpha2,sizeof (dev->mt76.alpha2)); dev->mt76.region = request->dfs_region; +mt7915_init_txpower (dev, &mphy->sband_2g.sband); +mt7915_init_txpower (dev, &mphy->sband_5g.sband); +if (!(chandef->chan->flags &IEEE80211_CHAN_RADAR ))return ;
drivers/net/wireless/mediatek/mt76/mt7915/main.c +1 -1
@@ -325,7 +325,7 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed) }if (changed &IEEE80211_CONF_CHANGE_POWER ) { - ret =mt7915_mcu_set_sku (phy); + ret =mt7915_mcu_set_txpower_sku (phy);if (ret)return ret; }
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +10 -19
@@ -3054,8 +3054,9 @@ int mt7915_mcu_get_rate_info(struct mt7915_dev *dev, u32 cmd, u16 wlan_idx) sizeof(req), false); } -int mt7915_mcu_set_sku (struct mt7915_phy *phy) +int mt7915_mcu_set_txpower_sku (struct mt7915_phy *phy) { +#define MT7915_SKU_RATE_NUM 161struct mt7915_dev *dev = phy->dev;struct mt76_phy *mphy = phy->mt76;struct ieee80211_hw *hw = mphy->hw;
@@ -3069,11 +3070,10 @@ int mt7915_mcu_set_sku(struct mt7915_phy *phy) .dbdc_idx = phy != &dev->phy, };struct mt76_power_limits limits_array; -s8 *delta, *la = (s8 *)&limits_array; +s8 *la = (s8 *)&limits_array;int i, idx, n_chains =hweight8 (mphy->antenna_mask);int tx_power; - delta = dev->rate_power[mphy->chandef.chan->band]; tx_power = hw->conf.power_level *2 -mt76_tx_power_nss_delta (n_chains);
@@ -3081,10 +3081,8 @@ int mt7915_mcu_set_sku(struct mt7915_phy *phy) &limits_array, tx_power); mphy->txpower_cur = tx_power; -for (i =0 , idx =0 ; i <MAX_SKU_RATE_GROUP_NUM ; i++) { -const struct sku_group *sku = &mt7915_sku_groups[i]; -u32 offset = sku->offset[mphy->chandef.chan->band]; -u8 mcs_num = sku->len; +for (i =0 , idx =0 ; i <ARRAY_SIZE (mt7915_sku_group_len); i++) { +u8 mcs_num, len = mt7915_sku_group_len[i];int j;if (i >=SKU_HT_BW20 && i <=SKU_VHT_BW160 ) {
@@ -3092,22 +3090,15 @@ int mt7915_mcu_set_sku(struct mt7915_phy *phy)if (i ==SKU_HT_BW20 || i ==SKU_VHT_BW20 ) la = (s8 *)&limits_array +12 ; + }else { + mcs_num = len; } -if (!offset) { - idx += sku->len; - la += mcs_num; -continue ; - } - -for (j =0 ; j <min_t (u8, mcs_num, sku->len); j++) { -s8 rate_power; +for (j =0 ; j <min_t (u8, mcs_num, len); j++) + req.val[idx + j] = la[j]; - rate_power = hw->conf.power_level *2 + delta[idx + j]; - req.val[idx + j] =min_t (s8, la[j], rate_power); - } la += mcs_num; - idx += sku->len; + idx += len; } return __mt76_mcu_send_msg(&dev->mt76,
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +2 -8
@@ -38,10 +38,6 @@#define MT7915_5G_RATE_DEFAULT 0x4b/* OFDM 6M */ #define MT7915_2G_RATE_DEFAULT 0x0/* CCK 1M */ -#define MT7915_SKU_RATE_NUM 161 -#define MT7915_SKU_MAX_DELTA_IDX MT7915_SKU_RATE_NUM -#define MT7915_SKU_TABLE_SIZE (MT7915_SKU_RATE_NUM + 1) -struct mt7915_vif ;struct mt7915_sta ;struct mt7915_dfs_pulse ;
@@ -169,8 +165,6 @@ struct mt7915_dev {spinlock_t token_lock;struct idr token; -s8 **rate_power;/* TODO: use mt76_rate_power */ -bool fw_debug; };
@@ -277,7 +271,7 @@ u32 mt7915_eeprom_read(struct mt7915_dev *dev, u32 offset);int mt7915_eeprom_get_target_power (struct mt7915_dev *dev,struct ieee80211_channel *chan,u8 chain_idx); -void mt7915_eeprom_init_sku (struct mt7915_dev *dev); +s8 mt7915_eeprom_get_power_delta (struct mt7915_dev *dev,int band);int mt7915_dma_init (struct mt7915_dev *dev);void mt7915_dma_prefetch (struct mt7915_dev *dev);void mt7915_dma_cleanup (struct mt7915_dev *dev);
@@ -320,7 +314,7 @@ int mt7915_mcu_set_ser(struct mt7915_dev *dev, u8 action, u8 set, u8 band);int mt7915_mcu_set_rts_thresh (struct mt7915_phy *phy,u32 val);int mt7915_mcu_set_pm (struct mt7915_dev *dev,int band,int enter);int mt7915_mcu_set_sku_en (struct mt7915_phy *phy,bool enable); -int mt7915_mcu_set_sku (struct mt7915_phy *phy); +int mt7915_mcu_set_txpower_sku (struct mt7915_phy *phy);int mt7915_mcu_set_txbf_type (struct mt7915_dev *dev);int mt7915_mcu_set_txbf_sounding (struct mt7915_dev *dev);int mt7915_mcu_set_fcc5_lpn (struct mt7915_dev *dev,int val);
drivers/net/wireless/mediatek/mt76/mt7915/pci.c +0 -25
@@ -75,28 +75,6 @@ static irqreturn_t mt7915_irq_handler(int irq, void *dev_instance)return IRQ_HANDLED ; } -static int -mt7915_alloc_device (struct pci_dev *pdev,struct mt7915_dev *dev) -{ -#define NUM_BANDS 2 -int i; -s8 **sku; - - sku =devm_kzalloc (&pdev->dev,NUM_BANDS *sizeof (*sku),GFP_KERNEL ); -if (!sku) -return -ENOMEM ; - -for (i =0 ; i <NUM_BANDS ; i++) { - sku[i] =devm_kzalloc (&pdev->dev,MT7915_SKU_TABLE_SIZE * -sizeof (**sku),GFP_KERNEL ); -if (!sku[i]) -return -ENOMEM ; - } - dev->rate_power = sku; - -return 0 ; -} -static int mt7915_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {
@@ -140,9 +118,6 @@ static int mt7915_pci_probe(struct pci_dev *pdev,return -ENOMEM ; dev = container_of(mdev, struct mt7915_dev, mt76); - ret =mt7915_alloc_device (pdev, dev); -if (ret) -return ret;mt76_mmio_init (&dev->mt76,pcim_iomap_table (pdev)[0 ]); mdev->rev = (mt7915_l1_rr(dev, MT_HW_CHIPID) << 16) |
Signature · 1 line
2.17.1
Shayne Chen
reviewerPATCH v3 3/3 mt76: mt7915: directly read per-rate tx power from registers
In reply to Shayne ChenSince driver no longer handler per-rate tx power setting, we need to read the power values directly from registers.
---
v2:
- fix reg_base and idx calculation
--- .../wireless/mediatek/mt76/mt7915/debugfs.c | 57 ++++++++++++++----- .../net/wireless/mediatek/mt76/mt7915/regs.h | 5 ++ 2 files changed, 47 insertions(+), 15 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c +42 -15
@@ -300,7 +300,8 @@ mt7915_queues_read(struct seq_file *s, void *data) }static void -mt7915_puts_rate_txpower (struct seq_file *s,s8 txpower_cur,int band) +mt7915_puts_rate_txpower (struct seq_file *s,struct mt7915_dev *dev, +int band,bool ext_phy) {static const char *const sku_group_name[] = {"CCK" ,"OFDM" ,"HT20" ,"HT40" ,
@@ -308,18 +309,46 @@ mt7915_puts_rate_txpower(struct seq_file *s, s8 txpower_cur, int band)"RU26" ,"RU52" ,"RU106" ,"RU242/SU20" ,"RU484/SU40" ,"RU996/SU80" ,"RU2x996/SU160" }; -s8 txpower[161 ]; +u32 reg_base =MT_TMAC_FP0R0 (ext_phy);int i, idx =0 ; -for (i =0 ; i <ARRAY_SIZE (txpower); i++) - txpower[i] =DIV_ROUND_UP (txpower_cur,2 ); -for (i =0 ; i <ARRAY_SIZE (mt7915_sku_group_len); i++) { -u8 len = mt7915_sku_group_len[i]; +u8 cnt, mcs_num = mt7915_sku_group_len[i]; +s8 txpower[12 ]; +int j; + +if (i ==SKU_HT_BW20 || i ==SKU_HT_BW40 ) { + mcs_num =8 ; + }else if (i >=SKU_VHT_BW20 && i <=SKU_VHT_BW160 ) { + mcs_num =10 ; + }else if (i ==SKU_HE_RU26 ) { + reg_base =MT_TMAC_FP0R18 (ext_phy); + idx =0 ; + } + +for (j =0 , cnt =0 ; j <DIV_ROUND_UP (mcs_num,4 ); j++) { +u32 val; + +if (i ==SKU_VHT_BW160 && idx ==60 ) { + reg_base =MT_TMAC_FP0R15 (ext_phy); + idx =0 ; + } + + val =mt76_rr (dev, reg_base + (idx /4 ) *4 ); + +if (idx && idx %4 ) + val >>= (idx %4 ) *8 ; + +while (val >0 && cnt < mcs_num) { +s8 pwr =FIELD_GET (MT_TMAC_FP_MASK , val); + + txpower[cnt++] = pwr; + val >>=8 ; + idx++; + } + } -mt76_seq_puts_array (s, sku_group_name[i], - txpower + idx, len); - idx += len; +mt76_seq_puts_array (s, sku_group_name[i], txpower, mcs_num); } }
@@ -329,18 +358,16 @@ mt7915_read_rate_txpower(struct seq_file *s, void *data)struct mt7915_dev *dev =dev_get_drvdata (s->private);struct mt76_phy *mphy = &dev->mphy;enum nl80211_band band = mphy->chandef.chan->band; -s8 txpower = mphy->txpower_cur; -seq_puts (s,"Band 0:\n" ); -mt7915_puts_rate_txpower (s, txpower, band); +seq_puts (s,"Band 0: (unit: 0.5 dBm)\n" ); +mt7915_puts_rate_txpower (s, dev, band, false);if (dev->mt76.phy2) { mphy = dev->mt76.phy2; band = mphy->chandef.chan->band; - txpower = mphy->txpower_cur; -seq_puts (s,"Band 1:\n" ); -mt7915_puts_rate_txpower (s, txpower, band); +seq_puts (s,"Band 1: (unit: 0.5 dBm)\n" ); +mt7915_puts_rate_txpower (s, dev, band, true); }return 0 ;
drivers/net/wireless/mediatek/mt76/mt7915/regs.h +5 -0
@@ -67,6 +67,11 @@#define MT_TMAC_CTCR0_INS_DDLMT_EN BIT(17)#define MT_TMAC_CTCR0_INS_DDLMT_VHT_SMPDU_EN BIT(18) +#define MT_TMAC_FP0R0 (_band) MT_WF_TMAC(_band, 0x020) +#define MT_TMAC_FP0R15 (_band) MT_WF_TMAC(_band, 0x080) +#define MT_TMAC_FP0R18 (_band) MT_WF_TMAC(_band, 0x270) +#define MT_TMAC_FP_MASK GENMASK(7, 0) +/* DMA Band 0 */ #define MT_WF_DMA_BASE 0x21e00#define MT_WF_DMA (ofs) (MT_WF_DMA_BASE + (ofs))
Signature · 1 line
2.17.1