* Re: [PATCH 4/6] mt76: mt7921: introduce mt7921_wpdma_reinit_cond utility routine [not found] <YHxi1+jRHIfAuKJa@lore-desk--annotate> @ 2021-04-19 3:04 ` sean.wang 0 siblings, 0 replies; 3+ messages in thread From: sean.wang @ 2021-04-19 3:04 UTC (permalink / raw) To: nbd, lorenzo.bianconi Cc: sean.wang, Soul.Huang, YN.Chen, Leon.Yen, Deren.Wu, km.lin, robin.chiu, ch.yeh, posh.sun, Eric.Liang, Stella.Chang, linux-wireless, linux-mediatek From: Sean Wang <sean.wang@mediatek.com> >> From: Sean Wang <sean.wang@mediatek.com> > >I guess here we should use my 'From' tag That is my fault, I'll change it in the next version. > >Regards, >Lorenzo > >> >> Add mt7921_wpdma_reinit_cond to check dummy reg if driver needs to >> reinitialized WPDMA after driver_own operation >> >> Co-developed-by: Leon Yen <leon.yen@mediatek.com> >> Signed-off-by: Leon Yen <leon.yen@mediatek.com> >> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> >> Signed-off-by: Sean Wang <sean.wang@mediatek.com> >> --- >> .../net/wireless/mediatek/mt76/mt76_connac.h | 4 +++ >> .../wireless/mediatek/mt76/mt7921/debugfs.c | 13 ++++++++++ >> .../net/wireless/mediatek/mt76/mt7921/dma.c | 25 +++++++++++++++++++ >> .../wireless/mediatek/mt76/mt7921/mt7921.h | 6 +++++ >> 4 files changed, 48 insertions(+) >> >> diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h >> b/drivers/net/wireless/mediatek/mt76/mt76_connac.h >> index b811f3c410a1..3b5bff80a462 100644 >> --- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h >> +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h >> @@ -58,6 +58,10 @@ struct mt76_connac_pm { >> struct delayed_work ps_work; >> unsigned long last_activity; >> unsigned long idle_timeout; >> + >> + struct { >> + unsigned int lp_wake; >> + } stats; >> }; >> >> struct mt76_connac_coredump { >> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c >> b/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c >> index 5a54cd8d2ce4..bd2aca654767 100644 >> --- a/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c >> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c >> @@ -256,6 +256,17 @@ mt7921_pm_get(void *data, u64 *val) >> >> DEFINE_DEBUGFS_ATTRIBUTE(fops_pm, mt7921_pm_get, mt7921_pm_set, >> "%lld\n"); >> >> +static int >> +mt7921_pm_stats(struct seq_file *s, void *data) { >> + struct mt7921_dev *dev = dev_get_drvdata(s->private); >> + struct mt76_connac_pm *pm = &dev->pm; >> + >> + seq_printf(s, "low power wakes: %9d\n", pm->stats.lp_wake); >> + >> + return 0; >> +} >> + >> static int >> mt7921_pm_idle_timeout_set(void *data, u64 val) { @@ -322,6 +333,8 >> @@ int mt7921_init_debugfs(struct mt7921_dev *dev) >> debugfs_create_file("idle-timeout", 0600, dir, dev, >> &fops_pm_idle_timeout); >> debugfs_create_file("chip_reset", 0600, dir, dev, &fops_reset); >> + debugfs_create_devm_seqfile(dev->mt76.dev, "runtime_pm_stats", dir, >> + mt7921_pm_stats); >> >> return 0; >> } >> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c >> b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c >> index 8c556ff3ae93..72f5704f8f11 100644 >> --- a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c >> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c >> @@ -329,6 +329,31 @@ int mt7921_wpdma_reset(struct mt7921_dev *dev, bool force) >> return 0; >> } >> > <snip> _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 0/6] enable deep sleep mode when mt7921e suspends
@ 2021-04-18 16:36 sean.wang
2021-04-18 16:36 ` [PATCH 4/6] mt76: mt7921: introduce mt7921_wpdma_reinit_cond utility routine sean.wang
0 siblings, 1 reply; 3+ messages in thread
From: sean.wang @ 2021-04-18 16:36 UTC (permalink / raw)
To: nbd, lorenzo.bianconi
Cc: sean.wang, Soul.Huang, YN.Chen, Leon.Yen, Deren.Wu, km.lin,
robin.chiu, ch.yeh, posh.sun, Eric.Liang, Stella.Chang,
linux-wireless, linux-mediatek
From: Sean Wang <sean.wang@mediatek.com>
Enable the deep sleep mode in suspend handler which is able to reduce the
power consumption further.
Lorenzo Bianconi (3):
mt76: mt7921: move mt7921_dma_reset in dma.c
mt76: mt7921: introduce mt7921_wpdma_reset utility routine
mt76: mt7921: introduce mt7921_dma_{enable,disable} utilities
Sean Wang (3):
mt76: mt7921: introduce mt7921_wpdma_reinit_cond utility routine
mt76: connac: introduce mt76_connac_mcu_set_deep_sleep utility
mt76: mt7921: enable deep sleep when the device suspends
.../net/wireless/mediatek/mt76/mt76_connac.h | 4 +
.../wireless/mediatek/mt76/mt76_connac_mcu.c | 22 +-
.../wireless/mediatek/mt76/mt76_connac_mcu.h | 10 +
.../wireless/mediatek/mt76/mt7921/debugfs.c | 13 ++
.../net/wireless/mediatek/mt76/mt7921/dma.c | 204 +++++++++++++-----
.../net/wireless/mediatek/mt76/mt7921/mac.c | 93 +-------
.../wireless/mediatek/mt76/mt7921/mt7921.h | 8 +-
.../net/wireless/mediatek/mt76/mt7921/pci.c | 12 ++
8 files changed, 215 insertions(+), 151 deletions(-)
--
2.25.1
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 4/6] mt76: mt7921: introduce mt7921_wpdma_reinit_cond utility routine 2021-04-18 16:36 [PATCH 0/6] enable deep sleep mode when mt7921e suspends sean.wang @ 2021-04-18 16:36 ` sean.wang 2021-04-18 16:48 ` Lorenzo Bianconi 0 siblings, 1 reply; 3+ messages in thread From: sean.wang @ 2021-04-18 16:36 UTC (permalink / raw) To: nbd, lorenzo.bianconi Cc: sean.wang, Soul.Huang, YN.Chen, Leon.Yen, Deren.Wu, km.lin, robin.chiu, ch.yeh, posh.sun, Eric.Liang, Stella.Chang, linux-wireless, linux-mediatek, Leon Yen, Lorenzo Bianconi From: Sean Wang <sean.wang@mediatek.com> Add mt7921_wpdma_reinit_cond to check dummy reg if driver needs to reinitialized WPDMA after driver_own operation Co-developed-by: Leon Yen <leon.yen@mediatek.com> Signed-off-by: Leon Yen <leon.yen@mediatek.com> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Signed-off-by: Sean Wang <sean.wang@mediatek.com> --- .../net/wireless/mediatek/mt76/mt76_connac.h | 4 +++ .../wireless/mediatek/mt76/mt7921/debugfs.c | 13 ++++++++++ .../net/wireless/mediatek/mt76/mt7921/dma.c | 25 +++++++++++++++++++ .../wireless/mediatek/mt76/mt7921/mt7921.h | 6 +++++ 4 files changed, 48 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h index b811f3c410a1..3b5bff80a462 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h @@ -58,6 +58,10 @@ struct mt76_connac_pm { struct delayed_work ps_work; unsigned long last_activity; unsigned long idle_timeout; + + struct { + unsigned int lp_wake; + } stats; }; struct mt76_connac_coredump { diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c index 5a54cd8d2ce4..bd2aca654767 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c @@ -256,6 +256,17 @@ mt7921_pm_get(void *data, u64 *val) DEFINE_DEBUGFS_ATTRIBUTE(fops_pm, mt7921_pm_get, mt7921_pm_set, "%lld\n"); +static int +mt7921_pm_stats(struct seq_file *s, void *data) +{ + struct mt7921_dev *dev = dev_get_drvdata(s->private); + struct mt76_connac_pm *pm = &dev->pm; + + seq_printf(s, "low power wakes: %9d\n", pm->stats.lp_wake); + + return 0; +} + static int mt7921_pm_idle_timeout_set(void *data, u64 val) { @@ -322,6 +333,8 @@ int mt7921_init_debugfs(struct mt7921_dev *dev) debugfs_create_file("idle-timeout", 0600, dir, dev, &fops_pm_idle_timeout); debugfs_create_file("chip_reset", 0600, dir, dev, &fops_reset); + debugfs_create_devm_seqfile(dev->mt76.dev, "runtime_pm_stats", dir, + mt7921_pm_stats); return 0; } diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c index 8c556ff3ae93..72f5704f8f11 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c @@ -329,6 +329,31 @@ int mt7921_wpdma_reset(struct mt7921_dev *dev, bool force) return 0; } +int mt7921_wpdma_reinit_cond(struct mt7921_dev *dev) +{ + struct mt76_connac_pm *pm = &dev->pm; + int err; + + /* check if the wpdma must be reinitialized */ + if (mt7921_dma_need_reinit(dev)) { + /* disable interrutpts */ + mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0); + mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0); + + err = mt7921_wpdma_reset(dev, false); + if (err) { + dev_err(dev->mt76.dev, "wpdma reset failed\n"); + return err; + } + + /* enable interrutpts */ + mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); + pm->stats.lp_wake++; + } + + return 0; +} + int mt7921_dma_init(struct mt7921_dev *dev) { /* Increase buffer size to receive large VHT/HE MPDUs */ diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h index 06a85d2d1c6f..bb4961d3969a 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h @@ -254,6 +254,7 @@ int mt7921_eeprom_get_target_power(struct mt7921_dev *dev, void mt7921_eeprom_init_sku(struct mt7921_dev *dev); int mt7921_dma_init(struct mt7921_dev *dev); int mt7921_wpdma_reset(struct mt7921_dev *dev, bool force); +int mt7921_wpdma_reinit_cond(struct mt7921_dev *dev); void mt7921_dma_cleanup(struct mt7921_dev *dev); int mt7921_run_firmware(struct mt7921_dev *dev); int mt7921_mcu_init(struct mt7921_dev *dev); @@ -317,6 +318,11 @@ mt7921_l1_rmw(struct mt7921_dev *dev, u32 addr, u32 mask, u32 val) #define mt7921_l1_set(dev, addr, val) mt7921_l1_rmw(dev, addr, 0, val) #define mt7921_l1_clear(dev, addr, val) mt7921_l1_rmw(dev, addr, val, 0) +static inline bool mt7921_dma_need_reinit(struct mt7921_dev *dev) +{ + return !mt76_get_field(dev, MT_WFDMA_DUMMY_CR, MT_WFDMA_NEED_REINIT); +} + void mt7921_mac_init(struct mt7921_dev *dev); bool mt7921_mac_wtbl_update(struct mt7921_dev *dev, int idx, u32 mask); void mt7921_mac_reset_counters(struct mt7921_phy *phy); -- 2.25.1 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 4/6] mt76: mt7921: introduce mt7921_wpdma_reinit_cond utility routine 2021-04-18 16:36 ` [PATCH 4/6] mt76: mt7921: introduce mt7921_wpdma_reinit_cond utility routine sean.wang @ 2021-04-18 16:48 ` Lorenzo Bianconi 0 siblings, 0 replies; 3+ messages in thread From: Lorenzo Bianconi @ 2021-04-18 16:48 UTC (permalink / raw) To: sean.wang Cc: nbd, lorenzo.bianconi, Soul.Huang, YN.Chen, Leon.Yen, Deren.Wu, km.lin, robin.chiu, ch.yeh, posh.sun, Eric.Liang, Stella.Chang, linux-wireless, linux-mediatek [-- Attachment #1.1: Type: text/plain, Size: 4942 bytes --] > From: Sean Wang <sean.wang@mediatek.com> I guess here we should use my 'From' tag Regards, Lorenzo > > Add mt7921_wpdma_reinit_cond to check dummy reg if driver needs to > reinitialized WPDMA after driver_own operation > > Co-developed-by: Leon Yen <leon.yen@mediatek.com> > Signed-off-by: Leon Yen <leon.yen@mediatek.com> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > Signed-off-by: Sean Wang <sean.wang@mediatek.com> > --- > .../net/wireless/mediatek/mt76/mt76_connac.h | 4 +++ > .../wireless/mediatek/mt76/mt7921/debugfs.c | 13 ++++++++++ > .../net/wireless/mediatek/mt76/mt7921/dma.c | 25 +++++++++++++++++++ > .../wireless/mediatek/mt76/mt7921/mt7921.h | 6 +++++ > 4 files changed, 48 insertions(+) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h > index b811f3c410a1..3b5bff80a462 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h > +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h > @@ -58,6 +58,10 @@ struct mt76_connac_pm { > struct delayed_work ps_work; > unsigned long last_activity; > unsigned long idle_timeout; > + > + struct { > + unsigned int lp_wake; > + } stats; > }; > > struct mt76_connac_coredump { > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c b/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c > index 5a54cd8d2ce4..bd2aca654767 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c > @@ -256,6 +256,17 @@ mt7921_pm_get(void *data, u64 *val) > > DEFINE_DEBUGFS_ATTRIBUTE(fops_pm, mt7921_pm_get, mt7921_pm_set, "%lld\n"); > > +static int > +mt7921_pm_stats(struct seq_file *s, void *data) > +{ > + struct mt7921_dev *dev = dev_get_drvdata(s->private); > + struct mt76_connac_pm *pm = &dev->pm; > + > + seq_printf(s, "low power wakes: %9d\n", pm->stats.lp_wake); > + > + return 0; > +} > + > static int > mt7921_pm_idle_timeout_set(void *data, u64 val) > { > @@ -322,6 +333,8 @@ int mt7921_init_debugfs(struct mt7921_dev *dev) > debugfs_create_file("idle-timeout", 0600, dir, dev, > &fops_pm_idle_timeout); > debugfs_create_file("chip_reset", 0600, dir, dev, &fops_reset); > + debugfs_create_devm_seqfile(dev->mt76.dev, "runtime_pm_stats", dir, > + mt7921_pm_stats); > > return 0; > } > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c > index 8c556ff3ae93..72f5704f8f11 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c > @@ -329,6 +329,31 @@ int mt7921_wpdma_reset(struct mt7921_dev *dev, bool force) > return 0; > } > > +int mt7921_wpdma_reinit_cond(struct mt7921_dev *dev) > +{ > + struct mt76_connac_pm *pm = &dev->pm; > + int err; > + > + /* check if the wpdma must be reinitialized */ > + if (mt7921_dma_need_reinit(dev)) { > + /* disable interrutpts */ > + mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0); > + mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0); > + > + err = mt7921_wpdma_reset(dev, false); > + if (err) { > + dev_err(dev->mt76.dev, "wpdma reset failed\n"); > + return err; > + } > + > + /* enable interrutpts */ > + mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); > + pm->stats.lp_wake++; > + } > + > + return 0; > +} > + > int mt7921_dma_init(struct mt7921_dev *dev) > { > /* Increase buffer size to receive large VHT/HE MPDUs */ > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h > index 06a85d2d1c6f..bb4961d3969a 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h > @@ -254,6 +254,7 @@ int mt7921_eeprom_get_target_power(struct mt7921_dev *dev, > void mt7921_eeprom_init_sku(struct mt7921_dev *dev); > int mt7921_dma_init(struct mt7921_dev *dev); > int mt7921_wpdma_reset(struct mt7921_dev *dev, bool force); > +int mt7921_wpdma_reinit_cond(struct mt7921_dev *dev); > void mt7921_dma_cleanup(struct mt7921_dev *dev); > int mt7921_run_firmware(struct mt7921_dev *dev); > int mt7921_mcu_init(struct mt7921_dev *dev); > @@ -317,6 +318,11 @@ mt7921_l1_rmw(struct mt7921_dev *dev, u32 addr, u32 mask, u32 val) > #define mt7921_l1_set(dev, addr, val) mt7921_l1_rmw(dev, addr, 0, val) > #define mt7921_l1_clear(dev, addr, val) mt7921_l1_rmw(dev, addr, val, 0) > > +static inline bool mt7921_dma_need_reinit(struct mt7921_dev *dev) > +{ > + return !mt76_get_field(dev, MT_WFDMA_DUMMY_CR, MT_WFDMA_NEED_REINIT); > +} > + > void mt7921_mac_init(struct mt7921_dev *dev); > bool mt7921_mac_wtbl_update(struct mt7921_dev *dev, int idx, u32 mask); > void mt7921_mac_reset_counters(struct mt7921_phy *phy); > -- > 2.25.1 > [-- 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 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-19 3:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <YHxi1+jRHIfAuKJa@lore-desk--annotate>
2021-04-19 3:04 ` [PATCH 4/6] mt76: mt7921: introduce mt7921_wpdma_reinit_cond utility routine sean.wang
2021-04-18 16:36 [PATCH 0/6] enable deep sleep mode when mt7921e suspends sean.wang
2021-04-18 16:36 ` [PATCH 4/6] mt76: mt7921: introduce mt7921_wpdma_reinit_cond utility routine sean.wang
2021-04-18 16:48 ` Lorenzo Bianconi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox