Skip to contentSkip to conversation

PCI/ASPM: Introduce aspm_get_l1ss_cap()

PATCH Superseded Jian-Hong Pan 2 participants 2 messages Apr 24, 2024 – Apr 26, 2024 PCI

v5 of 12 Superseded Latest is v12 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 3/4 PCI/ASPM: Introduce aspm_get_l1ss_cap()

Introduce aspm_get_l1ss_cap() which is extracted from aspm_l1ss_init() to get the PCIe's L1SS capability. This does not change any behavior, but aspm_get_l1ss_cap() can be reused later.

---
 drivers/pci/pcie/aspm.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/pci/pcie/aspm.c +14 -9
index 91a8b35b1ae2..c55ac11faa73 100644
@@ -612,6 +612,18 @@ static void pcie_aspm_check_latency(struct pci_dev *endpoint)
 	}
 }
 
+static u32 aspm_get_l1ss_cap(struct pci_dev *pdev)
+{
+	u32 l1ss_cap;
+
+	pci_read_config_dword(pdev, pdev->l1ss + PCI_L1SS_CAP, &l1ss_cap);
+
+	if (!(l1ss_cap & PCI_L1SS_CAP_L1_PM_SS))
+		l1ss_cap = 0;
+
+	return l1ss_cap;
+}
+
 /* Calculate L1.2 PM substate timing parameters */
 static void aspm_calc_l12_info(struct pcie_link_state *link,
 				u32 parent_l1ss_cap, u32 child_l1ss_cap)
@@ -722,15 +734,8 @@ static void aspm_l1ss_init(struct pcie_link_state *link)
 		return;
 
 	/* Setup L1 substate */
-	pci_read_config_dword(parent, parent->l1ss + PCI_L1SS_CAP,
-			      &parent_l1ss_cap);
-	pci_read_config_dword(child, child->l1ss + PCI_L1SS_CAP,
-			      &child_l1ss_cap);
-
-	if (!(parent_l1ss_cap & PCI_L1SS_CAP_L1_PM_SS))
-		parent_l1ss_cap = 0;
-	if (!(child_l1ss_cap & PCI_L1SS_CAP_L1_PM_SS))
-		child_l1ss_cap = 0;
+	parent_l1ss_cap = aspm_get_l1ss_cap(parent);
+	child_l1ss_cap = aspm_get_l1ss_cap(child);
 
 	/*
 	 * If we don't have LTR for the entire path from the Root Complex
Signature · 1 line
2.44.0
Reviewed-by on v5 3/4
#1 lore raw
Quoted 44 lines · Jian-Hong Pan

Introduce aspm_get_l1ss_cap() which is extracted from aspm_l1ss_init() to get the PCIe's L1SS capability. This does not change any behavior, but aspm_get_l1ss_cap() can be reused later.

---
 drivers/pci/pcie/aspm.c | 23 ++++++++++++++---------

 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/pci/pcie/aspm.c +0 -0
index 91a8b35b1ae2..c55ac11faa73 100644
@@ -612,6 +612,18 @@ static void pcie_aspm_check_latency(struct pci_dev
 *endpoint)
         }
  }

drivers/pci/pcie/aspm.c +12 -0
+static u32 aspm_get_l1ss_cap(struct pci_dev *pdev)
+{
+       u32 l1ss_cap;
+
+       pci_read_config_dword(pdev, pdev->l1ss + PCI_L1SS_CAP, &l1ss_cap);
+
+       if (!(l1ss_cap & PCI_L1SS_CAP_L1_PM_SS))
+               l1ss_cap = 0;
+
+       return l1ss_cap;
+}
+

 /* Calculate L1.2 PM substate timing parameters */
 static void aspm_calc_l12_info(struct pcie_link_state *link, u32 parent_l1ss_cap, u32 child_l1ss_cap)

drivers/pci/pcie/aspm.c +0 -0
@@ -722,15 +734,8 @@ static void aspm_l1ss_init(struct pcie_link_state *link)
                 return;


        /* Setup L1 substate */
-       pci_read_config_dword(parent, parent->l1ss + PCI_L1SS_CAP, -                             &parent_l1ss_cap);
-       pci_read_config_dword(child, child->l1ss + PCI_L1SS_CAP, -                             &child_l1ss_cap);
-
-       if (!(parent_l1ss_cap & PCI_L1SS_CAP_L1_PM_SS))

Quoted 8 lines

-               parent_l1ss_cap = 0;
-       if (!(child_l1ss_cap & PCI_L1SS_CAP_L1_PM_SS))
-               child_l1ss_cap = 0;
+       parent_l1ss_cap = aspm_get_l1ss_cap(parent);
+       child_l1ss_cap = aspm_get_l1ss_cap(child);

        /*
         * If we don't have LTR for the entire path from the Root Complex