[PATCH v2 2.6.33] rt2x00: Disable powersaving for rt61pci and rt2800pci.

[PATCH v2 2.6.33] rt2x00: Disable powersaving for rt61pci and rt2800pci.

[Gertjan van Wingerde]

We've had many reports of rt61pci failures with powersaving enabled.
Therefore, as a stop-gap measure, disable powersaving of the rt61pci
until we have found a proper solution.
Also disable powersaving on rt2800pci as it most probably will show
the same problem.

Cc: stable@kernel.org
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
---

John, this is an urgent fix for 2.6.33.

v2:
- Handled feedback from Ivo:
	- Only disable powersaving by default, not permanent.
	- Also apply to rt2800pci.

---
 drivers/net/wireless/rt2x00/rt2800lib.c |    6 ++++++
 drivers/net/wireless/rt2x00/rt61pci.c   |    5 +++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 6e13650..fa197ac 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -2022,6 +2022,12 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
 	u16 eeprom;
 
 	/*
+	 * Disable powersaving as default on PCI devices.
+	 */
+	if (rt2x00_intf_is_pci(rt2x00dev))
+		rt2x00dev->hw->wiphy->ps_default = false;
+
+	/*
 	 * Initialize all hw fields.
 	 */
 	rt2x00dev->hw->flags =
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 687e17d..9440a4d 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2539,6 +2539,11 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
 	unsigned int i;
 
 	/*
+	 * Disable powersaving as default.
+	 */
+	rt2x00dev->hw->wiphy->ps_default = false;
+
+	/*
 	 * Initialize all hw fields.
 	 */
 	rt2x00dev->hw->flags =
-- 
1.6.5.5

Re: [PATCH v2 2.6.33] rt2x00: Disable powersaving for rt61pci and rt2800pci.

[Ivo van Doorn]

On Monday 14 December 2009, Gertjan van Wingerde wrote:
> We've had many reports of rt61pci failures with powersaving enabled.
> Therefore, as a stop-gap measure, disable powersaving of the rt61pci
> until we have found a proper solution.
> Also disable powersaving on rt2800pci as it most probably will show
> the same problem.
> 
> Cc: stable@kernel.org
> Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>

Acked-by: Ivo van Doorn <IvDoorn@gmail.com>

> ---
> 
> John, this is an urgent fix for 2.6.33.
> 
> v2:
> - Handled feedback from Ivo:
> 	- Only disable powersaving by default, not permanent.
> 	- Also apply to rt2800pci.
> 
> ---
>  drivers/net/wireless/rt2x00/rt2800lib.c |    6 ++++++
>  drivers/net/wireless/rt2x00/rt61pci.c   |    5 +++++
>  2 files changed, 11 insertions(+), 0 deletions(-)
> 

Re: [PATCH v2 2.6.33] rt2x00: Disable powersaving for rt61pci and rt2800pci.

[John W. Linville]

On Mon, Dec 14, 2009 at 08:33:55PM +0100, Gertjan van Wingerde wrote:
> We've had many reports of rt61pci failures with powersaving enabled.
> Therefore, as a stop-gap measure, disable powersaving of the rt61pci
> until we have found a proper solution.
> Also disable powersaving on rt2800pci as it most probably will show
> the same problem.
> 
> Cc: stable@kernel.org
> Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
> ---
> 
> John, this is an urgent fix for 2.6.33.
> 
> v2:
> - Handled feedback from Ivo:
> 	- Only disable powersaving by default, not permanent.
> 	- Also apply to rt2800pci.

As posted, it will only compile on 2.6.32...

This is what I'm merging:

diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index a199f85..6bf6c0f 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -2022,6 +2022,12 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
 	u16 eeprom;
 
 	/*
+	 * Disable powersaving as default on PCI devices.
+	 */
+	if (rt2x00_intf_is_pci(rt2x00dev))
+		rt2x00dev->hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+
+	/*
 	 * Initialize all hw fields.
 	 */
 	rt2x00dev->hw->flags =
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 687e17d..0ca5893 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2539,6 +2539,11 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
 	unsigned int i;
 
 	/*
+	 * Disable powersaving as default.
+	 */
+	rt2x00dev->hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+
+	/*
 	 * Initialize all hw fields.
 	 */
 	rt2x00dev->hw->flags =
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH v2 2.6.33] rt2x00: Disable powersaving for rt61pci and rt2800pci.

[Gertjan van Wingerde]

On Tue, Dec 15, 2009 at 9:44 PM, John W. Linville
<linville@tuxdriver.com> wrote:
> On Mon, Dec 14, 2009 at 08:33:55PM +0100, Gertjan van Wingerde wrote:
>> We've had many reports of rt61pci failures with powersaving enabled.
>> Therefore, as a stop-gap measure, disable powersaving of the rt61pci
>> until we have found a proper solution.
>> Also disable powersaving on rt2800pci as it most probably will show
>> the same problem.
>>
>> Cc: stable@kernel.org
>> Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
>> ---
>>
>> John, this is an urgent fix for 2.6.33.
>>
>> v2:
>> - Handled feedback from Ivo:
>>       - Only disable powersaving by default, not permanent.
>>       - Also apply to rt2800pci.
>
> As posted, it will only compile on 2.6.32...
>

Me confused, as the patch was against the wireless-2.6.git tree, which
I thought was 2.6.33, and not 2.6.32. Please explain to which tree to
prepare fixes for 2.6.33.

> This is what I'm merging:
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index a199f85..6bf6c0f 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -2022,6 +2022,12 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
>        u16 eeprom;
>
>        /*
> +        * Disable powersaving as default on PCI devices.
> +        */
> +       if (rt2x00_intf_is_pci(rt2x00dev))
> +               rt2x00dev->hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
> +
> +       /*
>         * Initialize all hw fields.
>         */
>        rt2x00dev->hw->flags =
> diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
> index 687e17d..0ca5893 100644
> --- a/drivers/net/wireless/rt2x00/rt61pci.c
> +++ b/drivers/net/wireless/rt2x00/rt61pci.c
> @@ -2539,6 +2539,11 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
>        unsigned int i;
>
>        /*
> +        * Disable powersaving as default.
> +        */
> +       rt2x00dev->hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
> +
> +       /*
>         * Initialize all hw fields.
>         */
>        rt2x00dev->hw->flags =

Looks good to me.

---
Gertjan.

Re: [PATCH v2 2.6.33] rt2x00: Disable powersaving for rt61pci and rt2800pci.

[John W. Linville]

On Tue, Dec 15, 2009 at 10:10:19PM +0100, Gertjan van Wingerde wrote:
> On Tue, Dec 15, 2009 at 9:44 PM, John W. Linville
> <linville@tuxdriver.com> wrote:
> > On Mon, Dec 14, 2009 at 08:33:55PM +0100, Gertjan van Wingerde wrote:
> >> We've had many reports of rt61pci failures with powersaving enabled.
> >> Therefore, as a stop-gap measure, disable powersaving of the rt61pci
> >> until we have found a proper solution.
> >> Also disable powersaving on rt2800pci as it most probably will show
> >> the same problem.
> >>
> >> Cc: stable@kernel.org
> >> Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
> >> ---
> >>
> >> John, this is an urgent fix for 2.6.33.
> >>
> >> v2:
> >> - Handled feedback from Ivo:
> >>       - Only disable powersaving by default, not permanent.
> >>       - Also apply to rt2800pci.
> >
> > As posted, it will only compile on 2.6.32...
> >
> 
> Me confused, as the patch was against the wireless-2.6.git tree, which
> I thought was 2.6.33, and not 2.6.32. Please explain to which tree to
> prepare fixes for 2.6.33.

That seems rather impossible, since wireless-2.6 failed to build with
your patch applied. :-)  Perhaps you weren't up-to-date?

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH v2 2.6.33] rt2x00: Disable powersaving for rt61pci and rt2800pci.

[John W. Linville]

On Tue, Dec 15, 2009 at 04:30:52PM -0500, John W. Linville wrote:
> On Tue, Dec 15, 2009 at 10:10:19PM +0100, Gertjan van Wingerde wrote:
> > On Tue, Dec 15, 2009 at 9:44 PM, John W. Linville
> > <linville@tuxdriver.com> wrote:
> > > On Mon, Dec 14, 2009 at 08:33:55PM +0100, Gertjan van Wingerde wrote:
> > >> We've had many reports of rt61pci failures with powersaving enabled.
> > >> Therefore, as a stop-gap measure, disable powersaving of the rt61pci
> > >> until we have found a proper solution.
> > >> Also disable powersaving on rt2800pci as it most probably will show
> > >> the same problem.
> > >>
> > >> Cc: stable@kernel.org
> > >> Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
> > >> ---
> > >>
> > >> John, this is an urgent fix for 2.6.33.
> > >>
> > >> v2:
> > >> - Handled feedback from Ivo:
> > >>       - Only disable powersaving by default, not permanent.
> > >>       - Also apply to rt2800pci.
> > >
> > > As posted, it will only compile on 2.6.32...
> > >
> > 
> > Me confused, as the patch was against the wireless-2.6.git tree, which
> > I thought was 2.6.33, and not 2.6.32. Please explain to which tree to
> > prepare fixes for 2.6.33.
> 
> That seems rather impossible, since wireless-2.6 failed to build with
> your patch applied. :-)  Perhaps you weren't up-to-date?

For reference:

commit 5be83de54c16944dea9c16c6a5a53c1fa75ed304
Author: Johannes Berg <johannes@sipsolutions.net>
Date:   Thu Nov 19 00:56:28 2009 +0100

    cfg80211: convert bools into flags
    
    We've accumulated a number of options for wiphys
    which make more sense as flags as we keep adding
    more. Convert the existing ones.
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH v2 2.6.33] rt2x00: Disable powersaving for rt61pci and rt2800pci.

[Gertjan van Wingerde]

On Tue, Dec 15, 2009 at 10:30 PM, John W. Linville
<linville@tuxdriver.com> wrote:
> On Tue, Dec 15, 2009 at 10:10:19PM +0100, Gertjan van Wingerde wrote:
>> On Tue, Dec 15, 2009 at 9:44 PM, John W. Linville
>> <linville@tuxdriver.com> wrote:
>> > On Mon, Dec 14, 2009 at 08:33:55PM +0100, Gertjan van Wingerde wrote:
>> >> We've had many reports of rt61pci failures with powersaving enabled.
>> >> Therefore, as a stop-gap measure, disable powersaving of the rt61pci
>> >> until we have found a proper solution.
>> >> Also disable powersaving on rt2800pci as it most probably will show
>> >> the same problem.
>> >>
>> >> Cc: stable@kernel.org
>> >> Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
>> >> ---
>> >>
>> >> John, this is an urgent fix for 2.6.33.
>> >>
>> >> v2:
>> >> - Handled feedback from Ivo:
>> >>       - Only disable powersaving by default, not permanent.
>> >>       - Also apply to rt2800pci.
>> >
>> > As posted, it will only compile on 2.6.32...
>> >
>>
>> Me confused, as the patch was against the wireless-2.6.git tree, which
>> I thought was 2.6.33, and not 2.6.32. Please explain to which tree to
>> prepare fixes for 2.6.33.
>
> That seems rather impossible, since wireless-2.6 failed to build with
> your patch applied. :-)  Perhaps you weren't up-to-date?
>

Hmm, perhaps. Unfortunately I won't be back home until Friday. I'll
check when I return there.

---
Gertjan.