From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Michal Kazior <michal.kazior@tieto.com>
Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org
Subject: Re: [PATCH] ath10k: fix wmi service bitmap debug
Date: Fri, 8 Aug 2014 13:11:57 +0300 [thread overview]
Message-ID: <87d2cbz3wy.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1406628239-31322-1-git-send-email-michal.kazior@tieto.com> (Michal Kazior's message of "Tue, 29 Jul 2014 12:03:59 +0200")
Michal Kazior <michal.kazior@tieto.com> writes:
> The 10.x and main firmware branches have
> conflicting WMI service bitmap definitions.
>
> This also fixes WMI services parsing on big-endian
> hosts and changes debugfs output to be more human
> friendly.
>
> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Based on Joe's suggestion, I'm planning to change the macro like below.
Are you ok with that?
It actually adds a new checkpatch warning but I'm going to ignore that
for now:
drivers/net/wireless/ath/ath10k/wmi.h:177: ERROR: Macros with complex values should be enclosed in parenthesis
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index 109ea684f88f..e70836586756 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -174,46 +174,48 @@ enum wmi_main_service {
static inline char *wmi_service_name(int service_id)
{
-#define SVCSTR(x) { case x: return #x; }
+#define SVCSTR(x) case x: return #x
+
switch (service_id) {
- SVCSTR(WMI_SERVICE_BEACON_OFFLOAD)
- SVCSTR(WMI_SERVICE_SCAN_OFFLOAD)
- SVCSTR(WMI_SERVICE_ROAM_OFFLOAD)
- SVCSTR(WMI_SERVICE_BCN_MISS_OFFLOAD)
- SVCSTR(WMI_SERVICE_STA_PWRSAVE)
- SVCSTR(WMI_SERVICE_STA_ADVANCED_PWRSAVE)
- SVCSTR(WMI_SERVICE_AP_UAPSD)
- SVCSTR(WMI_SERVICE_AP_DFS)
- SVCSTR(WMI_SERVICE_11AC)
- SVCSTR(WMI_SERVICE_BLOCKACK)
- SVCSTR(WMI_SERVICE_PHYERR)
- SVCSTR(WMI_SERVICE_BCN_FILTER)
- SVCSTR(WMI_SERVICE_RTT)
- SVCSTR(WMI_SERVICE_RATECTRL)
- SVCSTR(WMI_SERVICE_WOW)
- SVCSTR(WMI_SERVICE_RATECTRL_CACHE)
- SVCSTR(WMI_SERVICE_IRAM_TIDS)
- SVCSTR(WMI_SERVICE_ARPNS_OFFLOAD)
- SVCSTR(WMI_SERVICE_NLO)
- SVCSTR(WMI_SERVICE_GTK_OFFLOAD)
- SVCSTR(WMI_SERVICE_SCAN_SCH)
- SVCSTR(WMI_SERVICE_CSA_OFFLOAD)
- SVCSTR(WMI_SERVICE_CHATTER)
- SVCSTR(WMI_SERVICE_COEX_FREQAVOID)
- SVCSTR(WMI_SERVICE_PACKET_POWER_SAVE)
- SVCSTR(WMI_SERVICE_FORCE_FW_HANG)
- SVCSTR(WMI_SERVICE_GPIO)
- SVCSTR(WMI_SERVICE_STA_DTIM_PS_MODULATED_DTIM)
- SVCSTR(WMI_SERVICE_STA_UAPSD_BASIC_AUTO_TRIG)
- SVCSTR(WMI_SERVICE_STA_UAPSD_VAR_AUTO_TRIG)
- SVCSTR(WMI_SERVICE_STA_KEEP_ALIVE)
- SVCSTR(WMI_SERVICE_TX_ENCAP)
- SVCSTR(WMI_SERVICE_BURST)
- SVCSTR(WMI_SERVICE_SMART_ANTENNA_SW_SUPPORT)
- SVCSTR(WMI_SERVICE_SMART_ANTENNA_HW_SUPPORT)
+ SVCSTR(WMI_SERVICE_BEACON_OFFLOAD);
+ SVCSTR(WMI_SERVICE_SCAN_OFFLOAD);
+ SVCSTR(WMI_SERVICE_ROAM_OFFLOAD);
+ SVCSTR(WMI_SERVICE_BCN_MISS_OFFLOAD);
+ SVCSTR(WMI_SERVICE_STA_PWRSAVE);
+ SVCSTR(WMI_SERVICE_STA_ADVANCED_PWRSAVE);
+ SVCSTR(WMI_SERVICE_AP_UAPSD);
+ SVCSTR(WMI_SERVICE_AP_DFS);
+ SVCSTR(WMI_SERVICE_11AC);
+ SVCSTR(WMI_SERVICE_BLOCKACK);
+ SVCSTR(WMI_SERVICE_PHYERR);
+ SVCSTR(WMI_SERVICE_BCN_FILTER);
+ SVCSTR(WMI_SERVICE_RTT);
+ SVCSTR(WMI_SERVICE_RATECTRL);
+ SVCSTR(WMI_SERVICE_WOW);
+ SVCSTR(WMI_SERVICE_RATECTRL_CACHE);
+ SVCSTR(WMI_SERVICE_IRAM_TIDS);
+ SVCSTR(WMI_SERVICE_ARPNS_OFFLOAD);
+ SVCSTR(WMI_SERVICE_NLO);
+ SVCSTR(WMI_SERVICE_GTK_OFFLOAD);
+ SVCSTR(WMI_SERVICE_SCAN_SCH);
+ SVCSTR(WMI_SERVICE_CSA_OFFLOAD);
+ SVCSTR(WMI_SERVICE_CHATTER);
+ SVCSTR(WMI_SERVICE_COEX_FREQAVOID);
+ SVCSTR(WMI_SERVICE_PACKET_POWER_SAVE);
+ SVCSTR(WMI_SERVICE_FORCE_FW_HANG);
+ SVCSTR(WMI_SERVICE_GPIO);
+ SVCSTR(WMI_SERVICE_STA_DTIM_PS_MODULATED_DTIM);
+ SVCSTR(WMI_SERVICE_STA_UAPSD_BASIC_AUTO_TRIG);
+ SVCSTR(WMI_SERVICE_STA_UAPSD_VAR_AUTO_TRIG);
+ SVCSTR(WMI_SERVICE_STA_KEEP_ALIVE);
+ SVCSTR(WMI_SERVICE_TX_ENCAP);
+ SVCSTR(WMI_SERVICE_BURST);
+ SVCSTR(WMI_SERVICE_SMART_ANTENNA_SW_SUPPORT);
+ SVCSTR(WMI_SERVICE_SMART_ANTENNA_HW_SUPPORT);
default:
return NULL;
}
+
#undef SVCSTR
}
--
Kalle Valo
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2014-08-08 10:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-29 10:03 [PATCH] ath10k: fix wmi service bitmap debug Michal Kazior
2014-08-02 6:39 ` Kalle Valo
2014-08-02 6:59 ` Joe Perches
2014-08-02 8:02 ` Kalle Valo
2014-08-08 10:11 ` Kalle Valo [this message]
2014-08-08 10:24 ` Michal Kazior
2014-08-08 11:13 ` Kalle Valo
2014-08-12 7:44 ` Kalle Valo
2014-08-19 7:46 ` Michal Kazior
2014-08-19 9:49 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d2cbz3wy.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@qca.qualcomm.com \
--cc=ath10k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=michal.kazior@tieto.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).