Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2829191pxv; Mon, 12 Jul 2021 02:59:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzahyBksA/UgDSX1Xm2JizHJvHNql5Y/hD5nY//M3AJL720cUGh38RzWCYOqmlVRBjwXNQ/ X-Received: by 2002:a5d:8916:: with SMTP id b22mr39972739ion.108.1626083964070; Mon, 12 Jul 2021 02:59:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626083964; cv=none; d=google.com; s=arc-20160816; b=cPpIM/ZwFGrFK3i++vARR/y2cZfNoHXVwGSGSfaiLJOSu+2rqWrulMLzTRE8BA+iBE EGcC73V1cLfUo516LdiYx6LGROVMqqiABogISsB6pONDua9lnOLwiyjA/llzkGSGSEhW G8UxJe3x2ATy7gz4xpAJBjUnDldbS1IBXrs+5T5kHVB+TdFBZE5NlP25liX7Bp3Gclol Jqyn/TGaKp3pYZd/6T8NqdBgZVS4YsR4fD7s8CSIF9dtJE99xMwAz9BSwjXxV+WQWelV RGY4XM69EFrWx2XIFX/Mfu0MQoEyJOwLo4/y5zwoL1SFBndFLx/wzRcwDeIMzWZJvI87 g6fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QP2rJpeoh78pm8RQYDG3GHbIHxpnsw4oMCwDpldy1k0=; b=zZH4fgepWIUGfxJbzheNIUfLq17TvZjeDr/lGxnyK6fdQ7iNM5iL/cdYJHz+EuwpoS wA0+wyrIngbNgAkOe4PLVH20GH+NHOeQH61FuD1yK1xKgOr3S5TXppq1eAiHI1brs4oN mgWab6bsqtGiR6qBzCxCGksbpq5FDEgVb3SY79pogaQnu/JxNQoW0by7MKN6VhIZiuqN 7FlmaGNMeVg3t2+5Yz81MlLXhYageHo7kPPR8z6BLCeN202WvMnZSviHImkZ7KRekGwV puep5fQZV2JjAsETTpA6ihkb6pkZp85A8P6jQ6AieKs9JK4FJlr+cblR88G//k+dr+e0 7Hhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=h7BOfha3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y1si2842606jao.99.2021.07.12.02.59.11; Mon, 12 Jul 2021 02:59:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=h7BOfha3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243181AbhGLHEl (ORCPT + 99 others); Mon, 12 Jul 2021 03:04:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:41510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234846AbhGLGqx (ORCPT ); Mon, 12 Jul 2021 02:46:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0409661158; Mon, 12 Jul 2021 06:42:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072163; bh=z7U3MY4f6Y0b6ZUutogu3Nyqjy1yxBByU/HVNEf9hLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h7BOfha3kyhrVI7BICMXeaknAVjNNa+lwYwaGLps3WN9akVdXehzgeUKPcDHiE0bR iy5VrrhwLATI5kX5z9o9+Ivvo03LCBWFo5kfEOgLS4Ml9pZnCSgKK0iHZ4KQiyVdO/ 4yGxI4oMAL8oB/IY6SUA4Q0W+BYatuiPGBHythrw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Luca Coelho , Sasha Levin Subject: [PATCH 5.10 379/593] iwlwifi: increase PNVM load timeout Date: Mon, 12 Jul 2021 08:08:59 +0200 Message-Id: <20210712060928.599982596@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Luca Coelho [ Upstream commit 5cc816ef9db1fe03f73e56e9d8f118add9c6efe4 ] The FW has a watchdog of 200ms in the PNVM load flow, so the driver should have a slightly higher timeout. Change the timeout from 100ms to 250ms. Signed-off-by: Luca Coelho Fixes: 70d3ca86b025 ("iwlwifi: mvm: ring the doorbell and wait for PNVM load completion") Signed-off-by: Luca Coelho Link: https://lore.kernel.org/r/iwlwifi.20210612142637.ba22aec1e2be.I36bfadc28c480f4fc57266c075a79e8ea4a6934f@changeid Signed-off-by: Luca Coelho Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/fw/pnvm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/pnvm.h b/drivers/net/wireless/intel/iwlwifi/fw/pnvm.h index e4f91bce222d..61d3d4e0b7d9 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/pnvm.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/pnvm.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /****************************************************************************** * - * Copyright(c) 2020 Intel Corporation + * Copyright(c) 2020-2021 Intel Corporation * *****************************************************************************/ @@ -10,7 +10,7 @@ #include "fw/notif-wait.h" -#define MVM_UCODE_PNVM_TIMEOUT (HZ / 10) +#define MVM_UCODE_PNVM_TIMEOUT (HZ / 4) int iwl_pnvm_load(struct iwl_trans *trans, struct iwl_notif_wait_data *notif_wait); -- 2.30.2