Commit ae130bb8 authored by Shayne Chen's avatar Shayne Chen Committed by Felix Fietkau
Browse files

mt76: mt7915: use mt7915_mcu_get_txpower_sku() to get per-rate txpower 



Get per-rate txpower with mcu command. This is the preparation of
co-driver for the next chipset, which has different tmac power registers
but can share this same command.

Signed-off-by: default avatarShayne Chen <shayne.chen@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent accbcea4

drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c

+9 −40
Original line number Diff line number Diff line
@@ -295,54 +295,23 @@ mt7915_puts_rate_txpower(struct seq_file *s, struct mt7915_phy *phy) 
		"RU26", "RU52", "RU106", "RU242/SU20",

		"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 != &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];

	}

}

drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

+33 −1
Original line number Diff line number Diff line
@@ -3676,7 +3676,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;
@@ -3726,6 +3725,39 @@ 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;

	struct {

		u8 format_id;

		u8 category;

		u8 band;

		u8 _rsv;

	} __packed req = {

		.format_id = 7,

		.category = RATE_POWER_INFO,

		.band = phy != &dev->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][req.band];



	dev_kfree_skb(skb);



	return 0;

}



int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param, bool test_mode,

			      u8 en)

{

drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 


#define MT7915_THERMAL_THROTTLE_MAX	100



#define MT7915_SKU_RATE_NUM		161



struct mt7915_vif;

struct mt7915_sta;

struct mt7915_dfs_pulse;
@@ -351,6 +353,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);

drivers/net/wireless/mediatek/mt76/mt7915/regs.h

+0 −5
Original line number Diff line number Diff line
@@ -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)