Commit e673d383 authored by Johan Hovold's avatar Johan Hovold Committed by Bjorn Helgaas

PCI/ASPM: Clean up __pci_disable_link_state() 'sem' parameter

Replace the current 'sem' parameter to the __pci_disable_link_state()
helper with a more descriptive 'locked' parameter, which indicates whether
a pci_bus_sem read lock is already held.

Link: https://lore.kernel.org/r/20231128081512.19387-6-johan+linaro@kernel.orgSigned-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
[bhelgaas: include function name in subject, commit log]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
parent 780f52e3
...@@ -1041,7 +1041,7 @@ static struct pcie_link_state *pcie_aspm_get_link(struct pci_dev *pdev) ...@@ -1041,7 +1041,7 @@ static struct pcie_link_state *pcie_aspm_get_link(struct pci_dev *pdev)
return bridge->link_state; return bridge->link_state;
} }
static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem) static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool locked)
{ {
struct pcie_link_state *link = pcie_aspm_get_link(pdev); struct pcie_link_state *link = pcie_aspm_get_link(pdev);
...@@ -1060,7 +1060,7 @@ static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem) ...@@ -1060,7 +1060,7 @@ static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)
return -EPERM; return -EPERM;
} }
if (sem) if (!locked)
down_read(&pci_bus_sem); down_read(&pci_bus_sem);
mutex_lock(&aspm_lock); mutex_lock(&aspm_lock);
if (state & PCIE_LINK_STATE_L0S) if (state & PCIE_LINK_STATE_L0S)
...@@ -1082,7 +1082,7 @@ static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem) ...@@ -1082,7 +1082,7 @@ static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)
link->clkpm_disable = 1; link->clkpm_disable = 1;
pcie_set_clkpm(link, policy_to_clkpm_state(link)); pcie_set_clkpm(link, policy_to_clkpm_state(link));
mutex_unlock(&aspm_lock); mutex_unlock(&aspm_lock);
if (sem) if (!locked)
up_read(&pci_bus_sem); up_read(&pci_bus_sem);
return 0; return 0;
...@@ -1090,7 +1090,7 @@ static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem) ...@@ -1090,7 +1090,7 @@ static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)
int pci_disable_link_state_locked(struct pci_dev *pdev, int state) int pci_disable_link_state_locked(struct pci_dev *pdev, int state)
{ {
return __pci_disable_link_state(pdev, state, false); return __pci_disable_link_state(pdev, state, true);
} }
EXPORT_SYMBOL(pci_disable_link_state_locked); EXPORT_SYMBOL(pci_disable_link_state_locked);
...@@ -1105,7 +1105,7 @@ EXPORT_SYMBOL(pci_disable_link_state_locked); ...@@ -1105,7 +1105,7 @@ EXPORT_SYMBOL(pci_disable_link_state_locked);
*/ */
int pci_disable_link_state(struct pci_dev *pdev, int state) int pci_disable_link_state(struct pci_dev *pdev, int state)
{ {
return __pci_disable_link_state(pdev, state, true); return __pci_disable_link_state(pdev, state, false);
} }
EXPORT_SYMBOL(pci_disable_link_state); EXPORT_SYMBOL(pci_disable_link_state);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment