ath10k: fix wmi service bitmap debug

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.

kvalo: remove braces and the last semicolon from SVCSTR()

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

1 files changed, 17 insertions, 9 deletions

diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
index c9e35c87edfb..df1abe7f1fef 100644
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -115,9 +115,10 @@ static ssize_t ath10k_read_wmi_services(struct file *file,
 {
         struct ath10k *ar = file->private_data;
         char *buf;
-        unsigned int len = 0, buf_len = 1500;
-        const char *status;
+        unsigned int len = 0, buf_len = 4096;
+        const char *name;
         ssize_t ret_cnt;
+        bool enabled;
         int i;
 
         buf = kzalloc(buf_len, GFP_KERNEL);
@@ -129,15 +130,22 @@ static ssize_t ath10k_read_wmi_services(struct file *file,
         if (len > buf_len)
                 len = buf_len;
 
-        for (i = 0; i < WMI_SERVICE_LAST; i++) {
-                if (WMI_SERVICE_IS_ENABLED(ar->debug.wmi_service_bitmap, i))
-                        status = "enabled";
-                else
-                        status = "disabled";
+        for (i = 0; i < WMI_MAX_SERVICE; i++) {
+                enabled = test_bit(i, ar->debug.wmi_service_bitmap);
+                name = wmi_service_name(i);
+
+                if (!name) {
+                        if (enabled)
+                                len += scnprintf(buf + len, buf_len - len,
+                                                 "%-40s %s (bit %d)\n",
+                                                 "unknown", "enabled", i);
+
+                        continue;
+                }
 
                 len += scnprintf(buf + len, buf_len - len,
-                                 "0x%02x - %20s - %s\n",
-                                 i, wmi_service_name(i), status);
+                                 "%-40s %s\n",
+                                 name, enabled ? "enabled" : "-");
         }
 
         ret_cnt = simple_read_from_buffer(user_buf, count, ppos, buf, len);