PCI/ASPM: Use RMW accessors for changing LNKCTL

Don't assume that the device is fully under the control of ASPM and use RMW
capability accessors which do proper locking to avoid losing concurrent
updates to the register values.

If configuration fails in pcie_aspm_configure_common_clock(), the
function attempts to restore the old PCI_EXP_LNKCTL_CCC settings. Store
only the old PCI_EXP_LNKCTL_CCC bit for the relevant devices rather
than the content of the whole LNKCTL registers. It aligns better with
how pcie_lnkctl_clear_and_set() expects its parameter and makes the
code more obvious to understand.

Suggested-by: Lukas Wunner <lukas@wunner.de>
Fixes: 2a42d9dba784 ("PCIe: ASPM: Break out of endless loop waiting for PCI config bits to switch")
Fixes: 7d715a6c1ae5 ("PCI: add PCI Express ASPM support")
Link: https://lore.kernel.org/r/20230717120503.15276-5-ilpo.jarvinen@linux.intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: "Rafael J. Wysocki" <rafael@kernel.org>

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 3dafba0b5f411e4d635dec91d4b70b3b2b1be735..1bf630059264478640c92ef9dc2ba61712b122fa 100644 (file)
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -199,7 +199,7 @@ static void pcie_clkpm_cap_init(struct pcie_link_state *link, int blacklist)
 static void pcie_aspm_configure_common_clock(struct pcie_link_state *link)
 {
        int same_clock = 1;
-       u16 reg16, parent_reg, child_reg[8];
+       u16 reg16, ccc, parent_old_ccc, child_old_ccc[8];
        struct pci_dev *child, *parent = link->pdev;
        struct pci_bus *linkbus = parent->subordinate;
        /*
@@ -221,6 +221,7 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link)
 
        /* Port might be already in common clock mode */
        pcie_capability_read_word(parent, PCI_EXP_LNKCTL, &reg16);
+       parent_old_ccc = reg16 & PCI_EXP_LNKCTL_CCC;
        if (same_clock && (reg16 & PCI_EXP_LNKCTL_CCC)) {
                bool consistent = true;
 
@@ -237,34 +238,29 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link)
                pci_info(parent, "ASPM: current common clock configuration is inconsistent, reconfiguring\n");
        }
 
+       ccc = same_clock ? PCI_EXP_LNKCTL_CCC : 0;
        /* Configure downstream component, all functions */
        list_for_each_entry(child, &linkbus->devices, bus_list) {
                pcie_capability_read_word(child, PCI_EXP_LNKCTL, &reg16);
-               child_reg[PCI_FUNC(child->devfn)] = reg16;
-               if (same_clock)
-                       reg16 |= PCI_EXP_LNKCTL_CCC;
-               else
-                       reg16 &= ~PCI_EXP_LNKCTL_CCC;
-               pcie_capability_write_word(child, PCI_EXP_LNKCTL, reg16);
+               child_old_ccc[PCI_FUNC(child->devfn)] = reg16 & PCI_EXP_LNKCTL_CCC;
+               pcie_capability_clear_and_set_word(child, PCI_EXP_LNKCTL,
+                                                  PCI_EXP_LNKCTL_CCC, ccc);
        }
 
        /* Configure upstream component */
-       pcie_capability_read_word(parent, PCI_EXP_LNKCTL, &reg16);
-       parent_reg = reg16;
-       if (same_clock)
-               reg16 |= PCI_EXP_LNKCTL_CCC;
-       else
-               reg16 &= ~PCI_EXP_LNKCTL_CCC;
-       pcie_capability_write_word(parent, PCI_EXP_LNKCTL, reg16);
+       pcie_capability_clear_and_set_word(parent, PCI_EXP_LNKCTL,
+                                          PCI_EXP_LNKCTL_CCC, ccc);
 
        if (pcie_retrain_link(link->pdev, true)) {
 
                /* Training failed. Restore common clock configurations */
                pci_err(parent, "ASPM: Could not configure common clock\n");
                list_for_each_entry(child, &linkbus->devices, bus_list)
-                       pcie_capability_write_word(child, PCI_EXP_LNKCTL,
-                                          child_reg[PCI_FUNC(child->devfn)]);
-               pcie_capability_write_word(parent, PCI_EXP_LNKCTL, parent_reg);
+                       pcie_capability_clear_and_set_word(child, PCI_EXP_LNKCTL,
+                                                          PCI_EXP_LNKCTL_CCC,
+                                                          child_old_ccc[PCI_FUNC(child->devfn)]);
+               pcie_capability_clear_and_set_word(parent, PCI_EXP_LNKCTL,
+                                                  PCI_EXP_LNKCTL_CCC, parent_old_ccc);
        }
 }