PCI/ASPM: Call pci_save_ltr_state() from pci_save_pcie_state()

ASPM state is saved and restored from pci_save/restore_pcie_state().  Since
the LTR Capability is linked with ASPM, move the LTR save and restore calls
there as well.  No functional change intended.

Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20240128233212.1139663-6-david.e.box@linux.intel.com
Link: https://lore.kernel.org/r/20240223205851.114931-6-helgaas@kernel.org
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index ca6673588bc091e4fc8fed85a762f7aa11ed8307..4ea98665172db19ec2d0f9b2e997b132c723be35 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1624,6 +1624,7 @@ static int pci_save_pcie_state(struct pci_dev *dev)
        pcie_capability_read_word(dev, PCI_EXP_SLTCTL2, &cap[i++]);
 
        pci_save_aspm_l1ss_state(dev);
+       pci_save_ltr_state(dev);
 
        return 0;
 }
@@ -1634,6 +1635,12 @@ static void pci_restore_pcie_state(struct pci_dev *dev)
        struct pci_cap_saved_state *save_state;
        u16 *cap, lnkctl;
 
+       /*
+        * Restore max latencies (in the LTR capability) before enabling
+        * LTR itself in PCI_EXP_DEVCTL2.
+        */
+       pci_restore_ltr_state(dev);
+
        save_state = pci_find_saved_cap(dev, PCI_CAP_ID_EXP);
        if (!save_state)
                return;
@@ -1726,7 +1733,6 @@ int pci_save_state(struct pci_dev *dev)
        if (i != 0)
                return i;
 
-       pci_save_ltr_state(dev);
        pci_save_dpc_state(dev);
        pci_save_aer_state(dev);
        pci_save_ptm_state(dev);
@@ -1827,12 +1833,6 @@ void pci_restore_state(struct pci_dev *dev)
        if (!dev->state_saved)
                return;
 
-       /*
-        * Restore max latencies (in the LTR capability) before enabling
-        * LTR itself (in the PCIe capability).
-        */
-       pci_restore_ltr_state(dev);
-
        pci_restore_pcie_state(dev);
        pci_restore_pasid_state(dev);
        pci_restore_pri_state(dev);