tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Chih-Kang Chang <gary.chang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221027052707.14605-3-pkshih@realtek.com

authored by

Chih-Kang Chang and committed by
Kalle Valo 5f05bdb0 d9112042

+9 -8
+5
drivers/net/wireless/realtek/rtw89/fw.c
··· 531 531 u8 val; 532 532 int ret; 533 533 534 + rtw89_mac_disable_cpu(rtwdev); 535 + ret = rtw89_mac_enable_cpu(rtwdev, 0, true); 536 + if (ret) 537 + return ret; 538 + 534 539 if (!fw || !len) { 535 540 rtw89_err(rtwdev, "fw type %d isn't recognized\n", type); 536 541 return -ENOENT;
+2 -8
drivers/net/wireless/realtek/rtw89/mac.c
··· 3116 3116 rtw89_mac_mem_write(rtwdev, R_AX_WDT_STATUS, val32, RTW89_MAC_MEM_CPU_LOCAL); 3117 3117 } 3118 3118 3119 - static void rtw89_mac_disable_cpu(struct rtw89_dev *rtwdev) 3119 + void rtw89_mac_disable_cpu(struct rtw89_dev *rtwdev) 3120 3120 { 3121 3121 clear_bit(RTW89_FLAG_FW_RDY, rtwdev->flags); 3122 3122 ··· 3131 3131 rtw89_write32_set(rtwdev, R_AX_PLATFORM_ENABLE, B_AX_PLATFORM_EN); 3132 3132 } 3133 3133 3134 - static int rtw89_mac_enable_cpu(struct rtw89_dev *rtwdev, u8 boot_reason, 3135 - bool dlfw) 3134 + int rtw89_mac_enable_cpu(struct rtw89_dev *rtwdev, u8 boot_reason, bool dlfw) 3136 3135 { 3137 3136 u32 val; 3138 3137 int ret; ··· 3269 3270 if (ret) 3270 3271 return ret; 3271 3272 } 3272 - 3273 - rtw89_mac_disable_cpu(rtwdev); 3274 - ret = rtw89_mac_enable_cpu(rtwdev, 0, true); 3275 - if (ret) 3276 - return ret; 3277 3273 3278 3274 ret = rtw89_fw_download(rtwdev, RTW89_FW_NORMAL); 3279 3275 if (ret)
+2
drivers/net/wireless/realtek/rtw89/mac.h
··· 815 815 void rtw89_mac_set_he_obss_narrow_bw_ru(struct rtw89_dev *rtwdev, 816 816 struct ieee80211_vif *vif); 817 817 int rtw89_mac_remove_vif(struct rtw89_dev *rtwdev, struct rtw89_vif *vif); 818 + void rtw89_mac_disable_cpu(struct rtw89_dev *rtwdev); 819 + int rtw89_mac_enable_cpu(struct rtw89_dev *rtwdev, u8 boot_reason, bool dlfw); 818 820 int rtw89_mac_enable_bb_rf(struct rtw89_dev *rtwdev); 819 821 int rtw89_mac_disable_bb_rf(struct rtw89_dev *rtwdev); 820 822