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>
This commit is contained in:

committed by
John W. Linville

parent
feced2012e
commit
b0302aba81
@@ -917,10 +917,7 @@ int rtl92ce_hw_init(struct ieee80211_hw *hw)
|
||||
RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
|
||||
"Failed to download FW. Init HW without FW now..\n");
|
||||
err = 1;
|
||||
rtlhal->fw_ready = false;
|
||||
return err;
|
||||
} else {
|
||||
rtlhal->fw_ready = true;
|
||||
}
|
||||
|
||||
rtlhal->last_hmeboxnum = 0;
|
||||
@@ -1193,7 +1190,6 @@ static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)
|
||||
{
|
||||
struct rtl_priv *rtlpriv = rtl_priv(hw);
|
||||
struct rtl_pci_priv *rtlpcipriv = rtl_pcipriv(hw);
|
||||
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
|
||||
u8 u1b_tmp;
|
||||
u32 u4b_tmp;
|
||||
|
||||
@@ -1204,7 +1200,7 @@ static void _rtl92ce_poweroff_adapter(struct ieee80211_hw *hw)
|
||||
rtl_write_byte(rtlpriv, REG_APSD_CTRL, 0x40);
|
||||
rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE2);
|
||||
rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, 0xE0);
|
||||
if ((rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7)) && rtlhal->fw_ready)
|
||||
if (rtl_read_byte(rtlpriv, REG_MCUFWDL) & BIT(7))
|
||||
rtl92c_firmware_selfreset(hw);
|
||||
rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, 0x51);
|
||||
rtl_write_byte(rtlpriv, REG_MCUFWDL, 0x00);
|
||||
|
Reference in New Issue
Block a user