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:   Sun, 7 Nov 2021 11:45:06 +0100
From:   Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
To:     Deren Wu <Deren.Wu@mediatek.com>
Cc:     Felix Fietkau <nbd@nbd.name>, Sean Wang <sean.wang@mediatek.com>,
        Soul Huang <Soul.Huang@mediatek.com>,
        YN Chen <YN.Chen@mediatek.com>,
        Leon Yen <Leon.Yen@mediatek.com>,
        Eric-SY Chang <Eric-SY.Chang@mediatek.com>,
        KM Lin <km.lin@mediatek.com>,
        Robin Chiu <robin.chiu@mediatek.com>,
        CH Yeh <ch.yeh@mediatek.com>, Posh Sun <posh.sun@mediatek.com>,
        Eric Liang <Eric.Liang@mediatek.com>,
        Stella Chang <Stella.Chang@mediatek.com>,
        Evelyn Tsai <evelyn.tsai@mediatek.com>,
        Ryder Lee <ryder.lee@mediatek.com>,
        Shayne Chen <shayne.chen@mediatek.com>,
        linux-wireless <linux-wireless@vger.kernel.org>,
        linux-mediatek <linux-mediatek@lists.infradead.org>
Subject: Re: [PATCH] mt76: mt7921: introduce 160 MHz channel bandwidth support
Message-ID: <YYeuMs+QD067Fc5R@lore-desk>
References: <d4e93e0ffa11d7126b2ab48a34d0b4a4a17f2134.1636207928.git.deren.wu@mediatek.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="pFtmkrBWDeyFXsfP"
Content-Disposition: inline
In-Reply-To: <d4e93e0ffa11d7126b2ab48a34d0b4a4a17f2134.1636207928.git.deren.wu@mediatek.com>
Precedence: bulk


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

> From: Deren Wu <deren.wu@mediatek.com>
>=20
> Introduce the basic configuration for chips with BW160 capability
>=20
> Signed-off-by: Deren Wu <deren.wu@mediatek.com>
> ---
>  drivers/net/wireless/mediatek/mt76/mt76.h            |  1 +
>  drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c |  1 +
>  drivers/net/wireless/mediatek/mt76/mt7921/init.c     |  4 ++++
>  drivers/net/wireless/mediatek/mt76/mt7921/main.c     | 12 ++++++++++++
>  4 files changed, 18 insertions(+)
>=20
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wire=
less/mediatek/mt76/mt76.h
> index e2da720a91b6..babca8086027 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76.h
> @@ -346,6 +346,7 @@ struct mt76_hw_cap {
>  	bool has_2ghz;
>  	bool has_5ghz;
>  	bool has_6ghz;
> +	bool has_bw160;
>  };
> =20
>  #define MT_DRV_TXWI_NO_FREE		BIT(0)
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drive=
rs/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> index 26b4b875dcc0..4da20537aaf9 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> @@ -1775,6 +1775,7 @@ static void mt76_connac_mcu_parse_phy_cap(struct mt=
76_dev *dev,
>  	dev->phy.chainmask =3D dev->phy.antenna_mask;
>  	dev->phy.cap.has_2ghz =3D cap->hw_path & BIT(WF0_24G);
>  	dev->phy.cap.has_5ghz =3D cap->hw_path & BIT(WF0_5G);
> +	dev->phy.cap.has_bw160 =3D (cap->max_bw >=3D IEEE80211_STA_RX_BW_160);

Hi Deren,

just out of my curiosity, what are the possible values of cap->max_bw here?

Regards,
Lorenzo

>  }
> =20
>  int mt76_connac_mcu_get_nic_capability(struct mt76_phy *phy)
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/n=
et/wireless/mediatek/mt76/mt7921/init.c
> index 210998f086ab..30c0246fba3a 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
> @@ -264,6 +264,10 @@ int mt7921_register_device(struct mt7921_dev *dev)
>  			IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |
>  			IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE |
>  			(3 << IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT);
> +	if (dev->mt76.phy.cap.has_bw160)
> +		dev->mphy.sband_5g.sband.vht_cap.cap |=3D
> +			IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ |
> +			IEEE80211_VHT_CAP_SHORT_GI_160;
> =20
>  	dev->mphy.hw->wiphy->available_antennas_rx =3D dev->mphy.chainmask;
>  	dev->mphy.hw->wiphy->available_antennas_tx =3D dev->mphy.chainmask;
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/n=
et/wireless/mediatek/mt76/mt7921/main.c
> index 633c6d2a57ac..af8c675f909f 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> @@ -128,11 +128,23 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl=
80211_band band,
>  				IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU |
>  				IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |
>  				IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB;
> +
> +			if (phy->mt76->cap.has_bw160) {
> +				he_cap_elem->phy_cap_info[0] |=3D
> +					IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;
> +				he_cap_elem->phy_cap_info[8] |=3D
> +					IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |
> +					IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU;
> +			}
>  			break;
>  		}
> =20
>  		he_mcs->rx_mcs_80 =3D cpu_to_le16(mcs_map);
>  		he_mcs->tx_mcs_80 =3D cpu_to_le16(mcs_map);
> +		if (phy->mt76->cap.has_bw160) {
> +			he_mcs->rx_mcs_160 =3D cpu_to_le16(mcs_map);
> +			he_mcs->tx_mcs_160 =3D cpu_to_le16(mcs_map);
> +		}
> =20
>  		memset(he_cap->ppe_thres, 0, sizeof(he_cap->ppe_thres));
>  		if (he_cap_elem->phy_cap_info[6] &
> --=20
> 2.18.0
>=20

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

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

iHUEABYIAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCYYeuMgAKCRA6cBh0uS2t
rDZRAPwKmeF6/0MuMzQcTou3JM4/mLpNEXiHQKOGPkIdpHk6VQD/dtMQo54IVMUP
klNiHyYxzV/4+q+IExvrsnf65wJcbAo=
=6xyL
-----END PGP SIGNATURE-----

--pFtmkrBWDeyFXsfP--