| From 70d71c575e3b9adfb9d457cc31da29beea396a1c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 12 Jun 2021 14:32:40 +0300 |
| Subject: iwlwifi: increase PNVM load timeout |
| |
| From: Luca Coelho <luciano.coelho@intel.com> |
| |
| [ 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 <luciano.coelho@intel.com> |
| Fixes: 70d3ca86b025 ("iwlwifi: mvm: ring the doorbell and wait for PNVM load completion") |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Link: https://lore.kernel.org/r/iwlwifi.20210612142637.ba22aec1e2be.I36bfadc28c480f4fc57266c075a79e8ea4a6934f@changeid |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 |
| |