Patch "idpf: fix transaction timeouts on reset" has been added to the 6.13-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    idpf: fix transaction timeouts on reset

to the 6.13-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     idpf-fix-transaction-timeouts-on-reset.patch
and it can be found in the queue-6.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 3c09a1b57ac80d841ef1ed331a78fe81c8d90a0b
Author: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
Date:   Thu Dec 19 18:09:32 2024 -0800

    idpf: fix transaction timeouts on reset
    
    [ Upstream commit 137da75ba72593598898a4e79da34f4b2da5d151 ]
    
    Restore the call to idpf_vc_xn_shutdown() at the beginning of
    idpf_vc_core_deinit() provided the function is not called on remove.
    In the reset path the mailbox is destroyed, leading to all transactions
    timing out.
    
    Fixes: 09d0fb5cb30e ("idpf: deinit virtchnl transaction manager after vport and vectors")
    Reviewed-by: Larysa Zaremba <larysa.zaremba@xxxxxxxxx>
    Signed-off-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
    Reviewed-by: Simon Horman <horms@xxxxxxxxxx>
    Tested-by: Krishneil Singh <krishneil.k.singh@xxxxxxxxx>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
index d46c95f91b0d8..7639d520b8063 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
@@ -3077,12 +3077,21 @@ int idpf_vc_core_init(struct idpf_adapter *adapter)
  */
 void idpf_vc_core_deinit(struct idpf_adapter *adapter)
 {
+	bool remove_in_prog;
+
 	if (!test_bit(IDPF_VC_CORE_INIT, adapter->flags))
 		return;
 
+	/* Avoid transaction timeouts when called during reset */
+	remove_in_prog = test_bit(IDPF_REMOVE_IN_PROG, adapter->flags);
+	if (!remove_in_prog)
+		idpf_vc_xn_shutdown(adapter->vcxn_mngr);
+
 	idpf_deinit_task(adapter);
 	idpf_intr_rel(adapter);
-	idpf_vc_xn_shutdown(adapter->vcxn_mngr);
+
+	if (remove_in_prog)
+		idpf_vc_xn_shutdown(adapter->vcxn_mngr);
 
 	cancel_delayed_work_sync(&adapter->serv_task);
 	cancel_delayed_work_sync(&adapter->mbx_task);