Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 17 Aug 2022 09:13:06 +0200
From:   Lorenzo Bianconi <lorenzo@kernel.org>
To:     sean.wang@mediatek.com
Cc:     nbd@nbd.name, lorenzo.bianconi@redhat.com, Soul.Huang@mediatek.com,
        YN.Chen@mediatek.com, Leon.Yen@mediatek.com,
        Eric-SY.Chang@mediatek.com, Deren.Wu@mediatek.com,
        km.lin@mediatek.com, jenhao.yang@mediatek.com,
        robin.chiu@mediatek.com, Eddie.Chen@mediatek.com,
        ch.yeh@mediatek.com, posh.sun@mediatek.com, ted.huang@mediatek.com,
        Stella.Chang@mediatek.com, Tom.Chou@mediatek.com,
        steve.lee@mediatek.com, jsiuda@google.com, frankgor@google.com,
        kuabhs@google.com, druth@google.com, abhishekpandit@google.com,
        shawnku@google.com, linux-wireless@vger.kernel.org,
        linux-mediatek@lists.infradead.org
Subject: Re: [PATCH 3/9] wifi: mt76: connac: rely on
 mt76_connac_mcu_uni_set_chctx
Message-ID: <YvyVAmu0RscaE8zs@lore-desk>
References: <cover.1660606893.git.objelf@gmail.com>
 <40d95ad10621c248a9129ef73158adfa9ffd6d17.1660606893.git.objelf@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="ZU+A2tqBkWBmk+7U"
Content-Disposition: inline
In-Reply-To: <40d95ad10621c248a9129ef73158adfa9ffd6d17.1660606893.git.objelf@gmail.com>
Precedence: bulk


--ZU+A2tqBkWBmk+7U
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

> From: Sean Wang <sean.wang@mediatek.com>
>=20
> Reuse mt76_connac_mcu_uni_set_chctx to avoid the dupicated code.

I guess you can squash this patch with the previous one.

Regards,
Lorenzo

>=20
> Signed-off-by: Sean Wang <sean.wang@mediatek.com>
> ---
>  .../wireless/mediatek/mt76/mt76_connac_mcu.c  | 73 +------------------
>  1 file changed, 1 insertion(+), 72 deletions(-)
>=20
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drive=
rs/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> index 3d5c70765d4f..3e473a409790 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> @@ -1401,7 +1401,6 @@ int mt76_connac_mcu_uni_add_bss(struct mt76_phy *ph=
y,
>  {
>  	struct mt76_vif *mvif =3D (struct mt76_vif *)vif->drv_priv;
>  	struct cfg80211_chan_def *chandef =3D &phy->chandef;
> -	int freq1 =3D chandef->center_freq1, freq2 =3D chandef->center_freq2;
>  	enum nl80211_band band =3D chandef->chan->band;
>  	struct mt76_dev *mdev =3D phy->dev;
>  	struct {
> @@ -1432,43 +1431,6 @@ int mt76_connac_mcu_uni_add_bss(struct mt76_phy *p=
hy,
>  			.qos =3D vif->bss_conf.qos,
>  		},
>  	};
> -	struct {
> -		struct {
> -			u8 bss_idx;
> -			u8 pad[3];
> -		} __packed hdr;
> -		struct rlm_tlv {
> -			__le16 tag;
> -			__le16 len;
> -			u8 control_channel;
> -			u8 center_chan;
> -			u8 center_chan2;
> -			u8 bw;
> -			u8 tx_streams;
> -			u8 rx_streams;
> -			u8 short_st;
> -			u8 ht_op_info;
> -			u8 sco;
> -			u8 band;
> -			u8 pad[2];
> -		} __packed rlm;
> -	} __packed rlm_req =3D {
> -		.hdr =3D {
> -			.bss_idx =3D mvif->idx,
> -		},
> -		.rlm =3D {
> -			.tag =3D cpu_to_le16(UNI_BSS_INFO_RLM),
> -			.len =3D cpu_to_le16(sizeof(struct rlm_tlv)),
> -			.control_channel =3D chandef->chan->hw_value,
> -			.center_chan =3D ieee80211_frequency_to_channel(freq1),
> -			.center_chan2 =3D ieee80211_frequency_to_channel(freq2),
> -			.tx_streams =3D hweight8(phy->antenna_mask),
> -			.ht_op_info =3D 4, /* set HT 40M allowed */
> -			.rx_streams =3D phy->chainmask,
> -			.short_st =3D true,
> -			.band =3D band,
> -		},
> -	};
>  	int err, conn_type;
>  	u8 idx, basic_phy;
> =20
> @@ -1555,40 +1517,7 @@ int mt76_connac_mcu_uni_add_bss(struct mt76_phy *p=
hy,
>  			return err;
>  	}
> =20
> -	switch (chandef->width) {
> -	case NL80211_CHAN_WIDTH_40:
> -		rlm_req.rlm.bw =3D CMD_CBW_40MHZ;
> -		break;
> -	case NL80211_CHAN_WIDTH_80:
> -		rlm_req.rlm.bw =3D CMD_CBW_80MHZ;
> -		break;
> -	case NL80211_CHAN_WIDTH_80P80:
> -		rlm_req.rlm.bw =3D CMD_CBW_8080MHZ;
> -		break;
> -	case NL80211_CHAN_WIDTH_160:
> -		rlm_req.rlm.bw =3D CMD_CBW_160MHZ;
> -		break;
> -	case NL80211_CHAN_WIDTH_5:
> -		rlm_req.rlm.bw =3D CMD_CBW_5MHZ;
> -		break;
> -	case NL80211_CHAN_WIDTH_10:
> -		rlm_req.rlm.bw =3D CMD_CBW_10MHZ;
> -		break;
> -	case NL80211_CHAN_WIDTH_20_NOHT:
> -	case NL80211_CHAN_WIDTH_20:
> -	default:
> -		rlm_req.rlm.bw =3D CMD_CBW_20MHZ;
> -		rlm_req.rlm.ht_op_info =3D 0;
> -		break;
> -	}
> -
> -	if (rlm_req.rlm.control_channel < rlm_req.rlm.center_chan)
> -		rlm_req.rlm.sco =3D 1; /* SCA */
> -	else if (rlm_req.rlm.control_channel > rlm_req.rlm.center_chan)
> -		rlm_req.rlm.sco =3D 3; /* SCB */
> -
> -	return mt76_mcu_send_msg(mdev, MCU_UNI_CMD(BSS_INFO_UPDATE), &rlm_req,
> -				 sizeof(rlm_req), true);
> +	return mt76_connac_mcu_uni_set_chctx(phy, mvif, NULL);
>  }
>  EXPORT_SYMBOL_GPL(mt76_connac_mcu_uni_add_bss);
> =20
> --=20
> 2.25.1
>=20

--ZU+A2tqBkWBmk+7U
Content-Type: application/pgp-signature; name="signature.asc"

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

iHUEABYKAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCYvyVAQAKCRA6cBh0uS2t
rF5bAQCuxPiqG8ZkZVCGnHK0rT7aQUpVMfyLZ+BhQwH/WDqILwD/RiALvSb8yyaF
IRvOmWakFXqio75nVekpFYpU0Fqn4wk=
=f/3G
-----END PGP SIGNATURE-----

--ZU+A2tqBkWBmk+7U--