Commit accbcea4 authored by Ryder Lee's avatar Ryder Lee Committed by Felix Fietkau
Browse files

mt76: mt7615: add .offset_tsf callback 



It's much more accurate than .get_tsf + .set_tsf and switch to use
mt76_rmw to operate tsf registers.

Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 16073134

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -1062,7 +1062,7 @@ void mt7615_mac_set_rates(struct mt7615_phy *phy, struct mt7615_sta *sta, 
	idx = idx > HW_BSSID_MAX ? HW_BSSID_0 : idx;

	addr = idx > 1 ? MT_LPON_TCR2(idx): MT_LPON_TCR0(idx);



	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 = mt76_rr(dev, MT_LPON_UTTR0) & ~BIT(0);

	sta->rate_set_tsf |= rd.rateset;

drivers/net/wireless/mediatek/mt76/mt7615/main.c

+30 −2
Original line number Diff line number Diff line
@@ -881,7 +881,8 @@ mt7615_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 


	mt7615_mutex_acquire(dev);



	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] = mt76_rr(dev, MT_LPON_UTTR0);

	tsf.t32[1] = mt76_rr(dev, MT_LPON_UTTR1);
@@ -911,7 +912,33 @@ mt7615_set_tsf(struct ieee80211_hw *hw, struct ieee80211_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);



	mt7615_mutex_release(dev);

}



static void

mt7615_offset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		  s64 timestamp)

{

	struct mt7615_vif *mvif = (struct mt7615_vif *)vif->drv_priv;

	struct mt7615_dev *dev = mt7615_hw_dev(hw);

	union {

		u64 t64;

		u32 t32[2];

	} tsf = { .t64 = timestamp, };

	u16 idx = mvif->mt76.omac_idx;

	u32 reg;



	idx = idx > HW_BSSID_MAX ? HW_BSSID_0 : idx;

	reg = idx > 1 ? MT_LPON_TCR2(idx): MT_LPON_TCR0(idx);



	mt7615_mutex_acquire(dev);



	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);



	mt7615_mutex_release(dev);

}
@@ -1278,6 +1305,7 @@ const struct ieee80211_ops mt7615_ops = { 
	.get_stats = mt7615_get_stats,

	.get_tsf = mt7615_get_tsf,

	.set_tsf = mt7615_set_tsf,

	.offset_tsf = mt7615_offset_tsf,

	.get_survey = mt76_get_survey,

	.get_antenna = mt76_get_antenna,

	.set_antenna = mt7615_set_antenna,

drivers/net/wireless/mediatek/mt76/mt7615/regs.h

+2 −0
Original line number Diff line number Diff line
@@ -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)



#define MT_LPON_UTTR0			MT_LPON(0x018)

#define MT_LPON_UTTR1			MT_LPON(0x01c)

drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static int mt7663_usb_sdio_set_rates(struct mt7615_dev *dev, 
	idx = idx > HW_BSSID_MAX ? HW_BSSID_0 : idx;

	addr = idx > 1 ? MT_LPON_TCR2(idx): MT_LPON_TCR0(idx);



	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 = mt76_rr(dev, MT_LPON_UTTR0);

	sta->rate_set_tsf = (val & ~BIT(0)) | rate->rateset;