Re: 回复: [PATCH] r8188eu: core: use time_is_after_eq_jiffies() instead of open coding it

[Martin Kaiser]

Thus wrote 王擎 (wangqing@xxxxxxxx):

> >Hi,

> >Thus wrote Qing Wang (wangqing@xxxxxxxx):

> >> From: Wang Qing <wangqing@xxxxxxxx>

> >> Use the helper function time_is_{before,after}_jiffies() to improve
> >> code readability.

> >> Signed-off-by: Wang Qing <wangqing@xxxxxxxx>
> >> ---
> >>  drivers/staging/r8188eu/core/rtw_pwrctrl.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)

> >> diff --git a/drivers/staging/r8188eu/core/rtw_pwrctrl.c b/drivers/staging/r8188eu/core/rtw_pwrctrl.c
> >> index 46e44ae..9894abb
> >> --- a/drivers/staging/r8188eu/core/rtw_pwrctrl.c
> >> +++ b/drivers/staging/r8188eu/core/rtw_pwrctrl.c
> >> @@ -102,7 +102,7 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter)
> >>        struct wifidirect_info  *pwdinfo = &adapter->wdinfo;
> >>        bool ret = false;

> >> -     if (adapter->pwrctrlpriv.ips_deny_time >= jiffies)
> >> +     if (time_is_after_eq_jiffies(adapter->pwrctrlpriv.ips_deny_time))
> >>                goto exit;

> >>        if (check_fwstate(pmlmepriv, WIFI_ASOC_STATE | WIFI_SITE_MONITOR) ||
> >> -- 
> >> 2.7.4


> >This doesn't compile on my system:

> >  CC [M]  drivers/staging/r8188eu/core/rtw_p2p.o
> >In file included from ./include/linux/irqflags.h:15,
> >                 from ./arch/arm/include/asm/atomic.h:14,
> >                 from ./include/linux/atomic.h:7,
> >                 from ./include/linux/rcupdate.h:25,
> >                 from ./include/linux/rculist.h:11,
> >                 from ./include/linux/sched/signal.h:5,
> >                 from drivers/staging/r8188eu/core/../include/osdep_service.h:7,
> >                from drivers/staging/r8188eu/core/rtw_pwrctrl.c:6:
> >drivers/staging/r8188eu/core/rtw_pwrctrl.c: In function ‘rtw_pwr_unassociated_idle’:
> >./include/linux/typecheck.h:12:25: warning: comparison of distinct pointer types lacks a cast
> >   12 |         (void)(&__dummy == &__dummy2); \
> >      |                         ^~
> >./include/linux/jiffies.h:111:10: note: in expansion of macro ‘typecheck’
> >  111 |         (typecheck(unsigned long, a) && \
> >      |          ^~~~~~~~~
> >./include/linux/jiffies.h:114:33: note: in expansion of macro ‘time_after_eq’
> >  114 | #define time_before_eq(a,b)     time_after_eq(b,a)
> >      |                                 ^~~~~~~~~~~~~
> ./include/linux/jiffies.h:166:37: note: in expansion of macro ‘time_before_eq’
> >  166 | #define time_is_after_eq_jiffies(a) time_before_eq(jiffies, a)
> >      |                                     ^~~~~~~~~~~~~~
> >drivers/staging/r8188eu/core/rtw_pwrctrl.c:92:13: note: in expansion of macro ‘time_is_after_eq_jiffies’
> >   92 |         if (time_is_after_eq_jiffies(adapter->pwrctrlpriv.ips_deny_time))
> >      |             ^~~~~~~~~~~~~~~~~~~~~~~~



> >time_is_after_eq_jiffies checks at compile time that its argument is
> >unsigned long but ips_deny_time is u32 in the r8188eu driver.

> >We should change ips_deny_time to unsigned long, the rtl8723bs driver did
> >this as well. ips_deny_time is used in these places

> >  11     92  drivers/staging/r8188eu/core/rtw_pwrctrl.c <<rtw_pwr_unassociated_idle>>
> >             if (adapter->pwrctrlpriv.ips_deny_time >= jiffies)
> >  12    363  drivers/staging/r8188eu/core/rtw_pwrctrl.c <<_rtw_pwr_wakeup>>
> >             if (pwrpriv->ips_deny_time < jiffies + rtw_ms_to_systime(ips_deffer_ms))
> >  13    364  drivers/staging/r8188eu/core/rtw_pwrctrl.c <<_rtw_pwr_wakeup>>
> >             pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ips_deffer_ms);
> >  14    399  drivers/staging/r8188eu/core/rtw_pwrctrl.c <<_rtw_pwr_wakeup>>
> >             if (pwrpriv->ips_deny_time < jiffies + rtw_ms_to_systime(ips_deffer_ms))
> >  15    400  drivers/staging/r8188eu/core/rtw_pwrctrl.c <<_rtw_pwr_wakeup>>
> >             pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ips_deffer_ms);

> >rtw_ms_to_systime converts milliseconds to jiffies and returns u32. We
> >should use msecs_to_jiffies instead, this functions returns unsigned long.

> >Do you want to have a go at this?

> >Best regards,

> >   Martin

> I see rtl8723bs/include/rtw_pwrctrl.h also has a definition of struct pwrctrl_priv on it, 
> which is unsigned long ips_deny_time.
> Is there any difference, or should it be changed to unsigned long?


Hi Wang,

yes, I believe that we should change ips_deny_time to unsigned long.

But before this, we have to change rtw_ms_to_systime to msecs_to_jiffies.

Best regards,
Martin