Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3508DC433F5 for ; Sat, 13 Nov 2021 03:39:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0D52960F39 for ; Sat, 13 Nov 2021 03:39:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233557AbhKMDmK (ORCPT ); Fri, 12 Nov 2021 22:42:10 -0500 Received: from mailgw01.mediatek.com ([60.244.123.138]:34468 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S232113AbhKMDmK (ORCPT ); Fri, 12 Nov 2021 22:42:10 -0500 X-UUID: 21b9028bc72f4a2cbe42367c4d27df62-20211113 X-UUID: 21b9028bc72f4a2cbe42367c4d27df62-20211113 Received: from mtkexhb02.mediatek.inc [(172.21.101.103)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1385967883; Sat, 13 Nov 2021 11:39:16 +0800 Received: from mtkexhb01.mediatek.inc (172.21.101.102) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sat, 13 Nov 2021 11:39:14 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkexhb01.mediatek.inc (172.21.101.102) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sat, 13 Nov 2021 11:39:14 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sat, 13 Nov 2021 11:39:14 +0800 Message-ID: <6978659235747261d652379d7d1a823f6b2f6505.camel@mediatek.com> Subject: Re: [PATCH v2] mt76: mt7921: introduce 160 MHz channel bandwidth support From: Deren Wu To: Ryder Lee , Felix Fietkau , "Lorenzo Bianconi" CC: Sean Wang , Soul Huang , YN Chen , Leon Yen , "Eric-SY Chang" , KM Lin , Robin Chiu , CH Yeh , Posh Sun , Eric Liang , Stella Chang , Evelyn Tsai , "Shayne Chen" , linux-wireless , linux-mediatek Date: Sat, 13 Nov 2021 11:39:14 +0800 In-Reply-To: References: <66edc3125e9a12dedeba1a61697d46322b0c004d.1636374449.git.deren.wu@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On Sat, 2021-11-13 at 03:12 +0800, Ryder Lee wrote: > On Mon, 2021-11-08 at 22:41 +0800, Deren Wu wrote: > > From: Deren Wu > > > > Introduce the basic configuration for chips with BW160 capability > > > > Signed-off-by: Deren Wu > > --- > > 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(+) > > > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h > > b/drivers/net/wireless/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; > > }; > > > > #define MT_DRV_TXWI_NO_FREE BIT(0) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c > > b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c > > index 26b4b875dcc0..3b42e1e8e970 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 mt76_dev *dev, > > dev->phy.chainmask = dev->phy.antenna_mask; > > dev->phy.cap.has_2ghz = cap->hw_path & BIT(WF0_24G); > > dev->phy.cap.has_5ghz = cap->hw_path & BIT(WF0_5G); > > + dev->phy.cap.has_bw160 = cap->max_bw == > > IEEE80211_STA_RX_BW_160; > > } > > > > int mt76_connac_mcu_get_nic_capability(struct mt76_phy *phy) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c > > b/drivers/net/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 |= > > + IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ | > > + IEEE80211_VHT_CAP_SHORT_GI_160; > > > > dev->mphy.hw->wiphy->available_antennas_rx = dev- > > > mphy.chainmask; > > > > dev->mphy.hw->wiphy->available_antennas_tx = dev- > > > mphy.chainmask; > > > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c > > b/drivers/net/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 nl80211_band band, > > IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_ > > THAN_242_TONE_RU | > > IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USI > > NG_MU_WITH_COMP_SIGB | > > IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USI > > NG_MU_WITH_NON_COMP_SIGB; > > + > > + if (phy->mt76->cap.has_bw160) { > > + he_cap_elem->phy_cap_info[0] |= > > + IEEE80211_HE_PHY_CAP0_CHANNEL_W > > IDTH_SET_160MHZ_IN_5G; > > + he_cap_elem->phy_cap_info[8] |= > > + IEEE80211_HE_PHY_CAP8_20MHZ_IN_ > > 160MHZ_HE_PPDU | > > + IEEE80211_HE_PHY_CAP8_80MHZ_IN_ > > 160MHZ_HE_PPDU; > > + } > > break; > > } > > > > he_mcs->rx_mcs_80 = cpu_to_le16(mcs_map); > > he_mcs->tx_mcs_80 = cpu_to_le16(mcs_map); > > + if (phy->mt76->cap.has_bw160) { > > + he_mcs->rx_mcs_160 = cpu_to_le16(mcs_map); > > + he_mcs->tx_mcs_160 = cpu_to_le16(mcs_map); > > + } > > > > But what about 80p80Mhz case? > > Ryder > Since 80p80MHz is not supprted in mt7921, we should not register this capability to mac80211. When the feature coming, we may have a new config cap.has_bw80p80 to adapte the new flow. Regards, Deren