* [PATCH] mt76: mt7915: use mt7915_mcu_get_txpower_sku() to get per-rate txpower
@ 2021-05-25 4:33 ` Shayne Chen
0 siblings, 0 replies; 6+ messages in thread
From: Shayne Chen @ 2021-05-25 4:33 UTC (permalink / raw)
To: Felix Fietkau
Cc: linux-wireless, Lorenzo Bianconi, Ryder Lee, linux-mediatek, Shayne Chen
Get per-rate txpower with mcu command instead of frequently access tmac
power registers from driver.
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
---
.../wireless/mediatek/mt76/mt7915/debugfs.c | 48 ++++---------------
.../net/wireless/mediatek/mt76/mt7915/mcu.c | 35 +++++++++++++-
.../wireless/mediatek/mt76/mt7915/mt7915.h | 3 ++
.../net/wireless/mediatek/mt76/mt7915/regs.h | 5 --
4 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
index 6a8ddee..42a829d 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
@@ -308,53 +308,23 @@ mt7915_puts_rate_txpower(struct seq_file *s, struct mt7915_phy *phy)
"RU484/SU40", "RU996/SU80", "RU2x996/SU160"
};
struct mt7915_dev *dev = dev_get_drvdata(s->private);
- bool ext_phy = phy != &dev->phy;
- u32 reg_base;
- int i, idx = 0;
+ s8 txpower[MT7915_SKU_RATE_NUM], *buf;
+ int i;
if (!phy)
return;
- reg_base = MT_TMAC_FP0R0(ext_phy);
- seq_printf(s, "\nBand %d\n", ext_phy);
+ seq_printf(s, "\nBand %d\n", phy != &dev->phy);
- for (i = 0; i < ARRAY_SIZE(mt7915_sku_group_len); i++) {
- u8 cnt, mcs_num = mt7915_sku_group_len[i];
- s8 txpower[12];
- int j;
+ mt7915_mcu_get_txpower_sku(phy, txpower, sizeof(txpower));
+ for (i = 0, buf = txpower; i < ARRAY_SIZE(mt7915_sku_group_len); i++) {
+ u8 mcs_num = mt7915_sku_group_len[i];
- if (i == SKU_HT_BW20 || i == SKU_HT_BW40) {
- mcs_num = 8;
- } else if (i >= SKU_VHT_BW20 && i <= SKU_VHT_BW160) {
+ 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, mcs_num);
+ mt76_seq_puts_array(s, sku_group_name[i], buf, mcs_num);
+ buf += mt7915_sku_group_len[i];
}
}
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index dcf2d4d..52671cc 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -3514,7 +3514,6 @@ int mt7915_mcu_get_tx_rate(struct mt7915_dev *dev, u32 cmd, u16 wlan_idx)
int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy)
{
-#define MT7915_SKU_RATE_NUM 161
struct mt7915_dev *dev = phy->dev;
struct mt76_phy *mphy = phy->mt76;
struct ieee80211_hw *hw = mphy->hw;
@@ -3564,6 +3563,40 @@ int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy)
sizeof(req), true);
}
+int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8 *txpower, int len)
+{
+#define RATE_POWER_INFO 2
+ struct mt7915_dev *dev = phy->dev;
+ bool ext_phy = phy != &dev->phy;
+ struct {
+ u8 format_id;
+ u8 category;
+ u8 band;
+ u8 _rsv;
+ } __packed req = {
+ .format_id = 7,
+ .category = RATE_POWER_INFO,
+ .band = ext_phy,
+ };
+ s8 res[MT7915_SKU_RATE_NUM][2];
+ struct sk_buff *skb;
+ int ret, i;
+
+ ret = mt76_mcu_send_and_get_msg(&dev->mt76,
+ MCU_EXT_CMD(TX_POWER_FEATURE_CTRL),
+ &req, sizeof(req), true, &skb);
+ if (ret)
+ return ret;
+
+ memcpy(res, skb->data + 4, sizeof(res));
+ for (i = 0; i < len; i++)
+ txpower[i] = res[i][ext_phy];
+
+ dev_kfree_skb(skb);
+
+ return 0;
+}
+
int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param, bool test_mode,
u8 en)
{
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index c4bf8ed..1f7e57d 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -38,6 +38,8 @@
#define MT7915_5G_RATE_DEFAULT 0x4b /* OFDM 6M */
#define MT7915_2G_RATE_DEFAULT 0x0 /* CCK 1M */
+#define MT7915_SKU_RATE_NUM 161
+
struct mt7915_vif;
struct mt7915_sta;
struct mt7915_dfs_pulse;
@@ -343,6 +345,7 @@ 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_txpower_sku(struct mt7915_phy *phy);
+int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8 *txpower, int len);
int mt7915_mcu_set_txbf_type(struct mt7915_dev *dev);
int mt7915_mcu_set_txbf_module(struct mt7915_dev *dev);
int mt7915_mcu_set_txbf_sounding(struct mt7915_dev *dev);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
index 48e4b22..ee525e7 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
@@ -82,11 +82,6 @@
#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)
-
#define MT_TMAC_TFCR0(_band) MT_WF_TMAC(_band, 0x1e0)
#define MT_WF_DMA_BASE(_band) ((_band) ? 0xa1e00 : 0x21e00)
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] mt76: mt7915: use mt7915_mcu_get_txpower_sku() to get per-rate txpower
@ 2021-05-25 4:33 ` Shayne Chen
0 siblings, 0 replies; 6+ messages in thread
From: Shayne Chen @ 2021-05-25 4:33 UTC (permalink / raw)
To: Felix Fietkau
Cc: linux-wireless, Lorenzo Bianconi, Ryder Lee, linux-mediatek, Shayne Chen
Get per-rate txpower with mcu command instead of frequently access tmac
power registers from driver.
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
---
.../wireless/mediatek/mt76/mt7915/debugfs.c | 48 ++++---------------
.../net/wireless/mediatek/mt76/mt7915/mcu.c | 35 +++++++++++++-
.../wireless/mediatek/mt76/mt7915/mt7915.h | 3 ++
.../net/wireless/mediatek/mt76/mt7915/regs.h | 5 --
4 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
index 6a8ddee..42a829d 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
@@ -308,53 +308,23 @@ mt7915_puts_rate_txpower(struct seq_file *s, struct mt7915_phy *phy)
"RU484/SU40", "RU996/SU80", "RU2x996/SU160"
};
struct mt7915_dev *dev = dev_get_drvdata(s->private);
- bool ext_phy = phy != &dev->phy;
- u32 reg_base;
- int i, idx = 0;
+ s8 txpower[MT7915_SKU_RATE_NUM], *buf;
+ int i;
if (!phy)
return;
- reg_base = MT_TMAC_FP0R0(ext_phy);
- seq_printf(s, "\nBand %d\n", ext_phy);
+ seq_printf(s, "\nBand %d\n", phy != &dev->phy);
- for (i = 0; i < ARRAY_SIZE(mt7915_sku_group_len); i++) {
- u8 cnt, mcs_num = mt7915_sku_group_len[i];
- s8 txpower[12];
- int j;
+ mt7915_mcu_get_txpower_sku(phy, txpower, sizeof(txpower));
+ for (i = 0, buf = txpower; i < ARRAY_SIZE(mt7915_sku_group_len); i++) {
+ u8 mcs_num = mt7915_sku_group_len[i];
- if (i == SKU_HT_BW20 || i == SKU_HT_BW40) {
- mcs_num = 8;
- } else if (i >= SKU_VHT_BW20 && i <= SKU_VHT_BW160) {
+ 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, mcs_num);
+ mt76_seq_puts_array(s, sku_group_name[i], buf, mcs_num);
+ buf += mt7915_sku_group_len[i];
}
}
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index dcf2d4d..52671cc 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -3514,7 +3514,6 @@ int mt7915_mcu_get_tx_rate(struct mt7915_dev *dev, u32 cmd, u16 wlan_idx)
int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy)
{
-#define MT7915_SKU_RATE_NUM 161
struct mt7915_dev *dev = phy->dev;
struct mt76_phy *mphy = phy->mt76;
struct ieee80211_hw *hw = mphy->hw;
@@ -3564,6 +3563,40 @@ int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy)
sizeof(req), true);
}
+int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8 *txpower, int len)
+{
+#define RATE_POWER_INFO 2
+ struct mt7915_dev *dev = phy->dev;
+ bool ext_phy = phy != &dev->phy;
+ struct {
+ u8 format_id;
+ u8 category;
+ u8 band;
+ u8 _rsv;
+ } __packed req = {
+ .format_id = 7,
+ .category = RATE_POWER_INFO,
+ .band = ext_phy,
+ };
+ s8 res[MT7915_SKU_RATE_NUM][2];
+ struct sk_buff *skb;
+ int ret, i;
+
+ ret = mt76_mcu_send_and_get_msg(&dev->mt76,
+ MCU_EXT_CMD(TX_POWER_FEATURE_CTRL),
+ &req, sizeof(req), true, &skb);
+ if (ret)
+ return ret;
+
+ memcpy(res, skb->data + 4, sizeof(res));
+ for (i = 0; i < len; i++)
+ txpower[i] = res[i][ext_phy];
+
+ dev_kfree_skb(skb);
+
+ return 0;
+}
+
int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param, bool test_mode,
u8 en)
{
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index c4bf8ed..1f7e57d 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -38,6 +38,8 @@
#define MT7915_5G_RATE_DEFAULT 0x4b /* OFDM 6M */
#define MT7915_2G_RATE_DEFAULT 0x0 /* CCK 1M */
+#define MT7915_SKU_RATE_NUM 161
+
struct mt7915_vif;
struct mt7915_sta;
struct mt7915_dfs_pulse;
@@ -343,6 +345,7 @@ 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_txpower_sku(struct mt7915_phy *phy);
+int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8 *txpower, int len);
int mt7915_mcu_set_txbf_type(struct mt7915_dev *dev);
int mt7915_mcu_set_txbf_module(struct mt7915_dev *dev);
int mt7915_mcu_set_txbf_sounding(struct mt7915_dev *dev);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
index 48e4b22..ee525e7 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
@@ -82,11 +82,6 @@
#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)
-
#define MT_TMAC_TFCR0(_band) MT_WF_TMAC(_band, 0x1e0)
#define MT_WF_DMA_BASE(_band) ((_band) ? 0xa1e00 : 0x21e00)
--
2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] mt76: mt7915: use mt7915_mcu_get_txpower_sku() to get per-rate txpower
2021-05-25 4:33 ` Shayne Chen
@ 2021-05-25 7:22 ` Lorenzo Bianconi
-1 siblings, 0 replies; 6+ messages in thread
From: Lorenzo Bianconi @ 2021-05-25 7:22 UTC (permalink / raw)
To: Shayne Chen
Cc: Felix Fietkau, linux-wireless, Lorenzo Bianconi, Ryder Lee,
linux-mediatek
[-- Attachment #1: Type: text/plain, Size: 6225 bytes --]
> Get per-rate txpower with mcu command instead of frequently access tmac
> power registers from driver.
Hi Shayne,
just out of curiosity, what is the advantage of doing so?
Regards,
Lorenzo
>
> Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
> ---
> .../wireless/mediatek/mt76/mt7915/debugfs.c | 48 ++++---------------
> .../net/wireless/mediatek/mt76/mt7915/mcu.c | 35 +++++++++++++-
> .../wireless/mediatek/mt76/mt7915/mt7915.h | 3 ++
> .../net/wireless/mediatek/mt76/mt7915/regs.h | 5 --
> 4 files changed, 46 insertions(+), 45 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> index 6a8ddee..42a829d 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> @@ -308,53 +308,23 @@ mt7915_puts_rate_txpower(struct seq_file *s, struct mt7915_phy *phy)
> "RU484/SU40", "RU996/SU80", "RU2x996/SU160"
> };
> struct mt7915_dev *dev = dev_get_drvdata(s->private);
> - bool ext_phy = phy != &dev->phy;
> - u32 reg_base;
> - int i, idx = 0;
> + s8 txpower[MT7915_SKU_RATE_NUM], *buf;
> + int i;
>
> if (!phy)
> return;
>
> - reg_base = MT_TMAC_FP0R0(ext_phy);
> - seq_printf(s, "\nBand %d\n", ext_phy);
> + seq_printf(s, "\nBand %d\n", phy != &dev->phy);
>
> - for (i = 0; i < ARRAY_SIZE(mt7915_sku_group_len); i++) {
> - u8 cnt, mcs_num = mt7915_sku_group_len[i];
> - s8 txpower[12];
> - int j;
> + mt7915_mcu_get_txpower_sku(phy, txpower, sizeof(txpower));
> + for (i = 0, buf = txpower; i < ARRAY_SIZE(mt7915_sku_group_len); i++) {
> + u8 mcs_num = mt7915_sku_group_len[i];
>
> - if (i == SKU_HT_BW20 || i == SKU_HT_BW40) {
> - mcs_num = 8;
> - } else if (i >= SKU_VHT_BW20 && i <= SKU_VHT_BW160) {
> + 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, mcs_num);
> + mt76_seq_puts_array(s, sku_group_name[i], buf, mcs_num);
> + buf += mt7915_sku_group_len[i];
> }
> }
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> index dcf2d4d..52671cc 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> @@ -3514,7 +3514,6 @@ int mt7915_mcu_get_tx_rate(struct mt7915_dev *dev, u32 cmd, u16 wlan_idx)
>
> int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy)
> {
> -#define MT7915_SKU_RATE_NUM 161
> struct mt7915_dev *dev = phy->dev;
> struct mt76_phy *mphy = phy->mt76;
> struct ieee80211_hw *hw = mphy->hw;
> @@ -3564,6 +3563,40 @@ int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy)
> sizeof(req), true);
> }
>
> +int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8 *txpower, int len)
> +{
> +#define RATE_POWER_INFO 2
> + struct mt7915_dev *dev = phy->dev;
> + bool ext_phy = phy != &dev->phy;
> + struct {
> + u8 format_id;
> + u8 category;
> + u8 band;
> + u8 _rsv;
> + } __packed req = {
> + .format_id = 7,
> + .category = RATE_POWER_INFO,
> + .band = ext_phy,
> + };
> + s8 res[MT7915_SKU_RATE_NUM][2];
> + struct sk_buff *skb;
> + int ret, i;
> +
> + ret = mt76_mcu_send_and_get_msg(&dev->mt76,
> + MCU_EXT_CMD(TX_POWER_FEATURE_CTRL),
> + &req, sizeof(req), true, &skb);
> + if (ret)
> + return ret;
> +
> + memcpy(res, skb->data + 4, sizeof(res));
> + for (i = 0; i < len; i++)
> + txpower[i] = res[i][ext_phy];
> +
> + dev_kfree_skb(skb);
> +
> + return 0;
> +}
> +
> int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param, bool test_mode,
> u8 en)
> {
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> index c4bf8ed..1f7e57d 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> @@ -38,6 +38,8 @@
> #define MT7915_5G_RATE_DEFAULT 0x4b /* OFDM 6M */
> #define MT7915_2G_RATE_DEFAULT 0x0 /* CCK 1M */
>
> +#define MT7915_SKU_RATE_NUM 161
> +
> struct mt7915_vif;
> struct mt7915_sta;
> struct mt7915_dfs_pulse;
> @@ -343,6 +345,7 @@ 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_txpower_sku(struct mt7915_phy *phy);
> +int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8 *txpower, int len);
> int mt7915_mcu_set_txbf_type(struct mt7915_dev *dev);
> int mt7915_mcu_set_txbf_module(struct mt7915_dev *dev);
> int mt7915_mcu_set_txbf_sounding(struct mt7915_dev *dev);
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
> index 48e4b22..ee525e7 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
> @@ -82,11 +82,6 @@
> #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)
> -
> #define MT_TMAC_TFCR0(_band) MT_WF_TMAC(_band, 0x1e0)
>
> #define MT_WF_DMA_BASE(_band) ((_band) ? 0xa1e00 : 0x21e00)
> --
> 2.18.0
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mt76: mt7915: use mt7915_mcu_get_txpower_sku() to get per-rate txpower
@ 2021-05-25 7:22 ` Lorenzo Bianconi
0 siblings, 0 replies; 6+ messages in thread
From: Lorenzo Bianconi @ 2021-05-25 7:22 UTC (permalink / raw)
To: Shayne Chen
Cc: Felix Fietkau, linux-wireless, Lorenzo Bianconi, Ryder Lee,
linux-mediatek
[-- Attachment #1.1: Type: text/plain, Size: 6225 bytes --]
> Get per-rate txpower with mcu command instead of frequently access tmac
> power registers from driver.
Hi Shayne,
just out of curiosity, what is the advantage of doing so?
Regards,
Lorenzo
>
> Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
> ---
> .../wireless/mediatek/mt76/mt7915/debugfs.c | 48 ++++---------------
> .../net/wireless/mediatek/mt76/mt7915/mcu.c | 35 +++++++++++++-
> .../wireless/mediatek/mt76/mt7915/mt7915.h | 3 ++
> .../net/wireless/mediatek/mt76/mt7915/regs.h | 5 --
> 4 files changed, 46 insertions(+), 45 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> index 6a8ddee..42a829d 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> @@ -308,53 +308,23 @@ mt7915_puts_rate_txpower(struct seq_file *s, struct mt7915_phy *phy)
> "RU484/SU40", "RU996/SU80", "RU2x996/SU160"
> };
> struct mt7915_dev *dev = dev_get_drvdata(s->private);
> - bool ext_phy = phy != &dev->phy;
> - u32 reg_base;
> - int i, idx = 0;
> + s8 txpower[MT7915_SKU_RATE_NUM], *buf;
> + int i;
>
> if (!phy)
> return;
>
> - reg_base = MT_TMAC_FP0R0(ext_phy);
> - seq_printf(s, "\nBand %d\n", ext_phy);
> + seq_printf(s, "\nBand %d\n", phy != &dev->phy);
>
> - for (i = 0; i < ARRAY_SIZE(mt7915_sku_group_len); i++) {
> - u8 cnt, mcs_num = mt7915_sku_group_len[i];
> - s8 txpower[12];
> - int j;
> + mt7915_mcu_get_txpower_sku(phy, txpower, sizeof(txpower));
> + for (i = 0, buf = txpower; i < ARRAY_SIZE(mt7915_sku_group_len); i++) {
> + u8 mcs_num = mt7915_sku_group_len[i];
>
> - if (i == SKU_HT_BW20 || i == SKU_HT_BW40) {
> - mcs_num = 8;
> - } else if (i >= SKU_VHT_BW20 && i <= SKU_VHT_BW160) {
> + 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, mcs_num);
> + mt76_seq_puts_array(s, sku_group_name[i], buf, mcs_num);
> + buf += mt7915_sku_group_len[i];
> }
> }
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> index dcf2d4d..52671cc 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> @@ -3514,7 +3514,6 @@ int mt7915_mcu_get_tx_rate(struct mt7915_dev *dev, u32 cmd, u16 wlan_idx)
>
> int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy)
> {
> -#define MT7915_SKU_RATE_NUM 161
> struct mt7915_dev *dev = phy->dev;
> struct mt76_phy *mphy = phy->mt76;
> struct ieee80211_hw *hw = mphy->hw;
> @@ -3564,6 +3563,40 @@ int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy)
> sizeof(req), true);
> }
>
> +int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8 *txpower, int len)
> +{
> +#define RATE_POWER_INFO 2
> + struct mt7915_dev *dev = phy->dev;
> + bool ext_phy = phy != &dev->phy;
> + struct {
> + u8 format_id;
> + u8 category;
> + u8 band;
> + u8 _rsv;
> + } __packed req = {
> + .format_id = 7,
> + .category = RATE_POWER_INFO,
> + .band = ext_phy,
> + };
> + s8 res[MT7915_SKU_RATE_NUM][2];
> + struct sk_buff *skb;
> + int ret, i;
> +
> + ret = mt76_mcu_send_and_get_msg(&dev->mt76,
> + MCU_EXT_CMD(TX_POWER_FEATURE_CTRL),
> + &req, sizeof(req), true, &skb);
> + if (ret)
> + return ret;
> +
> + memcpy(res, skb->data + 4, sizeof(res));
> + for (i = 0; i < len; i++)
> + txpower[i] = res[i][ext_phy];
> +
> + dev_kfree_skb(skb);
> +
> + return 0;
> +}
> +
> int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param, bool test_mode,
> u8 en)
> {
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> index c4bf8ed..1f7e57d 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> @@ -38,6 +38,8 @@
> #define MT7915_5G_RATE_DEFAULT 0x4b /* OFDM 6M */
> #define MT7915_2G_RATE_DEFAULT 0x0 /* CCK 1M */
>
> +#define MT7915_SKU_RATE_NUM 161
> +
> struct mt7915_vif;
> struct mt7915_sta;
> struct mt7915_dfs_pulse;
> @@ -343,6 +345,7 @@ 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_txpower_sku(struct mt7915_phy *phy);
> +int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8 *txpower, int len);
> int mt7915_mcu_set_txbf_type(struct mt7915_dev *dev);
> int mt7915_mcu_set_txbf_module(struct mt7915_dev *dev);
> int mt7915_mcu_set_txbf_sounding(struct mt7915_dev *dev);
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
> index 48e4b22..ee525e7 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
> @@ -82,11 +82,6 @@
> #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)
> -
> #define MT_TMAC_TFCR0(_band) MT_WF_TMAC(_band, 0x1e0)
>
> #define MT_WF_DMA_BASE(_band) ((_band) ? 0xa1e00 : 0x21e00)
> --
> 2.18.0
>
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
[-- Attachment #2: Type: text/plain, Size: 170 bytes --]
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mt76: mt7915: use mt7915_mcu_get_txpower_sku() to get per-rate txpower
2021-05-25 7:22 ` Lorenzo Bianconi
@ 2021-05-25 9:47 ` Shayne Chen
-1 siblings, 0 replies; 6+ messages in thread
From: Shayne Chen @ 2021-05-25 9:47 UTC (permalink / raw)
To: Lorenzo Bianconi
Cc: Felix Fietkau, linux-wireless, Lorenzo Bianconi, Ryder Lee,
linux-mediatek
On Tue, 2021-05-25 at 09:22 +0200, Lorenzo Bianconi wrote:
> > Get per-rate txpower with mcu command instead of frequently access
> > tmac
> > power registers from driver.
>
> Hi Shayne,
>
> just out of curiosity, what is the advantage of doing so?
>
> Regards,
> Lorenzo
Hi Lore,
I think I misunderstood something, frequently reading of these
registers by driver shouldn't matter. So please ignore the commit
message above.
The other reason I forget to mention is to prepare co-driver for the
next chipset. It has different offset of tmac power registers, but can
share this same command.
I'll revise these in v2.
Thanks,
Shayne
> >
> > Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
> > ---
> > .../wireless/mediatek/mt76/mt7915/debugfs.c | 48 ++++-----------
> > ----
> > .../net/wireless/mediatek/mt76/mt7915/mcu.c | 35 +++++++++++++-
> > .../wireless/mediatek/mt76/mt7915/mt7915.h | 3 ++
> > .../net/wireless/mediatek/mt76/mt7915/regs.h | 5 --
> > 4 files changed, 46 insertions(+), 45 deletions(-)
> >
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> > b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> > index 6a8ddee..42a829d 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> > @@ -308,53 +308,23 @@ mt7915_puts_rate_txpower(struct seq_file *s,
> > struct mt7915_phy *phy)
> > "RU484/SU40", "RU996/SU80", "RU2x996/SU160"
> > };
> > struct mt7915_dev *dev = dev_get_drvdata(s->private);
> > - bool ext_phy = phy != &dev->phy;
> > - u32 reg_base;
> > - int i, idx = 0;
> > + s8 txpower[MT7915_SKU_RATE_NUM], *buf;
> > + int i;
> >
> > if (!phy)
> > return;
> >
> > - reg_base = MT_TMAC_FP0R0(ext_phy);
> > - seq_printf(s, "\nBand %d\n", ext_phy);
> > + seq_printf(s, "\nBand %d\n", phy != &dev->phy);
> >
> > - for (i = 0; i < ARRAY_SIZE(mt7915_sku_group_len); i++) {
> > - u8 cnt, mcs_num = mt7915_sku_group_len[i];
> > - s8 txpower[12];
> > - int j;
> > + mt7915_mcu_get_txpower_sku(phy, txpower, sizeof(txpower));
> > + for (i = 0, buf = txpower; i <
> > ARRAY_SIZE(mt7915_sku_group_len); i++) {
> > + u8 mcs_num = mt7915_sku_group_len[i];
> >
> > - if (i == SKU_HT_BW20 || i == SKU_HT_BW40) {
> > - mcs_num = 8;
> > - } else if (i >= SKU_VHT_BW20 && i <= SKU_VHT_BW160) {
> > + 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,
> > mcs_num);
> > + mt76_seq_puts_array(s, sku_group_name[i], buf,
> > mcs_num);
> > + buf += mt7915_sku_group_len[i];
> > }
> > }
> >
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> > b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> > index dcf2d4d..52671cc 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> > @@ -3514,7 +3514,6 @@ int mt7915_mcu_get_tx_rate(struct mt7915_dev
> > *dev, u32 cmd, u16 wlan_idx)
> >
> > int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy)
> > {
> > -#define MT7915_SKU_RATE_NUM 161
> > struct mt7915_dev *dev = phy->dev;
> > struct mt76_phy *mphy = phy->mt76;
> > struct ieee80211_hw *hw = mphy->hw;
> > @@ -3564,6 +3563,40 @@ int mt7915_mcu_set_txpower_sku(struct
> > mt7915_phy *phy)
> > sizeof(req), true);
> > }
> >
> > +int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8
> > *txpower, int len)
> > +{
> > +#define RATE_POWER_INFO 2
> > + struct mt7915_dev *dev = phy->dev;
> > + bool ext_phy = phy != &dev->phy;
> > + struct {
> > + u8 format_id;
> > + u8 category;
> > + u8 band;
> > + u8 _rsv;
> > + } __packed req = {
> > + .format_id = 7,
> > + .category = RATE_POWER_INFO,
> > + .band = ext_phy,
> > + };
> > + s8 res[MT7915_SKU_RATE_NUM][2];
> > + struct sk_buff *skb;
> > + int ret, i;
> > +
> > + ret = mt76_mcu_send_and_get_msg(&dev->mt76,
> > + MCU_EXT_CMD(TX_POWER_FEATURE_CT
> > RL),
> > + &req, sizeof(req), true, &skb);
> > + if (ret)
> > + return ret;
> > +
> > + memcpy(res, skb->data + 4, sizeof(res));
> > + for (i = 0; i < len; i++)
> > + txpower[i] = res[i][ext_phy];
> > +
> > + dev_kfree_skb(skb);
> > +
> > + return 0;
> > +}
> > +
> > int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param,
> > bool test_mode,
> > u8 en)
> > {
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> > b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> > index c4bf8ed..1f7e57d 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> > @@ -38,6 +38,8 @@
> > #define MT7915_5G_RATE_DEFAULT 0x4b /* OFDM 6M
> > */
> > #define MT7915_2G_RATE_DEFAULT 0x0 /* CCK 1M */
> >
> > +#define MT7915_SKU_RATE_NUM 161
> > +
> > struct mt7915_vif;
> > struct mt7915_sta;
> > struct mt7915_dfs_pulse;
> > @@ -343,6 +345,7 @@ 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_txpower_sku(struct mt7915_phy *phy);
> > +int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8
> > *txpower, int len);
> > int mt7915_mcu_set_txbf_type(struct mt7915_dev *dev);
> > int mt7915_mcu_set_txbf_module(struct mt7915_dev *dev);
> > int mt7915_mcu_set_txbf_sounding(struct mt7915_dev *dev);
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
> > b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
> > index 48e4b22..ee525e7 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
> > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
> > @@ -82,11 +82,6 @@
> > #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)
> > -
> > #define MT_TMAC_TFCR0(_band) MT_WF_TMAC(_band,
> > 0x1e0)
> >
> > #define MT_WF_DMA_BASE(_band) ((_band) ? 0xa1e00 :
> > 0x21e00)
> > --
> > 2.18.0
> >
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mt76: mt7915: use mt7915_mcu_get_txpower_sku() to get per-rate txpower
@ 2021-05-25 9:47 ` Shayne Chen
0 siblings, 0 replies; 6+ messages in thread
From: Shayne Chen @ 2021-05-25 9:47 UTC (permalink / raw)
To: Lorenzo Bianconi
Cc: Felix Fietkau, linux-wireless, Lorenzo Bianconi, Ryder Lee,
linux-mediatek
On Tue, 2021-05-25 at 09:22 +0200, Lorenzo Bianconi wrote:
> > Get per-rate txpower with mcu command instead of frequently access
> > tmac
> > power registers from driver.
>
> Hi Shayne,
>
> just out of curiosity, what is the advantage of doing so?
>
> Regards,
> Lorenzo
Hi Lore,
I think I misunderstood something, frequently reading of these
registers by driver shouldn't matter. So please ignore the commit
message above.
The other reason I forget to mention is to prepare co-driver for the
next chipset. It has different offset of tmac power registers, but can
share this same command.
I'll revise these in v2.
Thanks,
Shayne
> >
> > Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
> > ---
> > .../wireless/mediatek/mt76/mt7915/debugfs.c | 48 ++++-----------
> > ----
> > .../net/wireless/mediatek/mt76/mt7915/mcu.c | 35 +++++++++++++-
> > .../wireless/mediatek/mt76/mt7915/mt7915.h | 3 ++
> > .../net/wireless/mediatek/mt76/mt7915/regs.h | 5 --
> > 4 files changed, 46 insertions(+), 45 deletions(-)
> >
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> > b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> > index 6a8ddee..42a829d 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c
> > @@ -308,53 +308,23 @@ mt7915_puts_rate_txpower(struct seq_file *s,
> > struct mt7915_phy *phy)
> > "RU484/SU40", "RU996/SU80", "RU2x996/SU160"
> > };
> > struct mt7915_dev *dev = dev_get_drvdata(s->private);
> > - bool ext_phy = phy != &dev->phy;
> > - u32 reg_base;
> > - int i, idx = 0;
> > + s8 txpower[MT7915_SKU_RATE_NUM], *buf;
> > + int i;
> >
> > if (!phy)
> > return;
> >
> > - reg_base = MT_TMAC_FP0R0(ext_phy);
> > - seq_printf(s, "\nBand %d\n", ext_phy);
> > + seq_printf(s, "\nBand %d\n", phy != &dev->phy);
> >
> > - for (i = 0; i < ARRAY_SIZE(mt7915_sku_group_len); i++) {
> > - u8 cnt, mcs_num = mt7915_sku_group_len[i];
> > - s8 txpower[12];
> > - int j;
> > + mt7915_mcu_get_txpower_sku(phy, txpower, sizeof(txpower));
> > + for (i = 0, buf = txpower; i <
> > ARRAY_SIZE(mt7915_sku_group_len); i++) {
> > + u8 mcs_num = mt7915_sku_group_len[i];
> >
> > - if (i == SKU_HT_BW20 || i == SKU_HT_BW40) {
> > - mcs_num = 8;
> > - } else if (i >= SKU_VHT_BW20 && i <= SKU_VHT_BW160) {
> > + 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,
> > mcs_num);
> > + mt76_seq_puts_array(s, sku_group_name[i], buf,
> > mcs_num);
> > + buf += mt7915_sku_group_len[i];
> > }
> > }
> >
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> > b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> > index dcf2d4d..52671cc 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> > @@ -3514,7 +3514,6 @@ int mt7915_mcu_get_tx_rate(struct mt7915_dev
> > *dev, u32 cmd, u16 wlan_idx)
> >
> > int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy)
> > {
> > -#define MT7915_SKU_RATE_NUM 161
> > struct mt7915_dev *dev = phy->dev;
> > struct mt76_phy *mphy = phy->mt76;
> > struct ieee80211_hw *hw = mphy->hw;
> > @@ -3564,6 +3563,40 @@ int mt7915_mcu_set_txpower_sku(struct
> > mt7915_phy *phy)
> > sizeof(req), true);
> > }
> >
> > +int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8
> > *txpower, int len)
> > +{
> > +#define RATE_POWER_INFO 2
> > + struct mt7915_dev *dev = phy->dev;
> > + bool ext_phy = phy != &dev->phy;
> > + struct {
> > + u8 format_id;
> > + u8 category;
> > + u8 band;
> > + u8 _rsv;
> > + } __packed req = {
> > + .format_id = 7,
> > + .category = RATE_POWER_INFO,
> > + .band = ext_phy,
> > + };
> > + s8 res[MT7915_SKU_RATE_NUM][2];
> > + struct sk_buff *skb;
> > + int ret, i;
> > +
> > + ret = mt76_mcu_send_and_get_msg(&dev->mt76,
> > + MCU_EXT_CMD(TX_POWER_FEATURE_CT
> > RL),
> > + &req, sizeof(req), true, &skb);
> > + if (ret)
> > + return ret;
> > +
> > + memcpy(res, skb->data + 4, sizeof(res));
> > + for (i = 0; i < len; i++)
> > + txpower[i] = res[i][ext_phy];
> > +
> > + dev_kfree_skb(skb);
> > +
> > + return 0;
> > +}
> > +
> > int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param,
> > bool test_mode,
> > u8 en)
> > {
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> > b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> > index c4bf8ed..1f7e57d 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> > @@ -38,6 +38,8 @@
> > #define MT7915_5G_RATE_DEFAULT 0x4b /* OFDM 6M
> > */
> > #define MT7915_2G_RATE_DEFAULT 0x0 /* CCK 1M */
> >
> > +#define MT7915_SKU_RATE_NUM 161
> > +
> > struct mt7915_vif;
> > struct mt7915_sta;
> > struct mt7915_dfs_pulse;
> > @@ -343,6 +345,7 @@ 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_txpower_sku(struct mt7915_phy *phy);
> > +int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8
> > *txpower, int len);
> > int mt7915_mcu_set_txbf_type(struct mt7915_dev *dev);
> > int mt7915_mcu_set_txbf_module(struct mt7915_dev *dev);
> > int mt7915_mcu_set_txbf_sounding(struct mt7915_dev *dev);
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
> > b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
> > index 48e4b22..ee525e7 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
> > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h
> > @@ -82,11 +82,6 @@
> > #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)
> > -
> > #define MT_TMAC_TFCR0(_band) MT_WF_TMAC(_band,
> > 0x1e0)
> >
> > #define MT_WF_DMA_BASE(_band) ((_band) ? 0xa1e00 :
> > 0x21e00)
> > --
> > 2.18.0
> >
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-25 9:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-25 4:33 [PATCH] mt76: mt7915: use mt7915_mcu_get_txpower_sku() to get per-rate txpower Shayne Chen
2021-05-25 4:33 ` Shayne Chen
2021-05-25 7:22 ` Lorenzo Bianconi
2021-05-25 7:22 ` Lorenzo Bianconi
2021-05-25 9:47 ` Shayne Chen
2021-05-25 9:47 ` Shayne Chen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.