diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2012-01-30 10:54:49 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-01-30 15:48:50 -0500 |
commit | b0302aba812bcc39291cdab9ad7e37008f352a91 (patch) | |
tree | 82915b1e24f204babeb65e1d517115c0e31cfd9a /drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | |
parent | feced2012e665468258a5c89b7f2a90b4e5695a4 (diff) |
rtlwifi: Convert to asynchronous firmware load
This patch addresses a kernel bugzilla report and two recent mail threads.
The kernel bugzilla report is https://bugzilla.kernel.org/show_bug.cgi?id=42632,
which reports a udev timeout on boot.
The first mail thread, which was on LKML (http://lkml.indiana.edu/hypermail/
linux/kernel/1112.3/00965.html) was for a WARNING that occurs after a
suspend/resume cycle for rtl8192cu.
The scond mail thread (http://marc.info/?l=linux-wireless&m=132655490826766&w=2)
concerned changes in udev that break drivers that delay while firmware is loaded
on modprobe.
This patch converts all rtlwifi-based drivers to use the asynchronous firmware
loading mechanism. Drivers rtl8192ce, rtl8192cu and rtl8192de share a common
callback routine. Driver rtl8192se needs different handling of the firmware,
thus it has its own code.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192ce/hw.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c index c5aced459cd0..48c7b5d3fc5b 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | |||
@@ -917,10 +917,7 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw) | |||
917 | RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, | 917 | RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, |
918 | "Failed to download FW. Init HW without FW now..\n"); | 918 | "Failed to download FW. Init HW without FW now..\n"); |
919 | err = 1; | 919 | err = 1; |
920 | rtlhal->fw_ready = false; | ||
921 | return err; | 920 | return err; |
922 | } else { | ||
923 | rtlhal->fw_ready = true; | ||
924 | } | 921 | } |
925 | 922 | ||
926 | rtlhal->last_hmeboxnum = 0; | 923 | rtlhal->last_hmeboxnum = 0; |
@@ -1193,7 +1190,6 @@ static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw) | |||
1193 | { | 1190 | { |
1194 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 1191 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
1195 | struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw); | 1192 | struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw); |
1196 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); | ||
1197 | u8 u1b_tmp; | 1193 | u8 u1b_tmp; |
1198 | u32 u4b_tmp; | 1194 | u32 u4b_tmp; |
1199 | 1195 | ||
@@ -1204,7 +1200,7 @@ static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw) | |||
1204 | rtl_write_byte(rtlpriv, REG_APSD_CTRL, 0x40); | 1200 | rtl_write_byte(rtlpriv, REG_APSD_CTRL, 0x40); |
1205 | rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2); | 1201 | rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2); |
1206 | rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE0); | 1202 | rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE0); |
1207 | if ((rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) && rtlhal->fw_ready) | 1203 | if (rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) |
1208 | rtl92c_firmware_selfreset(hw); | 1204 | rtl92c_firmware_selfreset(hw); |
1209 | rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, 0x51); | 1205 | rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, 0x51); |
1210 | rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00); | 1206 | rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00); |