mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-30 13:23:02 -04:00
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
This commit is contained in:
committed by
Ping-Ke Shih
parent
c3dfef1e35
commit
c423ed43c9
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user