These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / wireless / realtek / rtlwifi / rtl8821ae / hw.c

diff --git a/kernel/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
similarity index 99%
rename from kernel/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
rename to kernel/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
index 3fa2fb7..bbb789f 100644 (file)
--- a/kernel/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
@@ -2253,11 +2253,28 @@ void rtl8821ae_set_qos(struct ieee80211_hw *hw, int aci)
        }
 }
 
+static void rtl8821ae_clear_interrupt(struct ieee80211_hw *hw)
+{
+       struct rtl_priv *rtlpriv = rtl_priv(hw);
+       u32 tmp = rtl_read_dword(rtlpriv, REG_HISR);
+
+       rtl_write_dword(rtlpriv, REG_HISR, tmp);
+
+       tmp = rtl_read_dword(rtlpriv, REG_HISRE);
+       rtl_write_dword(rtlpriv, REG_HISRE, tmp);
+
+       tmp = rtl_read_dword(rtlpriv, REG_HSISR);
+       rtl_write_dword(rtlpriv, REG_HSISR, tmp);
+}
+
 void rtl8821ae_enable_interrupt(struct ieee80211_hw *hw)
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 
+       if (rtlpci->int_clear)
+               rtl8821ae_clear_interrupt(hw);/*clear it here first*/
+
        rtl_write_dword(rtlpriv, REG_HIMR, rtlpci->irq_mask[0] & 0xFFFFFFFF);
        rtl_write_dword(rtlpriv, REG_HIMRE, rtlpci->irq_mask[1] & 0xFFFFFFFF);
        rtlpci->irq_enabled = true;
@@ -3212,8 +3229,8 @@ static void _rtl8821ae_read_adapter_info(struct ieee80211_hw *hw, bool b_pseudo_
        if (rtlefuse->eeprom_channelplan == 0xff)
                rtlefuse->eeprom_channelplan = 0x7F;
 
-       /* set channel paln to world wide 13 */
-       /* rtlefuse->channel_plan = (u8)rtlefuse->eeprom_channelplan; */
+       /* set channel plan from efuse */
+       rtlefuse->channel_plan = rtlefuse->eeprom_channelplan;
 
        /*parse xtal*/
        rtlefuse->crystalcap = hwinfo[EEPROM_XTAL_8821AE];