Received-SPF: pass (google.com: domain of linux-wireless+bounces-1306-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Thu, 28 Dec 2023 14:56:52 +0100
From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Mingyen Hsieh <mingyen.hsieh@mediatek.com>
Cc: nbd@nbd.name, deren.wu@mediatek.com, Sean.Wang@mediatek.com,
	Soul.Huang@mediatek.com, Leon.Yen@mediatek.com,
	Eric-SY.Chang@mediatek.com, km.lin@mediatek.com,
	robin.chiu@mediatek.com, ch.yeh@mediatek.com, posh.sun@mediatek.com,
	Quan.Zhou@mediatek.com, Ryder.Lee@mediatek.com,
	Shayne.Chen@mediatek.com, linux-wireless@vger.kernel.org,
	linux-mediatek@lists.infradead.org
Subject: Re: [PATCH 04/10] wifi: mt76: mt7925: fix wmm queue mapping
Message-ID: <ZY1-pG8isKAXBhqa@lore-rh-laptop>
References: <20231228090749.15191-1-mingyen.hsieh@mediatek.com>
 <20231228090749.15191-5-mingyen.hsieh@mediatek.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="WQ30o7v/EYClCnAa"
Content-Disposition: inline
In-Reply-To: <20231228090749.15191-5-mingyen.hsieh@mediatek.com>


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

> From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
>=20
> Firmware uses access class index (ACI) for wmm parameters update,
> so convert mac80211 queue to ACI in mt7925_conf_tx().
>=20
> Fixes: c948b5da6bbe ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for =
mt7925 chips")
> Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
> ---
>  .../net/wireless/mediatek/mt76/mt7925/main.c  | 21 ++++++++++++++++++-
>  .../net/wireless/mediatek/mt76/mt7925/mcu.c   |  2 +-
>  2 files changed, 21 insertions(+), 2 deletions(-)
>=20
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/n=
et/wireless/mediatek/mt76/mt7925/main.c
> index a080df58120f..b832dd8adee5 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
> @@ -1273,6 +1273,25 @@ mt7925_channel_switch_beacon(struct ieee80211_hw *=
hw,
>  	mt792x_mutex_release(dev);
>  }
> =20
> +static int
> +mt7925_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
> +	       unsigned int link_id, u16 queue,
> +	       const struct ieee80211_tx_queue_params *params)
> +{
> +	struct mt792x_vif *mvif =3D (struct mt792x_vif *)vif->drv_priv;
> +	const u8 mq_to_aci[] =3D {

nit: static const here

Regards,
Lorenzo

> +		    [IEEE80211_AC_VO] =3D 3,
> +		    [IEEE80211_AC_VI] =3D 2,
> +		    [IEEE80211_AC_BE] =3D 0,
> +		    [IEEE80211_AC_BK] =3D 1,
> +	};
> +
> +	/* firmware uses access class index */
> +	mvif->queue_params[mq_to_aci[queue]] =3D *params;
> +
> +	return 0;
> +}
> +
>  static int
>  mt7925_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
>  		struct ieee80211_bss_conf *link_conf)
> @@ -1396,7 +1415,7 @@ const struct ieee80211_ops mt7925_ops =3D {
>  	.add_interface =3D mt7925_add_interface,
>  	.remove_interface =3D mt792x_remove_interface,
>  	.config =3D mt7925_config,
> -	.conf_tx =3D mt792x_conf_tx,
> +	.conf_tx =3D mt7925_conf_tx,
>  	.configure_filter =3D mt7925_configure_filter,
>  	.bss_info_changed =3D mt7925_bss_info_changed,
>  	.start_ap =3D mt7925_start_ap,
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/ne=
t/wireless/mediatek/mt76/mt7925/mcu.c
> index 4811fccbe30e..0299045b4b83 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
> @@ -895,7 +895,7 @@ int mt7925_mcu_set_tx(struct mt792x_dev *dev, struct =
ieee80211_vif *vif)
> =20
>  		e =3D (struct edca *)tlv;
>  		e->set =3D WMM_PARAM_SET;
> -		e->queue =3D ac + mvif->mt76.wmm_idx * MT76_CONNAC_MAX_WMM_SETS;
> +		e->queue =3D ac;
>  		e->aifs =3D q->aifs;
>  		e->txop =3D cpu_to_le16(q->txop);
> =20
> --=20
> 2.18.0
>=20

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

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

iHUEABYKAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCZY1+oQAKCRA6cBh0uS2t
rPj8AP0Qg+6JBTjCMzdcyWCdxF9WJUoD8KX46+BDiNcsAwtWfwD9GQOsR6uC8i+V
DBdzmKvn6Mg5rijo8s1SO00vDUv96Ak=
=GFFC
-----END PGP SIGNATURE-----

--WQ30o7v/EYClCnAa--