rtl8188eu: Routine rtw_get_current_time() is a synonym for jiffies

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2018-12-21 21:55:20 -06:00
parent 537fff9e9d
commit 45a86628d2
32 changed files with 127 additions and 133 deletions

View file

@ -362,7 +362,7 @@ void halbtcoutsrc_LeaveLowPower(PBTC_COEXIST pBtCoexist)
if (GLBtcBtCoexAliveRegistered == true)
return;
stime = rtw_get_current_time();
stime = jiffies;
do {
ready = rtw_register_task_alive(padapter, BTCOEX_ALIVE);
if (_SUCCESS == ready)
@ -422,7 +422,7 @@ void halbtcoutsrc_AggregationCheck(PBTC_COEXIST pBtCoexist)
/* It can only be called after 8 seconds. */
/* ===================================== */
curTime = rtw_systime_to_ms(rtw_get_current_time());
curTime = rtw_systime_to_ms(jiffies);
if ((curTime - preTime) < HALBTCOUTSRC_AGG_CHK_WINDOW_IN_MS) /* over 8 seconds you can execute this function again. */
return;
else

View file

@ -1333,7 +1333,7 @@ int c2h_iqk_offload_wait(_adapter *adapter, u32 timeout_ms)
HAL_DATA_TYPE *hal_data = GET_HAL_DATA(adapter);
struct submit_ctx *iqk_sctx = &hal_data->iqk_sctx;
iqk_sctx->submit_time = rtw_get_current_time();
iqk_sctx->submit_time = jiffies;
iqk_sctx->timeout_ms = timeout_ms;
iqk_sctx->status = RTW_SCTX_SUBMITTED;
@ -1480,7 +1480,7 @@ int hal_read_mac_hidden_rpt(_adapter *adapter)
int ret = _FAIL;
int ret_fwdl;
u8 mac_hidden_rpt[MAC_HIDDEN_RPT_LEN + MAC_HIDDEN_RPT_2_LEN] = {0};
u32 start = rtw_get_current_time();
u32 start = jiffies;
u32 cnt = 0;
u32 timeout_ms = 800;
u32 min_cnt = 10;
@ -1504,7 +1504,7 @@ int hal_read_mac_hidden_rpt(_adapter *adapter)
goto mac_hidden_rpt_hdl;
/* polling for data ready */
start = rtw_get_current_time();
start = jiffies;
do {
cnt++;
id = rtw_read8(adapter, REG_C2HEVT_MSG_NORMAL);
@ -1876,7 +1876,7 @@ u32 rtw_sec_read_cam(_adapter *adapter, u8 addr)
rtw_write32(adapter, REG_CAMCMD, CAM_POLLINIG | addr);
start = rtw_get_current_time();
start = jiffies;
while (1) {
if (rtw_is_surprise_removed(adapter)) {
sr = 1;
@ -1892,7 +1892,7 @@ u32 rtw_sec_read_cam(_adapter *adapter, u8 addr)
break;
}
}
end = rtw_get_current_time();
end = jiffies;
rdata = rtw_read32(adapter, REG_CAMREAD);
@ -1919,7 +1919,7 @@ void rtw_sec_write_cam(_adapter *adapter, u8 addr, u32 wdata)
rtw_write32(adapter, REG_CAMWRITE, wdata);
rtw_write32(adapter, REG_CAMCMD, CAM_POLLINIG | CAM_WRITE | addr);
start = rtw_get_current_time();
start = jiffies;
while (1) {
if (rtw_is_surprise_removed(adapter)) {
sr = 1;
@ -1935,7 +1935,7 @@ void rtw_sec_write_cam(_adapter *adapter, u8 addr, u32 wdata)
break;
}
}
end = rtw_get_current_time();
end = jiffies;
_exit_critical_mutex(mutex, NULL);
@ -6917,7 +6917,7 @@ static u32 _rtw_wow_pattern_read_cam(_adapter *adapter, u8 addr)
rtw_write32(adapter, REG_WKFMCAM_CMD, BIT_WKFCAM_POLLING_V1 | BIT_WKFCAM_ADDR_V2(addr));
start = rtw_get_current_time();
start = jiffies;
while (1) {
if (rtw_is_surprise_removed(adapter))
break;
@ -6988,7 +6988,7 @@ static void _rtw_wow_pattern_write_cam(_adapter *adapter, u8 addr, u32 wdata)
rtw_write32(adapter, REG_WKFMCAM_RWD, wdata);
rtw_write32(adapter, REG_WKFMCAM_CMD, BIT_WKFCAM_POLLING_V1 | BIT_WKFCAM_WE | BIT_WKFCAM_ADDR_V2(addr));
start = rtw_get_current_time();
start = jiffies;
while (1) {
if (rtw_is_surprise_removed(adapter))
break;
@ -7002,7 +7002,7 @@ static void _rtw_wow_pattern_write_cam(_adapter *adapter, u8 addr, u32 wdata)
break;
}
}
end = rtw_get_current_time();
end = jiffies;
_exit_critical_mutex(mutex, NULL);
@ -7055,7 +7055,7 @@ static u8 _rtw_wow_pattern_clean_cam(_adapter *adapter)
_enter_critical_mutex(mutex, NULL);
rtw_write32(adapter, REG_WKFMCAM_CMD, BIT_WKFCAM_POLLING_V1 | BIT_WKFCAM_CLR_V1);
start = rtw_get_current_time();
start = jiffies;
while (1) {
if (rtw_is_surprise_removed(adapter))
break;

View file

@ -56,7 +56,7 @@ u8 rtw_hal_read_chip_info(_adapter *padapter)
{
u8 rtn = _SUCCESS;
u8 hci_type = rtw_get_intf_type(padapter);
u32 start = rtw_get_current_time();
u32 start = jiffies;
/* before access eFuse, make sure card enable has been called */
if ((hci_type == RTW_SDIO || hci_type == RTW_GSPI)

View file

@ -1059,7 +1059,7 @@ static u8 rtw_hal_set_mcc_setting(PADAPTER padapter, u8 status)
u8 ret = _FAIL;
struct mcc_obj_priv *pmccobjpriv = &(adapter_to_dvobj(padapter)->mcc_objpriv);
u8 stop = (status < MCC_SETCMD_STATUS_START_CONNECT) ? true : false;
u32 start_time = rtw_get_current_time();
u32 start_time = jiffies;
RTW_INFO("===> "FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
@ -1289,14 +1289,14 @@ void rtw_hal_mcc_c2h_handler(PADAPTER padapter, u8 buflen, u8 *tmpBuf)
RTW_INFO("[MCC] TXNULL FAIL\n");
break;
case MCC_RPT_STOPMCC:
RTW_INFO("[MCC] MCC stop (time:%d)\n", rtw_get_current_time());
RTW_INFO("[MCC] MCC stop (time:%d)\n", jiffies);
pmccobjpriv->mcc_c2h_status = MCC_RPT_STOPMCC;
rtw_sctx_done(&mcc_sctx);
break;
case MCC_RPT_READY:
_enter_critical_bh(&pmccobjpriv->mcc_lock, &irqL);
/* initialize counter & time */
pmccobjpriv->mcc_launch_time = rtw_get_current_time();
pmccobjpriv->mcc_launch_time = jiffies;
pmccobjpriv->mcc_c2h_status = MCC_RPT_READY;
pmccobjpriv->cur_mcc_success_cnt = 0;
pmccobjpriv->prev_mcc_success_cnt = 0;
@ -1811,7 +1811,7 @@ void rtw_hal_mcc_issue_null_data(_adapter *padapter, u8 chbw_allow, u8 ps_mode)
{
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
_adapter *iface = NULL;
u32 start = rtw_get_current_time();
u32 start = jiffies;
u8 i = 0;
if (!MCC_EN(padapter))

View file

@ -430,7 +430,7 @@ odm_get_current_time(
struct PHY_DM_STRUCT *p_dm_odm
)
{
return (u64)rtw_get_current_time();
return (u64)jiffies;
}
u64

View file

@ -63,7 +63,7 @@ static s32 iol_execute(PADAPTER padapter, u8 control)
/* RTW_INFO("%s reg_0x88:0x%02x, write 0x%02x\n", __func__, reg_0x88, reg_0x88|control); */
rtw_write8(padapter, REG_HMEBOX_E0, reg_0x88 | control);
t1 = start = rtw_get_current_time();
t1 = start = jiffies;
while (
/* (reg_1c7 = rtw_read8(padapter, 0x1c7) >1) && */
(reg_0x88 = rtw_read8(padapter, REG_HMEBOX_E0)) & control
@ -77,7 +77,7 @@ static s32 iol_execute(PADAPTER padapter, u8 control)
status = (reg_0x88 & control) ? _FAIL : _SUCCESS;
if (reg_0x88 & control << 4)
status = _FAIL;
t2 = rtw_get_current_time();
t2 = jiffies;
return status;
}
@ -287,7 +287,7 @@ static void efuse_read_phymap_from_txpktbuf(
/* RTW_INFO("%s write reg_0x143:0x00\n", __func__); */
rtw_write8(adapter, REG_TXPKTBUF_DBG, 0);
start = rtw_get_current_time();
start = jiffies;
while (!(reg_0x143 = rtw_read8(adapter, REG_TXPKTBUF_DBG)) /* dbg */
/* while(rtw_read8(adapter, REG_TXPKTBUF_DBG) & BIT0 */
&& (passing_time = rtw_get_passing_time_ms(start)) < 1000
@ -410,7 +410,7 @@ static s32 iol_ioconfig(
static int rtl8188e_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt)
{
u32 start_time = rtw_get_current_time();
u32 start_time = jiffies;
u32 passing_time_ms;
u8 polling_ret, i;
int ret = _FAIL;
@ -432,7 +432,7 @@ static int rtl8188e_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit
dump_mgntframe_and_wait(adapter, xmit_frame, max_wating_ms);
t1 = rtw_get_current_time();
t1 = jiffies;
iol_mode_enable(adapter, 1);
for (i = 0; i < bndy_cnt; i++) {
u8 page_no = 0;
@ -442,7 +442,7 @@ static int rtl8188e_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit
break;
}
iol_mode_enable(adapter, 0);
t2 = rtw_get_current_time();
t2 = jiffies;
exit:
/* restore BCN_HEAD */
rtw_write8(adapter, REG_TDECTRL + 1, 0);
@ -693,7 +693,7 @@ static s32 polling_fwdl_chksum(_adapter *adapter, u32 min_cnt, u32 timeout_ms)
{
s32 ret = _FAIL;
u32 value32;
u32 start = rtw_get_current_time();
u32 start = jiffies;
u32 cnt = 0;
/* polling CheckSum report */
@ -724,7 +724,7 @@ static s32 _FWFreeToGo(_adapter *adapter, u32 min_cnt, u32 timeout_ms)
{
s32 ret = _FAIL;
u32 value32;
u32 start = rtw_get_current_time();
u32 start = jiffies;
u32 cnt = 0;
value32 = rtw_read32(adapter, REG_MCUFWDL);
@ -909,7 +909,7 @@ s32 rtl8188e_FirmwareDownload(PADAPTER padapter, bool bUsedWoWLANFw)
}
_FWDownloadEnable_8188E(padapter, true);
fwdl_start_time = rtw_get_current_time();
fwdl_start_time = jiffies;
while (!RTW_CANNOT_IO(padapter)
&& (write_fw++ < 3 || rtw_get_passing_time_ms(fwdl_start_time) < 500)) {
/* reset FWDL chksum */
@ -4174,7 +4174,7 @@ void SetHwReg8188E(_adapter *adapter, u8 variable, u8 *val)
u16 val16;
u32 reg_200 = 0, reg_204 = 0;
u32 init_reg_200 = 0, init_reg_204 = 0;
u32 start = rtw_get_current_time();
u32 start = jiffies;
u32 pass_ms;
int i = 0;

View file

@ -39,7 +39,7 @@ void rtl8188e_sreset_xmit_status_check(_adapter *padapter)
RTW_INFO("%s REG_TXDMA_STATUS:0x%08x\n", __func__, txdma_status);
rtw_hal_sreset_reset(padapter);
}
current_time = rtw_get_current_time();
current_time = jiffies;
if (0 == pxmitpriv->free_xmitbuf_cnt || 0 == pxmitpriv->free_xmit_extbuf_cnt) {

View file

@ -1064,7 +1064,7 @@ static u32 rtl8188eu_hal_init(PADAPTER Adapter)
struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist);
#endif
u32 init_start_time = rtw_get_current_time();
u32 init_start_time = jiffies;
#ifdef DBG_HAL_INIT_PROFILING
@ -1133,7 +1133,7 @@ static u32 rtl8188eu_hal_init(PADAPTER Adapter)
for (hal_init_profiling_i = 0; hal_init_profiling_i < HAL_INIT_STAGES_NUM; hal_init_profiling_i++)
hal_init_stages_timestamp[hal_init_profiling_i] = 0;
#define HAL_INIT_PROFILE_TAG(stage) do { hal_init_stages_timestamp[(stage)] = rtw_get_current_time(); } while (0)
#define HAL_INIT_PROFILE_TAG(stage) do { hal_init_stages_timestamp[(stage)] = jiffies; } while (0)
#else
#define HAL_INIT_PROFILE_TAG(stage) do {} while (0)
#endif /* DBG_HAL_INIT_PROFILING */
@ -1463,7 +1463,7 @@ exit:
RTW_INFO("%s in %dms\n", __func__, rtw_get_passing_time_ms(init_start_time));
#ifdef DBG_HAL_INIT_PROFILING
hal_init_stages_timestamp[HAL_INIT_STAGES_END] = rtw_get_current_time();
hal_init_stages_timestamp[HAL_INIT_STAGES_END] = jiffies;
for (hal_init_profiling_i = 0; hal_init_profiling_i < HAL_INIT_STAGES_NUM - 1; hal_init_profiling_i++) {
RTW_INFO("DBG_HAL_INIT_PROFILING: %35s, %u, %5u, %5u\n"