From: Oliver W. <oli...@ol...> - 2012-05-29 18:13:53
|
Hi Jim, The series is pushed! Thanks again ;)! I did the usual (full) test-program, with one interesting finding, more below. Regarding _acx_issue_cmd_timeo_debug(), I included the common acx_wait_cmd_status(), but with an msleep() for pci instead of an udelay(). Since in the pci case we may sleep, I prefer the possibility to be able to schedule away to let the CPU other things. In pci, especially in AP-mode we also execute more often fw-commands, so the possibility to sleep accumulates and the increased cpu utilization pays-off still more over time. The checkpatch problem in "patch#05, whitespace", acxpci_issue_cmd_timeo_debug() seems to be #ifdef out, so left it for the moment. Then there is a strange problem with my DWL-650+ acx100-pci card: Doesn't associate anymore with kernel 3.4, neither driver version v20120522 nor this one. Scanning works, so there is some radio path, but no assoc anymore. Kernel 3.3 works fine with both driver versions ?! => Need to look into that in more detail. Cheers, Oliver On 05/25/2012 08:48 PM, Jim Cromie wrote: > Current logging messages look like: > > acx.log_fn_exit_v: 95382776 <== acx_read_cmd_type_status: 00000000 > acx.log_fn_enter: 95382776 ==> acx_write_cmd_type_status > acx.log_fn_exit: 95382776 <== acx_write_cmd_type_status > acx.log_fn_enter: 95382776 ==> acx_mwait > > fix this by: > - adding space at beginning of log_fn_exit format string > - drop last _ from log_fn_exit_v so it matches length of log_fn_enter > > Result is that the numbers and arrows line up nicely. > > Signed-off-by: Jim Cromie <jim...@gm...> > --- > acx_func.h | 4 ++-- > common.c | 6 +++--- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/acx_func.h b/acx_func.h > index fbad144..af20ab5 100644 > --- a/acx_func.h > +++ b/acx_func.h > @@ -169,7 +169,7 @@ void acx_lock_unhold(void); > #if ACX_DEBUG > void log_fn_enter(const char *funcname); > void log_fn_exit(const char *funcname); > -void log_fn_exit_v(const char *funcname, int v); > +void log_fn_exitv(const char *funcname, int v); > /* > * char *acx_print_mac(char *buf, const u8 *mac); > * void acx_print_mac2(const char *head, const u8 *mac, const char *tail); > @@ -189,7 +189,7 @@ const char *acx_cmd_status_str(unsigned int state); > #define FN_EXIT1(v) \ > do { \ > if (unlikely(acx_debug & L_FUNC)) { \ > - log_fn_exit_v(__func__, v); \ > + log_fn_exitv(__func__, v); \ > } \ > } while (0) > #define FN_EXIT0 \ > diff --git a/common.c b/common.c > index 5c526cc..adca18a 100644 > --- a/common.c > +++ b/common.c > @@ -66,7 +66,7 @@ static inline const char *acx_sanitize_str(const char *s); > /* Logging */ > void log_fn_enter(const char *funcname); > void log_fn_exit(const char *funcname); > -void log_fn_exit_v(const char *funcname, int v); > +void log_fn_exitv(const char *funcname, int v); > char *acx_print_mac(char *buf, const u8 *mac); > void acx_print_mac2(const char *head, const u8 *mac, const char *tail); > void acxlog_mac(int level, const char *head, const u8 *mac, const char *tail); > @@ -794,12 +794,12 @@ void log_fn_exit(const char *funcname) > if (indent >= sizeof(acx_debug_spaces)) > indent = sizeof(acx_debug_spaces) - 1; > > - pr_info("%08ld %s<== %s\n", d % 100000000, > + pr_info(" %08ld %s<== %s\n", d % 100000000, > acx_debug_spaces + (sizeof(acx_debug_spaces) - 1) - indent, > funcname); > } > > -void log_fn_exit_v(const char *funcname, int v) > +void log_fn_exitv(const char *funcname, int v) > { > int indent; > TIMESTAMP(d); |