mt76: add stbc entries to mt76_rate_power

Add stbc tx power eeprom parsing support for mt76x2 driver.
When writing power entries, make a distinction between rates that are
read from the same EEPROM value, but have separate register entries.

No effect on runtime behavior, but preparation for unification with mt76x0
and for placing restrictions on individual rate power limits

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index b4980959efa7d536518f10fe36e02510221116c7..dc6a5f075f3d773789b972669e0cf70285af1523 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -423,10 +423,11 @@ struct mt76_rate_power {
                struct {
                        s8 cck[4];
                        s8 ofdm[8];
+                       s8 stbc[10];
                        s8 ht[16];
                        s8 vht[10];
                };
-               s8 all[38];
+               s8 all[48];
        };
 };
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_debugfs.c b/drivers/net/wireless/mediatek/mt76/mt76x2_debugfs.c
index 2cd0d8200a573b0562f9912123394d1e1462ebca..45f3439a6563ad6310705389791d2c345e6f8301 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_debugfs.c
@@ -59,6 +59,8 @@ static int read_txpower(struct seq_file *file, void *data)
                            ARRAY_SIZE(dev->rate_power.cck));
        mt76_seq_puts_array(file, "OFDM", dev->rate_power.ofdm,
                            ARRAY_SIZE(dev->rate_power.ofdm));
+       mt76_seq_puts_array(file, "STBC", dev->rate_power.stbc,
+                           ARRAY_SIZE(dev->rate_power.stbc));
        mt76_seq_puts_array(file, "HT", dev->rate_power.ht,
                            ARRAY_SIZE(dev->rate_power.ht));
        mt76_seq_puts_array(file, "VHT", dev->rate_power.vht,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c
index 1753bcb3635612ec8f4972fcd8b466a7d5f2ba8c..6f6c64f97e2d10c21d31d2515e6353956ec304b6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c
@@ -482,6 +482,10 @@ void mt76x2_get_rate_power(struct mt76x2_dev *dev, struct mt76_rate_power *t,
        if (!is_5ghz)
                val >>= 8;
        t->vht[8] = t->vht[9] = mt76x2_rate_power_val(val >> 8);
+
+       memcpy(t->stbc, t->ht, sizeof(t->stbc[0]) * 8);
+       t->stbc[8] = t->vht[8];
+       t->stbc[9] = t->vht[9];
 }
 EXPORT_SYMBOL_GPL(mt76x2_get_rate_power);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_phy_common.c b/drivers/net/wireless/mediatek/mt76/mt76x2_phy_common.c
index a24243df0066e283aa608776cbcbc912cf8c7767..813ec01b4ec039f0276a9568b304e6cc02481aed 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_phy_common.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_phy_common.c
@@ -227,15 +227,15 @@ void mt76x2_phy_set_txpower(struct mt76x2_dev *dev)
        mt76_wr(dev, MT_TX_PWR_CFG_2,
                mt76x2_tx_power_mask(t.ht[4], t.ht[6], t.ht[8], t.ht[10]));
        mt76_wr(dev, MT_TX_PWR_CFG_3,
-               mt76x2_tx_power_mask(t.ht[12], t.ht[14], t.ht[0], t.ht[2]));
+               mt76x2_tx_power_mask(t.ht[12], t.ht[14], t.stbc[0], t.stbc[2]));
        mt76_wr(dev, MT_TX_PWR_CFG_4,
-               mt76x2_tx_power_mask(t.ht[4], t.ht[6], 0, 0));
+               mt76x2_tx_power_mask(t.stbc[4], t.stbc[6], 0, 0));
        mt76_wr(dev, MT_TX_PWR_CFG_7,
-               mt76x2_tx_power_mask(t.ofdm[6], t.vht[8], t.ht[6], t.vht[8]));
+               mt76x2_tx_power_mask(t.ofdm[7], t.vht[8], t.ht[7], t.vht[9]));
        mt76_wr(dev, MT_TX_PWR_CFG_8,
-               mt76x2_tx_power_mask(t.ht[14], 0, t.vht[8], t.vht[8]));
+               mt76x2_tx_power_mask(t.ht[14], 0, t.vht[8], t.vht[9]));
        mt76_wr(dev, MT_TX_PWR_CFG_9,
-               mt76x2_tx_power_mask(t.ht[6], 0, t.vht[8], t.vht[8]));
+               mt76x2_tx_power_mask(t.ht[7], 0, t.stbc[8], t.stbc[9]));
 }
 EXPORT_SYMBOL_GPL(mt76x2_phy_set_txpower);