iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtw88: not to enter or leave PS under IRQ

Browse Source 
Remove PS related *_irqsafe functions to avoid entering/leaving PS
under interrupt context. Instead, make PS decision in watch_dog.
This could simplify the logic and make the code look clean.

But it could have a little side-effect that if the driver is having
heavy traffic before the every-2-second watch_dog detect the traffic
and decide to leave PS, the thoughput will be lower. Once traffic is
detected by watch_dog and left PS state, the throughput will resume
to the peak the hardware ought to have again.

Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Yan-Hsuan Chuang 2019-10-02 10:31:19 +08:00 committed by Kalle Valo
parent 6f0b0d28fd
commit 61d7309562
6 changed files with 2 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/realtek/rtw88/main.c
View File

@ -182,6 +182,8 @@ static void rtw_watch_dog_work(struct work_struct *work)
if (rtw_fw_support_lps && if (rtw_fw_support_lps &&
data.rtwvif && !data.active && data.assoc_cnt == 1) data.rtwvif && !data.active && data.assoc_cnt == 1)
rtw_enter_lps(rtwdev, data.rtwvif); rtw_enter_lps(rtwdev, data.rtwvif);
else
rtw_leave_lps(rtwdev, rtwdev->lps_conf.rtwvif);
if (test_bit(RTW_FLAG_SCANNING, rtwdev->flags)) if (test_bit(RTW_FLAG_SCANNING, rtwdev->flags))
return; return;
@ -1152,7 +1154,6 @@ int rtw_core_init(struct rtw_dev *rtwdev)
rtw_tx_report_purge_timer, 0); rtw_tx_report_purge_timer, 0);
INIT_DELAYED_WORK(&rtwdev->watch_dog_work, rtw_watch_dog_work); INIT_DELAYED_WORK(&rtwdev->watch_dog_work, rtw_watch_dog_work);
INIT_DELAYED_WORK(&rtwdev->lps_work, rtw_lps_work);
INIT_DELAYED_WORK(&coex->bt_relink_work, rtw_coex_bt_relink_work); INIT_DELAYED_WORK(&coex->bt_relink_work, rtw_coex_bt_relink_work);
INIT_DELAYED_WORK(&coex->bt_reenable_work, rtw_coex_bt_reenable_work); INIT_DELAYED_WORK(&coex->bt_reenable_work, rtw_coex_bt_reenable_work);
INIT_DELAYED_WORK(&coex->defreeze_work, rtw_coex_defreeze_work); INIT_DELAYED_WORK(&coex->defreeze_work, rtw_coex_defreeze_work);

1
drivers/net/wireless/realtek/rtw88/main.h
View File

@ -1361,7 +1361,6 @@ struct rtw_dev {
/* lps power state & handler work */ /* lps power state & handler work */
struct rtw_lps_conf lps_conf; struct rtw_lps_conf lps_conf;
struct delayed_work lps_work;
struct dentry *debugfs; struct dentry *debugfs;

44
drivers/net/wireless/realtek/rtw88/ps.c
View File

@ -91,50 +91,6 @@ static void rtw_enter_lps_core(struct rtw_dev *rtwdev)
set_bit(RTW_FLAG_LEISURE_PS, rtwdev->flags); set_bit(RTW_FLAG_LEISURE_PS, rtwdev->flags);
} }
void rtw_lps_work(struct work_struct *work)
{
struct rtw_dev *rtwdev = container_of(work, struct rtw_dev,
lps_work.work);
struct rtw_lps_conf *conf = &rtwdev->lps_conf;
struct rtw_vif *rtwvif = conf->rtwvif;
if (WARN_ON(!rtwvif))
return;
if (conf->mode == RTW_MODE_LPS)
rtw_enter_lps_core(rtwdev);
else
rtw_leave_lps_core(rtwdev);
}
void rtw_enter_lps_irqsafe(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif)
{
struct rtw_lps_conf *conf = &rtwdev->lps_conf;
if (rtwvif->in_lps)
return;
conf->mode = RTW_MODE_LPS;
conf->rtwvif = rtwvif;
rtwvif->in_lps = true;
ieee80211_queue_delayed_work(rtwdev->hw, &rtwdev->lps_work, 0);
}
void rtw_leave_lps_irqsafe(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif)
{
struct rtw_lps_conf *conf = &rtwdev->lps_conf;
if (!rtwvif->in_lps)
return;
conf->mode = RTW_MODE_ACTIVE;
conf->rtwvif = rtwvif;
rtwvif->in_lps = false;
ieee80211_queue_delayed_work(rtwdev->hw, &rtwdev->lps_work, 0);
}
bool rtw_in_lps(struct rtw_dev *rtwdev) bool rtw_in_lps(struct rtw_dev *rtwdev)
{ {
return test_bit(RTW_FLAG_LEISURE_PS, rtwdev->flags); return test_bit(RTW_FLAG_LEISURE_PS, rtwdev->flags);

3
drivers/net/wireless/realtek/rtw88/ps.h
View File

@ -10,9 +10,6 @@
int rtw_enter_ips(struct rtw_dev *rtwdev); int rtw_enter_ips(struct rtw_dev *rtwdev);
int rtw_leave_ips(struct rtw_dev *rtwdev); int rtw_leave_ips(struct rtw_dev *rtwdev);
void rtw_lps_work(struct work_struct *work);
void rtw_enter_lps_irqsafe(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif);
void rtw_leave_lps_irqsafe(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif);
void rtw_enter_lps(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif); void rtw_enter_lps(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif);
void rtw_leave_lps(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif); void rtw_leave_lps(struct rtw_dev *rtwdev, struct rtw_vif *rtwvif);
bool rtw_in_lps(struct rtw_dev *rtwdev); bool rtw_in_lps(struct rtw_dev *rtwdev);

2
drivers/net/wireless/realtek/rtw88/rx.c
View File

@ -25,8 +25,6 @@ void rtw_rx_stats(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
rtwvif = (struct rtw_vif *)vif->drv_priv; rtwvif = (struct rtw_vif *)vif->drv_priv;
rtwvif->stats.rx_unicast += skb->len; rtwvif->stats.rx_unicast += skb->len;
rtwvif->stats.rx_cnt++; rtwvif->stats.rx_cnt++;
if (rtwvif->stats.rx_cnt > RTW_LPS_THRESHOLD)
rtw_leave_lps_irqsafe(rtwdev, rtwvif);
} }
} }
} }

2
drivers/net/wireless/realtek/rtw88/tx.c
View File

@ -27,8 +27,6 @@ void rtw_tx_stats(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
rtwvif = (struct rtw_vif *)vif->drv_priv; rtwvif = (struct rtw_vif *)vif->drv_priv;
rtwvif->stats.tx_unicast += skb->len; rtwvif->stats.tx_unicast += skb->len;
rtwvif->stats.tx_cnt++; rtwvif->stats.tx_cnt++;
if (rtwvif->stats.tx_cnt > RTW_LPS_THRESHOLD)
rtw_leave_lps_irqsafe(rtwdev, rtwvif);
} }
} }
} }