lkml.org 
[lkml]   [2014]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 49/83] rtlwifi: rtl8723ae: Fix too long disable of IRQs
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Larry Finger <Larry.Finger@lwfinger.net>

    commit bfc1010c418a22cbebd8b1bd1e75dad6a527a609 upstream.

    In commit f78bccd79ba3cd9d9664981b501d57bdb81ab8a4 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 rtl8723ae.

    Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 18 +++++++++++++++---
    1 file changed, 15 insertions(+), 3 deletions(-)

    --- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
    +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
    @@ -880,14 +880,25 @@ int rtl8723ae_hw_init(struct ieee80211_h
    bool rtstatus = true;
    int err;
    u8 tmp_u1b;
    + unsigned long flags;

    rtlpriv->rtlhal.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);
    rtstatus = _rtl8712e_init_mac(hw);
    if (rtstatus != true) {
    RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Init MAC failed\n");
    err = 1;
    - return err;
    + goto exit;
    }

    err = rtl8723ae_download_fw(hw);
    @@ -895,8 +906,7 @@ int rtl8723ae_hw_init(struct ieee80211_h
    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;
    + goto exit;
    } else {
    rtlhal->fw_ready = true;
    }
    @@ -971,6 +981,8 @@ int rtl8723ae_hw_init(struct ieee80211_h
    RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "under 1.5V\n");
    }
    rtl8723ae_dm_init(hw);
    +exit:
    + local_irq_restore(flags);
    rtlpriv->rtlhal.being_init_adapter = false;
    return err;
    }



    \
     
     \ /
      Last update: 2014-05-11 22:41    [W:4.095 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site