]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
i40e: Save PCI state before suspend
authorGreg Rose <gregory.v.rose@intel.com>
Mon, 16 May 2016 17:26:38 +0000 (10:26 -0700)
committerDhaval Giani <dhaval.giani@oracle.com>
Wed, 8 Mar 2017 00:30:29 +0000 (19:30 -0500)
Orabug: 24568124

The i40e_suspend() function was failing to save PCI state
and this would result in a kernel stack trace from a WARN_ONCE in the
pci_legacy_suspend() function.

Add a call to pci_save_state() to fix that problem.

Change-ID: I4736e62bb660966bd208cc8af617a14cb07fc4bd
Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 059ff69b5fa136a23a2d71df6d9814e86485e8b9)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
drivers/net/ethernet/intel/i40e/i40e_main.c

index 5fed8f6e0195f1ebbf42531882a59ce005a56c09..49c4bff196bedc02d033d2ce75a9a4635e4b69a2 100644 (file)
@@ -11391,6 +11391,7 @@ static int i40e_suspend(struct pci_dev *pdev, pm_message_t state)
 {
        struct i40e_pf *pf = pci_get_drvdata(pdev);
        struct i40e_hw *hw = &pf->hw;
+       int retval = 0;
 
        set_bit(__I40E_SUSPENDED, &pf->state);
        set_bit(__I40E_DOWN, &pf->state);
@@ -11404,10 +11405,14 @@ static int i40e_suspend(struct pci_dev *pdev, pm_message_t state)
 
        i40e_stop_misc_vector(pf);
 
+       retval = pci_save_state(pdev);
+       if (retval)
+               return retval;
+
        pci_wake_from_d3(pdev, pf->wol_en);
        pci_set_power_state(pdev, PCI_D3hot);
 
-       return 0;
+       return retval;
 }
 
 /**