[stable 2.6.37][PATCH] ath9k: Fix ath9k to allow CPU to enter C3 state.

[stable 2.6.37][PATCH] ath9k: Fix ath9k to allow CPU to enter C3 state.

[Vivek Natarajan]

The default qos value of 55 causes higher power consumption
and the battery drains out quickly. So, remove the pm_qos request
in the driver and the throughout issue in the Intel Pinetrail
platforms in which the DMA latency is seen can be fixed with
the following script:
http://www.kernel.org/pub/linux/kernel/people/mcgrof/scripts/cpudmalatency.c
http://johannes.sipsolutions.net/files/netlatency.c.txt

More details can be found in the following bugzilla link:
https://bugzilla.kernel.org/show_bug.cgi?id=27532

Cc: stable@kernel.org
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>
---
 drivers/net/wireless/ath/ath9k/ath9k.h |    2 --
 drivers/net/wireless/ath/ath9k/init.c  |    4 ----
 drivers/net/wireless/ath/ath9k/main.c  |    4 ----
 3 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 0963071..f424b08 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -21,7 +21,6 @@
 #include <linux/device.h>
 #include <linux/leds.h>
 #include <linux/completion.h>
-#include <linux/pm_qos_params.h>
 
 #include "debug.h"
 #include "common.h"
@@ -648,7 +647,6 @@ struct ath_softc {
 
 	struct ath_ant_comb ant_comb;
 
-	struct pm_qos_request_list pm_qos_req;
 };
 
 struct ath_wiphy {
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 14b8ab3..91d9b2a 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -758,9 +758,6 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
 	ath_init_leds(sc);
 	ath_start_rfkill_poll(sc);
 
-	pm_qos_add_request(&sc->pm_qos_req, PM_QOS_CPU_DMA_LATENCY,
-			   PM_QOS_DEFAULT_VALUE);
-
 	return 0;
 
 error_world:
@@ -829,7 +826,6 @@ void ath9k_deinit_device(struct ath_softc *sc)
 	}
 
 	ieee80211_unregister_hw(hw);
-	pm_qos_remove_request(&sc->pm_qos_req);
 	ath_rx_cleanup(sc);
 	ath_tx_cleanup(sc);
 	ath9k_deinit_softc(sc);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index c0c3464..7d332e5 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1244,8 +1244,6 @@ static int ath9k_start(struct ieee80211_hw *hw)
 			ath9k_btcoex_timer_resume(sc);
 	}
 
-	pm_qos_update_request(&sc->pm_qos_req, 55);
-
 mutex_unlock:
 	mutex_unlock(&sc->mutex);
 
@@ -1423,8 +1421,6 @@ static void ath9k_stop(struct ieee80211_hw *hw)
 
 	sc->sc_flags |= SC_OP_INVALID;
 
-	pm_qos_update_request(&sc->pm_qos_req, PM_QOS_DEFAULT_VALUE);
-
 	mutex_unlock(&sc->mutex);
 
 	ath_print(common, ATH_DBG_CONFIG, "Driver halt\n");
-- 
1.7.3.4

[stable 2.6.38][PATCH] ath9k: Fix ath9k to allow CPU to enter C3 state.

[Vivek Natarajan]

The default qos value of 55 causes higher power consumption
and the battery drains out quickly. So, remove the pm_qos request
in the driver and the throughout issue in the Intel Pinetrail
platforms in which the DMA latency is seen can be fixed with
the following script:
http://www.kernel.org/pub/linux/kernel/people/mcgrof/scripts/cpudmalatency.c
http://johannes.sipsolutions.net/files/netlatency.c.txt

More details can be found in the following bugzilla link:
https://bugzilla.kernel.org/show_bug.cgi?id=27532

Cc: stable@kernel.org
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>
---
 drivers/net/wireless/ath/ath9k/ath9k.h |    5 -----
 drivers/net/wireless/ath/ath9k/init.c  |    7 -------
 drivers/net/wireless/ath/ath9k/main.c  |    8 --------
 3 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 23838e3..a993d8a 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -21,7 +21,6 @@
 #include <linux/device.h>
 #include <linux/leds.h>
 #include <linux/completion.h>
-#include <linux/pm_qos_params.h>
 
 #include "debug.h"
 #include "common.h"
@@ -57,8 +56,6 @@ struct ath_node;
 
 #define A_MAX(a, b) ((a) > (b) ? (a) : (b))
 
-#define ATH9K_PM_QOS_DEFAULT_VALUE	55
-
 #define TSF_TO_TU(_h,_l) \
 	((((u32)(_h)) << 22) | (((u32)(_l)) >> 10))
 
@@ -634,7 +631,6 @@ struct ath_softc {
 
 	struct ath_ant_comb ant_comb;
 
-	struct pm_qos_request_list pm_qos_req;
 };
 
 struct ath_wiphy {
@@ -666,7 +662,6 @@ static inline void ath_read_cachesize(struct ath_common *common, int *csz)
 extern struct ieee80211_ops ath9k_ops;
 extern int ath9k_modparam_nohwcrypt;
 extern int led_blink;
-extern int ath9k_pm_qos_value;
 extern bool is_ath9k_unloaded;
 
 irqreturn_t ath_isr(int irq, void *dev);
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 087a6a9..82cac80 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -41,9 +41,6 @@ static int ath9k_btcoex_enable;
 module_param_named(btcoex_enable, ath9k_btcoex_enable, int, 0444);
 MODULE_PARM_DESC(btcoex_enable, "Enable wifi-BT coexistence");
 
-int ath9k_pm_qos_value = ATH9K_PM_QOS_DEFAULT_VALUE;
-module_param_named(pmqos, ath9k_pm_qos_value, int, S_IRUSR | S_IRGRP | S_IROTH);
-MODULE_PARM_DESC(pmqos, "User specified PM-QOS value");
 
 bool is_ath9k_unloaded;
 /* We use the hw_value as an index into our private channel structure */
@@ -762,9 +759,6 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
 	ath_init_leds(sc);
 	ath_start_rfkill_poll(sc);
 
-	pm_qos_add_request(&sc->pm_qos_req, PM_QOS_CPU_DMA_LATENCY,
-			   PM_QOS_DEFAULT_VALUE);
-
 	return 0;
 
 error_world:
@@ -831,7 +825,6 @@ void ath9k_deinit_device(struct ath_softc *sc)
 	}
 
 	ieee80211_unregister_hw(hw);
-	pm_qos_remove_request(&sc->pm_qos_req);
 	ath_rx_cleanup(sc);
 	ath_tx_cleanup(sc);
 	ath9k_deinit_softc(sc);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index da5c645..a09d15f 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1173,12 +1173,6 @@ static int ath9k_start(struct ieee80211_hw *hw)
 			ath9k_btcoex_timer_resume(sc);
 	}
 
-	/* User has the option to provide pm-qos value as a module
-	 * parameter rather than using the default value of
-	 * 'ATH9K_PM_QOS_DEFAULT_VALUE'.
-	 */
-	pm_qos_update_request(&sc->pm_qos_req, ath9k_pm_qos_value);
-
 	if (ah->caps.pcie_lcr_extsync_en && common->bus_ops->extn_synch_en)
 		common->bus_ops->extn_synch_en(common);
 
@@ -1345,8 +1339,6 @@ static void ath9k_stop(struct ieee80211_hw *hw)
 
 	sc->sc_flags |= SC_OP_INVALID;
 
-	pm_qos_update_request(&sc->pm_qos_req, PM_QOS_DEFAULT_VALUE);
-
 	mutex_unlock(&sc->mutex);
 
 	ath_dbg(common, ATH_DBG_CONFIG, "Driver halt\n");
-- 
1.7.3.4

Re: [stable] [stable 2.6.37][PATCH] ath9k: Fix ath9k to allow CPU to enter C3 state.

[Greg KH]

On Mon, Feb 28, 2011 at 11:50:53AM +0530, Vivek Natarajan wrote:
> The default qos value of 55 causes higher power consumption
> and the battery drains out quickly. So, remove the pm_qos request
> in the driver and the throughout issue in the Intel Pinetrail
> platforms in which the DMA latency is seen can be fixed with
> the following script:
> http://www.kernel.org/pub/linux/kernel/people/mcgrof/scripts/cpudmalatency.c
> http://johannes.sipsolutions.net/files/netlatency.c.txt
> 
> More details can be found in the following bugzilla link:
> https://bugzilla.kernel.org/show_bug.cgi?id=27532
> 
> Cc: stable@kernel.org
> Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
> Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>

Why did you send me 3 copies of this patch, when I don't need any copies
of it?

Totally confused,

greg k-h

Re: [stable] [stable 2.6.37][PATCH] ath9k: Fix ath9k to allow CPU to enter C3 state.

[Luis R. Rodriguez]

On Mon, Feb 28, 2011 at 6:22 AM, Greg KH <greg@kroah.com> wrote:
> On Mon, Feb 28, 2011 at 11:50:53AM +0530, Vivek Natarajan wrote:
>> The default qos value of 55 causes higher power consumption
>> and the battery drains out quickly. So, remove the pm_qos request
>> in the driver and the throughout issue in the Intel Pinetrail
>> platforms in which the DMA latency is seen can be fixed with
>> the following script:
>> http://www.kernel.org/pub/linux/kernel/people/mcgrof/scripts/cpudmalatency.c
>> http://johannes.sipsolutions.net/files/netlatency.c.txt
>>
>> More details can be found in the following bugzilla link:
>> https://bugzilla.kernel.org/show_bug.cgi?id=27532
>>
>> Cc: stable@kernel.org
>> Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
>> Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>
>
> Why did you send me 3 copies of this patch, when I don't need any copies
> of it?
>
> Totally confused,

Vivek, please only ask John to send this to David as stable so it can
get into 2.6.38-rc, then once there you can refer the sha1sum from
Linus' tree and justify propagating into the stable series.

  Luis

Re: [stable] [stable 2.6.37][PATCH] ath9k: Fix ath9k to allow CPU to enter C3 state.

[Vivek Natarajan]

On Mon, Feb 28, 2011 at 8:18 PM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
> On Mon, Feb 28, 2011 at 6:22 AM, Greg KH <greg@kroah.com> wrote:
>> On Mon, Feb 28, 2011 at 11:50:53AM +0530, Vivek Natarajan wrote:
>>> The default qos value of 55 causes higher power consumption
>>> and the battery drains out quickly. So, remove the pm_qos request
>>> in the driver and the throughout issue in the Intel Pinetrail
>>> platforms in which the DMA latency is seen can be fixed with
>>> the following script:
>>> http://www.kernel.org/pub/linux/kernel/people/mcgrof/scripts/cpudmalatency.c
>>> http://johannes.sipsolutions.net/files/netlatency.c.txt
>>>
>>> More details can be found in the following bugzilla link:
>>> https://bugzilla.kernel.org/show_bug.cgi?id=27532
>>>
>>> Cc: stable@kernel.org
>>> Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
>>> Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>
>>
>> Why did you send me 3 copies of this patch, when I don't need any copies
>> of it?
>>
>> Totally confused,
>
> Vivek, please only ask John to send this to David as stable so it can
> get into 2.6.38-rc, then once there you can refer the sha1sum from
> Linus' tree and justify propagating into the stable series.
>
I had sent separate patches for v2.6.37 and for v2.6.38 since the
patch could not be applied directly to previous versions. So, should I
send this rebased patch for v2.6.37 only after it makes it into
v2.6.38?

Vivek.

Re: [stable] [stable 2.6.37][PATCH] ath9k: Fix ath9k to allow CPU to enter C3 state.

[Luis R. Rodriguez]

On Mon, Feb 28, 2011 at 8:52 AM, Vivek Natarajan <vivek.natraj@gmail.com> wrote:
> On Mon, Feb 28, 2011 at 8:18 PM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
>> On Mon, Feb 28, 2011 at 6:22 AM, Greg KH <greg@kroah.com> wrote:
>>> On Mon, Feb 28, 2011 at 11:50:53AM +0530, Vivek Natarajan wrote:
>>>> The default qos value of 55 causes higher power consumption
>>>> and the battery drains out quickly. So, remove the pm_qos request
>>>> in the driver and the throughout issue in the Intel Pinetrail
>>>> platforms in which the DMA latency is seen can be fixed with
>>>> the following script:
>>>> http://www.kernel.org/pub/linux/kernel/people/mcgrof/scripts/cpudmalatency.c
>>>> http://johannes.sipsolutions.net/files/netlatency.c.txt
>>>>
>>>> More details can be found in the following bugzilla link:
>>>> https://bugzilla.kernel.org/show_bug.cgi?id=27532
>>>>
>>>> Cc: stable@kernel.org
>>>> Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
>>>> Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>
>>>
>>> Why did you send me 3 copies of this patch, when I don't need any copies
>>> of it?
>>>
>>> Totally confused,
>>
>> Vivek, please only ask John to send this to David as stable so it can
>> get into 2.6.38-rc, then once there you can refer the sha1sum from
>> Linus' tree and justify propagating into the stable series.
>>
> I had sent separate patches for v2.6.37 and for v2.6.38 since the
> patch could not be applied directly to previous versions. So, should I
> send this rebased patch for v2.6.37 only after it makes it into
> v2.6.38?

Affirmative. You cannot propagate stable patches unless they are
already in Linus' tree.

  Luis

Re: [stable] [stable 2.6.37][PATCH] ath9k: Fix ath9k to allow CPU to enter C3 state.

[Luis R. Rodriguez]

On Mon, Feb 28, 2011 at 9:20 AM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
> On Mon, Feb 28, 2011 at 8:52 AM, Vivek Natarajan <vivek.natraj@gmail.com> wrote:
>> On Mon, Feb 28, 2011 at 8:18 PM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
>>> On Mon, Feb 28, 2011 at 6:22 AM, Greg KH <greg@kroah.com> wrote:
>>>> On Mon, Feb 28, 2011 at 11:50:53AM +0530, Vivek Natarajan wrote:
>>>>> The default qos value of 55 causes higher power consumption
>>>>> and the battery drains out quickly. So, remove the pm_qos request
>>>>> in the driver and the throughout issue in the Intel Pinetrail
>>>>> platforms in which the DMA latency is seen can be fixed with
>>>>> the following script:
>>>>> http://www.kernel.org/pub/linux/kernel/people/mcgrof/scripts/cpudmalatency.c
>>>>> http://johannes.sipsolutions.net/files/netlatency.c.txt
>>>>>
>>>>> More details can be found in the following bugzilla link:
>>>>> https://bugzilla.kernel.org/show_bug.cgi?id=27532
>>>>>
>>>>> Cc: stable@kernel.org
>>>>> Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
>>>>> Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>
>>>>
>>>> Why did you send me 3 copies of this patch, when I don't need any copies
>>>> of it?
>>>>
>>>> Totally confused,
>>>
>>> Vivek, please only ask John to send this to David as stable so it can
>>> get into 2.6.38-rc, then once there you can refer the sha1sum from
>>> Linus' tree and justify propagating into the stable series.
>>>
>> I had sent separate patches for v2.6.37 and for v2.6.38 since the
>> patch could not be applied directly to previous versions. So, should I
>> send this rebased patch for v2.6.37 only after it makes it into
>> v2.6.38?
>
> Affirmative. You cannot propagate stable patches unless they are
> already in Linus' tree.

See:

http://wireless.kernel.org/en/users/Documentation/Fix_Propagation

  Luis

Re: [stable] [stable 2.6.37][PATCH] ath9k: Fix ath9k to allow CPU to enter C3 state.

[Greg KH]

On Mon, Feb 28, 2011 at 09:21:01AM -0800, Luis R. Rodriguez wrote:
> On Mon, Feb 28, 2011 at 9:20 AM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
> > On Mon, Feb 28, 2011 at 8:52 AM, Vivek Natarajan <vivek.natraj@gmail.com> wrote:
> >> On Mon, Feb 28, 2011 at 8:18 PM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
> >>> On Mon, Feb 28, 2011 at 6:22 AM, Greg KH <greg@kroah.com> wrote:
> >>>> On Mon, Feb 28, 2011 at 11:50:53AM +0530, Vivek Natarajan wrote:
> >>>>> The default qos value of 55 causes higher power consumption
> >>>>> and the battery drains out quickly. So, remove the pm_qos request
> >>>>> in the driver and the throughout issue in the Intel Pinetrail
> >>>>> platforms in which the DMA latency is seen can be fixed with
> >>>>> the following script:
> >>>>> http://www.kernel.org/pub/linux/kernel/people/mcgrof/scripts/cpudmalatency.c
> >>>>> http://johannes.sipsolutions.net/files/netlatency.c.txt
> >>>>>
> >>>>> More details can be found in the following bugzilla link:
> >>>>> https://bugzilla.kernel.org/show_bug.cgi?id=27532
> >>>>>
> >>>>> Cc: stable@kernel.org
> >>>>> Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
> >>>>> Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>
> >>>>
> >>>> Why did you send me 3 copies of this patch, when I don't need any copies
> >>>> of it?
> >>>>
> >>>> Totally confused,
> >>>
> >>> Vivek, please only ask John to send this to David as stable so it can
> >>> get into 2.6.38-rc, then once there you can refer the sha1sum from
> >>> Linus' tree and justify propagating into the stable series.
> >>>
> >> I had sent separate patches for v2.6.37 and for v2.6.38 since the
> >> patch could not be applied directly to previous versions. So, should I
> >> send this rebased patch for v2.6.37 only after it makes it into
> >> v2.6.38?
> >
> > Affirmative. You cannot propagate stable patches unless they are
> > already in Linus' tree.
> 
> See:
> 
> http://wireless.kernel.org/en/users/Documentation/Fix_Propagation

And of course, the file, Documentation/stable_kernel_rules.txt

thanks,

greg k-h