From dd7fdbcb04c3b2a368e113bf52bbc13b7f84110d Mon Sep 17 00:00:00 2001 From: Alex Zhao Date: Fri, 25 Oct 2019 17:01:22 +0800 Subject: [PATCH] net: rockchip_wlan: rtl8723cs: enable wowlan Change-Id: Iadce78000563e91eac21a10cdd82f7dc7da9463c Signed-off-by: Alex Zhao --- drivers/net/wireless/rockchip_wlan/rtl8723cs/Makefile | 4 ++-- .../net/wireless/rockchip_wlan/rtl8723cs/hal/hal_com.c | 8 ++++---- .../rockchip_wlan/rtl8723cs/hal/rtl8703b/sdio/sdio_ops.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8723cs/Makefile index 91803a3b7575..f42f734461f5 100644 --- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/Makefile +++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/Makefile @@ -89,13 +89,13 @@ CONFIG_RTW_DEBUG = y # please refer to "How_to_set_driver_debug_log_level.doc" to set the available level. CONFIG_RTW_LOG_LEVEL = 2 ######################## Wake On Lan ########################## -CONFIG_WOWLAN = n +CONFIG_WOWLAN = y #bit2: deauth, bit1: unicast, bit0: magic pkt. CONFIG_WAKEUP_TYPE = 0x7 #bit0: disBBRF off, #bit1: Wireless remote controller (WRC) CONFIG_SUSPEND_TYPE = 0 CONFIG_WOW_STA_MIX = n -CONFIG_GPIO_WAKEUP = n +CONFIG_GPIO_WAKEUP = y CONFIG_WAKEUP_GPIO_IDX = default CONFIG_HIGH_ACTIVE_DEV2HST = n ######### only for USB ######### diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/hal_com.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/hal_com.c index db3fa094b30b..fb15b598a98c 100644 --- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/hal_com.c +++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/hal_com.c @@ -11509,12 +11509,12 @@ s32 rtw_hal_set_wifi_btc_port_id_cmd(_adapter *adapter) } #endif -#define LPS_ACTIVE_TIMEOUT 10 /*number of times*/ +#define LPS_ACTIVE_TIMEOUT 500 /*number of times*/ void rtw_lps_state_chk(_adapter *adapter, u8 ps_mode) { if (ps_mode == PS_MODE_ACTIVE) { u8 ps_ready = _FALSE; - s8 leave_wait_count = LPS_ACTIVE_TIMEOUT; + s16 leave_wait_count = LPS_ACTIVE_TIMEOUT; do { if ((rtw_read8(adapter, REG_TCR) & BIT_PWRBIT_OW_EN) == 0) { @@ -11525,8 +11525,8 @@ void rtw_lps_state_chk(_adapter *adapter, u8 ps_mode) } while (leave_wait_count--); if (ps_ready == _FALSE) { - RTW_ERR(FUNC_ADPT_FMT" PS_MODE_ACTIVE check failed\n", FUNC_ADPT_ARG(adapter)); - rtw_warn_on(1); + RTW_WARN(FUNC_ADPT_FMT" PS_MODE_ACTIVE check failed\n", FUNC_ADPT_ARG(adapter)); + /* rtw_warn_on(1); */ } } } diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/rtl8703b/sdio/sdio_ops.c b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/rtl8703b/sdio/sdio_ops.c index 2ed7a4a1edfa..2c0e96657e19 100644 --- a/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/rtl8703b/sdio/sdio_ops.c +++ b/drivers/net/wireless/rockchip_wlan/rtl8723cs/hal/rtl8703b/sdio/sdio_ops.c @@ -1657,7 +1657,7 @@ u8 RecvOnePkt(PADAPTER padapter) if (len) { sdio_claim_host(func); - precvbuf = sd_recv_rxfifo(padapter, len); + res = sd_recv_rxfifo(padapter, len, &precvbuf); if (precvbuf) { /* printk("Completed Recv One Pkt.\n"); */