iwlwifi: add basic runtime PM support
Subsystems (3)
PATCH v2 1/1 iwlwifi: add basic runtime PM support
This simple patch adds open/close based runtime PM support to the iwlwifi driver. Namely, make the driver suspend the device after shutting down the interface and resume the device when activating the interface. In my test, suspending the device can save about 0.4 watt power. The shortcoming is that the device no longer generate rfkill changes interrupt.
Signed-off-by Zheng Yan <[email protected]>
---
Changes since v1:
Add module parameter to enable/disable runtime PM
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn.c | 21 +++++++++++++++++++-- drivers/net/wireless/iwlwifi/iwl-pci.c | 22 +++++++++++++++++++++- drivers/net/wireless/iwlwifi/iwl-shared.h | 1 + 4 files changed, 42 insertions(+), 3 deletions(-)
drivers/net/wireless/iwlwifi/iwl-agn-lib.c +1 -0
@@ -164,6 +164,7 @@ struct iwl_mod_params iwlagn_mod_params = { .bt_ch_announce = true, .wanted_ucode_alternative = 1, .auto_agg = true, + .runtime_pm = false,/* the rest are 0 by default */ };
drivers/net/wireless/iwlwifi/iwl-agn.c +19 -2
@@ -38,6 +38,7 @@#include <linux/firmware.h> #include <linux/etherdevice.h> #include <linux/if_arp.h> +#include <linux/pm_runtime.h> #include <net/mac80211.h>
@@ -1755,6 +1756,8 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw)struct iwl_priv *priv = hw->priv;int ret; +pm_runtime_get_sync (bus (priv)->dev); +IWL_DEBUG_MAC80211 (priv,"enter\n" );/* we should be verifying the device is ready to be opened */
@@ -1762,7 +1765,7 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) ret =__iwl_up (priv);mutex_unlock (&priv->shrd->mutex);if (ret) -return ret; + goto out;IWL_DEBUG_INFO (priv,"Start UP work done.\n" );
@@ -1774,7 +1777,10 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) priv->is_open =1 ;IWL_DEBUG_MAC80211 (priv,"leave\n" ); -return 0 ; + ret =0 ; +out: +pm_runtime_put (bus (priv)->dev); +return ret; }static void iwlagn_mac_stop (struct ieee80211_hw *hw)
@@ -1786,6 +1792,8 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)if (!priv->is_open)return ; +pm_runtime_get_sync (bus (priv)->dev); + priv->is_open =0 ;iwl_down (priv);
@@ -1798,6 +1806,8 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)iwl_enable_rfkill_int (priv);IWL_DEBUG_MAC80211 (priv,"leave\n" ); + +pm_runtime_put (bus (priv)->dev); }#ifdef CONFIG_PM_SLEEP
@@ -3557,3 +3567,10 @@ module_param_named(no_sleep_autoadjust, iwlagn_mod_params.no_sleep_autoadjust,MODULE_PARM_DESC (no_sleep_autoadjust,"don't automatically adjust sleep level " "according to maximum network latency (default: true)" ); + +module_param_named (runtime_pm, iwlagn_mod_params.runtime_pm, bool,S_IRUGO ); +MODULE_PARM_DESC (runtime_pm, +"enable open/close based runtime power management, this " +"feature can make HW rfkill unusable (default: disabled)" ); + +
drivers/net/wireless/iwlwifi/iwl-pci.c +21 -1
@@ -63,6 +63,7 @@#include <linux/module.h> #include <linux/pci.h> #include <linux/pci-aspm.h> +#include <linux/pm_runtime.h> #include "iwl-bus.h" #include "iwl-io.h"
@@ -465,6 +466,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err =iwl_probe (bus, &trans_ops_pcie, cfg);if (err) goto out_disable_msi; + +pm_runtime_put_noidle (&pdev->dev);return 0 ; out_disable_msi:
@@ -487,6 +490,8 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)struct pci_dev *pci_dev =IWL_BUS_GET_PCI_DEV (bus);struct iwl_shared *shrd = bus->shrd; +pm_runtime_get_noresume (&pdev->dev); +iwl_remove (shrd->priv);pci_disable_msi (pci_dev);
@@ -534,7 +539,22 @@ static int iwl_pci_resume(struct device *device)return iwl_trans_resume (shrd->trans); } -static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); + +static int iwl_pci_runtime_idle (struct device *dev) +{ +struct pci_dev *pdev =to_pci_dev (dev); +struct iwl_bus *bus =pci_get_drvdata (pdev); +struct iwl_shared *shrd = bus->shrd; + +if (iwlagn_mod_params.runtime_pm && + !test_bit (STATUS_ALIVE , &shrd->status)) +return 0 ; + +return -EBUSY ; +} + +static UNIVERSAL_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, + iwl_pci_resume, iwl_pci_runtime_idle);#define IWL_PM_OPS (&iwl_dev_pm_ops)
drivers/net/wireless/iwlwifi/iwl-shared.h +1 -0
@@ -152,6 +152,7 @@ struct iwl_mod_params {bool bt_ch_announce;int wanted_ucode_alternative;bool auto_agg; +bool runtime_pm; };/**
Signature · 1 line
1.7.7.5
Quoted 22 lines · Zheng
This simple patch adds open/close based runtime PM support to the iwlwifi driver. Namely, make the driver suspend the device after shutting down the interface and resume the device when activating the interface. In my test, suspending the device can save about 0.4 watt power. The shortcoming is that the device no longer generate rfkill changes interrupt.
Signed-off-by Zheng Yan <[email protected]>---
Changes since v1:
Add module parameter to enable/disable runtime PMdrivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn.c | 21 +++++++++++++++++++-- drivers/net/wireless/iwlwifi/iwl-pci.c | 22 +++++++++++++++++++++- drivers/net/wireless/iwlwifi/iwl-shared.h | 1 + 4 files changed, 42 insertions(+), 3 deletions(-)drivers/net/wireless/iwlwifi/iwl-agn-lib.c +0
-0
drivers/net/wireless/iwlwifi/iwl-agn-lib.c struct iwl_mod_params iwlagn_mod_params = { · line 167
Quoted 4 lines
drivers/net/wireless/iwlwifi/iwl-agn-lib.c +1
-0@@ -164,6 +164,7 @@ struct iwl_mod_params iwlagn_mod_params = { .bt_ch_announce = true, .wanted_ucode_alternative = 1, .auto_agg = true, + .runtime_pm = false,
no need if it is "false"
Quoted 109 lines
drivers/net/wireless/iwlwifi/iwl-agn-lib.c +0
-0/* the rest are 0 by default */ };drivers/net/wireless/iwlwifi/iwl-agn.c +19
-2@@ -38,6 +38,7 @@#include <linux/firmware.h> #include <linux/etherdevice.h> #include <linux/if_arp.h> +#include <linux/pm_runtime.h> #include <net/mac80211.h> @@ -1755,6 +1756,8 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw)struct iwl_priv *priv = hw->priv;int ret; +pm_runtime_get_sync (bus (priv)->dev); +IWL_DEBUG_MAC80211 (priv,"enter\n" );/* we should be verifying the device is ready to be opened */ @@ -1762,7 +1765,7 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) ret =__iwl_up (priv);mutex_unlock (&priv->shrd->mutex);if (ret) -return ret; + goto out;IWL_DEBUG_INFO (priv,"Start UP work done.\n" );@@ -1774,7 +1777,10 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) priv->is_open =1 ;IWL_DEBUG_MAC80211 (priv,"leave\n" ); -return 0 ; + ret =0 ; +out: +pm_runtime_put (bus (priv)->dev); +return ret; }static void iwlagn_mac_stop (struct ieee80211_hw *hw)@@ -1786,6 +1792,8 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)if (!priv->is_open)return ; +pm_runtime_get_sync (bus (priv)->dev); + priv->is_open =0 ;iwl_down (priv);@@ -1798,6 +1806,8 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)iwl_enable_rfkill_int (priv);IWL_DEBUG_MAC80211 (priv,"leave\n" ); + +pm_runtime_put (bus (priv)->dev); }#ifdef CONFIG_PM_SLEEP @@ -3557,3 +3567,10 @@ module_param_named(no_sleep_autoadjust, iwlagn_mod_params.no_sleep_autoadjust,MODULE_PARM_DESC (no_sleep_autoadjust,"don't automatically adjust sleep level " "according to maximum network latency (default: true)" ); + +module_param_named (runtime_pm, iwlagn_mod_params.runtime_pm, bool,S_IRUGO ); +MODULE_PARM_DESC (runtime_pm, +"enable open/close based runtime power management, this " +"feature can make HW rfkill unusable (default: disabled)" ); + +drivers/net/wireless/iwlwifi/iwl-pci.c +5
-1@@ -63,6 +63,7 @@#include <linux/module.h> #include <linux/pci.h> #include <linux/pci-aspm.h> +#include <linux/pm_runtime.h> #include "iwl-bus.h" #include "iwl-io.h" @@ -465,6 +466,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err =iwl_probe (bus, &trans_ops_pcie, cfg);if (err) goto out_disable_msi; + +pm_runtime_put_noidle (&pdev->dev);return 0 ; out_disable_msi:@@ -487,6 +490,8 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)struct pci_dev *pci_dev =IWL_BUS_GET_PCI_DEV (bus);struct iwl_shared *shrd = bus->shrd; +pm_runtime_get_noresume (&pdev->dev); +iwl_remove (shrd->priv);pci_disable_msi (pci_dev);@@ -534,7 +539,22 @@ static int iwl_pci_resume(struct device *device)return iwl_trans_resume (shrd->trans); } -static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume);
drivers/net/wireless/iwlwifi/iwl-pci.c static int iwl_pci_resume(struct device *device) · line 551
Quoted 10 lines
drivers/net/wireless/iwlwifi/iwl-pci.c +10
-0+ +static int iwl_pci_runtime_idle (struct device *dev) +{ +struct pci_dev *pdev =to_pci_dev (dev); +struct iwl_bus *bus =pci_get_drvdata (pdev); +struct iwl_shared *shrd = bus->shrd; + +if (iwlagn_mod_params.runtime_pm && + !test_bit (STATUS_ALIVE , &shrd->status)) +return 0 ;
checking for "Runtiem PM parameter enabled" and "uCode not loaded"?
Quoted 21 lines
drivers/net/wireless/iwlwifi/iwl-pci.c +6
-0+ +return -EBUSY ; +} + +static UNIVERSAL_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, + iwl_pci_resume, iwl_pci_runtime_idle);#define IWL_PM_OPS (&iwl_dev_pm_ops)drivers/net/wireless/iwlwifi/iwl-shared.h +1
-0@@ -152,6 +152,7 @@ struct iwl_mod_params {bool bt_ch_announce;int wanted_ucode_alternative;bool auto_agg; +bool runtime_pm; };/**
Quoted 18 lines · wwguy
Quoted 17 lines · Zheng
This simple patch adds open/close based runtime PM support to the iwlwifi driver. Namely, make the driver suspend the device after shutting down the interface and resume the device when activating the interface. In my test, suspending the device can save about 0.4 watt power. The shortcoming is that the device no longer generate rfkill changes interrupt.
Signed-off-by Zheng Yan <[email protected]>---
Changes since v1:
Add module parameter to enable/disable runtime PMdrivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn.c | 21 +++++++++++++++++++-- drivers/net/wireless/iwlwifi/iwl-pci.c | 22 +++++++++++++++++++++- drivers/net/wireless/iwlwifi/iwl-shared.h | 1 + 4 files changed, 42 insertions(+), 3 deletions(-)
Quoted 10 lines
drivers/net/wireless/iwlwifi/iwl-agn-lib.c struct iwl_mod_params iwlagn_mod_params = { · line 167
Quoted 9 lines
drivers/net/wireless/iwlwifi/iwl-agn-lib.c +1
-0@@ -164,6 +164,7 @@ struct iwl_mod_params iwlagn_mod_params = { .bt_ch_announce = true, .wanted_ucode_alternative = 1, .auto_agg = true, + .runtime_pm = false,no need if it is "false"
Ok, I will update the patch.
Quoted 109 lines
Quoted 109 lines
drivers/net/wireless/iwlwifi/iwl-agn-lib.c +0
-0/* the rest are 0 by default */ };drivers/net/wireless/iwlwifi/iwl-agn.c +19
-2@@ -38,6 +38,7 @@#include <linux/firmware.h> #include <linux/etherdevice.h> #include <linux/if_arp.h> +#include <linux/pm_runtime.h> #include <net/mac80211.h> @@ -1755,6 +1756,8 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw)struct iwl_priv *priv = hw->priv;int ret; +pm_runtime_get_sync (bus (priv)->dev); +IWL_DEBUG_MAC80211 (priv,"enter\n" );/* we should be verifying the device is ready to be opened */ @@ -1762,7 +1765,7 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) ret =__iwl_up (priv);mutex_unlock (&priv->shrd->mutex);if (ret) -return ret; + goto out;IWL_DEBUG_INFO (priv,"Start UP work done.\n" );@@ -1774,7 +1777,10 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) priv->is_open =1 ;IWL_DEBUG_MAC80211 (priv,"leave\n" ); -return 0 ; + ret =0 ; +out: +pm_runtime_put (bus (priv)->dev); +return ret; }static void iwlagn_mac_stop (struct ieee80211_hw *hw)@@ -1786,6 +1792,8 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)if (!priv->is_open)return ; +pm_runtime_get_sync (bus (priv)->dev); + priv->is_open =0 ;iwl_down (priv);@@ -1798,6 +1806,8 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)iwl_enable_rfkill_int (priv);IWL_DEBUG_MAC80211 (priv,"leave\n" ); + +pm_runtime_put (bus (priv)->dev); }#ifdef CONFIG_PM_SLEEP @@ -3557,3 +3567,10 @@ module_param_named(no_sleep_autoadjust, iwlagn_mod_params.no_sleep_autoadjust,MODULE_PARM_DESC (no_sleep_autoadjust,"don't automatically adjust sleep level " "according to maximum network latency (default: true)" ); + +module_param_named (runtime_pm, iwlagn_mod_params.runtime_pm, bool,S_IRUGO ); +MODULE_PARM_DESC (runtime_pm, +"enable open/close based runtime power management, this " +"feature can make HW rfkill unusable (default: disabled)" ); + +drivers/net/wireless/iwlwifi/iwl-pci.c +5
-0@@ -63,6 +63,7 @@#include <linux/module.h> #include <linux/pci.h> #include <linux/pci-aspm.h> +#include <linux/pm_runtime.h> #include "iwl-bus.h" #include "iwl-io.h" @@ -465,6 +466,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err =iwl_probe (bus, &trans_ops_pcie, cfg);if (err) goto out_disable_msi; + +pm_runtime_put_noidle (&pdev->dev);return 0 ; out_disable_msi:@@ -487,6 +490,8 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)struct pci_dev *pci_dev =IWL_BUS_GET_PCI_DEV (bus);struct iwl_shared *shrd = bus->shrd; +pm_runtime_get_noresume (&pdev->dev); +iwl_remove (shrd->priv);pci_disable_msi (pci_dev);@@ -534,7 +539,22 @@ static int iwl_pci_resume(struct device *device)return iwl_trans_resume (shrd->trans); }
Quoted 12 lines
drivers/net/wireless/iwlwifi/iwl-pci.c static int iwl_pci_resume(struct device *device) · line 551
Quoted 11 lines
drivers/net/wireless/iwlwifi/iwl-pci.c +10
-1-static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); + +static int iwl_pci_runtime_idle (struct device *dev) +{ +struct pci_dev *pdev =to_pci_dev (dev); +struct iwl_bus *bus =pci_get_drvdata (pdev); +struct iwl_shared *shrd = bus->shrd; + +if (iwlagn_mod_params.runtime_pm && + !test_bit (STATUS_ALIVE , &shrd->status)) +return 0 ;checking for "Runtiem PM parameter enabled" and "uCode not loaded"?
Yes. If idle function return -EBUSY, the runtime PM core will not suspend the device.
Regards
Yan, Zheng
Quoted 23 lines
Quoted 21 lines
drivers/net/wireless/iwlwifi/iwl-pci.c +6
-0+ +return -EBUSY ; +} + +static UNIVERSAL_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, + iwl_pci_resume, iwl_pci_runtime_idle);#define IWL_PM_OPS (&iwl_dev_pm_ops)drivers/net/wireless/iwlwifi/iwl-shared.h +1
-0@@ -152,6 +152,7 @@ struct iwl_mod_params {bool bt_ch_announce;int wanted_ucode_alternative;bool auto_agg; +bool runtime_pm; };/**
Quoted 5 lines · Zheng
This simple patch adds open/close based runtime PM support to the iwlwifi driver. Namely, make the driver suspend the device after shutting down the interface and resume the device when activating the interface. In my test, suspending the device can save about 0.4 watt power. The shortcoming is that the device no longer generate rfkill changes interrupt.
That could be a problem; how are rfkill changes noticed then when the device is suspended or are they just dropped? In userspace we want to know that the device cannot be used until it is unkilled so that we can show the right stuff to the user.
Dan
Quoted 160 lines
Signed-off-by Zheng Yan <[email protected]>---
Changes since v1:
Add module parameter to enable/disable runtime PMdrivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn.c | 21 +++++++++++++++++++-- drivers/net/wireless/iwlwifi/iwl-pci.c | 22 +++++++++++++++++++++- drivers/net/wireless/iwlwifi/iwl-shared.h | 1 + 4 files changed, 42 insertions(+), 3 deletions(-)drivers/net/wireless/iwlwifi/iwl-agn-lib.c +1
-0@@ -164,6 +164,7 @@ struct iwl_mod_params iwlagn_mod_params = { .bt_ch_announce = true, .wanted_ucode_alternative = 1, .auto_agg = true, + .runtime_pm = false,/* the rest are 0 by default */ };drivers/net/wireless/iwlwifi/iwl-agn.c +19
-2@@ -38,6 +38,7 @@#include <linux/firmware.h> #include <linux/etherdevice.h> #include <linux/if_arp.h> +#include <linux/pm_runtime.h> #include <net/mac80211.h> @@ -1755,6 +1756,8 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw)struct iwl_priv *priv = hw->priv;int ret; +pm_runtime_get_sync (bus (priv)->dev); +IWL_DEBUG_MAC80211 (priv,"enter\n" );/* we should be verifying the device is ready to be opened */ @@ -1762,7 +1765,7 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) ret =__iwl_up (priv);mutex_unlock (&priv->shrd->mutex);if (ret) -return ret; + goto out;IWL_DEBUG_INFO (priv,"Start UP work done.\n" );@@ -1774,7 +1777,10 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) priv->is_open =1 ;IWL_DEBUG_MAC80211 (priv,"leave\n" ); -return 0 ; + ret =0 ; +out: +pm_runtime_put (bus (priv)->dev); +return ret; }static void iwlagn_mac_stop (struct ieee80211_hw *hw)@@ -1786,6 +1792,8 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)if (!priv->is_open)return ; +pm_runtime_get_sync (bus (priv)->dev); + priv->is_open =0 ;iwl_down (priv);@@ -1798,6 +1806,8 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)iwl_enable_rfkill_int (priv);IWL_DEBUG_MAC80211 (priv,"leave\n" ); + +pm_runtime_put (bus (priv)->dev); }#ifdef CONFIG_PM_SLEEP @@ -3557,3 +3567,10 @@ module_param_named(no_sleep_autoadjust, iwlagn_mod_params.no_sleep_autoadjust,MODULE_PARM_DESC (no_sleep_autoadjust,"don't automatically adjust sleep level " "according to maximum network latency (default: true)" ); + +module_param_named (runtime_pm, iwlagn_mod_params.runtime_pm, bool,S_IRUGO ); +MODULE_PARM_DESC (runtime_pm, +"enable open/close based runtime power management, this " +"feature can make HW rfkill unusable (default: disabled)" ); + +drivers/net/wireless/iwlwifi/iwl-pci.c +21
-1@@ -63,6 +63,7 @@#include <linux/module.h> #include <linux/pci.h> #include <linux/pci-aspm.h> +#include <linux/pm_runtime.h> #include "iwl-bus.h" #include "iwl-io.h" @@ -465,6 +466,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err =iwl_probe (bus, &trans_ops_pcie, cfg);if (err) goto out_disable_msi; + +pm_runtime_put_noidle (&pdev->dev);return 0 ; out_disable_msi:@@ -487,6 +490,8 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)struct pci_dev *pci_dev =IWL_BUS_GET_PCI_DEV (bus);struct iwl_shared *shrd = bus->shrd; +pm_runtime_get_noresume (&pdev->dev); +iwl_remove (shrd->priv);pci_disable_msi (pci_dev);@@ -534,7 +539,22 @@ static int iwl_pci_resume(struct device *device)return iwl_trans_resume (shrd->trans); } -static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); + +static int iwl_pci_runtime_idle (struct device *dev) +{ +struct pci_dev *pdev =to_pci_dev (dev); +struct iwl_bus *bus =pci_get_drvdata (pdev); +struct iwl_shared *shrd = bus->shrd; + +if (iwlagn_mod_params.runtime_pm && + !test_bit (STATUS_ALIVE , &shrd->status)) +return 0 ; + +return -EBUSY ; +} + +static UNIVERSAL_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, + iwl_pci_resume, iwl_pci_runtime_idle);#define IWL_PM_OPS (&iwl_dev_pm_ops)drivers/net/wireless/iwlwifi/iwl-shared.h +1
-0@@ -152,6 +152,7 @@ struct iwl_mod_params {bool bt_ch_announce;int wanted_ucode_alternative;bool auto_agg; +bool runtime_pm; };/**
Quoted 7 lines · Dan Williams
Quoted 5 lines · Zheng
This simple patch adds open/close based runtime PM support to the iwlwifi driver. Namely, make the driver suspend the device after shutting down the interface and resume the device when activating the interface. In my test, suspending the device can save about 0.4 watt power. The shortcoming is that the device no longer generate rfkill changes interrupt.
Quoted 5 lines
That could be a problem; how are rfkill changes noticed then when the device is suspended or are they just dropped? In userspace we want to know that the device cannot be used until it is unkilled so that we can show the right stuff to the user.
Yes, it's a problem for system that uses HW rfkill. But it may have some value for system that uses software rfkill. The feature is disabled by default, so I assume it's not a big issue.
Thanks
Yan, Zheng
Quoted 163 lines
Quoted 161 lines
Signed-off-by Zheng Yan <[email protected]>---
Changes since v1:
Add module parameter to enable/disable runtime PMdrivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn.c | 21 +++++++++++++++++++-- drivers/net/wireless/iwlwifi/iwl-pci.c | 22 +++++++++++++++++++++- drivers/net/wireless/iwlwifi/iwl-shared.h | 1 + 4 files changed, 42 insertions(+), 3 deletions(-)drivers/net/wireless/iwlwifi/iwl-agn-lib.c +1
-0@@ -164,6 +164,7 @@ struct iwl_mod_params iwlagn_mod_params = { .bt_ch_announce = true, .wanted_ucode_alternative = 1, .auto_agg = true, + .runtime_pm = false,/* the rest are 0 by default */ };drivers/net/wireless/iwlwifi/iwl-agn.c +19
-2@@ -38,6 +38,7 @@#include <linux/firmware.h> #include <linux/etherdevice.h> #include <linux/if_arp.h> +#include <linux/pm_runtime.h> #include <net/mac80211.h> @@ -1755,6 +1756,8 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw)struct iwl_priv *priv = hw->priv;int ret; +pm_runtime_get_sync (bus (priv)->dev); +IWL_DEBUG_MAC80211 (priv,"enter\n" );/* we should be verifying the device is ready to be opened */ @@ -1762,7 +1765,7 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) ret =__iwl_up (priv);mutex_unlock (&priv->shrd->mutex);if (ret) -return ret; + goto out;IWL_DEBUG_INFO (priv,"Start UP work done.\n" );@@ -1774,7 +1777,10 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) priv->is_open =1 ;IWL_DEBUG_MAC80211 (priv,"leave\n" ); -return 0 ; + ret =0 ; +out: +pm_runtime_put (bus (priv)->dev); +return ret; }static void iwlagn_mac_stop (struct ieee80211_hw *hw)@@ -1786,6 +1792,8 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)if (!priv->is_open)return ; +pm_runtime_get_sync (bus (priv)->dev); + priv->is_open =0 ;iwl_down (priv);@@ -1798,6 +1806,8 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw)iwl_enable_rfkill_int (priv);IWL_DEBUG_MAC80211 (priv,"leave\n" ); + +pm_runtime_put (bus (priv)->dev); }#ifdef CONFIG_PM_SLEEP @@ -3557,3 +3567,10 @@ module_param_named(no_sleep_autoadjust, iwlagn_mod_params.no_sleep_autoadjust,MODULE_PARM_DESC (no_sleep_autoadjust,"don't automatically adjust sleep level " "according to maximum network latency (default: true)" ); + +module_param_named (runtime_pm, iwlagn_mod_params.runtime_pm, bool,S_IRUGO ); +MODULE_PARM_DESC (runtime_pm, +"enable open/close based runtime power management, this " +"feature can make HW rfkill unusable (default: disabled)" ); + +drivers/net/wireless/iwlwifi/iwl-pci.c +21
-1@@ -63,6 +63,7 @@#include <linux/module.h> #include <linux/pci.h> #include <linux/pci-aspm.h> +#include <linux/pm_runtime.h> #include "iwl-bus.h" #include "iwl-io.h" @@ -465,6 +466,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err =iwl_probe (bus, &trans_ops_pcie, cfg);if (err) goto out_disable_msi; + +pm_runtime_put_noidle (&pdev->dev);return 0 ; out_disable_msi:@@ -487,6 +490,8 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)struct pci_dev *pci_dev =IWL_BUS_GET_PCI_DEV (bus);struct iwl_shared *shrd = bus->shrd; +pm_runtime_get_noresume (&pdev->dev); +iwl_remove (shrd->priv);pci_disable_msi (pci_dev);@@ -534,7 +539,22 @@ static int iwl_pci_resume(struct device *device)return iwl_trans_resume (shrd->trans); } -static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); + +static int iwl_pci_runtime_idle (struct device *dev) +{ +struct pci_dev *pdev =to_pci_dev (dev); +struct iwl_bus *bus =pci_get_drvdata (pdev); +struct iwl_shared *shrd = bus->shrd; + +if (iwlagn_mod_params.runtime_pm && + !test_bit (STATUS_ALIVE , &shrd->status)) +return 0 ; + +return -EBUSY ; +} + +static UNIVERSAL_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, + iwl_pci_resume, iwl_pci_runtime_idle);#define IWL_PM_OPS (&iwl_dev_pm_ops)drivers/net/wireless/iwlwifi/iwl-shared.h +1
-0@@ -152,6 +152,7 @@ struct iwl_mod_params {bool bt_ch_announce;int wanted_ucode_alternative;bool auto_agg; +bool runtime_pm; };/**