From patchwork Mon Jan 25 10:47:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sjoerd Simons X-Patchwork-Id: 60337 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1274274lbb; Mon, 25 Jan 2016 02:47:42 -0800 (PST) X-Received: by 10.66.234.226 with SMTP id uh2mr24711395pac.20.1453718862341; Mon, 25 Jan 2016 02:47:42 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 7si32953582pfn.223.2016.01.25.02.47.41; Mon, 25 Jan 2016 02:47:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756678AbcAYKrk (ORCPT + 30 others); Mon, 25 Jan 2016 05:47:40 -0500 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 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: sjoerd) with ESMTPSA id 721ED264B5A Received: by dusk.luon.net (Postfix, from userid 1000) id 5D152226B8; Mon, 25 Jan 2016 11:47:29 +0100 (CET) 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> X-Mailer: git-send-email 2.7.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.7.0 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