diff mbox series

[4/9] mt76: mt7921: enable deep sleep at runtime

Message ID 1620659697-12048-4-git-send-email-sean.wang@mediatek.com
State New
Headers show
Series None | expand

Commit Message

Sean Wang May 10, 2021, 3:14 p.m. UTC 
From: Sean Wang <sean.wang@mediatek.com>

Enable the deep sleep mode with that firmware is able to trap into
the doze state at runtime to reduce the power consumption further.

The deep sleep mode is not allowed in the STA state transition with
the firmware to have the fast connection experience as we've done in
the full power mode

Reviewed-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
---
 .../wireless/mediatek/mt76/mt76_connac_mcu.c  | 20 +++++++++++++
 .../wireless/mediatek/mt76/mt76_connac_mcu.h  |  3 ++
 .../net/wireless/mediatek/mt76/mt7921/init.c  |  6 +++-
 .../net/wireless/mediatek/mt76/mt7921/main.c  | 28 +++++++++++++++++--
 4 files changed, 54 insertions(+), 3 deletions(-)

Comments

Felix Fietkau May 28, 2021, 12:51 p.m. UTC | #1 
Hi Sean,

On 2021-05-10 17:14, sean.wang@mediatek.com wrote:
> From: Sean Wang <sean.wang@mediatek.com>

> 

> Enable the deep sleep mode with that firmware is able to trap into

> the doze state at runtime to reduce the power consumption further.

> 

> The deep sleep mode is not allowed in the STA state transition with

> the firmware to have the fast connection experience as we've done in

> the full power mode

> 

> Reviewed-by: Lorenzo Bianconi <lorenzo@kernel.org>

> Signed-off-by: Sean Wang <sean.wang@mediatek.com>

> ---

>  .../wireless/mediatek/mt76/mt76_connac_mcu.c  | 20 +++++++++++++

>  .../wireless/mediatek/mt76/mt76_connac_mcu.h  |  3 ++

>  .../net/wireless/mediatek/mt76/mt7921/init.c  |  6 +++-

>  .../net/wireless/mediatek/mt76/mt7921/main.c  | 28 +++++++++++++++++--

>  4 files changed, 54 insertions(+), 3 deletions(-)

> 

>  void mt7921_unregister_device(struct mt7921_dev *dev)

> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c

> index 39b3e769925e..5dbccbefe047 100644

> --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c

> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c

> @@ -848,6 +848,31 @@ mt7921_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

>  			      IEEE80211_STA_NOTEXIST);

>  }

>  

> +static int mt7921_sta_state(struct ieee80211_hw *hw,

> +			    struct ieee80211_vif *vif,

> +			    struct ieee80211_sta *sta,

> +			    enum ieee80211_sta_state old_state,

> +			    enum ieee80211_sta_state new_state)

> +{

> +	struct mt7921_dev *dev = mt7921_hw_dev(hw);

> +

> +	if (dev->pm.enable) {

> +		mt7921_mutex_acquire(dev);

> +		mt76_connac_sta_state_dp(&dev->mt76, old_state, new_state);

> +		mt7921_mutex_release(dev);

> +	}

> +

> +	if (old_state == IEEE80211_STA_AUTH &&

> +	    new_state == IEEE80211_STA_ASSOC) {

> +		return mt7921_sta_add(hw, vif, sta);

> +	} else if (old_state == IEEE80211_STA_ASSOC &&

> +		   new_state == IEEE80211_STA_AUTH) {

> +		return mt7921_sta_remove(hw, vif, sta);

> +	}

> +

> +	return 0;

> +}

> +

>  static int

>  mt7921_get_stats(struct ieee80211_hw *hw,

>  		 struct ieee80211_low_level_stats *stats)

> @@ -1191,8 +1216,7 @@ const struct ieee80211_ops mt7921_ops = {

>  	.conf_tx = mt7921_conf_tx,

>  	.configure_filter = mt7921_configure_filter,

>  	.bss_info_changed = mt7921_bss_info_changed,

> -	.sta_add = mt7921_sta_add,

> -	.sta_remove = mt7921_sta_remove,

> +	.sta_state = mt7921_sta_state,

>  	.sta_pre_rcu_remove = mt76_sta_pre_rcu_remove,

>  	.set_key = mt7921_set_key,

>  	.sta_set_decap_offload = mt7921_sta_set_decap_offload,

Unfortunately, we can't switch from sta_add/remove to .sta_state here.
When .sta_state is implemented, mac80211 assumes that the station entry
is usable after the NOTEXIST->NONE transition, while the driver state is
only created after the AUTH->ASSOC transition.

Can you please send a fix, or a replacement patch?

Thanks,

- Felix
diff mbox series

Patch

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index 7b8f8e6f431d..542d7d9f1f52 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -1596,6 +1596,26 @@  int mt76_connac_mcu_set_deep_sleep(struct mt76_dev *dev, bool enable)
 }
 EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_deep_sleep);
 
+int mt76_connac_sta_state_dp(struct mt76_dev *dev,
+			     enum ieee80211_sta_state old_state,
+			     enum ieee80211_sta_state new_state)
+{
+	if ((old_state == IEEE80211_STA_ASSOC &&
+	     new_state == IEEE80211_STA_AUTHORIZED) ||
+	    (old_state == IEEE80211_STA_NONE &&
+	     new_state == IEEE80211_STA_NOTEXIST))
+		mt76_connac_mcu_set_deep_sleep(dev, true);
+
+	if ((old_state == IEEE80211_STA_NOTEXIST &&
+	     new_state == IEEE80211_STA_NONE) ||
+	    (old_state == IEEE80211_STA_AUTHORIZED &&
+	     new_state == IEEE80211_STA_ASSOC))
+		mt76_connac_mcu_set_deep_sleep(dev, false);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(mt76_connac_sta_state_dp);
+
 void mt76_connac_mcu_coredump_event(struct mt76_dev *dev, struct sk_buff *skb,
 				    struct mt76_connac_coredump *coredump)
 {
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index 01fc9f2c2f4a..3ed2fb5e1389 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -1032,6 +1032,9 @@  int mt76_connac_mcu_update_gtk_rekey(struct ieee80211_hw *hw,
 int mt76_connac_mcu_set_hif_suspend(struct mt76_dev *dev, bool suspend);
 void mt76_connac_mcu_set_suspend_iter(void *priv, u8 *mac,
 				      struct ieee80211_vif *vif);
+int mt76_connac_sta_state_dp(struct mt76_dev *dev,
+			     enum ieee80211_sta_state old_state,
+			     enum ieee80211_sta_state new_state);
 int mt76_connac_mcu_chip_config(struct mt76_dev *dev);
 int mt76_connac_mcu_set_deep_sleep(struct mt76_dev *dev, bool enable);
 void mt76_connac_mcu_coredump_event(struct mt76_dev *dev, struct sk_buff *skb,
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
index 6947d98287c0..cd68721314fa 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
@@ -250,7 +250,11 @@  int mt7921_register_device(struct mt7921_dev *dev)
 	if (ret)
 		return ret;
 
-	return mt7921_init_debugfs(dev);
+	ret = mt7921_init_debugfs(dev);
+	if (ret)
+		return ret;
+
+	return mt76_connac_mcu_set_deep_sleep(&dev->mt76, dev->pm.enable);
 }
 
 void mt7921_unregister_device(struct mt7921_dev *dev)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index 39b3e769925e..5dbccbefe047 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -848,6 +848,31 @@  mt7921_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 			      IEEE80211_STA_NOTEXIST);
 }
 
+static int mt7921_sta_state(struct ieee80211_hw *hw,
+			    struct ieee80211_vif *vif,
+			    struct ieee80211_sta *sta,
+			    enum ieee80211_sta_state old_state,
+			    enum ieee80211_sta_state new_state)
+{
+	struct mt7921_dev *dev = mt7921_hw_dev(hw);
+
+	if (dev->pm.enable) {
+		mt7921_mutex_acquire(dev);
+		mt76_connac_sta_state_dp(&dev->mt76, old_state, new_state);
+		mt7921_mutex_release(dev);
+	}
+
+	if (old_state == IEEE80211_STA_AUTH &&
+	    new_state == IEEE80211_STA_ASSOC) {
+		return mt7921_sta_add(hw, vif, sta);
+	} else if (old_state == IEEE80211_STA_ASSOC &&
+		   new_state == IEEE80211_STA_AUTH) {
+		return mt7921_sta_remove(hw, vif, sta);
+	}
+
+	return 0;
+}
+
 static int
 mt7921_get_stats(struct ieee80211_hw *hw,
 		 struct ieee80211_low_level_stats *stats)
@@ -1191,8 +1216,7 @@  const struct ieee80211_ops mt7921_ops = {
 	.conf_tx = mt7921_conf_tx,
 	.configure_filter = mt7921_configure_filter,
 	.bss_info_changed = mt7921_bss_info_changed,
-	.sta_add = mt7921_sta_add,
-	.sta_remove = mt7921_sta_remove,
+	.sta_state = mt7921_sta_state,
 	.sta_pre_rcu_remove = mt76_sta_pre_rcu_remove,
 	.set_key = mt7921_set_key,
 	.sta_set_decap_offload = mt7921_sta_set_decap_offload,