| Message ID | 20190923024703.2995-1-yhchuang@realtek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0b8dc6abbdb9f6696b1a79c42976e506645e5c2c |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [5.4,v2] rtw88: configure firmware after HCI started | expand |
<yhchuang@realtek.com> wrote: > From: Yan-Hsuan Chuang <yhchuang@realtek.com> > > After firmware has been downloaded, driver should send > some information to it through H2C commands. Those H2C > commands are transmitted through TX path. > > But before HCI has been started, the TX path is not > working completely. Such as PCI interfaces, the interrupts > are not enabled, hence TX interrupts will not be issued > after H2C skb has been DMAed to the device. And the H2C > skbs will not be released until the device is powered off. > > Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com> Patch applied to wireless-drivers.git, thanks. 0b8dc6abbdb9 rtw88: configure firmware after HCI started
diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/realtek/rtw88/mac.c index fc14b37d927d..b61b073031e5 100644 --- a/drivers/net/wireless/realtek/rtw88/mac.c +++ b/drivers/net/wireless/realtek/rtw88/mac.c @@ -707,9 +707,6 @@ int rtw_download_firmware(struct rtw_dev *rtwdev, struct rtw_fw_state *fw) rtwdev->h2c.last_box_num = 0; rtwdev->h2c.seq = 0; - rtw_fw_send_general_info(rtwdev); - rtw_fw_send_phydm_info(rtwdev); - rtw_flag_set(rtwdev, RTW_FLAG_FW_RUNNING); return 0; diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index fc8f6213fc8f..6dd457741b15 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -704,6 +704,10 @@ static int rtw_power_on(struct rtw_dev *rtwdev) goto err_off; } + /* send H2C after HCI has started */ + rtw_fw_send_general_info(rtwdev); + rtw_fw_send_phydm_info(rtwdev); + wifi_only = !rtwdev->efuse.btcoex; rtw_coex_power_on_setting(rtwdev); rtw_coex_init_hw_config(rtwdev, wifi_only);