wifi: rtw89: Let hfc_param_ini have separate settings for USB 2/3

RTL8912AU needs different settings for USB 2 and USB 3.

Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/588bf309-4b92-454f-bfd6-5e81248abee3@gmail.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index fd29dbbb120d2f77a749d4b571fa8b0d04c69926..2d7d3a11be166cb073a7eb59467b4b6f0045a01f 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -4544,7 +4544,7 @@ struct rtw89_chip_info {
        u16 max_rx_agg_num;
        bool dis_2g_40m_ul_ofdma;
        u32 rsvd_ple_ofst;
-       const struct rtw89_hfc_param_ini *hfc_param_ini[RTW89_HCI_TYPE_NUM];
+       const struct rtw89_hfc_param_ini *hfc_param_ini[RTW89_HCI_DLE_TYPE_NUM];
        const struct rtw89_dle_mem *dle_mem[RTW89_HCI_DLE_TYPE_NUM];
        u8 wde_qempty_acq_grpnum;
        u8 wde_qempty_mgq_grpsel;

diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c
index 54aad37485d6a2590e96cff8f87308fb09dfbe73..8d5375ec33a21d9862d64e9976d33aa0de6f162b 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.c
+++ b/drivers/net/wireless/realtek/rtw89/mac.c
@@ -898,7 +898,7 @@ static int hfc_reset_param(struct rtw89_dev *rtwdev)
        struct rtw89_hfc_param *param = &rtwdev->mac.hfc_param;
        u8 qta_mode = rtwdev->mac.dle_info.qta_mode;
 
-       param_inis = rtwdev->chip->hfc_param_ini[rtwdev->hci.type];
+       param_inis = rtwdev->chip->hfc_param_ini[rtwdev->hci.dle_type];
        if (!param_inis)
                return -EINVAL;
 

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8851b.c b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
index 84bdd39b3cebc361f879866986c85a1de8e4ea27..ff4113eb911413e9e70ddc21f1b3c3bc2b3b6b06 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8851b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
@@ -2600,6 +2600,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = {
        .dis_2g_40m_ul_ofdma    = true,
        .rsvd_ple_ofst          = 0x2f800,
        .hfc_param_ini          = {rtw8851b_hfc_param_ini_pcie,
+                                  rtw8851b_hfc_param_ini_usb,
                                   rtw8851b_hfc_param_ini_usb,
                                   NULL},
        .dle_mem                = {rtw8851b_dle_mem_pcie,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
index 1d4f1df524a1cd8982b5493df1920ae3c05d72c4..ea4d22616512940239422c08f3976347d8577d1a 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
@@ -2336,6 +2336,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = {
        .dis_2g_40m_ul_ofdma    = true,
        .rsvd_ple_ofst          = 0x6f800,
        .hfc_param_ini          = {rtw8852a_hfc_param_ini_pcie,
+                                  rtw8852a_hfc_param_ini_usb,
                                   rtw8852a_hfc_param_ini_usb,
                                   NULL},
        .dle_mem                = {rtw8852a_dle_mem_pcie,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
index 5e8738bb2dc2ebfadb375af881c82295f7baefdc..417b1502a2dd05eaf0a111a534ea972c6192d011 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
@@ -931,6 +931,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = {
        .dis_2g_40m_ul_ofdma    = true,
        .rsvd_ple_ofst          = 0x2f800,
        .hfc_param_ini          = {rtw8852b_hfc_param_ini_pcie,
+                                  rtw8852b_hfc_param_ini_usb,
                                   rtw8852b_hfc_param_ini_usb,
                                   NULL},
        .dle_mem                = {rtw8852b_dle_mem_pcie,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852bt.c b/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
index ab4263bc8b9f375004dd58a24893ad2cabf046c7..7d86e9598ca82c213cf9a036489e4afc285f738b 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852bt.c
@@ -776,7 +776,7 @@ const struct rtw89_chip_info rtw8852bt_chip_info = {
        .max_rx_agg_num         = 64,
        .dis_2g_40m_ul_ofdma    = true,
        .rsvd_ple_ofst          = 0x6f800,
-       .hfc_param_ini          = {rtw8852bt_hfc_param_ini_pcie, NULL, NULL},
+       .hfc_param_ini          = {rtw8852bt_hfc_param_ini_pcie, NULL, NULL, NULL},
        .dle_mem                = {rtw8852bt_dle_mem_pcie, NULL, NULL, NULL},
        .wde_qempty_acq_grpnum  = 4,
        .wde_qempty_mgq_grpsel  = 4,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index 40db7e3c0d9740fa8bbfa2ee15e9d44cd18e8e77..9c2c05f80393a8813740cd54beef0788fc523866 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -3126,6 +3126,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = {
        .dis_2g_40m_ul_ofdma    = false,
        .rsvd_ple_ofst          = 0x6f800,
        .hfc_param_ini          = {rtw8852c_hfc_param_ini_pcie,
+                                  rtw8852c_hfc_param_ini_usb,
                                   rtw8852c_hfc_param_ini_usb,
                                   NULL},
        .dle_mem                = {rtw8852c_dle_mem_pcie,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8922a.c b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
index 2bea44faa109cd0c162a9d0ac1c9f705ecc22608..b247980cc9ec9b160f6958bbcbfa1a143e709119 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8922a.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8922a.c
@@ -2969,7 +2969,7 @@ const struct rtw89_chip_info rtw8922a_chip_info = {
        .max_rx_agg_num         = 64,
        .dis_2g_40m_ul_ofdma    = false,
        .rsvd_ple_ofst          = 0x8f800,
-       .hfc_param_ini          = {rtw8922a_hfc_param_ini_pcie, NULL, NULL},
+       .hfc_param_ini          = {rtw8922a_hfc_param_ini_pcie, NULL, NULL, NULL},
        .dle_mem                = {rtw8922a_dle_mem_pcie, NULL, NULL, NULL},
        .wde_qempty_acq_grpnum  = 4,
        .wde_qempty_mgq_grpsel  = 4,

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8922d.c b/drivers/net/wireless/realtek/rtw89/rtw8922d.c
index e3b77cd2351476dcac09f75c474e5a5c9920301a..96e7b70a3b930a988aa8c682ac330722abd26951 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8922d.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8922d.c
@@ -2948,7 +2948,7 @@ const struct rtw89_chip_info rtw8922d_chip_info = {
        .max_rx_agg_num         = 256,
        .dis_2g_40m_ul_ofdma    = false,
        .rsvd_ple_ofst          = 0x5f800,
-       .hfc_param_ini          = {rtw8922d_hfc_param_ini_pcie, NULL, NULL},
+       .hfc_param_ini          = {rtw8922d_hfc_param_ini_pcie, NULL, NULL, NULL},
        .dle_mem                = {rtw8922d_dle_mem_pcie, NULL, NULL, NULL},
        .wde_qempty_acq_grpnum  = 8,
        .wde_qempty_mgq_grpsel  = 8,