mt76: mt7915: add txpower init for 6GHz

Add support to init txpower values of 6GHz band.

Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: MeiChia Chiu <MeiChia.Chiu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c
index 317c3bc..5b133bc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c
@@ -282,8 +282,8 @@ int mt7915_eeprom_get_target_power(struct mt7915_dev *dev,
                        if (!tssi_on)
                                target_power += eeprom[index + 1];
                }
-       } else {
-               int group = mt7915_get_channel_group(chan->hw_value, is_7976);
+       } else if (chan->band == NL80211_BAND_5GHZ) {
+               int group = mt7915_get_channel_group_5g(chan->hw_value, is_7976);
 
                if (is_7976) {
                        index = MT_EE_TX0_POWER_5G_V2 + chain_idx * 5;
@@ -295,6 +295,11 @@ int mt7915_eeprom_get_target_power(struct mt7915_dev *dev,
                        if (!tssi_on)
                                target_power += eeprom[index + 8];
                }
+       } else {
+               int group = mt7915_get_channel_group_6g(chan->hw_value);
+
+               index = MT_EE_TX0_POWER_6G_V2 + chain_idx * 8;
+               target_power = is_7976 ? eeprom[index + group] : 0;
        }
 
        return target_power;
@@ -309,12 +314,14 @@ s8 mt7915_eeprom_get_power_delta(struct mt7915_dev *dev, int band)
 
        if (band == NL80211_BAND_2GHZ)
                offs = is_7976 ? MT_EE_RATE_DELTA_2G_V2 : MT_EE_RATE_DELTA_2G;
-       else
+       else if (band == NL80211_BAND_5GHZ)
                offs = is_7976 ? MT_EE_RATE_DELTA_5G_V2 : MT_EE_RATE_DELTA_5G;
+       else
+               offs = is_7976 ? MT_EE_RATE_DELTA_6G_V2 : 0;
 
        val = eeprom[offs];
 
-       if (!(val & MT_EE_RATE_DELTA_EN))
+       if (!offs || !(val & MT_EE_RATE_DELTA_EN))
                return 0;
 
        delta = FIELD_GET(MT_EE_RATE_DELTA_MASK, val);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h
index 4576091..7578ac6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h
@@ -25,8 +25,10 @@ enum mt7915_eeprom_field {
        MT_EE_TX0_POWER_5G =    0x34b,
        MT_EE_RATE_DELTA_2G_V2 = 0x7d3,
        MT_EE_RATE_DELTA_5G_V2 = 0x81e,
+       MT_EE_RATE_DELTA_6G_V2 = 0x884, /* 6g fields only appear in eeprom v2 */
        MT_EE_TX0_POWER_2G_V2 = 0x441,
        MT_EE_TX0_POWER_5G_V2 = 0x445,
+       MT_EE_TX0_POWER_6G_V2 = 0x465,
        MT_EE_ADIE_FT_VERSION = 0x9a0,
 
        __MT_EE_MAX =           0xe00,
@@ -103,7 +105,7 @@ enum mt7915_sku_rate_group {
 };
 
 static inline int
-mt7915_get_channel_group(int channel, bool is_7976)
+mt7915_get_channel_group_5g(int channel, bool is_7976)
 {
        if (is_7976) {
                if (channel <= 64)
@@ -134,6 +136,15 @@ mt7915_get_channel_group(int channel, bool is_7976)
        return 7;
 }
 
+static inline int
+mt7915_get_channel_group_6g(int channel)
+{
+       if (channel <= 29)
+               return 0;
+
+       return DIV_ROUND_UP(channel - 29, 32);
+}
+
 static inline bool
 mt7915_tssi_enabled(struct mt7915_dev *dev, enum nl80211_band band)
 {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index 9a69668..668244e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -312,6 +312,7 @@ mt7915_regd_notifier(struct wiphy *wiphy,
 
        mt7915_init_txpower(dev, &mphy->sband_2g.sband);
        mt7915_init_txpower(dev, &mphy->sband_5g.sband);
+       mt7915_init_txpower(dev, &mphy->sband_6g.sband);
 
        mphy->dfs_state = MT_DFS_STATE_UNKNOWN;
        mt7915_dfs_init_radar_detector(phy);
@@ -558,6 +559,7 @@ static void mt7915_init_work(struct work_struct *work)
        mt7915_mac_init(dev);
        mt7915_init_txpower(dev, &dev->mphy.sband_2g.sband);
        mt7915_init_txpower(dev, &dev->mphy.sband_5g.sband);
+       mt7915_init_txpower(dev, &dev->mphy.sband_6g.sband);
        mt7915_txbf_init(dev);
 }