Commit 3c92d551 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Kalle Valo

rtlwifi: use ktime_get_real_seconds() for suspend time

do_gettimeofday() is deprecated and slower than necessary for the purpose
of reading the seconds. This changes rtl_op_suspend/resume to use
ktime_get_real_seconds() instead, which is simpler and avoids confusion
about whether it is y2038-safe or not.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 3f2a162f
...@@ -550,15 +550,13 @@ static int rtl_op_suspend(struct ieee80211_hw *hw, ...@@ -550,15 +550,13 @@ static int rtl_op_suspend(struct ieee80211_hw *hw,
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_hal *rtlhal = rtl_hal(rtlpriv); struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
struct timeval ts;
RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "\n"); RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "\n");
if (WARN_ON(!wow)) if (WARN_ON(!wow))
return -EINVAL; return -EINVAL;
/* to resolve s4 can not wake up*/ /* to resolve s4 can not wake up*/
do_gettimeofday(&ts); rtlhal->last_suspend_sec = ktime_get_real_seconds();
rtlhal->last_suspend_sec = ts.tv_sec;
if ((ppsc->wo_wlan_mode & WAKE_ON_PATTERN_MATCH) && wow->n_patterns) if ((ppsc->wo_wlan_mode & WAKE_ON_PATTERN_MATCH) && wow->n_patterns)
_rtl_add_wowlan_patterns(hw, wow); _rtl_add_wowlan_patterns(hw, wow);
...@@ -577,7 +575,7 @@ static int rtl_op_resume(struct ieee80211_hw *hw) ...@@ -577,7 +575,7 @@ static int rtl_op_resume(struct ieee80211_hw *hw)
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_hal *rtlhal = rtl_hal(rtlpriv); struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
struct rtl_mac *mac = rtl_mac(rtl_priv(hw)); struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
struct timeval ts; time64_t now;
RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "\n"); RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, "\n");
rtlhal->driver_is_goingto_unload = false; rtlhal->driver_is_goingto_unload = false;
...@@ -585,8 +583,8 @@ static int rtl_op_resume(struct ieee80211_hw *hw) ...@@ -585,8 +583,8 @@ static int rtl_op_resume(struct ieee80211_hw *hw)
rtlhal->wake_from_pnp_sleep = true; rtlhal->wake_from_pnp_sleep = true;
/* to resovle s4 can not wake up*/ /* to resovle s4 can not wake up*/
do_gettimeofday(&ts); now = ktime_get_real_seconds();
if (ts.tv_sec - rtlhal->last_suspend_sec < 5) if (now - rtlhal->last_suspend_sec < 5)
return -1; return -1;
rtl_op_start(hw); rtl_op_start(hw);
......
...@@ -1373,8 +1373,7 @@ static void _rtl8821ae_get_wakeup_reason(struct ieee80211_hw *hw) ...@@ -1373,8 +1373,7 @@ static void _rtl8821ae_get_wakeup_reason(struct ieee80211_hw *hw)
ppsc->wakeup_reason = 0; ppsc->wakeup_reason = 0;
do_gettimeofday(&ts); rtlhal->last_suspend_sec = ktime_get_real_seconds();
rtlhal->last_suspend_sec = ts.tv_sec;
switch (fw_reason) { switch (fw_reason) {
case FW_WOW_V2_PTK_UPDATE_EVENT: case FW_WOW_V2_PTK_UPDATE_EVENT:
......
...@@ -1600,7 +1600,7 @@ struct rtl_hal { ...@@ -1600,7 +1600,7 @@ struct rtl_hal {
bool enter_pnp_sleep; bool enter_pnp_sleep;
bool wake_from_pnp_sleep; bool wake_from_pnp_sleep;
bool wow_enabled; bool wow_enabled;
__kernel_time_t last_suspend_sec; time64_t last_suspend_sec;
u32 wowlan_fwsize; u32 wowlan_fwsize;
u8 *wowlan_firmware; u8 *wowlan_firmware;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment