diff mbox series

[4.4,076/100] wil6210: increase firmware ready timeout

Message ID	20200422095036.785246209@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=aqQR=6G=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Hamad Kadmany <hkadmany@codeaurora.org>, Maya Erez <merez@codeaurora.org>, Kalle Valo <kvalo@codeaurora.org>, Lee Jones <lee.jones@linaro.org> Subject: [PATCH 4.4 076/100] wil6210: increase firmware ready timeout Date: Wed, 22 Apr 2020 11:56:46 +0200 Message-Id: <20200422095036.785246209@linuxfoundation.org> In-Reply-To: <20200422095022.476101261@linuxfoundation.org> References: <20200422095022.476101261@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [4.4,002/100] net: vxge: fix wrong __VA_ARGS__ usage [4.4,004/100] i2c: st: fix missing struct parameter description [4.4,006/100] selftests/x86/ptrace_syscall_32: Fix no-vDSO segfault [4.4,008/100] gfs2: Dont demote a glock until its revokes are written [4.4,012/100] btrfs: track reloc roots based on their commit root bytenr [4.4,013/100] misc: rtsx: set correct pcr_ops for rts522A [4.4,016/100] ASoC: dpcm: allow start or stop during pause for backend [4.4,018/100] usb: gadget: f_fs: Fix use after free issue as part of queue failure [4.4,022/100] ALSA: hda: Fix potential access overflow in beep helper [4.4,023/100] ALSA: ice1724: Fix invalid access for enumerated ctl items [4.4,024/100] ALSA: pcm: oss: Fix regression by buffer overflow fix [4.4,025/100] acpi/x86: ignore unspecified bit positions in the ACPI global lock field [4.4,028/100] irqchip/versatile-fpga: Apply clear-mask earlier [4.4,032/100] x86/entry/32: Add missing ASM_CLAC to general_protection entry [4.4,033/100] KVM: x86: Allocate new rmap and large page tracking when moving memslot [4.4,035/100] futex: futex_wake_op, do not fail on invalid op [4.4,036/100] xen-netfront: Rework the fix for Rx stall during OOM and network stress [4.4,037/100] ALSA: hda: Initialize power_state field properly [4.4,041/100] arm64: armv8_deprecated: Fix undef_hook mask for thumb setend [4.4,044/100] s390/diag: fix display of diagnose call statistics [4.4,045/100] Input: i8042 - add Acer Aspire 5738z to nomux list [4.4,046/100] kmod: make request_module() return an error when autoloading is disabled [4.4,048/100] libata: Return correct status in sata_pmp_eh_recover_pm() when ATA_DFLAG_DETACH is set [4.4,050/100] Btrfs: fix crash during unmount due to race with delayed inode workers [4.4,051/100] drm/dp_mst: Fix clearing payload state on topology disable [4.4,054/100] misc: echo: Remove unnecessary parentheses and simplify check for zero [4.4,056/100] net: ipv4: devinet: Fix crash when add/del multicast IP with autojoin [4.4,057/100] net: ipv6: do not consider routes via gateways for anycast address check [4.4,059/100] jbd2: improve comments about freeing data buffers whose page mapping is NULL [4.4,061/100] ext4: fix incorrect inodes per group in error message [4.4,066/100] ext4: do not zeroout extents beyond i_disksize [4.4,067/100] dm flakey: check for null arg_name in parse_features() [4.4,069/100] x86/mitigations: Clear CPU buffers on the SYSCALL fast path [4.4,070/100] tracing: Fix the race between registering snapshot event trigger and triggering sna... [4.4,073/100] of: unittest: kmemleak on changeset destroy [4.4,075/100] drm: NULL pointer dereference [null-pointer-deref] (CWE 476) problem [4.4,076/100] wil6210: increase firmware ready timeout [4.4,080/100] rtc: pm8xxx: Fix issue in RTC write path [4.4,083/100] of: unittest: kmemleak in of_unittest_platform_populate() [4.4,085/100] clk: tegra: Fix Tegra PMC clock out parents [4.4,086/100] NFS: direct.c: Fix memory leak of dreq when nfs_get_lock_context fails [4.4,087/100] ext4: do not commit super on read-only bdev [4.4,089/100] compiler.h: fix error in BUILD_BUG_ON() reporting [4.4,091/100] ext2: fix empty body warnings when -Wextra is used [4.4,095/100] locktorture: Print ratio of acquisitions, not failures [4.4,097/100] mtd: phram: fix a double free issue in error path [4.4,098/100] x86/CPU: Add native CPUID variants returning a single datum [4.4,099/100] x86/microcode/intel: replace sync_core() with native_cpuid_reg(eax) [4.4,100/100] x86/vdso: Fix lsl operand order

Commit Message

Greg KH April 22, 2020, 9:56 a.m. UTC

From: Hamad Kadmany <hkadmany@codeaurora.org>

[ Upstream commit 6ccae584014ef7074359eb4151086beef66ecfa9 ]

Firmware ready event may take longer than
current timeout in some scenarios, for example
with multiple RFs connected where each
requires an initial calibration.

Increase the timeout to support these scenarios.

Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
Signed-off-by: Maya Erez <merez@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/wireless/ath/wil6210/main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -741,7 +741,7 @@  static void wil_bl_crash_info(struct wil
 
 static int wil_wait_for_fw_ready(struct wil6210_priv *wil)
 {
-	ulong to = msecs_to_jiffies(1000);
+	ulong to = msecs_to_jiffies(2000);
 	ulong left = wait_for_completion_timeout(&wil->wmi_ready, to);
 
 	if (0 == left) {