android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI/ASPM: Return 0 or -ETIMEDOUT from pcie_retrain_link()

Browse Source 
[ Upstream commit f5297a01ee805d7fa569d288ed65fc0f9ac9b03d ]

"pcie_retrain_link" is not a question with a true/false answer, so "bool"
isn't quite the right return type.  Return 0 for success or -ETIMEDOUT if
the retrain failed.  No functional change intended.

[bhelgaas: based on Ilpo's patch below]
Link: https://lore.kernel.org/r/20230502083923.34562-1-ilpo.jarvinen@linux.intel.com
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Stable-dep-of: e7e39756363a ("PCI/ASPM: Avoid link retraining race")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Bjorn Helgaas 2023-06-20 14:44:55 -05:00 committed by Greg Kroah-Hartman
parent ecd9da1d05
commit 8dfeae8082
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/pci/pcie/aspm.c
View File

@ -193,7 +193,7 @@ static void pcie_clkpm_cap_init(struct pcie_link_state *link, int blacklist)
link->clkpm_disable = blacklist ? 1 : 0; link->clkpm_disable = blacklist ? 1 : 0;
} }
static bool pcie_retrain_link(struct pcie_link_state *link) static int pcie_retrain_link(struct pcie_link_state *link)
{ {
struct pci_dev *parent = link->pdev; struct pci_dev *parent = link->pdev;
unsigned long end_jiffies; unsigned long end_jiffies;
@ -220,7 +220,9 @@ static bool pcie_retrain_link(struct pcie_link_state *link)
break; break;
msleep(1); msleep(1);
} while (time_before(jiffies, end_jiffies)); } while (time_before(jiffies, end_jiffies));
return !(reg16 & PCI_EXP_LNKSTA_LT); if (reg16 & PCI_EXP_LNKSTA_LT)
return -ETIMEDOUT;
return 0;
} }
/* /*
@ -289,15 +291,15 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link)
reg16 &= ~PCI_EXP_LNKCTL_CCC; reg16 &= ~PCI_EXP_LNKCTL_CCC;
pcie_capability_write_word(parent, PCI_EXP_LNKCTL, reg16); pcie_capability_write_word(parent, PCI_EXP_LNKCTL, reg16);
if (pcie_retrain_link(link)) if (pcie_retrain_link(link)) {
return;
/* Training failed. Restore common clock configurations */ /* Training failed. Restore common clock configurations */
pci_err(parent, "ASPM: Could not configure common clock\n"); pci_err(parent, "ASPM: Could not configure common clock\n");
list_for_each_entry(child, &linkbus->devices, bus_list) list_for_each_entry(child, &linkbus->devices, bus_list)
pcie_capability_write_word(child, PCI_EXP_LNKCTL, pcie_capability_write_word(child, PCI_EXP_LNKCTL,
child_reg[PCI_FUNC(child->devfn)]); child_reg[PCI_FUNC(child->devfn)]);
pcie_capability_write_word(parent, PCI_EXP_LNKCTL, parent_reg); pcie_capability_write_word(parent, PCI_EXP_LNKCTL, parent_reg);
}
} }
/* Convert L0s latency encoding to ns */ /* Convert L0s latency encoding to ns */