[PATCH] compat-wireless: fix debugging in iwlwifi

[PATCH] compat-wireless: fix debugging in iwlwifi

[Johannes Berg]

From: Johannes Berg <johannes.berg@intel.com>

As compat includes linux/device.h well before iwlwifi, the
definitions from there are used without DEBUG, but iwlwifi
defines DEBUG to get debug output. Use dev_printk instead
of dev_dbg to get debugging back.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 patches/57-iwlwifi-debug-fix.patch |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 patches/57-iwlwifi-debug-fix.patch

diff --git a/patches/57-iwlwifi-debug-fix.patch b/patches/57-iwlwifi-debug-fix.patch
new file mode 100644
index 0000000..4b2dfa9
--- /dev/null
+++ b/patches/57-iwlwifi-debug-fix.patch
@@ -0,0 +1,19 @@
+Due to compat including linux/device.h before we do,
+we don't get a chance to #define DEBUG to get our
+debugging prints. This patch replaces dev_dbg with
+dev_printk to make them show up again.
+
+--- a/drivers/net/wireless/iwlwifi/iwl-debug.c
++++ b/drivers/net/wireless/iwlwifi/iwl-debug.c
+@@ -138,8 +138,9 @@ void __iwl_dbg(struct device *dev,
+ 
+ 		va_copy(args2, args);
+ 		vaf.va = &args2;
+-		dev_dbg(dev, "%c %s %pV", in_interrupt() ? 'I' : 'U',
+-			function, &vaf);
++		dev_printk(KERN_DEBUG, dev, "%c %s %pV",
++			   in_interrupt() ? 'I' : 'U',
++			   function, &vaf);
+ 		va_end(args2);
+ 	}
+ #endif
-- 
1.7.10

Re: [PATCH] compat-wireless: fix debugging in iwlwifi

[Luis R. Rodriguez]

On Tue, Jul 3, 2012 at 6:28 AM, Johannes Berg <johannes@sipsolutions.net> wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> As compat includes linux/device.h well before iwlwifi, the
> definitions from there are used without DEBUG, but iwlwifi
> defines DEBUG to get debug output. Use dev_printk instead
> of dev_dbg to get debugging back.
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Applied and pushed, thanks!

  Luis

Re: [PATCH] compat-wireless: fix debugging in iwlwifi

[Luis R. Rodriguez]

On Tue, Jul 3, 2012 at 8:47 AM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
> On Tue, Jul 3, 2012 at 6:28 AM, Johannes Berg <johannes@sipsolutions.net> wrote:
>> From: Johannes Berg <johannes.berg@intel.com>
>>
>> As compat includes linux/device.h well before iwlwifi, the
>> definitions from there are used without DEBUG, but iwlwifi
>> defines DEBUG to get debug output. Use dev_printk instead
>> of dev_dbg to get debugging back.
>>
>> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>
> Applied and pushed, thanks!

On today's linux-next.git the dev_dbg() changed to dev_err(), I've
updated the patch to reflect this.

mcgrof@tux ~/devel/compat-wireless (git::master)$ git diff
diff --git a/patches/57-iwlwifi-debug-fix.patch
b/patches/57-iwlwifi-debug-fix.patch
index 4b2dfa9..1bfc88f 100644
--- a/patches/57-iwlwifi-debug-fix.patch
+++ b/patches/57-iwlwifi-debug-fix.patch
@@ -9,7 +9,7 @@ dev_printk to make them show up again.

                va_copy(args2, args);
                vaf.va = &args2;
--              dev_dbg(dev, "%c %s %pV", in_interrupt() ? 'I' : 'U',
+-              dev_err(dev, "%c %s %pV", in_interrupt() ? 'I' : 'U',
 -                      function, &vaf);
 +              dev_printk(KERN_DEBUG, dev, "%c %s %pV",
 +                         in_interrupt() ? 'I' : 'U'

  Luis

Re: [PATCH] compat-wireless: fix debugging in iwlwifi

[Johannes Berg]

On Tue, 2012-07-03 at 09:16 -0700, Luis R. Rodriguez wrote:
> On Tue, Jul 3, 2012 at 8:47 AM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
> > On Tue, Jul 3, 2012 at 6:28 AM, Johannes Berg <johannes@sipsolutions.net> wrote:
> >> From: Johannes Berg <johannes.berg@intel.com>
> >>
> >> As compat includes linux/device.h well before iwlwifi, the
> >> definitions from there are used without DEBUG, but iwlwifi
> >> defines DEBUG to get debug output. Use dev_printk instead
> >> of dev_dbg to get debugging back.
> >>
> >> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> >
> > Applied and pushed, thanks!
> 
> On today's linux-next.git the dev_dbg() changed to dev_err(), I've
> updated the patch to reflect this.

Huh, sorry. Please drop this for now -- the patch to change it *from*
dev_err *to* dev_dbg is only in my iwlwifi-next tree now.

johannes

Re: [PATCH] compat-wireless: fix debugging in iwlwifi

[Joe Perches]

On Tue, 2012-07-03 at 18:21 +0200, Johannes Berg wrote:
> On Tue, 2012-07-03 at 09:16 -0700, Luis R. Rodriguez wrote:
> > On Tue, Jul 3, 2012 at 8:47 AM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
> > > On Tue, Jul 3, 2012 at 6:28 AM, Johannes Berg <johannes@sipsolutions.net> wrote:
> > >> From: Johannes Berg <johannes.berg@intel.com>
> > >>
> > >> As compat includes linux/device.h well before iwlwifi, the
> > >> definitions from there are used without DEBUG, but iwlwifi
> > >> defines DEBUG to get debug output. Use dev_printk instead
> > >> of dev_dbg to get debugging back.
> > >>
> > >> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> > >
> > > Applied and pushed, thanks!
> > 
> > On today's linux-next.git the dev_dbg() changed to dev_err(), I've
> > updated the patch to reflect this.
> 
> Huh, sorry. Please drop this for now -- the patch to change it *from*
> dev_err *to* dev_dbg is only in my iwlwifi-next tree now.

And besides, the concept is wrong.

There's no reason to drop dynamic_debug support by
forcing output to KERN_DEBUG.

Re: [PATCH] compat-wireless: fix debugging in iwlwifi

[Luis R. Rodriguez]

On Tue, Jul 3, 2012 at 9:21 AM, Johannes Berg <johannes@sipsolutions.net> wrote:
> On Tue, 2012-07-03 at 09:16 -0700, Luis R. Rodriguez wrote:
>> On Tue, Jul 3, 2012 at 8:47 AM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
>> > On Tue, Jul 3, 2012 at 6:28 AM, Johannes Berg <johannes@sipsolutions.net> wrote:
>> >> From: Johannes Berg <johannes.berg@intel.com>
>> >>
>> >> As compat includes linux/device.h well before iwlwifi, the
>> >> definitions from there are used without DEBUG, but iwlwifi
>> >> defines DEBUG to get debug output. Use dev_printk instead
>> >> of dev_dbg to get debugging back.
>> >>
>> >> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>> >
>> > Applied and pushed, thanks!
>>
>> On today's linux-next.git the dev_dbg() changed to dev_err(), I've
>> updated the patch to reflect this.
>
> Huh, sorry. Please drop this for now -- the patch to change it *from*
> dev_err *to* dev_dbg is only in my iwlwifi-next tree now.

Dropped patches/57-iwlwifi-debug-fix.patch

  Luis

Re: [PATCH] compat-wireless: fix debugging in iwlwifi

[Johannes Berg]

On Tue, 2012-07-03 at 09:28 -0700, Joe Perches wrote:
> On Tue, 2012-07-03 at 18:21 +0200, Johannes Berg wrote:
> > On Tue, 2012-07-03 at 09:16 -0700, Luis R. Rodriguez wrote:
> > > On Tue, Jul 3, 2012 at 8:47 AM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
> > > > On Tue, Jul 3, 2012 at 6:28 AM, Johannes Berg <johannes@sipsolutions.net> wrote:
> > > >> From: Johannes Berg <johannes.berg@intel.com>
> > > >>
> > > >> As compat includes linux/device.h well before iwlwifi, the
> > > >> definitions from there are used without DEBUG, but iwlwifi
> > > >> defines DEBUG to get debug output. Use dev_printk instead
> > > >> of dev_dbg to get debugging back.
> > > >>
> > > >> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> > > >
> > > > Applied and pushed, thanks!
> > > 
> > > On today's linux-next.git the dev_dbg() changed to dev_err(), I've
> > > updated the patch to reflect this.
> > 
> > Huh, sorry. Please drop this for now -- the patch to change it *from*
> > dev_err *to* dev_dbg is only in my iwlwifi-next tree now.
> 
> And besides, the concept is wrong.
> 
> There's no reason to drop dynamic_debug support by
> forcing output to KERN_DEBUG.

Well, the thing is, "#define DEBUG" doesn't work in compat-wireless ...
We add it to the Makefile though I guess

johannes

Re: [PATCH] compat-wireless: fix debugging in iwlwifi

[Luis R. Rodriguez]

On Tue, Jul 3, 2012 at 9:47 AM, Johannes Berg <johannes@sipsolutions.net> wrote:
> On Tue, 2012-07-03 at 09:28 -0700, Joe Perches wrote:
>> On Tue, 2012-07-03 at 18:21 +0200, Johannes Berg wrote:
>> > On Tue, 2012-07-03 at 09:16 -0700, Luis R. Rodriguez wrote:
>> > > On Tue, Jul 3, 2012 at 8:47 AM, Luis R. Rodriguez <mcgrof@gmail.com> wrote:
>> > > > On Tue, Jul 3, 2012 at 6:28 AM, Johannes Berg <johannes@sipsolutions.net> wrote:
>> > > >> From: Johannes Berg <johannes.berg@intel.com>
>> > > >>
>> > > >> As compat includes linux/device.h well before iwlwifi, the
>> > > >> definitions from there are used without DEBUG, but iwlwifi
>> > > >> defines DEBUG to get debug output. Use dev_printk instead
>> > > >> of dev_dbg to get debugging back.
>> > > >>
>> > > >> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>> > > >
>> > > > Applied and pushed, thanks!
>> > >
>> > > On today's linux-next.git the dev_dbg() changed to dev_err(), I've
>> > > updated the patch to reflect this.
>> >
>> > Huh, sorry. Please drop this for now -- the patch to change it *from*
>> > dev_err *to* dev_dbg is only in my iwlwifi-next tree now.
>>
>> And besides, the concept is wrong.
>>
>> There's no reason to drop dynamic_debug support by
>> forcing output to KERN_DEBUG.
>
> Well, the thing is, "#define DEBUG" doesn't work in compat-wireless ...
> We add it to the Makefile though I guess

What if we add a hunk to iwlwifi to undef DEBUG and redefine it ? Sort
of similar problem as with pr_fmt no? I've merged this patch now.

  Luis