| Message ID | 279b29408c742c4b043e7af11217dcd5eeb7b8c2.1592276165.git.ryder.lee@mediatek.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | [1/4] dt-bindings: net: wireless: mt76: add ru property in power-limits node | expand |
On 2020-06-16 14:46, Shayne Chen wrote: > Add support to limit per-rate max txpower from DT. > > Tested-by: Evelyn Tsai <evelyn.tsai@mediatek.com> > Signed-off-by: Shayne Chen <shayne.chen@mediatek.com> > --- > .../wireless/mediatek/mt76/mt7915/eeprom.h | 2 +- > .../net/wireless/mediatek/mt76/mt7915/mcu.c | 38 +++++++++++++++++-- > 2 files changed, 35 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h > index 4e31d6ab4fa6..284de8b4e0a4 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h > @@ -120,6 +120,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 struct sku_group mt7915_sku_groups[MAX_SKU_RATE_GROUP_NUM]; > > #endif > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > index 349163d0b7f2..c5e9893cbd87 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > @@ -3171,15 +3171,45 @@ 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; > > delta = dev->rate_power[mphy->chandef.chan->band]; > mphy->txpower_cur = hw->conf.power_level * 2 + > delta[MT7915_SKU_MAX_DELTA_IDX]; I think the delta needs to be subtracted instead of added here. > - for (i = 0; i < MT7915_SKU_RATE_NUM; i++) > - req.val[i] = hw->conf.power_level * 2 + delta[i]; > + mt76_get_rate_power_limits(mphy, mphy->chandef.chan, > + &limits_array, mphy->txpower_cur); This should set mphy->txpower_cur to the return code of mt76_get_rate_power_limits. The nss delta is added in the core mt76 code before reporting to user space. - Felix
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h index 4e31d6ab4fa6..284de8b4e0a4 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h +++ b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h @@ -120,6 +120,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 struct sku_group mt7915_sku_groups[MAX_SKU_RATE_GROUP_NUM]; #endif diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c index 349163d0b7f2..c5e9893cbd87 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c @@ -3171,15 +3171,45 @@ 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; delta = dev->rate_power[mphy->chandef.chan->band]; mphy->txpower_cur = hw->conf.power_level * 2 + delta[MT7915_SKU_MAX_DELTA_IDX]; - for (i = 0; i < MT7915_SKU_RATE_NUM; i++) - req.val[i] = hw->conf.power_level * 2 + delta[i]; + mt76_get_rate_power_limits(mphy, mphy->chandef.chan, + &limits_array, mphy->txpower_cur); + + for (i = 0, idx = 0; i < ARRAY_SIZE(mt7915_sku_groups); 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,