Skip to content

Commit b8c8a03

Browse files
egrumbachjmberg-intel
authored andcommitted
wifi: iwlwifi: mvm: fix PNVM timeout for non-MSI-X platforms
When MSI-X is not enabled, we mask all the interrupts in the interrupt handler and re-enable them when the interrupt thread runs. If STATUS_INT_ENABLED is not set, we won't re-enable in the thread. In order to get the ALIVE interrupt, we allow the ALIVE interrupt itself, and RX as well in order to receive the ALIVE notification (which is received as an RX from the firmware. The problem is that STATUS_INT_ENABLED is clear until the op_mode calls trans_fw_alive which means that until trans_fw_alive is called, any notification from the firmware will not be received. This became a problem when we inserted the pnvm_load exactly between the ALIVE and trans_fw_alive. Fix that by calling trans_fw_alive before loading the PNVM. This will allow to get the notification from the firmware about PNVM load being complete and continue the flow normally. This didn't happen on MSI-X because we don't disable the interrupts in the ISR when MSI-X is available. The error in the log looks like this: iwlwifi 0000:00:03.0: Timeout waiting for PNVM load! iwlwifi 0000:00:03.0: Failed to start RT ucode: -110 iwlwifi 0000:00:03.0: WRT: Collecting data: ini trigger 13 fired (delay=0ms). Fixes: 70d3ca8 ("iwlwifi: mvm: ring the doorbell and wait for PNVM load completion") Signed-off-by: Emmanuel Grumbach <[email protected]> Reviewed-by: Johannes Berg <[email protected]> Signed-off-by: Miri Korenblit <[email protected]> Link: https://patch.msgid.link/20250306122425.0f2cf207aae1.I025d8f724b44f52eadf6c19069352eb9275613a8@changeid Signed-off-by: Johannes Berg <[email protected]>
1 parent bbb18f7 commit b8c8a03

File tree

1 file changed

+3
-3
lines changed
  • drivers/net/wireless/intel/iwlwifi/mvm

1 file changed

+3
-3
lines changed

drivers/net/wireless/intel/iwlwifi/mvm/fw.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
22
/*
3-
* Copyright (C) 2012-2014, 2018-2024 Intel Corporation
3+
* Copyright (C) 2012-2014, 2018-2025 Intel Corporation
44
* Copyright (C) 2013-2015 Intel Mobile Communications GmbH
55
* Copyright (C) 2016-2017 Intel Deutschland GmbH
66
*/
@@ -422,6 +422,8 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
422422
/* if reached this point, Alive notification was received */
423423
iwl_mei_alive_notif(true);
424424

425+
iwl_trans_fw_alive(mvm->trans, alive_data.scd_base_addr);
426+
425427
ret = iwl_pnvm_load(mvm->trans, &mvm->notif_wait,
426428
&mvm->fw->ucode_capa);
427429
if (ret) {
@@ -430,8 +432,6 @@ static int iwl_mvm_load_ucode_wait_alive(struct iwl_mvm *mvm,
430432
return ret;
431433
}
432434

433-
iwl_trans_fw_alive(mvm->trans, alive_data.scd_base_addr);
434-
435435
/*
436436
* Note: all the queues are enabled as part of the interface
437437
* initialization, but in firmware restart scenarios they

0 commit comments

Comments
 (0)