Return-path: Received: from bhuna.collabora.co.uk ([46.235.227.227]:59122 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753390AbcAYKre (ORCPT ); Mon, 25 Jan 2016 05:47:34 -0500 From: Sjoerd Simons To: Kalle Valo Cc: Paul Stewart , Doug Anderson , linux-rockchip@lists.infradead.org, Arend van Spriel , Pieter-Paul Giesberts , brcm80211-dev-list@broadcom.com, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Hante Meuleman , Brett Rudley , netdev@vger.kernel.org, "Franky (Zhenhui) Lin" Subject: [PATCH] brcmfmac: sdio: Increase the default timeouts a bit Date: Mon, 25 Jan 2016 11:47:29 +0100 Message-Id: <1453718849-3508-1-git-send-email-sjoerd.simons@collabora.co.uk> (sfid-20160125_114819_984707_525C249E) Sender: linux-wireless-owner@vger.kernel.org List-ID: On a Radxa Rock2 board with a Ampak AP6335 (Broadcom 4339 core) it seems the card responds very quickly most of the time, unfortunately during initialisation it sometimes seems to take just a bit over 2 seconds to respond. This results intialization failing with message like: brcmf_c_preinit_dcmds: Retreiving cur_etheraddr failed, -52 brcmf_bus_start: failed: -52 brcmf_sdio_firmware_callback: dongle is not responding Increasing the timeout to allow for a bit more headroom allows the card to initialize reliably. A quick search online after diagnosing/fixing this showed that Google has a similar patch in their ChromeOS tree, so this doesn't seem specific to the board I'm using. Signed-off-by: Sjoerd Simons --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index dd66143..75ac4bd 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -45,8 +45,8 @@ #include "chip.h" #include "firmware.h" -#define DCMD_RESP_TIMEOUT msecs_to_jiffies(2000) -#define CTL_DONE_TIMEOUT msecs_to_jiffies(2000) +#define DCMD_RESP_TIMEOUT msecs_to_jiffies(2500) +#define CTL_DONE_TIMEOUT msecs_to_jiffies(2500) #ifdef DEBUG -- 2.7.0