wifi: rtw89: refine element naming used by queue empty check

In queue empty check, one group contains 32 queues. And, the two elements,
wde_qempty_acq_num and wde_qempty_mgq_sel, are number of group and select
of group. To avoid confusing them with queue number and queue selection,
we refine their naming.

(don't change logic at all)

Signed-off-by: Zong-Zhe Yang <kevin_yang@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/20231124071703.132549-5-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 5124f98425963d6f5b263ffe968c9eca5569fa51..c315ef96e91e3ee136f93b196fcc8480fcf70374 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -3692,8 +3692,8 @@ struct rtw89_chip_info {
        u32 rsvd_ple_ofst;
        const struct rtw89_hfc_param_ini *hfc_param_ini;
        const struct rtw89_dle_mem *dle_mem;
-       u8 wde_qempty_acq_num;
-       u8 wde_qempty_mgq_sel;
+       u8 wde_qempty_acq_grpnum;
+       u8 wde_qempty_mgq_grpsel;
        u32 rf_base_addr[2];
        u8 support_chanctx_num;
        u8 support_bands;

diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c
index bdd9c152951f05de4c2bbfb3225146221a44daf3..b5e32b830a17579e96f6ed9b3bb6d9b2e5360403 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.c
+++ b/drivers/net/wireless/realtek/rtw89/mac.c
@@ -1621,13 +1621,13 @@ int rtw89_mac_get_dle_rsvd_qt_cfg(struct rtw89_dev *rtwdev,
 static bool mac_is_txq_empty(struct rtw89_dev *rtwdev)
 {
        struct rtw89_mac_dle_dfi_qempty qempty;
-       u32 qnum, qtmp, val32, msk32;
+       u32 grpnum, qtmp, val32, msk32;
        int i, j, ret;
 
-       qnum = rtwdev->chip->wde_qempty_acq_num;
+       grpnum = rtwdev->chip->wde_qempty_acq_grpnum;
        qempty.dle_type = DLE_CTRL_TYPE_WDE;
 
-       for (i = 0; i < qnum; i++) {
+       for (i = 0; i < grpnum; i++) {
                qempty.grpsel = i;
                ret = dle_dfi_qempty(rtwdev, &qempty);
                if (ret) {
@@ -1643,7 +1643,7 @@ static bool mac_is_txq_empty(struct rtw89_dev *rtwdev)
                }
        }
 
-       qempty.grpsel = rtwdev->chip->wde_qempty_mgq_sel;
+       qempty.grpsel = rtwdev->chip->wde_qempty_mgq_grpsel;
        ret = dle_dfi_qempty(rtwdev, &qempty);
        if (ret) {
                rtw89_warn(rtwdev, "dle dfi mgq empty %d\n", ret);

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8851b.c b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
index ed1f0560a514d5cc739f002cd2e103d007f68886..e850e34be51f17851615ab43518a2ddf2ca2b1d7 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8851b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
@@ -2374,8 +2374,8 @@ const struct rtw89_chip_info rtw8851b_chip_info = {
        .rsvd_ple_ofst          = 0x2f800,
        .hfc_param_ini          = rtw8851b_hfc_param_ini_pcie,
        .dle_mem                = rtw8851b_dle_mem_pcie,
-       .wde_qempty_acq_num     = 4,
-       .wde_qempty_mgq_sel     = 4,
+       .wde_qempty_acq_grpnum  = 4,
+       .wde_qempty_mgq_grpsel  = 4,
        .rf_base_addr           = {0xe000},
        .pwr_on_seq             = NULL,
        .pwr_off_seq            = NULL,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index 561049d17854c62929ec47f6dd9dca7d8c7826b9..90f39a8791ea45c8a92b430e791dca5a6204a84d 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -2109,8 +2109,8 @@ const struct rtw89_chip_info rtw8852a_chip_info = {
        .rsvd_ple_ofst          = 0x6f800,
        .hfc_param_ini          = rtw8852a_hfc_param_ini_pcie,
        .dle_mem                = rtw8852a_dle_mem_pcie,
-       .wde_qempty_acq_num     = 16,
-       .wde_qempty_mgq_sel     = 16,
+       .wde_qempty_acq_grpnum  = 16,
+       .wde_qempty_mgq_grpsel  = 16,
        .rf_base_addr           = {0xc000, 0xd000},
        .pwr_on_seq             = pwr_on_seq_8852a,
        .pwr_off_seq            = pwr_off_seq_8852a,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
index 9c62844cf06b503ed6d6c88784ac14928726c08b..7b2062cc84996825ec38a204ac056526726661a1 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
@@ -2543,8 +2543,8 @@ const struct rtw89_chip_info rtw8852b_chip_info = {
        .rsvd_ple_ofst          = 0x2f800,
        .hfc_param_ini          = rtw8852b_hfc_param_ini_pcie,
        .dle_mem                = rtw8852b_dle_mem_pcie,
-       .wde_qempty_acq_num     = 4,
-       .wde_qempty_mgq_sel     = 4,
+       .wde_qempty_acq_grpnum  = 4,
+       .wde_qempty_mgq_grpsel  = 4,
        .rf_base_addr           = {0xe000, 0xf000},
        .pwr_on_seq             = NULL,
        .pwr_off_seq            = NULL,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index 976d34b33377e19898368688e7332d350ce67265..d618faf1885b779104dd3aed81eb641940e32e4f 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -2879,8 +2879,8 @@ const struct rtw89_chip_info rtw8852c_chip_info = {
        .rsvd_ple_ofst          = 0x6f800,
        .hfc_param_ini          = rtw8852c_hfc_param_ini_pcie,
        .dle_mem                = rtw8852c_dle_mem_pcie,
-       .wde_qempty_acq_num     = 16,
-       .wde_qempty_mgq_sel     = 16,
+       .wde_qempty_acq_grpnum  = 16,
+       .wde_qempty_mgq_grpsel  = 16,
        .rf_base_addr           = {0xe000, 0xf000},
        .pwr_on_seq             = NULL,
        .pwr_off_seq            = NULL,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8922a.c b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
index b75d555d0cc3b032aecb4cc6f61212d2e8d3b4c7..a82c17fb1281933ec915a27d35cbf16e71a6b965 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8922a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
@@ -342,6 +342,8 @@ const struct rtw89_chip_info rtw8922a_chip_info = {
        .rsvd_ple_ofst          = 0x8f800,
        .hfc_param_ini          = rtw8922a_hfc_param_ini_pcie,
        .dle_mem                = rtw8922a_dle_mem_pcie,
+       .wde_qempty_acq_grpnum  = 4,
+       .wde_qempty_mgq_grpsel  = 4,
        .rf_base_addr           = {0xe000, 0xf000},
        .pwr_on_seq             = NULL,
        .pwr_off_seq            = NULL,