diff mbox series

[2/2] mt76: mt7615: add .offset_tsf callback

Message ID 02303700150757de92fec3525fe51c04d1aca416.1621931743.git.ryder.lee@mediatek.com (mailing list archive)
State Superseded
Delegated to: Felix Fietkau
Headers show
Series [1/2] mt76: mt7915: add .offset_tsf callback | expand

Commit Message

Ryder Lee May 25, 2021, 8:45 a.m. UTC 
It's much more accurate than .get_tsf + .set_tsf, and switch to use
mt76_rmw to operate tsf registers.

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

Comments

Lorenzo Bianconi May 25, 2021, 9:03 a.m. UTC | #1 
> It's much more accurate than .get_tsf + .set_tsf, and switch to use
> mt76_rmw to operate tsf registers.
> 
> 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(-)
> 
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/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, 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;
>  
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/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 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);
>  
> @@ -921,11 +922,37 @@ 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, };

same here

> +	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);
> +
> +	mutex_lock(&dev->mt76.mutex);

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);
> +
> +	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 = {
>  	.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,
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h b/drivers/net/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)
>  
>  #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/drivers/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_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;
>  
> -- 
> 2.18.0
>
diff mbox series

Patch

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/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, 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;
 
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/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 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);
 
@@ -921,11 +922,37 @@  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);
+
+	mutex_lock(&dev->mt76.mutex);
+
+	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);
+}
+
 static void
 mt7615_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)
 {
@@ -1308,6 +1335,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,
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h b/drivers/net/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)
 
 #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/drivers/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_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;