2010-07-11 20:23:21

by Hauke Mehrtens

[permalink] [raw]
Subject: [PATCH] compat-wireless: fix build of ath5k for CONFIG_PM_SLEEP=n

suspend and resume are activated in ath5k if CONFIG_PM_SLEEP is set and
not if just CONFIG_PM is set.

This should fix the problems reported by Philip Prindeville.

Signed-off-by: Hauke Mehrtens <[email protected]>
---
patches/11-dev-pm-ops.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index 3e97ed9..688da84 100644
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -49,7 +49,7 @@ calls on compat code with only slight modifications.
.remove = __devexit_p(ath5k_pci_remove),
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
.driver.pm = ATH5K_PM_OPS,
-+#elif defined(CONFIG_PM)
++#elif defined(CONFIG_PM_SLEEP)
+ .suspend = ath5k_pci_suspend_compat,
+ .resume = ath5k_pci_resume_compat,
+#endif
--
1.7.0.4



2010-07-14 18:33:31

by Luis R. Rodriguez

[permalink] [raw]
Subject: Re: [PATCH] compat-wireless: fix build of ath5k for CONFIG_PM_SLEEP=n

On Wed, Jul 14, 2010 at 11:11 AM, Philip A. Prindeville
<[email protected]> wrote:
> On 07/13/2010 04:44 PM, Luis R. Rodriguez wrote:
>> On Tue, Jul 13, 2010 at 2:54 PM, Luis R. Rodriguez
>> <[email protected]> wrote:
>>> On Mon, Jul 12, 2010 at 12:19 PM, Philip A. Prindeville
>>> <[email protected]> wrote:
>>>> On 07/12/2010 09:30 AM, Luis R. Rodriguez wrote:
>>>>> On Sun, Jul 11, 2010 at 1:23 PM, Hauke Mehrtens <[email protected]> wrote:
>>>>>> suspend and resume are activated in ath5k if CONFIG_PM_SLEEP is set and
>>>>>> not if just CONFIG_PM is set.
>>>>>>
>>>>>> This should fix the problems reported by Philip Prindeville.
>>>>>>
>>>>>> Signed-off-by: Hauke Mehrtens <[email protected]>
>>>>>
>>>>> Thanks! Applied and pushed out, at noon we'll have a new tarball with this.
>>>>>
>>>>>   Luis
>>>>
>>>> And...
>>>>
>>>>
>>>>  CC [M]  /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.o
>>>> /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.c: In function 'l2cap_data_channel':
>>>> /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.c:4352: error: void value not ignored as it ought to be
>>>> make[4]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.o] Error 1
>>>> make[3]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth] Error 2
>>>> make[2]: *** [_module_/home/philipp/kernel/build_i586/compat-wireless-2010-07-12] Error 2
>>>> make[2]: Leaving directory `/home/philipp/kernel/build_i586/linux-2.6.27.48-astlinux'
>>>> make[1]: *** [modules] Error 2
>>>> make[1]: Leaving directory `/home/philipp/kernel/build_i586/compat-wireless-2010-07-12'
>>>> make: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/wireless/lib80211.ko] Error 2
>>>
>>> Thanks for reporting this, I am working on it now.
>>
>> This is now fixed, I'll push out a new tarball shortly.
>>
>>   Luis
>
> That tarball never made it out...  can you please retry?

The cronjob kicks off at noon PST time.

Luis

2010-07-14 18:11:12

by Philip Prindeville

[permalink] [raw]
Subject: Re: [PATCH] compat-wireless: fix build of ath5k for CONFIG_PM_SLEEP=n

On 07/13/2010 04:44 PM, Luis R. Rodriguez wrote:
> On Tue, Jul 13, 2010 at 2:54 PM, Luis R. Rodriguez
> <[email protected]> wrote:
>> On Mon, Jul 12, 2010 at 12:19 PM, Philip A. Prindeville
>> <[email protected]> wrote:
>>> On 07/12/2010 09:30 AM, Luis R. Rodriguez wrote:
>>>> On Sun, Jul 11, 2010 at 1:23 PM, Hauke Mehrtens <[email protected]> wrote:
>>>>> suspend and resume are activated in ath5k if CONFIG_PM_SLEEP is set and
>>>>> not if just CONFIG_PM is set.
>>>>>
>>>>> This should fix the problems reported by Philip Prindeville.
>>>>>
>>>>> Signed-off-by: Hauke Mehrtens <[email protected]>
>>>>
>>>> Thanks! Applied and pushed out, at noon we'll have a new tarball with this.
>>>>
>>>> Luis
>>>
>>> And...
>>>
>>>
>>> CC [M] /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.o
>>> /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.c: In function 'l2cap_data_channel':
>>> /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.c:4352: error: void value not ignored as it ought to be
>>> make[4]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.o] Error 1
>>> make[3]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth] Error 2
>>> make[2]: *** [_module_/home/philipp/kernel/build_i586/compat-wireless-2010-07-12] Error 2
>>> make[2]: Leaving directory `/home/philipp/kernel/build_i586/linux-2.6.27.48-astlinux'
>>> make[1]: *** [modules] Error 2
>>> make[1]: Leaving directory `/home/philipp/kernel/build_i586/compat-wireless-2010-07-12'
>>> make: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/wireless/lib80211.ko] Error 2
>>
>> Thanks for reporting this, I am working on it now.
>
> This is now fixed, I'll push out a new tarball shortly.
>
> Luis

That tarball never made it out... can you please retry?

Thanks.



2010-07-13 21:55:10

by Luis R. Rodriguez

[permalink] [raw]
Subject: Re: [PATCH] compat-wireless: fix build of ath5k for CONFIG_PM_SLEEP=n

On Mon, Jul 12, 2010 at 12:19 PM, Philip A. Prindeville
<[email protected]> wrote:
> On 07/12/2010 09:30 AM, Luis R. Rodriguez wrote:
>> On Sun, Jul 11, 2010 at 1:23 PM, Hauke Mehrtens <[email protected]> wrote:
>>> suspend and resume are activated in ath5k if CONFIG_PM_SLEEP is set and
>>> not if just CONFIG_PM is set.
>>>
>>> This should fix the problems reported by Philip Prindeville.
>>>
>>> Signed-off-by: Hauke Mehrtens <[email protected]>
>>
>> Thanks! Applied and pushed out, at noon we'll have a new tarball with this.
>>
>>   Luis
>
> And...
>
>
>  CC [M]  /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.o
> /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.c: In function 'l2cap_data_channel':
> /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.c:4352: error: void value not ignored as it ought to be
> make[4]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.o] Error 1
> make[3]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth] Error 2
> make[2]: *** [_module_/home/philipp/kernel/build_i586/compat-wireless-2010-07-12] Error 2
> make[2]: Leaving directory `/home/philipp/kernel/build_i586/linux-2.6.27.48-astlinux'
> make[1]: *** [modules] Error 2
> make[1]: Leaving directory `/home/philipp/kernel/build_i586/compat-wireless-2010-07-12'
> make: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/wireless/lib80211.ko] Error 2

Thanks for reporting this, I am working on it now.

Luis

2010-07-13 22:44:27

by Luis R. Rodriguez

[permalink] [raw]
Subject: Re: [PATCH] compat-wireless: fix build of ath5k for CONFIG_PM_SLEEP=n

On Tue, Jul 13, 2010 at 2:54 PM, Luis R. Rodriguez
<[email protected]> wrote:
> On Mon, Jul 12, 2010 at 12:19 PM, Philip A. Prindeville
> <[email protected]> wrote:
>> On 07/12/2010 09:30 AM, Luis R. Rodriguez wrote:
>>> On Sun, Jul 11, 2010 at 1:23 PM, Hauke Mehrtens <[email protected]> wrote:
>>>> suspend and resume are activated in ath5k if CONFIG_PM_SLEEP is set and
>>>> not if just CONFIG_PM is set.
>>>>
>>>> This should fix the problems reported by Philip Prindeville.
>>>>
>>>> Signed-off-by: Hauke Mehrtens <[email protected]>
>>>
>>> Thanks! Applied and pushed out, at noon we'll have a new tarball with this.
>>>
>>>   Luis
>>
>> And...
>>
>>
>>  CC [M]  /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.o
>> /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.c: In function 'l2cap_data_channel':
>> /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.c:4352: error: void value not ignored as it ought to be
>> make[4]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.o] Error 1
>> make[3]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth] Error 2
>> make[2]: *** [_module_/home/philipp/kernel/build_i586/compat-wireless-2010-07-12] Error 2
>> make[2]: Leaving directory `/home/philipp/kernel/build_i586/linux-2.6.27.48-astlinux'
>> make[1]: *** [modules] Error 2
>> make[1]: Leaving directory `/home/philipp/kernel/build_i586/compat-wireless-2010-07-12'
>> make: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/wireless/lib80211.ko] Error 2
>
> Thanks for reporting this, I am working on it now.

This is now fixed, I'll push out a new tarball shortly.

Luis

2010-07-12 15:30:46

by Luis R. Rodriguez

[permalink] [raw]
Subject: Re: [PATCH] compat-wireless: fix build of ath5k for CONFIG_PM_SLEEP=n

On Sun, Jul 11, 2010 at 1:23 PM, Hauke Mehrtens <[email protected]> wrote:
> suspend and resume are activated in ath5k if CONFIG_PM_SLEEP is set and
> not if just CONFIG_PM is set.
>
> This should fix the problems reported by Philip Prindeville.
>
> Signed-off-by: Hauke Mehrtens <[email protected]>

Thanks! Applied and pushed out, at noon we'll have a new tarball with this.

Luis

2010-07-14 20:32:45

by Luis R. Rodriguez

[permalink] [raw]
Subject: Re: [PATCH] compat-wireless: fix build of ath5k for CONFIG_PM_SLEEP=n

On Wed, Jul 14, 2010 at 12:42:13PM -0700, Philip A. Prindeville wrote:
> On 07/14/2010 12:33 PM, Luis R. Rodriguez wrote:
> > On Wed, Jul 14, 2010 at 11:11 AM, Philip A. Prindeville
> > <[email protected]> wrote:
> >> On 07/13/2010 04:44 PM, Luis R. Rodriguez wrote:
> >>> On Tue, Jul 13, 2010 at 2:54 PM, Luis R. Rodriguez
> >>> <[email protected]> wrote:
> >>>> On Mon, Jul 12, 2010 at 12:19 PM, Philip A. Prindeville
> >>>> <[email protected]> wrote:
> >>>>> On 07/12/2010 09:30 AM, Luis R. Rodriguez wrote:
> >>>>>> On Sun, Jul 11, 2010 at 1:23 PM, Hauke Mehrtens <[email protected]> wrote:
> >>>>>>> suspend and resume are activated in ath5k if CONFIG_PM_SLEEP is set and
> >>>>>>> not if just CONFIG_PM is set.
> >>>>>>>
> >>>>>>> This should fix the problems reported by Philip Prindeville.
> >>>>>>>
> >>>>>>> Signed-off-by: Hauke Mehrtens <[email protected]>
> >>>>>>
> >>>>>> Thanks! Applied and pushed out, at noon we'll have a new tarball with this.
> >>>>>>
> >>>>>> Luis
> >>>>>
> >>>>> And...
> >>>>>
> >>>>>
> >>>>> CC [M] /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.o
> >>>>> /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.c: In function 'l2cap_data_channel':
> >>>>> /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.c:4352: error: void value not ignored as it ought to be
> >>>>> make[4]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.o] Error 1
> >>>>> make[3]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth] Error 2
> >>>>> make[2]: *** [_module_/home/philipp/kernel/build_i586/compat-wireless-2010-07-12] Error 2
> >>>>> make[2]: Leaving directory `/home/philipp/kernel/build_i586/linux-2.6.27.48-astlinux'
> >>>>> make[1]: *** [modules] Error 2
> >>>>> make[1]: Leaving directory `/home/philipp/kernel/build_i586/compat-wireless-2010-07-12'
> >>>>> make: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/wireless/lib80211.ko] Error 2
> >>>>
> >>>> Thanks for reporting this, I am working on it now.
> >>>
> >>> This is now fixed, I'll push out a new tarball shortly.
> >>>
> >>> Luis
> >>
> >> That tarball never made it out... can you please retry?
> >
> > The cronjob kicks off at noon PST time.
> >
> > Luis
>
> Just picked up the tarball:
>
> /home/philipp/kernel/build_i586/compat-wireless-2010-07-14/drivers/net/wireless/rt2x00/rt2x00pci.c: In function 'rt2x00pci_initialize':
> /home/philipp/kernel/build_i586/compat-wireless-2010-07-14/drivers/net/wireless/rt2x00/rt2x00pci.c:156: error: implicit declaration of function 'request_threaded_irq'
> make[5]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-14/drivers/net/wireless/rt2x00/rt2x00pci.o] Error 1
> make[4]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-14/drivers/net/wireless/rt2x00] Error 2
> make[4]: *** Waiting for unfinished jobs....
>
>
> I'm thinking that it might be good to have a variety of nightly builds to detect damage. Do you all have infrastructure for that?

Yeah, feel free to send patches against this to enable that:

git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/compat-user.git

Otherwise I'll get to it when I can.

> This is building against 2.6.27.48

Hauke pointed out threaded ISR stuff needs to be done as was done with b43.

Luis

2010-07-12 19:19:32

by Philip Prindeville

[permalink] [raw]
Subject: Re: [PATCH] compat-wireless: fix build of ath5k for CONFIG_PM_SLEEP=n

On 07/12/2010 09:30 AM, Luis R. Rodriguez wrote:
> On Sun, Jul 11, 2010 at 1:23 PM, Hauke Mehrtens <[email protected]> wrote:
>> suspend and resume are activated in ath5k if CONFIG_PM_SLEEP is set and
>> not if just CONFIG_PM is set.
>>
>> This should fix the problems reported by Philip Prindeville.
>>
>> Signed-off-by: Hauke Mehrtens <[email protected]>
>
> Thanks! Applied and pushed out, at noon we'll have a new tarball with this.
>
> Luis

And...


CC [M] /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.o
/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.c: In function 'l2cap_data_channel':
/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.c:4352: error: void value not ignored as it ought to be
make[4]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.o] Error 1
make[3]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth] Error 2
make[2]: *** [_module_/home/philipp/kernel/build_i586/compat-wireless-2010-07-12] Error 2
make[2]: Leaving directory `/home/philipp/kernel/build_i586/linux-2.6.27.48-astlinux'
make[1]: *** [modules] Error 2
make[1]: Leaving directory `/home/philipp/kernel/build_i586/compat-wireless-2010-07-12'
make: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/wireless/lib80211.ko] Error 2


oh, well.


2010-07-14 19:42:21

by Philip Prindeville

[permalink] [raw]
Subject: Re: [PATCH] compat-wireless: fix build of ath5k for CONFIG_PM_SLEEP=n

On 07/14/2010 12:33 PM, Luis R. Rodriguez wrote:
> On Wed, Jul 14, 2010 at 11:11 AM, Philip A. Prindeville
> <[email protected]> wrote:
>> On 07/13/2010 04:44 PM, Luis R. Rodriguez wrote:
>>> On Tue, Jul 13, 2010 at 2:54 PM, Luis R. Rodriguez
>>> <[email protected]> wrote:
>>>> On Mon, Jul 12, 2010 at 12:19 PM, Philip A. Prindeville
>>>> <[email protected]> wrote:
>>>>> On 07/12/2010 09:30 AM, Luis R. Rodriguez wrote:
>>>>>> On Sun, Jul 11, 2010 at 1:23 PM, Hauke Mehrtens <[email protected]> wrote:
>>>>>>> suspend and resume are activated in ath5k if CONFIG_PM_SLEEP is set and
>>>>>>> not if just CONFIG_PM is set.
>>>>>>>
>>>>>>> This should fix the problems reported by Philip Prindeville.
>>>>>>>
>>>>>>> Signed-off-by: Hauke Mehrtens <[email protected]>
>>>>>>
>>>>>> Thanks! Applied and pushed out, at noon we'll have a new tarball with this.
>>>>>>
>>>>>> Luis
>>>>>
>>>>> And...
>>>>>
>>>>>
>>>>> CC [M] /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.o
>>>>> /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.c: In function 'l2cap_data_channel':
>>>>> /home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.c:4352: error: void value not ignored as it ought to be
>>>>> make[4]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth/l2cap.o] Error 1
>>>>> make[3]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/bluetooth] Error 2
>>>>> make[2]: *** [_module_/home/philipp/kernel/build_i586/compat-wireless-2010-07-12] Error 2
>>>>> make[2]: Leaving directory `/home/philipp/kernel/build_i586/linux-2.6.27.48-astlinux'
>>>>> make[1]: *** [modules] Error 2
>>>>> make[1]: Leaving directory `/home/philipp/kernel/build_i586/compat-wireless-2010-07-12'
>>>>> make: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-12/net/wireless/lib80211.ko] Error 2
>>>>
>>>> Thanks for reporting this, I am working on it now.
>>>
>>> This is now fixed, I'll push out a new tarball shortly.
>>>
>>> Luis
>>
>> That tarball never made it out... can you please retry?
>
> The cronjob kicks off at noon PST time.
>
> Luis

Just picked up the tarball:

/home/philipp/kernel/build_i586/compat-wireless-2010-07-14/drivers/net/wireless/rt2x00/rt2x00pci.c: In function 'rt2x00pci_initialize':
/home/philipp/kernel/build_i586/compat-wireless-2010-07-14/drivers/net/wireless/rt2x00/rt2x00pci.c:156: error: implicit declaration of function 'request_threaded_irq'
make[5]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-14/drivers/net/wireless/rt2x00/rt2x00pci.o] Error 1
make[4]: *** [/home/philipp/kernel/build_i586/compat-wireless-2010-07-14/drivers/net/wireless/rt2x00] Error 2
make[4]: *** Waiting for unfinished jobs....


I'm thinking that it might be good to have a variety of nightly builds to detect damage. Do you all have infrastructure for that?

This is building against 2.6.27.48