The firmware elements are recognized according to hardware variants in rtw89_chip_info_setup(), and the last function uses firmware content is rtw89_core_setup_rfe_parms(). Release firmware at the end of the function if we have duplicated the elements. Signed-off-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw89/core.c | 4 ++++ drivers/net/wireless/realtek/rtw89/fw.c | 24 ++++++++++++++--------- drivers/net/wireless/realtek/rtw89/fw.h | 1 + 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c index 0c1c5c8ae8ce..5ca0c401c43a 100644 --- a/drivers/net/wireless/realtek/rtw89/core.c +++ b/drivers/net/wireless/realtek/rtw89/core.c @@ -7388,6 +7388,7 @@ void rtw89_core_rfkill_poll(struct rtw89_dev *rtwdev, bool force) int rtw89_chip_info_setup(struct rtw89_dev *rtwdev) { + struct rtw89_fw_req_info *fw_req = &rtwdev->fw.req; struct rtw89_efuse *efuse = &rtwdev->efuse; struct rtw89_hal *hal = &rtwdev->hal; int ret; @@ -7437,6 +7438,9 @@ int rtw89_chip_info_setup(struct rtw89_dev *rtwdev) hal->cid, hal->cv, hal->aid, hal->acv, efuse->rfe_type); out: + if (fw_req->free_after_probe) + __rtw89_unload_firmware(rtwdev); + rtw89_mac_pwr_off(rtwdev); return ret; diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c index 3cdfb141f075..e4b59690622d 100644 --- a/drivers/net/wireless/realtek/rtw89/fw.c +++ b/drivers/net/wireless/realtek/rtw89/fw.c @@ -2206,20 +2206,26 @@ static void rtw89_unload_firmware_elements(struct rtw89_dev *rtwdev) kfree(elm_info->rfk_log_fmt); } -void rtw89_unload_firmware(struct rtw89_dev *rtwdev) +void __rtw89_unload_firmware(struct rtw89_dev *rtwdev) { struct rtw89_fw_info *fw = &rtwdev->fw; - cancel_work_sync(&rtwdev->load_firmware_work); + release_firmware(fw->req.firmware); - if (fw->req.firmware) { - release_firmware(fw->req.firmware); + /* + * Directly call this to free firmware early in normal flow. Assign + * NULL back in case rtw89_free_ieee80211_hw() or tw89_core_deinit() + * try to release the same one again in error handling paths. + */ + fw->req.firmware = NULL; +} - /* assign NULL back in case rtw89_free_ieee80211_hw() - * try to release the same one again. - */ - fw->req.firmware = NULL; - } +void rtw89_unload_firmware(struct rtw89_dev *rtwdev) +{ + struct rtw89_fw_info *fw = &rtwdev->fw; + + cancel_work_sync(&rtwdev->load_firmware_work); + __rtw89_unload_firmware(rtwdev); kfree(fw->log.fmts); rtw89_unload_firmware_elements(rtwdev); diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h index 473278f6bbea..cb4209df5843 100644 --- a/drivers/net/wireless/realtek/rtw89/fw.h +++ b/drivers/net/wireless/realtek/rtw89/fw.h @@ -5419,6 +5419,7 @@ rtw89_early_fw_feature_recognize(struct device *device, int rtw89_fw_download(struct rtw89_dev *rtwdev, enum rtw89_fw_type type, bool include_bb); void rtw89_load_firmware_work(struct work_struct *work); +void __rtw89_unload_firmware(struct rtw89_dev *rtwdev); void rtw89_unload_firmware(struct rtw89_dev *rtwdev); int rtw89_wait_firmware_completion(struct rtw89_dev *rtwdev); int rtw89_fw_log_prepare(struct rtw89_dev *rtwdev); -- 2.25.1