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:   Fri, 28 May 2021 16:48:19 +0200
From:   Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
To:     Lorenzo Bianconi <lorenzo@kernel.org>
Cc:     nbd@nbd.name, linux-wireless@vger.kernel.org
Subject: Re: [PATCH v2] mt76: mt7921: set MT76_RESET during mac reset
Message-ID: <YLECsxSLgurAzyIS@lore-desk>
References: <f201e2d43858d022eb149a7cc29c82ea0361d328.1622210344.git.lorenzo@kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="ENfnrD664C3bmRIX"
Content-Disposition: inline
In-Reply-To: <f201e2d43858d022eb149a7cc29c82ea0361d328.1622210344.git.lorenzo@kernel.org>
Precedence: bulk


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

> Set MT76_RESET during mt7921_mac_reset in order to avoid packet
> transmissions. Move tx scheduling at the end of reset routine.
>=20
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>

Hi Felix,

please drop this patch, I need to fix an issue.

Regards,
Lorenzo

> ---
> Changes since v1:
> - move tx scheduling at the end of reset routine
> ---
>  .../net/wireless/mediatek/mt76/mt7921/mac.c   | 20 ++++++++++++-------
>  1 file changed, 13 insertions(+), 7 deletions(-)
>=20
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/ne=
t/wireless/mediatek/mt76/mt7921/mac.c
> index 4d1050ae9f39..baaca4eb715e 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
> @@ -1255,6 +1255,7 @@ mt7921_mac_reset(struct mt7921_dev *dev)
>  	mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0);
>  	mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0);
> =20
> +	set_bit(MT76_RESET, &dev->mphy.state);
>  	set_bit(MT76_MCU_RESET, &dev->mphy.state);
>  	wake_up(&dev->mt76.mcu.wait);
>  	skb_queue_purge(&dev->mt76.mcu.res_q);
> @@ -1274,17 +1275,13 @@ mt7921_mac_reset(struct mt7921_dev *dev)
>  	if (err)
>  		return err;
> =20
> +	clear_bit(MT76_MCU_RESET, &dev->mphy.state);
> +
>  	mt76_for_each_q_rx(&dev->mt76, i) {
>  		napi_enable(&dev->mt76.napi[i]);
>  		napi_schedule(&dev->mt76.napi[i]);
>  	}
> =20
> -	napi_enable(&dev->mt76.tx_napi);
> -	napi_schedule(&dev->mt76.tx_napi);
> -	mt76_worker_enable(&dev->mt76.tx_worker);
> -
> -	clear_bit(MT76_MCU_RESET, &dev->mphy.state);
> -
>  	mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA,
>  		MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL |
>  		MT_INT_MCU_CMD);
> @@ -1302,7 +1299,16 @@ mt7921_mac_reset(struct mt7921_dev *dev)
>  	if (err)
>  		return err;
> =20
> -	return __mt7921_start(&dev->phy);
> +	err =3D __mt7921_start(&dev->phy);
> +	if (err)
> +		return err;
> +
> +	clear_bit(MT76_RESET, &dev->mphy.state);
> +	napi_enable(&dev->mt76.tx_napi);
> +	napi_schedule(&dev->mt76.tx_napi);
> +	mt76_worker_enable(&dev->mt76.tx_worker);
> +
> +	return 0;
>  }
> =20
>  /* system error recovery */
> --=20
> 2.31.1
>=20

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

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

iHUEABYIAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCYLECqwAKCRA6cBh0uS2t
rE1IAQDjl6E3OUxBK/+DyFsLQX7r0S2qqD4VvwYpalnWOzhyogD8CLjlC8yfU9Ev
aDHqIh5cdJ4xwVJzOtJlEJp4n2sTCQo=
=HOWx
-----END PGP SIGNATURE-----

--ENfnrD664C3bmRIX--