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:   Tue, 25 May 2021 11:03:03 +0200
From:   Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
To:     Ryder Lee <ryder.lee@mediatek.com>
Cc:     Felix Fietkau <nbd@nbd.name>,
        Shayne Chen <shayne.chen@mediatek.com>,
        Evelyn Tsai <evelyn.tsai@mediatek.com>,
        linux-wireless@vger.kernel.org, linux-mediatek@lists.infradead.org
Subject: Re: [PATCH 2/2] mt76: mt7615: add .offset_tsf callback
Message-ID: <YKy9R82co40IqVSw@lore-desk>
References: <324aa6af6a191a1f929fd3054148b001acd0bd13.1621931743.git.ryder.lee@mediatek.com>
 <02303700150757de92fec3525fe51c04d1aca416.1621931743.git.ryder.lee@mediatek.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="wDAorh6uHV8+h+wZ"
Content-Disposition: inline
In-Reply-To: <02303700150757de92fec3525fe51c04d1aca416.1621931743.git.ryder.lee@mediatek.com>
Precedence: bulk


--wDAorh6uHV8+h+wZ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

> It's much more accurate than .get_tsf + .set_tsf, and switch to use
> mt76_rmw to operate tsf registers.
>=20
> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> ---
>  .../net/wireless/mediatek/mt76/mt7615/mac.c   |  2 +-
>  .../net/wireless/mediatek/mt76/mt7615/main.c  | 32 +++++++++++++++++--
>  .../net/wireless/mediatek/mt76/mt7615/regs.h  |  2 ++
>  .../wireless/mediatek/mt76/mt7615/usb_sdio.c  |  2 +-
>  4 files changed, 34 insertions(+), 4 deletions(-)
>=20
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/ne=
t/wireless/mediatek/mt76/mt7615/mac.c
> index 71af122a0b38..2ac7d0b0eff4 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
> @@ -1125,7 +1125,7 @@ void mt7615_mac_set_rates(struct mt7615_phy *phy, s=
truct mt7615_sta *sta,
>  	idx =3D idx > HW_BSSID_MAX ? HW_BSSID_0 : idx;
>  	addr =3D idx > 1 ? MT_LPON_TCR2(idx): MT_LPON_TCR0(idx);
> =20
> -	mt76_set(dev, addr, MT_LPON_TCR_MODE); /* TSF read */
> +	mt76_rmw(dev, addr, MT_LPON_TCR_MODE, MT_LPON_TCR_READ); /* TSF read */
>  	sta->rate_set_tsf =3D mt76_rr(dev, MT_LPON_UTTR0) & ~BIT(0);
>  	sta->rate_set_tsf |=3D rd.rateset;
> =20
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/n=
et/wireless/mediatek/mt76/mt7615/main.c
> index e36c52290985..3bd755634d5b 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
> @@ -891,7 +891,8 @@ mt7615_get_tsf(struct ieee80211_hw *hw, struct ieee80=
211_vif *vif)
> =20
>  	mt7615_mutex_acquire(dev);
> =20
> -	mt76_set(dev, reg, MT_LPON_TCR_MODE); /* TSF read */
> +	/* TSF read */
> +	mt76_rmw(dev, reg, MT_LPON_TCR_MODE, MT_LPON_TCR_READ);
>  	tsf.t32[0] =3D mt76_rr(dev, MT_LPON_UTTR0);
>  	tsf.t32[1] =3D mt76_rr(dev, MT_LPON_UTTR1);
> =20
> @@ -921,11 +922,37 @@ mt7615_set_tsf(struct ieee80211_hw *hw, struct ieee=
80211_vif *vif,
>  	mt76_wr(dev, MT_LPON_UTTR0, tsf.t32[0]);
>  	mt76_wr(dev, MT_LPON_UTTR1, tsf.t32[1]);
>  	/* TSF software overwrite */
> -	mt76_set(dev, reg, MT_LPON_TCR_WRITE);
> +	mt76_rmw(dev, reg, MT_LPON_TCR_MODE, MT_LPON_TCR_WRITE);
> =20
>  	mt7615_mutex_release(dev);
>  }
> =20
> +static void
> +mt7615_offset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
> +		  s64 timestamp)
> +{
> +	struct mt7615_vif *mvif =3D (struct mt7615_vif *)vif->drv_priv;
> +	struct mt7615_dev *dev =3D mt7615_hw_dev(hw);
> +	union {
> +		u64 t64;
> +		u32 t32[2];
> +	} tsf =3D { .t64 =3D timestamp, };

same here

> +	u16 idx =3D mvif->mt76.omac_idx;
> +	u32 reg;
> +
> +	idx =3D idx > HW_BSSID_MAX ? HW_BSSID_0 : idx;
> +	reg =3D idx > 1 ? MT_LPON_TCR2(idx): MT_LPON_TCR0(idx);
> +
> +	mutex_lock(&dev->mt76.mutex);

mt7615_mutex_acquire(dev);=20

> +
> +	mt76_wr(dev, MT_LPON_UTTR0, tsf.t32[0]);
> +	mt76_wr(dev, MT_LPON_UTTR1, tsf.t32[1]);
> +	/* TSF software adjust*/
> +	mt76_rmw(dev, reg, MT_LPON_TCR_MODE, MT_LPON_TCR_ADJUST);
> +
> +	mutex_unlock(&dev->mt76.mutex);

mt7615_mutex_release(dev);

Regards,
Lorenzo
> +}
> +
>  static void
>  mt7615_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)
>  {
> @@ -1308,6 +1335,7 @@ const struct ieee80211_ops mt7615_ops =3D {
>  	.get_stats =3D mt7615_get_stats,
>  	.get_tsf =3D mt7615_get_tsf,
>  	.set_tsf =3D mt7615_set_tsf,
> +	.offset_tsf =3D mt7615_offset_tsf,
>  	.get_survey =3D mt76_get_survey,
>  	.get_antenna =3D mt76_get_antenna,
>  	.set_antenna =3D mt7615_set_antenna,
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h b/drivers/n=
et/wireless/mediatek/mt76/mt7615/regs.h
> index 63c081bb04d0..6712ad9faeaa 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
> @@ -463,7 +463,9 @@ enum mt7615_reg_base {
>  #define MT_LPON_TCR0(_n)		MT_LPON(0x010 + ((_n) * 4))
>  #define MT_LPON_TCR2(_n)		MT_LPON(0x0f8 + ((_n) - 2) * 4)
>  #define MT_LPON_TCR_MODE		GENMASK(1, 0)
> +#define MT_LPON_TCR_READ		GENMASK(1, 0)
>  #define MT_LPON_TCR_WRITE		BIT(0)
> +#define MT_LPON_TCR_ADJUST		BIT(1)
> =20
>  #define MT_LPON_UTTR0			MT_LPON(0x018)
>  #define MT_LPON_UTTR1			MT_LPON(0x01c)
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c b/drive=
rs/net/wireless/mediatek/mt76/mt7615/usb_sdio.c
> index 75a05f8dd7e7..996d48cca18a 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c
> @@ -123,7 +123,7 @@ static int mt7663_usb_sdio_set_rates(struct mt7615_de=
v *dev,
>  	idx =3D idx > HW_BSSID_MAX ? HW_BSSID_0 : idx;
>  	addr =3D idx > 1 ? MT_LPON_TCR2(idx): MT_LPON_TCR0(idx);
> =20
> -	mt76_set(dev, addr, MT_LPON_TCR_MODE); /* TSF read */
> +	mt76_rmw(dev, addr, MT_LPON_TCR_MODE, MT_LPON_TCR_READ); /* TSF read */
>  	val =3D mt76_rr(dev, MT_LPON_UTTR0);
>  	sta->rate_set_tsf =3D (val & ~BIT(0)) | rate->rateset;
> =20
> --=20
> 2.18.0
>=20

--wDAorh6uHV8+h+wZ
Content-Type: application/pgp-signature; name="signature.asc"

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

iHUEABYIAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCYKy9QwAKCRA6cBh0uS2t
rN8IAQCQ4liOss2SnQgl2OWEh8uhfFUuIF6Fr4p2lF+rUv3U8gD/Q6V9q7MqyQ4U
uOjMWqhIHyqMEdDV4eFK0f9a3gXXQw4=
=YaBR
-----END PGP SIGNATURE-----

--wDAorh6uHV8+h+wZ--