From mboxrd@z Thu Jan 1 00:00:00 1970 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 4D081C433F5 for ; Thu, 28 Oct 2021 08:59:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 330AB61056 for ; Thu, 28 Oct 2021 08:59:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229868AbhJ1JB3 (ORCPT ); Thu, 28 Oct 2021 05:01:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:48952 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229808AbhJ1JB1 (ORCPT ); Thu, 28 Oct 2021 05:01:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8FF3A61056; Thu, 28 Oct 2021 08:59:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635411541; bh=8SOrFqh6ahUH4xgUJc5/8K1+D/mt3bVDVU4QkfArC4M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=W7RNeFPOYC08QmFZKVNN+TPKZwZBa4YIYKr7P3z9y8hyRcmlmCMuXw5f2o7TlNgYD KIwqN4htm46Y2hPQQWYURLZHKQczbHpXuPt7ZDdyI9hn89sY7lsKuTN7y4WXcRorG6 8VRprlOfc86uhjHlOdBvWwbxv/7FzdRdvqLa3sJ7gKF43zAqvCniZG2a39mneogEif FszGY261wJFBFJuFOYUJK+NOKAjH7r/jq0puFrSg/kYE2ggIPWab5hUXFu/7hSIyqC 1cc93X9QsxKQxOJjeSe2fxtUQdRT2M/7C8jyrGV5K/vENy5PmXdA15MJYuZHMJdRa1 Mt9fdK0re8HrQ== Date: Thu, 28 Oct 2021 10:58:57 +0200 From: Lorenzo Bianconi To: Bo Jiao Cc: Felix Fietkau , linux-wireless , Ryder Lee , Xing Song , Sujuan Chen , Shayne Chen , Evelyn Tsai , linux-mediatek Subject: Re: [PATCH 06/11] mt76: mt7915: enlarge wcid size to 544 Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="sIDnMYqbS7oJp422" Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org --sIDnMYqbS7oJp422 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > From: Bo Jiao >=20 > The mt7916 can support up to 544 wcid entries. > This is an intermediate patch to add mt7916 support. >=20 > Co-developed-by: Sujuan Chen > Signed-off-by: Sujuan Chen > Co-developed-by: Ryder Lee > Signed-off-by: Ryder Lee > Signed-off-by: Bo Jiao > --- > drivers/net/wireless/mediatek/mt76/mt76.h | 2 +- > drivers/net/wireless/mediatek/mt76/mt7915/init.c | 2 +- > drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 2 +- > drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 8 +++++++- > 4 files changed, 10 insertions(+), 4 deletions(-) >=20 > diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wire= less/mediatek/mt76/mt76.h > index ce687d5..0f1197e 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76.h > +++ b/drivers/net/wireless/mediatek/mt76/mt76.h > @@ -225,7 +225,7 @@ enum mt76_wcid_flags { > MT_WCID_FLAG_HDR_TRANS, > }; > =20 > -#define MT76_N_WCIDS 288 > +#define MT76_N_WCIDS 544 is this change ok with older chipset as well? Regards, Lorenzo > =20 > /* stored in ieee80211_tx_info::hw_queue */ > #define MT_TX_HW_QUEUE_EXT_PHY BIT(3) > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/n= et/wireless/mediatek/mt76/mt7915/init.c > index 8d16c96..4dfa1c1 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c > @@ -430,7 +430,7 @@ static void mt7915_mac_init(struct mt7915_dev *dev) > /* enable hardware de-agg */ > mt76_set(dev, MT_MDP_DCR0, MT_MDP_DCR0_DAMSDU_EN); > =20 > - for (i =3D 0; i < MT7915_WTBL_SIZE; i++) > + for (i =3D 0; i < mt7915_wtbl_size(dev); i++) > mt7915_mac_wtbl_update(dev, i, > MT_WTBL_UPDATE_ADM_COUNT_CLEAR); > for (i =3D 0; i < 2; i++) > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/ne= t/wireless/mediatek/mt76/mt7915/mac.c > index ba39f3d..4212dbb 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c > @@ -1492,7 +1492,7 @@ static void mt7915_mac_add_txs(struct mt7915_dev *d= ev, void *data) > if (pid < MT_PACKET_ID_FIRST) > return; > =20 > - if (wcidx >=3D MT7915_WTBL_SIZE) > + if (wcidx >=3D mt7915_wtbl_size(dev)) > return; > =20 > rcu_read_lock(); > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers= /net/wireless/mediatek/mt76/mt7915/mt7915.h > index 3e2e900..e8fbe69 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h > @@ -12,7 +12,8 @@ > #define MT7915_MAX_INTERFACES 19 > #define MT7915_MAX_WMM_SETS 4 > #define MT7915_WTBL_SIZE 288 > -#define MT7915_WTBL_RESERVED (MT7915_WTBL_SIZE - 1) > +#define MT7916_WTBL_SIZE 544 > +#define MT7915_WTBL_RESERVED (mt7915_wtbl_size(dev) - 1) > #define MT7915_WTBL_STA (MT7915_WTBL_RESERVED - \ > MT7915_MAX_INTERFACES) > =20 > @@ -477,6 +478,11 @@ static inline bool is_mt7915(struct mt76_dev *dev) > return mt76_chip(dev) =3D=3D 0x7915; > } > =20 > +static inline u16 mt7915_wtbl_size(struct mt7915_dev *dev) > +{ > + return is_mt7915(&dev->mt76) ? MT7915_WTBL_SIZE : MT7916_WTBL_SIZE; > +} > + > void mt7915_dual_hif_set_irq_mask(struct mt7915_dev *dev, bool write_reg, > u32 clear, u32 set); > =20 > --=20 > 2.18.0 >=20 --sIDnMYqbS7oJp422 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCYXpmUQAKCRA6cBh0uS2t rAR1AP47ell8fA8Utj87vGHWWGWemeaRTTykOJAY+p3Jdh8AigEAnLiqLdKXug9r uC6mC3H88NEu8dXRpNgNEWfYNN/oaAM= =VBSX -----END PGP SIGNATURE----- --sIDnMYqbS7oJp422--