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
Date: Tue, 25 May 2021 11:03:03 +0200 [thread overview]
Message-ID: <YKy9R82co40IqVSw@lore-desk> (raw)
In-Reply-To: <02303700150757de92fec3525fe51c04d1aca416.1621931743.git.ryder.lee@mediatek.com>
[-- Attachment #1.1: Type: text/plain, Size: 4951 bytes --]
> 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
>
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
[-- Attachment #2: Type: text/plain, Size: 170 bytes --]
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
WARNING: multiple messages have this Message-ID (diff)
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
Date: Tue, 25 May 2021 11:03:03 +0200 [thread overview]
Message-ID: <YKy9R82co40IqVSw@lore-desk> (raw)
In-Reply-To: <02303700150757de92fec3525fe51c04d1aca416.1621931743.git.ryder.lee@mediatek.com>
[-- Attachment #1: Type: text/plain, Size: 4951 bytes --]
> 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
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2021-05-25 9:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-25 8:45 [PATCH 1/2] mt76: mt7915: add .offset_tsf callback Ryder Lee
2021-05-25 8:45 ` Ryder Lee
2021-05-25 8:45 ` [PATCH 2/2] mt76: mt7615: " Ryder Lee
2021-05-25 8:45 ` Ryder Lee
2021-05-25 9:03 ` Lorenzo Bianconi [this message]
2021-05-25 9:03 ` Lorenzo Bianconi
2021-05-25 9:01 ` [PATCH 1/2] mt76: mt7915: " Lorenzo Bianconi
2021-05-25 9:01 ` Lorenzo Bianconi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YKy9R82co40IqVSw@lore-desk \
--to=lorenzo.bianconi@redhat.com \
--cc=evelyn.tsai@mediatek.com \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=nbd@nbd.name \
--cc=ryder.lee@mediatek.com \
--cc=shayne.chen@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.