| Message ID | 7e05e8a7-d7cd-4cc2-87c5-143ba30e8c54@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | wifi: rtw89: Add support for USB devices | expand |
Bitterblue Smith <rtl8821cerfe2@gmail.com> wrote: > USB and SDIO will need different sets of values, so make hfc_param_ini > in struct rtw89_chip_info an array. > > Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com> [...] > diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c > index 2ee766e37322..0a3603f2e6bf 100644 > --- a/drivers/net/wireless/realtek/rtw89/mac.c > +++ b/drivers/net/wireless/realtek/rtw89/mac.c > @@ -881,13 +881,14 @@ static int hfc_reset_param(struct rtw89_dev *rtwdev) By the way, please help to remove the initializer of param_ini, which is weird and unnecessary: struct rtw89_hfc_param_ini param_ini = {NULL}; > > switch (rtwdev->hci.type) { > case RTW89_HCI_TYPE_PCIE: > - param_ini = rtwdev->chip->hfc_param_ini[qta_mode]; > - param->en = 0; > break; > default: > return -EINVAL; > } > > + param_ini = rtwdev->chip->hfc_param_ini[rtwdev->hci.type][qta_mode]; Like patch 02/14, we can remove switch...case above, and check rtwdev->chip->hfc_param_ini[rtwdev->hci.type] to know if we can support certain HCI, like param_inis = rtwdev->chip->hfc_param_ini[rtwdev->hci.type]; if (!param_inis) return -EINVAL; param_ini = param_inis[qta_mode]; > + param->en = 0; > + > if (param_ini.pub_cfg) > param->pub_cfg = *param_ini.pub_cfg; >
Bitterblue Smith <rtl8821cerfe2@gmail.com> wrote: > On 16/06/2025 04:26, Ping-Ke Shih wrote: > > Bitterblue Smith <rtl8821cerfe2@gmail.com> wrote: > >> USB and SDIO will need different sets of values, so make hfc_param_ini > >> in struct rtw89_chip_info an array. > >> > >> Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com> > > > > [...] > > > > > >> diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c > >> index 2ee766e37322..0a3603f2e6bf 100644 > >> --- a/drivers/net/wireless/realtek/rtw89/mac.c > >> +++ b/drivers/net/wireless/realtek/rtw89/mac.c > >> @@ -881,13 +881,14 @@ static int hfc_reset_param(struct rtw89_dev *rtwdev) > > > > By the way, please help to remove the initializer of param_ini, which is weird > > and unnecessary: > > > > struct rtw89_hfc_param_ini param_ini = {NULL}; > > > >> > >> switch (rtwdev->hci.type) { > >> case RTW89_HCI_TYPE_PCIE: > >> - param_ini = rtwdev->chip->hfc_param_ini[qta_mode]; > >> - param->en = 0; > >> break; > >> default: > >> return -EINVAL; > >> } > >> > >> + param_ini = rtwdev->chip->hfc_param_ini[rtwdev->hci.type][qta_mode]; > > > > Like patch 02/14, we can remove switch...case above, and check > > rtwdev->chip->hfc_param_ini[rtwdev->hci.type] to know if we can support > > certain HCI, like > > > > param_inis = rtwdev->chip->hfc_param_ini[rtwdev->hci.type]; > > if (!param_inis) > > return -EINVAL; > > > > param_ini = param_inis[qta_mode]; > > > > > > That reminds me, why make a copy? param_ini could be a pointer instead. I guess this is because vendor driver does, and pointer is reasonable. > > >> + param->en = 0; > >> + > >> if (param_ini.pub_cfg) > >> param->pub_cfg = *param_ini.pub_cfg; > >> > > > > >
diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h index 12d5727abfe9..d4c7b47c3ba6 100644 --- a/drivers/net/wireless/realtek/rtw89/core.h +++ b/drivers/net/wireless/realtek/rtw89/core.h @@ -130,6 +130,8 @@ enum rtw89_hci_type { RTW89_HCI_TYPE_PCIE, RTW89_HCI_TYPE_USB, RTW89_HCI_TYPE_SDIO, + + RTW89_HCI_TYPE_NUM, }; enum rtw89_hci_dle_type { @@ -4302,7 +4304,7 @@ struct rtw89_chip_info { u16 max_amsdu_limit; bool dis_2g_40m_ul_ofdma; u32 rsvd_ple_ofst; - const struct rtw89_hfc_param_ini *hfc_param_ini; + const struct rtw89_hfc_param_ini *hfc_param_ini[RTW89_HCI_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 2ee766e37322..0a3603f2e6bf 100644 --- a/drivers/net/wireless/realtek/rtw89/mac.c +++ b/drivers/net/wireless/realtek/rtw89/mac.c @@ -881,13 +881,14 @@ static int hfc_reset_param(struct rtw89_dev *rtwdev) switch (rtwdev->hci.type) { case RTW89_HCI_TYPE_PCIE: - param_ini = rtwdev->chip->hfc_param_ini[qta_mode]; - param->en = 0; break; default: return -EINVAL; } + param_ini = rtwdev->chip->hfc_param_ini[rtwdev->hci.type][qta_mode]; + param->en = 0; + if (param_ini.pub_cfg) param->pub_cfg = *param_ini.pub_cfg; diff --git a/drivers/net/wireless/realtek/rtw89/rtw8851b.c b/drivers/net/wireless/realtek/rtw89/rtw8851b.c index f0755afb1fdc..b825b1b4ad9f 100644 --- a/drivers/net/wireless/realtek/rtw89/rtw8851b.c +++ b/drivers/net/wireless/realtek/rtw89/rtw8851b.c @@ -2464,7 +2464,7 @@ const struct rtw89_chip_info rtw8851b_chip_info = { .max_amsdu_limit = 3500, .dis_2g_40m_ul_ofdma = true, .rsvd_ple_ofst = 0x2f800, - .hfc_param_ini = rtw8851b_hfc_param_ini_pcie, + .hfc_param_ini = {rtw8851b_hfc_param_ini_pcie, NULL, NULL}, .dle_mem = {rtw8851b_dle_mem_pcie, NULL, NULL, NULL}, .wde_qempty_acq_grpnum = 4, .wde_qempty_mgq_grpsel = 4, diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c index 7c631ccee8fc..4285af5c9ad4 100644 --- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c +++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c @@ -2183,7 +2183,7 @@ const struct rtw89_chip_info rtw8852a_chip_info = { .max_amsdu_limit = 3500, .dis_2g_40m_ul_ofdma = true, .rsvd_ple_ofst = 0x6f800, - .hfc_param_ini = rtw8852a_hfc_param_ini_pcie, + .hfc_param_ini = {rtw8852a_hfc_param_ini_pcie, NULL, NULL}, .dle_mem = {rtw8852a_dle_mem_pcie, NULL, NULL, NULL}, .wde_qempty_acq_grpnum = 16, .wde_qempty_mgq_grpsel = 16, diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c index a2dfdc541ce6..aff87cc9bffe 100644 --- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c +++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c @@ -819,7 +819,7 @@ const struct rtw89_chip_info rtw8852b_chip_info = { .max_amsdu_limit = 5000, .dis_2g_40m_ul_ofdma = true, .rsvd_ple_ofst = 0x2f800, - .hfc_param_ini = rtw8852b_hfc_param_ini_pcie, + .hfc_param_ini = {rtw8852b_hfc_param_ini_pcie, NULL, NULL}, .dle_mem = {rtw8852b_dle_mem_pcie, NULL, NULL, NULL}, .wde_qempty_acq_grpnum = 4, .wde_qempty_mgq_grpsel = 4, diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852bt.c b/drivers/net/wireless/realtek/rtw89/rtw8852bt.c index 96800ccdedc6..e13d6beb9aa3 100644 --- a/drivers/net/wireless/realtek/rtw89/rtw8852bt.c +++ b/drivers/net/wireless/realtek/rtw89/rtw8852bt.c @@ -753,7 +753,7 @@ const struct rtw89_chip_info rtw8852bt_chip_info = { .max_amsdu_limit = 5000, .dis_2g_40m_ul_ofdma = true, .rsvd_ple_ofst = 0x6f800, - .hfc_param_ini = rtw8852bt_hfc_param_ini_pcie, + .hfc_param_ini = {rtw8852bt_hfc_param_ini_pcie, 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 5210f2f9124b..f419e6ace39d 100644 --- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c +++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c @@ -3003,7 +3003,7 @@ const struct rtw89_chip_info rtw8852c_chip_info = { .max_amsdu_limit = 8000, .dis_2g_40m_ul_ofdma = false, .rsvd_ple_ofst = 0x6f800, - .hfc_param_ini = rtw8852c_hfc_param_ini_pcie, + .hfc_param_ini = {rtw8852c_hfc_param_ini_pcie, NULL, NULL}, .dle_mem = {rtw8852c_dle_mem_pcie, NULL, NULL, NULL}, .wde_qempty_acq_grpnum = 16, .wde_qempty_mgq_grpsel = 16, diff --git a/drivers/net/wireless/realtek/rtw89/rtw8922a.c b/drivers/net/wireless/realtek/rtw89/rtw8922a.c index 0517f0d27a5c..780d449a2140 100644 --- a/drivers/net/wireless/realtek/rtw89/rtw8922a.c +++ b/drivers/net/wireless/realtek/rtw89/rtw8922a.c @@ -2816,7 +2816,7 @@ const struct rtw89_chip_info rtw8922a_chip_info = { .max_amsdu_limit = 8000, .dis_2g_40m_ul_ofdma = false, .rsvd_ple_ofst = 0x8f800, - .hfc_param_ini = rtw8922a_hfc_param_ini_pcie, + .hfc_param_ini = {rtw8922a_hfc_param_ini_pcie, NULL, NULL}, .dle_mem = {rtw8922a_dle_mem_pcie, NULL, NULL, NULL}, .wde_qempty_acq_grpnum = 4, .wde_qempty_mgq_grpsel = 4,
USB and SDIO will need different sets of values, so make hfc_param_ini in struct rtw89_chip_info an array. Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com> --- v2: - Make hfc_param_ini an array instead of having (eventually) three different hfc_param_ini_* members. --- drivers/net/wireless/realtek/rtw89/core.h | 4 +++- drivers/net/wireless/realtek/rtw89/mac.c | 5 +++-- drivers/net/wireless/realtek/rtw89/rtw8851b.c | 2 +- drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2 +- drivers/net/wireless/realtek/rtw89/rtw8852b.c | 2 +- drivers/net/wireless/realtek/rtw89/rtw8852bt.c | 2 +- drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 +- drivers/net/wireless/realtek/rtw89/rtw8922a.c | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-)