PCI/ASPM: aspm_disable/default state handling and other trivial fixes
v3 cover PCI/ASPM: aspm_disable/default state handling and other trivial fixes
On going through the aspm driver, I found some potential bugs and opportunities for code cleanup in the way the aspm_disable and aspm_default states are being handled by the driver. Perform other refactoring as well.
Changes from v2 to v3:
- Commit message updates
Changes from v1 to v2:
- Split the patches into smaller patches
- Add the patch to rename L1.2 specific functions
Ajay Agarwal (5):
PCI/ASPM: Disable ASPM_STATE_L1 only when driver disables L1 ASPM PCI/ASPM: Set ASPM_STATE_L1 only when driver enables L1 PCI/ASPM: Set ASPM_STATE_L1 when driver enables L1ss PCI/ASPM: Rename L1.2 specific functions
PCI/ASPM: Remove unnecessary ASPM_STATE_L1SS check
drivers/pci/pcie/aspm.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-)
Signature · 1 line
2.40.1.495.gc816e09b53d-goog
PATCH v3 1/5 PCI/ASPM: Disable ASPM_STATE_L1 only when driver disables L1 ASPM
Currently the aspm driver sets ASPM_STATE_L1 as well as ASPM_STATE_L1SS bits in aspm_disable when the caller disables L1. pcie_config_aspm_link takes care that L1ss ASPM is not enabled if L1 is disabled. ASPM_STATE_L1SS bits do not need to be explicitly set. The sysfs node store() function, which also modifies the aspm_disable value, does not set these bits either when only L1 ASPM is disabled by the user.
Disable ASPM_STATE_L1 only when the caller disables L1 ASPM. No functional changes intended.
---
Changelog since v2:
- Better commit message
Changelog since v1:
- Better commit message
drivers/pci/pcie/aspm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/pci/pcie/aspm.c +1 -2
@@ -1095,8 +1095,7 @@ static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)if (state &PCIE_LINK_STATE_L0S ) link->aspm_disable |=ASPM_STATE_L0S ;if (state &PCIE_LINK_STATE_L1 ) -/* L1 PM substates require L1 */ - link->aspm_disable |=ASPM_STATE_L1 |ASPM_STATE_L1SS ; + link->aspm_disable |=ASPM_STATE_L1 ;if (state &PCIE_LINK_STATE_L1_1 ) link->aspm_disable |=ASPM_STATE_L1_1 ;if (state &PCIE_LINK_STATE_L1_2 )
Signature · 1 line
2.40.1.495.gc816e09b53d-goog
PATCH v3 2/5 PCI/ASPM: Set ASPM_STATE_L1 only when driver enables L1
In reply to Ajay AgarwalCurrently the ASPM driver sets ASPM_STATE_L1 as well as ASPM_STATE_L1SS when the caller wants to enable just L1. This is incorrect. Fix this by setting the ASPM_STATE_L1 bit only when the caller wishes to enable L1.
---
Changelog since v2:
- Replace "L1.0" with "L1" in the commit message
Changelog since v1:
- Break down the L1 and L1ss handling into separate patches
drivers/pci/pcie/aspm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/pci/pcie/aspm.c +1 -2
@@ -1170,8 +1170,7 @@ int pci_enable_link_state(struct pci_dev *pdev, int state)if (state &PCIE_LINK_STATE_L0S ) link->aspm_default |=ASPM_STATE_L0S ;if (state &PCIE_LINK_STATE_L1 ) -/* L1 PM substates require L1 */ - link->aspm_default |=ASPM_STATE_L1 |ASPM_STATE_L1SS ; + link->aspm_default |=ASPM_STATE_L1 ;if (state &PCIE_LINK_STATE_L1_1 ) link->aspm_default |=ASPM_STATE_L1_1 ;if (state &PCIE_LINK_STATE_L1_2 )
Signature · 1 line
2.40.1.495.gc816e09b53d-goog
PATCH v3 3/5 PCI/ASPM: Set ASPM_STATE_L1 when driver enables L1ss
In reply to Ajay AgarwalCurrently the aspm driver does not set ASPM_STATE_L1 bit in aspm_default when the caller requests L1SS ASPM state. This will lead to pcie_config_aspm_link() not enabling the requested L1SS state. Set ASPM_STATE_L1 when driver enables L1ss.
---
Changelog since v2:
- None
Changelog since v1:
- Break down the L1 and L1ss handling into separate patches
drivers/pci/pcie/aspm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/pci/pcie/aspm.c +5 -4
@@ -1171,14 +1171,15 @@ int pci_enable_link_state(struct pci_dev *pdev, int state) link->aspm_default |=ASPM_STATE_L0S ;if (state &PCIE_LINK_STATE_L1 ) link->aspm_default |=ASPM_STATE_L1 ; +/* L1 PM substates require L1 */ if (state &PCIE_LINK_STATE_L1_1 ) - link->aspm_default |=ASPM_STATE_L1_1 ; + link->aspm_default |=ASPM_STATE_L1_1 |ASPM_STATE_L1 ;if (state &PCIE_LINK_STATE_L1_2 ) - link->aspm_default |=ASPM_STATE_L1_2 ; + link->aspm_default |=ASPM_STATE_L1_2 |ASPM_STATE_L1 ;if (state &PCIE_LINK_STATE_L1_1_PCIPM ) - link->aspm_default |=ASPM_STATE_L1_1_PCIPM ; + link->aspm_default |=ASPM_STATE_L1_1_PCIPM |ASPM_STATE_L1 ;if (state &PCIE_LINK_STATE_L1_2_PCIPM ) - link->aspm_default |=ASPM_STATE_L1_2_PCIPM ; + link->aspm_default |=ASPM_STATE_L1_2_PCIPM |ASPM_STATE_L1 ;pcie_config_aspm_link (link,policy_to_aspm_state (link)); link->clkpm_default = (state &PCIE_LINK_STATE_CLKPM ) ?1 :0 ;
Signature · 1 line
2.40.1.495.gc816e09b53d-goog
PATCH v3 4/5 PCI/ASPM: Rename L1.2 specific functions
In reply to Ajay AgarwalThe functions aspm_calc_l1ss_info() and calc_l1ss_pwron() perform calculations and register programming specific to L1.2 state. Rename them to aspm_calc_l12_info() and calc_l12_pwron() respectively.
---
Changelog since v2:
- None
Changelog since v1:
- New patch to rename L1.2 specific functions
drivers/pci/pcie/aspm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/pci/pcie/aspm.c +7 -7
@@ -337,7 +337,7 @@ static u32 calc_l1_acceptable(u32 encoding) }/* Convert L1SS T_pwr encoding to usec */ -static u32 calc_l1ss_pwron (struct pci_dev *pdev,u32 scale,u32 val) +static u32 calc_l12_pwron (struct pci_dev *pdev,u32 scale,u32 val) {switch (scale) {case 0 :
@@ -471,7 +471,7 @@ static void pci_clear_and_set_dword(struct pci_dev *pdev, int pos, }/* Calculate L1.2 PM substate timing parameters */ -static void aspm_calc_l1ss_info (struct pcie_link_state *link, +static void aspm_calc_l12_info (struct pcie_link_state *link,u32 parent_l1ss_cap,u32 child_l1ss_cap) {struct pci_dev *child = link->downstream, *parent = link->pdev;
@@ -495,13 +495,13 @@ static void aspm_calc_l1ss_info(struct pcie_link_state *link, val2 = (child_l1ss_cap &PCI_L1SS_CAP_P_PWR_ON_VALUE ) >>19 ; scale2 = (child_l1ss_cap &PCI_L1SS_CAP_P_PWR_ON_SCALE ) >>16 ; -if (calc_l1ss_pwron (parent, scale1, val1) > -calc_l1ss_pwron (child, scale2, val2)) { +if (calc_l12_pwron (parent, scale1, val1) > +calc_l12_pwron (child, scale2, val2)) { ctl2 |= scale1 | (val1 <<3 ); - t_power_on =calc_l1ss_pwron (parent, scale1, val1); + t_power_on =calc_l12_pwron (parent, scale1, val1); }else { ctl2 |= scale2 | (val2 <<3 ); - t_power_on =calc_l1ss_pwron (child, scale2, val2); + t_power_on =calc_l12_pwron (child, scale2, val2); }/*
@@ -617,7 +617,7 @@ static void aspm_l1ss_init(struct pcie_link_state *link) link->aspm_enabled |=ASPM_STATE_L1_2_PCIPM ;if (link->aspm_support &ASPM_STATE_L1SS ) -aspm_calc_l1ss_info (link, parent_l1ss_cap, child_l1ss_cap); +aspm_calc_l12_info (link, parent_l1ss_cap, child_l1ss_cap); }static void pcie_aspm_cap_init (struct pcie_link_state *link,int blacklist)
Signature · 1 line
2.40.1.495.gc816e09b53d-goog
PATCH v3 5/5 PCI/ASPM: Remove unnecessary ASPM_STATE_L1SS check
In reply to Ajay AgarwalCurrently the driver checks if ASPM_STATE_L1SS is supported before calling aspm_calc_l12_info(), only for this function to return if ASPM_STATE_L1_2_MASK is not supported. Simplify the logic by directly checking for L1.2 mask.
---
Changelog since v2:
- None
Changelog since v1:
- Rebase on top of the L1.2 function rename patch
drivers/pci/pcie/aspm.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/pci/pcie/aspm.c +1 -4
@@ -481,9 +481,6 @@ static void aspm_calc_l12_info(struct pcie_link_state *link,u32 pctl1, pctl2, cctl1, cctl2;u32 pl1_2_enables, cl1_2_enables; -if (!(link->aspm_support &ASPM_STATE_L1_2_MASK )) -return ; -/* Choose the greater of the two Port Common_Mode_Restore_Times */ val1 = (parent_l1ss_cap &PCI_L1SS_CAP_CM_RESTORE_TIME ) >>8 ; val2 = (child_l1ss_cap &PCI_L1SS_CAP_CM_RESTORE_TIME ) >>8 ;
@@ -616,7 +613,7 @@ static void aspm_l1ss_init(struct pcie_link_state *link)if (parent_l1ss_ctl1 & child_l1ss_ctl1 &PCI_L1SS_CTL1_PCIPM_L1_2 ) link->aspm_enabled |=ASPM_STATE_L1_2_PCIPM ; -if (link->aspm_support &ASPM_STATE_L1SS ) +if (link->aspm_support &ASPM_STATE_L1_2_MASK )aspm_calc_l12_info (link, parent_l1ss_cap, child_l1ss_cap); }
Signature · 1 line
2.40.1.495.gc816e09b53d-goog
Bjorn Helgaas
AppliedQuoted 19 lines · Ajay Agarwal
On going through the aspm driver, I found some potential bugs and opportunities for code cleanup in the way the
aspm_disableandaspm_defaultstates are being handled by the driver. Perform other refactoring as well.Changes from v2 to v3:
- Commit message updatesChanges from v1 to v2:
- Split the patches into smaller patches
- Add the patch to rename L1.2 specific functionsAjay Agarwal (5):
PCI/ASPM: DisableASPM_STATE_L1only when driver disables L1 ASPM PCI/ASPM: SetASPM_STATE_L1only when driver enables L1 PCI/ASPM: SetASPM_STATE_L1when driver enables L1ss PCI/ASPM: Rename L1.2 specific functions
PCI/ASPM: Remove unnecessaryASPM_STATE_L1SScheck
Quoted 2 lines
drivers/pci/pcie/aspm.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-)
Applied to pci/aspm for v6.5, thanks!
Bjorn
Quoted 20 lines · Bjorn Helgaas
Quoted 19 lines · Ajay Agarwal
On going through the aspm driver, I found some potential bugs and opportunities for code cleanup in the way the
aspm_disableandaspm_defaultstates are being handled by the driver. Perform other refactoring as well.Changes from v2 to v3:
- Commit message updatesChanges from v1 to v2:
- Split the patches into smaller patches
- Add the patch to rename L1.2 specific functionsAjay Agarwal (5):
PCI/ASPM: DisableASPM_STATE_L1only when driver disables L1 ASPM PCI/ASPM: SetASPM_STATE_L1only when driver enables L1 PCI/ASPM: SetASPM_STATE_L1when driver enables L1ss PCI/ASPM: Rename L1.2 specific functions
PCI/ASPM: Remove unnecessaryASPM_STATE_L1SScheck
Quoted 4 lines
Quoted 2 lines
drivers/pci/pcie/aspm.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-)Applied to pci/aspm for v6.5, thanks!
Forgot to mention that I picked up Sathy's Reviewed-by on patches 1 and 2 from the v2 posting. If you only change things suggested by the reviewer, you can carry those tags forward to the next posting.
Bjorn