From 6923560ba3c93c8070bc1df8c56ccedcbd24beff Mon Sep 17 00:00:00 2001 From: Yao Xiao Date: Mon, 26 Oct 2020 09:21:42 +0800 Subject: [PATCH] net: rockchip_wlan: bcmdhd_indep_power: decrease KSO_CLR timeout Signed-off-by: Yao Xiao Change-Id: I40387ed81c4fcab3596dc0c13773494927fe8334 --- .../rockchip_wlan/rkwifi/bcmdhd_indep_power/dhd_sdio.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_indep_power/dhd_sdio.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_indep_power/dhd_sdio.c index a3136403f21a..3496d32f95e4 100644 --- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_indep_power/dhd_sdio.c +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd_indep_power/dhd_sdio.c @@ -1055,8 +1055,8 @@ dhdsdio_clk_kso_init(dhd_bus_t *bus) #define CUSTOM_MAX_KSO_ATTEMPTS DEFAULT_MAX_KSO_ATTEMPTS #endif -#define KSO_CLR_WAIT_MS 50 -#define KSO_CLR_RETRY 100 +#define KSO_CLR_WAIT_MS 1 +#define KSO_CLR_RETRY 1000 static int dhdsdio_clk_kso_enab(dhd_bus_t *bus, bool on) @@ -1143,6 +1143,7 @@ dhdsdio_clk_kso_disable(dhd_bus_t *bus) //mmc_retune_disable(host); KSO_DBG(("%s> op:%s\n", __FUNCTION__, (on ? "KSO_SET" : "KSO_CLR"))); + pr_err("%s> op:%s\n", __FUNCTION__, "KSO_CLR"); bcmsdh_cfg_write(bus->sdh, SDIO_FUNC_1, SBSDIO_FUNC1_SLEEPCSR, wr_val, &err); @@ -1154,8 +1155,11 @@ dhdsdio_clk_kso_disable(dhd_bus_t *bus) rd_val = bcmsdh_cfg_read(bus->sdh, SDIO_FUNC_1, SBSDIO_FUNC1_SLEEPCSR, &err); cmp_val = 0; bmask = SBSDIO_FUNC1_SLEEPCSR_KSO_MASK; - if (((rd_val & bmask) == cmp_val) && !err) + if (((rd_val & bmask) == cmp_val) && !err) { + DHD_ERROR(("[%s]: rd_val=%d, err=%d, try_cnt=%d, max=%d\n", __func__, + (rd_val & bmask), err, try_cnt, KSO_CLR_RETRY)); break; + } wr_val = 0; OSL_SLEEP(KSO_CLR_WAIT_MS); bcmsdh_cfg_write(bus->sdh, SDIO_FUNC_1, SBSDIO_FUNC1_SLEEPCSR, wr_val, &err);