Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2610decd authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8192se: Fix too long disable of IRQs 



In commit f78bccd7 entitled "rtlwifi:
rtl8192ce: Fix too long disable of IRQs", Olivier Langlois
<olivier@trillion01.com> fixed a problem caused by an extra long disabling
of interrupts. This patch makes the same fix for rtl8192se.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a53268be

drivers/net/wireless/rtlwifi/rtl8192se/hw.c

+21 −6
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ int rtl92se_hw_init(struct ieee80211_hw *hw) 
	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));

	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));

	u8 tmp_byte = 0;



	unsigned long flags;

	bool rtstatus = true;

	u8 tmp_u1b;

	int err = false;
@@ -967,6 +967,16 @@ int rtl92se_hw_init(struct ieee80211_hw *hw) 


	rtlpci->being_init_adapter = true;



	/* As this function can take a very long time (up to 350 ms)

	 * and can be called with irqs disabled, reenable the irqs

	 * to let the other devices continue being serviced.

	 *

	 * It is safe doing so since our own interrupts will only be enabled

	 * in a subsequent step.

	 */

	local_save_flags(flags);

	local_irq_enable();



	rtlpriv->intf_ops->disable_aspm(hw);



	/* 1. MAC Initialize */
@@ -984,7 +994,8 @@ int rtl92se_hw_init(struct ieee80211_hw *hw) 
		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

			 "Failed to download FW. Init HW without FW now... "

			 "Please copy FW into /lib/firmware/rtlwifi\n");

		return 1;

		err = 1;

		goto exit;

	}



	/* After FW download, we have to reset MAC register */
@@ -997,7 +1008,8 @@ int rtl92se_hw_init(struct ieee80211_hw *hw) 
	/* 3. Initialize MAC/PHY Config by MACPHY_reg.txt */

	if (!rtl92s_phy_mac_config(hw)) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "MAC Config failed\n");

		return rtstatus;

		err = rtstatus;

		goto exit;

	}



	/* because last function modify RCR, so we update
@@ -1016,7 +1028,8 @@ int rtl92se_hw_init(struct ieee80211_hw *hw) 
	/* 4. Initialize BB After MAC Config PHY_reg.txt, AGC_Tab.txt */

	if (!rtl92s_phy_bb_config(hw)) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "BB Config failed\n");

		return rtstatus;

		err = rtstatus;

		goto exit;

	}



	/* 5. Initiailze RF RAIO_A.txt RF RAIO_B.txt */
@@ -1033,7 +1046,8 @@ int rtl92se_hw_init(struct ieee80211_hw *hw) 


	if (!rtl92s_phy_rf_config(hw)) {

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "RF Config failed\n");

		return rtstatus;

		err = rtstatus;

		goto exit;

	}



	/* After read predefined TXT, we must set BB/MAC/RF
@@ -1122,8 +1136,9 @@ int rtl92se_hw_init(struct ieee80211_hw *hw) 


	rtlpriv->cfg->ops->led_control(hw, LED_CTL_POWER_ON);

	rtl92s_dm_init(hw);

exit:

	local_irq_restore(flags);

	rtlpci->being_init_adapter = false;



	return err;

}