Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 25 May 2021 09:22:06 +0200
From:   Lorenzo Bianconi <lorenzo@kernel.org>
To:     Shayne Chen <shayne.chen@mediatek.com>
Cc:     Felix Fietkau <nbd@nbd.name>,
        linux-wireless <linux-wireless@vger.kernel.org>,
        Lorenzo Bianconi <lorenzo.bianconi@redhat.com>,
        Ryder Lee <ryder.lee@mediatek.com>,
        linux-mediatek <linux-mediatek@lists.infradead.org>
Subject: Re: [PATCH] mt76: mt7915: use mt7915_mcu_get_txpower_sku() to get
 per-rate txpower
Message-ID: <YKylnox6YrOLgo7M@lore-desk>
References: <20210525043312.12623-1-shayne.chen@mediatek.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="VkN8laLagn6cSNMO"
Content-Disposition: inline
In-Reply-To: <20210525043312.12623-1-shayne.chen@mediatek.com>
Precedence: bulk


--VkN8laLagn6cSNMO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

> 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
>=20
> 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(-)
>=20
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c b/driver=
s/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 =3D dev_get_drvdata(s->private);
> -	bool ext_phy =3D phy !=3D &dev->phy;
> -	u32 reg_base;
> -	int i, idx =3D 0;
> +	s8 txpower[MT7915_SKU_RATE_NUM], *buf;
> +	int i;
> =20
>  	if (!phy)
>  		return;
> =20
> -	reg_base =3D MT_TMAC_FP0R0(ext_phy);
> -	seq_printf(s, "\nBand %d\n", ext_phy);
> +	seq_printf(s, "\nBand %d\n", phy !=3D &dev->phy);
> =20
> -	for (i =3D 0; i < ARRAY_SIZE(mt7915_sku_group_len); i++) {
> -		u8 cnt, mcs_num =3D mt7915_sku_group_len[i];
> -		s8 txpower[12];
> -		int j;
> +	mt7915_mcu_get_txpower_sku(phy, txpower, sizeof(txpower));
> +	for (i =3D 0, buf =3D txpower; i < ARRAY_SIZE(mt7915_sku_group_len); i+=
+) {
> +		u8 mcs_num =3D mt7915_sku_group_len[i];
> =20
> -		if (i =3D=3D SKU_HT_BW20 || i =3D=3D SKU_HT_BW40) {
> -			mcs_num =3D 8;
> -		} else if (i >=3D SKU_VHT_BW20 && i <=3D SKU_VHT_BW160) {
> +		if (i >=3D SKU_VHT_BW20 && i <=3D SKU_VHT_BW160)
>  			mcs_num =3D 10;
> -		} else if (i =3D=3D SKU_HE_RU26) {
> -			reg_base =3D MT_TMAC_FP0R18(ext_phy);
> -			idx =3D 0;
> -		}
> -
> -		for (j =3D 0, cnt =3D 0; j < DIV_ROUND_UP(mcs_num, 4); j++) {
> -			u32 val;
> -
> -			if (i =3D=3D SKU_VHT_BW160 && idx =3D=3D 60) {
> -				reg_base =3D MT_TMAC_FP0R15(ext_phy);
> -				idx =3D 0;
> -			}
> -
> -			val =3D mt76_rr(dev, reg_base + (idx / 4) * 4);
> -
> -			if (idx && idx % 4)
> -				val >>=3D (idx % 4) * 8;
> -
> -			while (val > 0 && cnt < mcs_num) {
> -				s8 pwr =3D FIELD_GET(MT_TMAC_FP_MASK, val);
> -
> -				txpower[cnt++] =3D pwr;
> -				val >>=3D 8;
> -				idx++;
> -			}
> -		}
> =20
> -		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 +=3D mt7915_sku_group_len[i];
>  	}
>  }
> =20
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/ne=
t/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)
> =20
>  int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy)
>  {
> -#define MT7915_SKU_RATE_NUM		161
>  	struct mt7915_dev *dev =3D phy->dev;
>  	struct mt76_phy *mphy =3D phy->mt76;
>  	struct ieee80211_hw *hw =3D mphy->hw;
> @@ -3564,6 +3563,40 @@ int mt7915_mcu_set_txpower_sku(struct mt7915_phy *=
phy)
>  				 sizeof(req), true);
>  }
> =20
> +int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8 *txpower, int =
len)
> +{
> +#define RATE_POWER_INFO	2
> +	struct mt7915_dev *dev =3D phy->dev;
> +	bool ext_phy =3D phy !=3D &dev->phy;
> +	struct {
> +		u8 format_id;
> +		u8 category;
> +		u8 band;
> +		u8 _rsv;
> +	} __packed req =3D {
> +		.format_id =3D 7,
> +		.category =3D RATE_POWER_INFO,
> +		.band =3D ext_phy,
> +	};
> +	s8 res[MT7915_SKU_RATE_NUM][2];
> +	struct sk_buff *skb;
> +	int ret, i;
> +
> +	ret =3D 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 =3D 0; i < len; i++)
> +		txpower[i] =3D res[i][ext_phy];
> +
> +	dev_kfree_skb(skb);
> +
> +	return 0;
> +}
> +
>  int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param, bool tes=
t_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 */
> =20
> +#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/n=
et/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)
> =20
> -#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)
> =20
>  #define MT_WF_DMA_BASE(_band)		((_band) ? 0xa1e00 : 0x21e00)
> --=20
> 2.18.0
>=20

--VkN8laLagn6cSNMO
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEABYIAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCYKylmgAKCRA6cBh0uS2t
rCKaAP0SkqEfaDBxrpNaKcpFuScYfBn2cpQH5nMB4mu/QdZoFgEA6+TBxrfqj7Bx
4GK0ooXE+Neg0YxczVun8PCd7UU/Wws=
=IDED
-----END PGP SIGNATURE-----

--VkN8laLagn6cSNMO--