wifi: rtw89: Add rtw8852c_dle_mem_usb{2,3}

Add rtw8852c_dle_mem_usb2 and rtw8852c_dle_mem_usb3 and their various
quotas and sizes in struct rtw89_mac_size_set.

"dle" could be "Data Link Engine" or "Double Link Engine". These are
some parameters needed for RTL8852CU.

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/40a58644-13ce-48a4-85e2-ba4f3cbb975b@gmail.com

diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c
index b5309ae3fd57df04b81003f182f46155f7c30e08..bc39b4f7bc4f48f1d3d48536ac20a97e8a727595 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.c
+++ b/drivers/net/wireless/realtek/rtw89/mac.c
@@ -1663,6 +1663,8 @@ const struct rtw89_mac_size_set rtw89_mac_size = {
        .wde_size7 = {RTW89_WDE_PG_64, 510, 2,},
        /* DLFW */
        .wde_size9 = {RTW89_WDE_PG_64, 0, 1024,},
+       /* 8852C USB3.0 */
+       .wde_size17 = {RTW89_WDE_PG_64, 354, 30,},
        /* 8852C DLFW */
        .wde_size18 = {RTW89_WDE_PG_64, 0, 2048,},
        /* 8852C PCIE SCC */
@@ -1670,6 +1672,8 @@ const struct rtw89_mac_size_set rtw89_mac_size = {
        .wde_size23 = {RTW89_WDE_PG_64, 1022, 2,},
        /* 8852B USB2.0/USB3.0 SCC */
        .wde_size25 = {RTW89_WDE_PG_64, 162, 94,},
+       /* 8852C USB2.0 */
+       .wde_size31 = {RTW89_WDE_PG_64, 384, 0,},
        /* PCIE */
        .ple_size0 = {RTW89_PLE_PG_128, 1520, 16,},
        .ple_size0_v1 = {RTW89_PLE_PG_128, 2688, 240, 212992,},
@@ -1681,6 +1685,8 @@ const struct rtw89_mac_size_set rtw89_mac_size = {
        /* DLFW */
        .ple_size8 = {RTW89_PLE_PG_128, 64, 960,},
        .ple_size9 = {RTW89_PLE_PG_128, 2288, 16,},
+       /* 8852C USB */
+       .ple_size17 = {RTW89_PLE_PG_128, 3368, 24,},
        /* 8852C DLFW */
        .ple_size18 = {RTW89_PLE_PG_128, 2544, 16,},
        /* 8852C PCIE SCC */
@@ -1689,6 +1695,8 @@ const struct rtw89_mac_size_set rtw89_mac_size = {
        .ple_size32 = {RTW89_PLE_PG_128, 620, 20,},
        /* 8852B USB3.0 SCC */
        .ple_size33 = {RTW89_PLE_PG_128, 632, 8,},
+       /* 8852C USB2.0 */
+       .ple_size34 = {RTW89_PLE_PG_128, 3374, 18,},
        /* PCIE 64 */
        .wde_qt0 = {3792, 196, 0, 107,},
        .wde_qt0_v1 = {3302, 6, 0, 20,},
@@ -1698,6 +1706,8 @@ const struct rtw89_mac_size_set rtw89_mac_size = {
        .wde_qt6 = {448, 48, 0, 16,},
        /* 8852B PCIE SCC */
        .wde_qt7 = {446, 48, 0, 16,},
+       /* 8852C USB3.0 */
+       .wde_qt16 = {344, 2, 0, 8,},
        /* 8852C DLFW */
        .wde_qt17 = {0, 0, 0,  0,},
        /* 8852C PCIE SCC */
@@ -1705,6 +1715,8 @@ const struct rtw89_mac_size_set rtw89_mac_size = {
        .wde_qt23 = {958, 48, 0, 16,},
        /* 8852B USB2.0/USB3.0 SCC */
        .wde_qt25 = {152, 2, 0, 8,},
+       /* 8852C USB2.0 */
+       .wde_qt31 = {338, 6, 0, 40,},
        .ple_qt0 = {320, 320, 32, 16, 13, 13, 292, 292, 64, 18, 1, 4, 0,},
        .ple_qt1 = {320, 320, 32, 16, 1316, 1316, 1595, 1595, 1367, 1321, 1, 1307, 0,},
        /* PCIE SCC */
@@ -1716,6 +1728,10 @@ const struct rtw89_mac_size_set rtw89_mac_size = {
        .ple_qt13 = {0, 0, 16, 48, 0, 0, 0, 0, 0, 0, 0,},
        /* PCIE 64 */
        .ple_qt18 = {147, 0, 16, 20, 17, 13, 89, 0, 32, 14, 8, 0,},
+       /* USB 52C USB3.0 */
+       .ple_qt42 = {1068, 0, 16, 48, 4, 13, 178, 0, 16, 1, 8, 16, 0,},
+       /* USB 52C USB3.0 */
+       .ple_qt43 = {3068, 0, 32, 48, 4, 13, 178, 0, 16, 1, 8, 16, 0,},
        /* DLFW 52C */
        .ple_qt44 = {0, 0, 16, 256, 0, 0, 0, 0, 0, 0, 0, 0,},
        /* DLFW 52C */
@@ -1735,6 +1751,10 @@ const struct rtw89_mac_size_set rtw89_mac_size = {
        /* USB3.0 52B 92K */
        .ple_qt74 = {286, 0, 16, 48, 4, 13, 178, 0, 32, 14, 8, 0, 0,},
        .ple_qt75 = {286, 0, 32, 48, 37, 13, 211, 0, 65, 14, 24, 0, 0,},
+       /* USB2.0 52C */
+       .ple_qt78 = {1560, 0, 16, 48, 13, 13, 390, 0, 32, 38, 8, 16, 0,},
+       /* USB2.0 52C */
+       .ple_qt79 = {1560, 0, 32, 48, 1253, 13, 1630, 0, 1272, 38, 120, 1256, 0,},
        /* 8852A PCIE WOW */
        .ple_qt_52a_wow = {264, 0, 32, 20, 64, 13, 1005, 0, 64, 128, 120,},
        /* 8852B PCIE WOW */

diff --git a/drivers/net/wireless/realtek/rtw89/mac.h b/drivers/net/wireless/realtek/rtw89/mac.h
index 25fe5e5c8a979473bc49e5fbf9b228a86b60cdcc..46302f4aa3d989b31df5817b0ca9c0088ebe5891 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.h
+++ b/drivers/net/wireless/realtek/rtw89/mac.h
@@ -923,10 +923,12 @@ struct rtw89_mac_size_set {
        const struct rtw89_dle_size wde_size6;
        const struct rtw89_dle_size wde_size7;
        const struct rtw89_dle_size wde_size9;
+       const struct rtw89_dle_size wde_size17;
        const struct rtw89_dle_size wde_size18;
        const struct rtw89_dle_size wde_size19;
        const struct rtw89_dle_size wde_size23;
        const struct rtw89_dle_size wde_size25;
+       const struct rtw89_dle_size wde_size31;
        const struct rtw89_dle_size ple_size0;
        const struct rtw89_dle_size ple_size0_v1;
        const struct rtw89_dle_size ple_size3_v1;
@@ -934,19 +936,23 @@ struct rtw89_mac_size_set {
        const struct rtw89_dle_size ple_size6;
        const struct rtw89_dle_size ple_size8;
        const struct rtw89_dle_size ple_size9;
+       const struct rtw89_dle_size ple_size17;
        const struct rtw89_dle_size ple_size18;
        const struct rtw89_dle_size ple_size19;
        const struct rtw89_dle_size ple_size32;
        const struct rtw89_dle_size ple_size33;
+       const struct rtw89_dle_size ple_size34;
        const struct rtw89_wde_quota wde_qt0;
        const struct rtw89_wde_quota wde_qt0_v1;
        const struct rtw89_wde_quota wde_qt4;
        const struct rtw89_wde_quota wde_qt6;
        const struct rtw89_wde_quota wde_qt7;
+       const struct rtw89_wde_quota wde_qt16;
        const struct rtw89_wde_quota wde_qt17;
        const struct rtw89_wde_quota wde_qt18;
        const struct rtw89_wde_quota wde_qt23;
        const struct rtw89_wde_quota wde_qt25;
+       const struct rtw89_wde_quota wde_qt31;
        const struct rtw89_ple_quota ple_qt0;
        const struct rtw89_ple_quota ple_qt1;
        const struct rtw89_ple_quota ple_qt4;
@@ -954,6 +960,8 @@ struct rtw89_mac_size_set {
        const struct rtw89_ple_quota ple_qt9;
        const struct rtw89_ple_quota ple_qt13;
        const struct rtw89_ple_quota ple_qt18;
+       const struct rtw89_ple_quota ple_qt42;
+       const struct rtw89_ple_quota ple_qt43;
        const struct rtw89_ple_quota ple_qt44;
        const struct rtw89_ple_quota ple_qt45;
        const struct rtw89_ple_quota ple_qt46;
@@ -965,6 +973,8 @@ struct rtw89_mac_size_set {
        const struct rtw89_ple_quota ple_qt73;
        const struct rtw89_ple_quota ple_qt74;
        const struct rtw89_ple_quota ple_qt75;
+       const struct rtw89_ple_quota ple_qt78;
+       const struct rtw89_ple_quota ple_qt79;
        const struct rtw89_ple_quota ple_qt_52a_wow;
        const struct rtw89_ple_quota ple_qt_52b_wow;
        const struct rtw89_ple_quota ple_qt_52bt_wow;

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
index 6aedbd03e3d49c079b8b604770ad216624f69a52..651ef96d143accce219023a64bd0e5dbebd38bf6 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
@@ -64,6 +64,32 @@ static const struct rtw89_dle_mem rtw8852c_dle_mem_pcie[] = {
                               NULL},
 };
 
+static const struct rtw89_dle_mem rtw8852c_dle_mem_usb2[] = {
+       [RTW89_QTA_SCC] = {RTW89_QTA_SCC, &rtw89_mac_size.wde_size31,
+                          &rtw89_mac_size.ple_size34, &rtw89_mac_size.wde_qt31,
+                          &rtw89_mac_size.wde_qt31, &rtw89_mac_size.ple_qt78,
+                          &rtw89_mac_size.ple_qt79},
+       [RTW89_QTA_DLFW] = {RTW89_QTA_DLFW, &rtw89_mac_size.wde_size18,
+                           &rtw89_mac_size.ple_size18, &rtw89_mac_size.wde_qt17,
+                           &rtw89_mac_size.wde_qt17, &rtw89_mac_size.ple_qt44,
+                           &rtw89_mac_size.ple_qt45},
+       [RTW89_QTA_INVALID] = {RTW89_QTA_INVALID, NULL, NULL, NULL, NULL, NULL,
+                              NULL},
+};
+
+static const struct rtw89_dle_mem rtw8852c_dle_mem_usb3[] = {
+       [RTW89_QTA_SCC] = {RTW89_QTA_SCC, &rtw89_mac_size.wde_size17,
+                          &rtw89_mac_size.ple_size17, &rtw89_mac_size.wde_qt16,
+                          &rtw89_mac_size.wde_qt16, &rtw89_mac_size.ple_qt42,
+                          &rtw89_mac_size.ple_qt43},
+       [RTW89_QTA_DLFW] = {RTW89_QTA_DLFW, &rtw89_mac_size.wde_size18,
+                           &rtw89_mac_size.ple_size18, &rtw89_mac_size.wde_qt17,
+                           &rtw89_mac_size.wde_qt17, &rtw89_mac_size.ple_qt44,
+                           &rtw89_mac_size.ple_qt45},
+       [RTW89_QTA_INVALID] = {RTW89_QTA_INVALID, NULL, NULL, NULL, NULL, NULL,
+                              NULL},
+};
+
 static const u32 rtw8852c_h2c_regs[RTW89_H2CREG_MAX] = {
        R_AX_H2CREG_DATA0_V1, R_AX_H2CREG_DATA1_V1, R_AX_H2CREG_DATA2_V1,
        R_AX_H2CREG_DATA3_V1
@@ -3026,7 +3052,10 @@ 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, NULL, NULL},
-       .dle_mem                = {rtw8852c_dle_mem_pcie, NULL, NULL, NULL},
+       .dle_mem                = {rtw8852c_dle_mem_pcie,
+                                  rtw8852c_dle_mem_usb2,
+                                  rtw8852c_dle_mem_usb3,
+                                  NULL},
        .wde_qempty_acq_grpnum  = 16,
        .wde_qempty_mgq_grpsel  = 16,
        .rf_base_addr           = {0xe000, 0xf000},