wifi: rtw89: coex: refactor debug log of slot list

Slot list is to list the WiFi/Bluetooth PTA hardware priority setting.
Move the list parser to its function, not to append together with TDMA
parser.

Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230106120844.17441-5-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index 5979efb5e465dad5585349a91c348e3c73008f64..03872ac8cced0312f1d67a476cde3e786bfe81e0 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -6345,9 +6345,6 @@ static void _show_fbtc_tdma(struct rtw89_dev *rtwdev, struct seq_file *m)
        struct rtw89_btc_btf_fwinfo *pfwinfo = &btc->fwinfo;
        struct rtw89_btc_rpt_cmn_info *pcinfo = NULL;
        struct rtw89_btc_fbtc_tdma *t = NULL;
-       struct rtw89_btc_fbtc_slot *s = NULL;
-       struct rtw89_btc_dm *dm = &btc->dm;
-       u8 i, cnt = 0;
 
        pcinfo = &pfwinfo->rpt_fbtc_tdma.cinfo;
        if (!pcinfo->valid)
@@ -6373,61 +6370,29 @@ static void _show_fbtc_tdma(struct rtw89_dev *rtwdev, struct seq_file *m)
                   "policy_type:%d",
                   (u32)btc->policy_type);
 
-       s = pfwinfo->rpt_fbtc_slots.finfo.slot;
-
-       for (i = 0; i < CXST_MAX; i++) {
-               if (dm->update_slot_map == BIT(CXST_MAX) - 1)
-                       break;
-
-               if (!(dm->update_slot_map & BIT(i)))
-                       continue;
-
-               if (cnt % 6 == 0)
-                       seq_printf(m,
-                                  " %-15s : %d[%d/0x%x/%d]",
-                                  "[slot_policy]",
-                                  (u32)i,
-                                  s[i].dur, s[i].cxtbl, s[i].cxtype);
-               else
-                       seq_printf(m,
-                                  ", %d[%d/0x%x/%d]",
-                                  (u32)i,
-                                  s[i].dur, s[i].cxtbl, s[i].cxtype);
-               if (cnt % 6 == 5)
-                       seq_puts(m, "\n");
-               cnt++;
-       }
        seq_puts(m, "\n");
 }
 
 static void _show_fbtc_slots(struct rtw89_dev *rtwdev, struct seq_file *m)
 {
        struct rtw89_btc *btc = &rtwdev->btc;
-       struct rtw89_btc_btf_fwinfo *pfwinfo = &btc->fwinfo;
-       struct rtw89_btc_rpt_cmn_info *pcinfo = NULL;
-       struct rtw89_btc_fbtc_slots *pslots = NULL;
-       struct rtw89_btc_fbtc_slot s;
+       struct rtw89_btc_dm *dm = &btc->dm;
+       struct rtw89_btc_fbtc_slot *s;
        u8 i = 0;
 
-       pcinfo = &pfwinfo->rpt_fbtc_slots.cinfo;
-       if (!pcinfo->valid)
-               return;
-
-       pslots = &pfwinfo->rpt_fbtc_slots.finfo;
-
        for (i = 0; i < CXST_MAX; i++) {
-               s = pslots->slot[i];
+               s = &dm->slot_now[i];
                if (i % 6 == 0)
                        seq_printf(m,
                                   " %-15s : %02d[%03d/0x%x/%d]",
                                   "[slot_list]",
                                   (u32)i,
-                                  s.dur, s.cxtbl, s.cxtype);
+                                  s->dur, s->cxtbl, s->cxtype);
                else
                        seq_printf(m,
                                   ", %02d[%03d/0x%x/%d]",
                                   (u32)i,
-                                  s.dur, s.cxtbl, s.cxtype);
+                                  s->dur, s->cxtbl, s->cxtype);
                if (i % 6 == 5)
                        seq_puts(m, "\n");
        }