Commit 5f05bdb0 authored by Chih-Kang Chang's avatar Chih-Kang Chang Committed by Kalle Valo
Browse files

wifi: rtw89: move enable_cpu/disable_cpu into fw_download 



For WoWLAN mode, we need to download WoWLAN firmware by calling
fw_download(). Another, to disable/enable WiFi CPU is needed before
calling fw_download. Since Firmware runs on WiFi CPU, it is intuitive
to combine enable_cpu/disable_cpu functions into fw_download.

Signed-off-by: default avatarChih-Kang Chang <gary.chang@realtek.com>
Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221027052707.14605-3-pkshih@realtek.com
parent d9112042

drivers/net/wireless/realtek/rtw89/fw.c

+5 −0
Original line number Diff line number Diff line
@@ -531,6 +531,11 @@ int rtw89_fw_download(struct rtw89_dev *rtwdev, enum rtw89_fw_type type) 
	u8 val;

	int ret;



	rtw89_mac_disable_cpu(rtwdev);

	ret = rtw89_mac_enable_cpu(rtwdev, 0, true);

	if (ret)

		return ret;



	if (!fw || !len) {

		rtw89_err(rtwdev, "fw type %d isn't recognized\n", type);

		return -ENOENT;

drivers/net/wireless/realtek/rtw89/mac.c

+2 −8
Original line number Diff line number Diff line
@@ -3116,7 +3116,7 @@ static void rtw89_disable_fw_watchdog(struct rtw89_dev *rtwdev) 
	rtw89_mac_mem_write(rtwdev, R_AX_WDT_STATUS, val32, RTW89_MAC_MEM_CPU_LOCAL);

}



static void rtw89_mac_disable_cpu(struct rtw89_dev *rtwdev)

void rtw89_mac_disable_cpu(struct rtw89_dev *rtwdev)

{

	clear_bit(RTW89_FLAG_FW_RDY, rtwdev->flags);
@@ -3131,8 +3131,7 @@ static void rtw89_mac_disable_cpu(struct rtw89_dev *rtwdev) 
	rtw89_write32_set(rtwdev, R_AX_PLATFORM_ENABLE, B_AX_PLATFORM_EN);

}



static int rtw89_mac_enable_cpu(struct rtw89_dev *rtwdev, u8 boot_reason,

				bool dlfw)

int rtw89_mac_enable_cpu(struct rtw89_dev *rtwdev, u8 boot_reason, bool dlfw)

{

	u32 val;

	int ret;
@@ -3271,11 +3270,6 @@ int rtw89_mac_partial_init(struct rtw89_dev *rtwdev) 
			return ret;

	}



	rtw89_mac_disable_cpu(rtwdev);

	ret = rtw89_mac_enable_cpu(rtwdev, 0, true);

	if (ret)

		return ret;



	ret = rtw89_fw_download(rtwdev, RTW89_FW_NORMAL);

	if (ret)

		return ret;

drivers/net/wireless/realtek/rtw89/mac.h

+2 −0
Original line number Diff line number Diff line
@@ -815,6 +815,8 @@ int rtw89_mac_port_update(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif); 
void rtw89_mac_set_he_obss_narrow_bw_ru(struct rtw89_dev *rtwdev,

					struct ieee80211_vif *vif);

int rtw89_mac_remove_vif(struct rtw89_dev *rtwdev, struct rtw89_vif *vif);

void rtw89_mac_disable_cpu(struct rtw89_dev *rtwdev);

int rtw89_mac_enable_cpu(struct rtw89_dev *rtwdev, u8 boot_reason, bool dlfw);

int rtw89_mac_enable_bb_rf(struct rtw89_dev *rtwdev);

int rtw89_mac_disable_bb_rf(struct rtw89_dev *rtwdev);