PCI/ASPM: Cleanups
cover PCI/ASPM: Cleanups
What started as simple FIELD_GET/PREP() cleanup patch on ASPM became this series of cleanups.
Ilpo Järvinen (7):
PCI: Add PCI_L1SS_CTL2 fields
PCI/ASPM: Use FIELD_GET/PREP() to access PCIe capability fields PCI/ASPM: Return U32_MAX instead of bit magic construct PCI/ASPM: Use time constants
PCI/ASPM: Use FIELD_MAX() instead of literals PCI/ASPM: Remove unnecessary includes
PCI/ASPM: Convert printk() to pr_*() and add include
drivers/pci/pcie/aspm.c | 71 +++++++++++++++++++---------------- include/uapi/linux/pci_regs.h | 2 + 2 files changed, 41 insertions(+), 32 deletions(-)
Signature · 1 line
2.30.2
PATCH 1/7 PCI: Add PCI_L1SS_CTL2 fields
Add L1 PM Substates Control 2 Register fields (PCI_L1SS_CTL2_*).
--- include/uapi/linux/pci_regs.h | 2 ++ 1 file changed, 2 insertions(+)
include/uapi/linux/pci_regs.h +2 -0
@@ -1088,6 +1088,8 @@#define PCI_L1SS_CTL1_LTR_L12_TH_VALUE 0x03ff0000/* LTR_L1.2_THRESHOLD_Value */ #define PCI_L1SS_CTL1_LTR_L12_TH_SCALE 0xe0000000/* LTR_L1.2_THRESHOLD_Scale */ #define PCI_L1SS_CTL2 0x0c/* Control 2 Register */ +#define PCI_L1SS_CTL2_T_PWR_ON_SCALE 0x00000003/* T_POWER_ON Scale */ +#define PCI_L1SS_CTL2_T_PWR_ON_VALUE 0x000000f8/* T_POWER_ON Value */ /* Designated Vendor-Specific (DVSEC, PCI_EXT_CAP_ID_DVSEC) */ #define PCI_DVSEC_HEADER1 0x4/* Designated Vendor-Specific Header1 */
Signature · 1 line
2.30.2
PATCH 2/7 PCI/ASPM: Use FIELD_GET/PREP() to access PCIe capability fields
In reply to Ilpo JärvinenReplace open-coded variants to access PCIe capability registers fields with FIELD_GET/PREP().
--- drivers/pci/pcie/aspm.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-)
drivers/pci/pcie/aspm.c +18 -13
@@ -7,6 +7,7 @@* Copyright (C) Shaohua Li ([email protected]) */ +#include <linux/bitfield.h> #include <linux/kernel.h> #include <linux/math.h> #include <linux/module.h>
@@ -267,7 +268,7 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link)/* Convert L0s latency encoding to ns */ static u32 calc_l0s_latency (u32 lnkcap) { -u32 encoding = (lnkcap &PCI_EXP_LNKCAP_L0SEL ) >>12 ; +u32 encoding =FIELD_GET (PCI_EXP_LNKCAP_L0SEL , lnkcap);if (encoding ==0x7 )return (5 *1000 );/* > 4us */
@@ -285,7 +286,7 @@ static u32 calc_l0s_acceptable(u32 encoding)/* Convert L1 latency encoding to ns */ static u32 calc_l1_latency (u32 lnkcap) { -u32 encoding = (lnkcap &PCI_EXP_LNKCAP_L1EL ) >>15 ; +u32 encoding =FIELD_GET (PCI_EXP_LNKCAP_L1EL , lnkcap);if (encoding ==0x7 )return (65 *1000 );/* > 64us */
@@ -371,11 +372,11 @@ static void pcie_aspm_check_latency(struct pci_dev *endpoint) link = endpoint->bus->self->link_state;/* Calculate endpoint L0s acceptable latency */ - encoding = (endpoint->devcap &PCI_EXP_DEVCAP_L0S ) >>6 ; + encoding =FIELD_GET (PCI_EXP_DEVCAP_L0S , endpoint->devcap); acceptable_l0s =calc_l0s_acceptable (encoding);/* Calculate endpoint L1 acceptable latency */ - encoding = (endpoint->devcap &PCI_EXP_DEVCAP_L1 ) >>9 ; + encoding =FIELD_GET (PCI_EXP_DEVCAP_L1 , endpoint->devcap); acceptable_l1 =calc_l1_acceptable (encoding);while (link) {
@@ -446,22 +447,24 @@ static void aspm_calc_l12_info(struct pcie_link_state *link,u32 pl1_2_enables, cl1_2_enables;/* 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 ; + val1 =FIELD_GET (PCI_L1SS_CAP_CM_RESTORE_TIME , parent_l1ss_cap); + val2 =FIELD_GET (PCI_L1SS_CAP_CM_RESTORE_TIME , child_l1ss_cap); t_common_mode =max (val1, val2);/* Choose the greater of the two Port T_POWER_ON times */ - val1 = (parent_l1ss_cap &PCI_L1SS_CAP_P_PWR_ON_VALUE ) >>19 ; - scale1 = (parent_l1ss_cap &PCI_L1SS_CAP_P_PWR_ON_SCALE ) >>16 ; - val2 = (child_l1ss_cap &PCI_L1SS_CAP_P_PWR_ON_VALUE ) >>19 ; - scale2 = (child_l1ss_cap &PCI_L1SS_CAP_P_PWR_ON_SCALE ) >>16 ; + val1 =FIELD_GET (PCI_L1SS_CAP_P_PWR_ON_VALUE , parent_l1ss_cap); + scale1 =FIELD_GET (PCI_L1SS_CAP_P_PWR_ON_SCALE , parent_l1ss_cap); + val2 =FIELD_GET (PCI_L1SS_CAP_P_PWR_ON_VALUE , child_l1ss_cap); + scale2 =FIELD_GET (PCI_L1SS_CAP_P_PWR_ON_SCALE , child_l1ss_cap);if (calc_l12_pwron (parent, scale1, val1) >calc_l12_pwron (child, scale2, val2)) { - ctl2 |= scale1 | (val1 <<3 ); + ctl2 |=FIELD_PREP (PCI_L1SS_CTL2_T_PWR_ON_SCALE , scale1) | +FIELD_PREP (PCI_L1SS_CTL2_T_PWR_ON_VALUE , val1); t_power_on =calc_l12_pwron (parent, scale1, val1); }else { - ctl2 |= scale2 | (val2 <<3 ); + ctl2 |=FIELD_PREP (PCI_L1SS_CTL2_T_PWR_ON_SCALE , scale2) | +FIELD_PREP (PCI_L1SS_CTL2_T_PWR_ON_VALUE , val2); t_power_on =calc_l12_pwron (child, scale2, val2); }
@@ -477,7 +480,9 @@ static void aspm_calc_l12_info(struct pcie_link_state *link,*/ l1_2_threshold =2 +4 + t_common_mode + t_power_on;encode_l12_threshold (l1_2_threshold, &scale, &value); - ctl1 |= t_common_mode <<8 | scale <<29 | value <<16 ; + ctl1 |=FIELD_PREP (PCI_L1SS_CTL1_CM_RESTORE_TIME , t_common_mode) | +FIELD_PREP (PCI_L1SS_CTL1_LTR_L12_TH_VALUE , value) | +FIELD_PREP (PCI_L1SS_CTL1_LTR_L12_TH_SCALE , scale);/* Some broken devices only support dword access to L1 SS */ pci_read_config_dword (parent, parent->l1ss +PCI_L1SS_CTL1 , &pctl1);
Signature · 1 line
2.30.2
PATCH 3/7 PCI/ASPM: Return U32_MAX instead of bit magic construct
In reply to Ilpo JärvinenInstead of returning a bit obscure -1U, make code's intent of returning the maximum representable value more obvious by returning U32_MAX.
--- drivers/pci/pcie/aspm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/pci/pcie/aspm.c +3 -2
@@ -9,6 +9,7 @@#include <linux/bitfield.h> #include <linux/kernel.h> +#include <linux/limits.h> #include <linux/math.h> #include <linux/module.h> #include <linux/moduleparam.h>
@@ -279,7 +280,7 @@ static u32 calc_l0s_latency(u32 lnkcap)static u32 calc_l0s_acceptable (u32 encoding) {if (encoding ==0x7 ) -return -1U ; +return U32_MAX ;return (64 << encoding); }
@@ -297,7 +298,7 @@ static u32 calc_l1_latency(u32 lnkcap)static u32 calc_l1_acceptable (u32 encoding) {if (encoding ==0x7 ) -return -1U ; +return U32_MAX ;return (1000 << encoding); }
Signature · 1 line
2.30.2
PATCH 4/7 PCI/ASPM: Use time constants
In reply to Ilpo JärvinenUse defined constants to convert between time units.
--- drivers/pci/pcie/aspm.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/pci/pcie/aspm.c +8 -6
@@ -21,6 +21,8 @@#include <linux/slab.h> #include <linux/jiffies.h> #include <linux/delay.h> +#include <linux/time.h> +#include "../pci.h" #ifdef MODULE_PARAM_PREFIX
@@ -272,7 +274,7 @@ static u32 calc_l0s_latency(u32 lnkcap)u32 encoding =FIELD_GET (PCI_EXP_LNKCAP_L0SEL , lnkcap);if (encoding ==0x7 ) -return (5 *1000 );/* > 4us */ +return 5 *NSEC_PER_USEC ;/* > 4us */ return (64 << encoding); }
@@ -290,8 +292,8 @@ static u32 calc_l1_latency(u32 lnkcap)u32 encoding =FIELD_GET (PCI_EXP_LNKCAP_L1EL , lnkcap);if (encoding ==0x7 ) -return (65 *1000 );/* > 64us */ -return (1000 << encoding); +return 65 *NSEC_PER_USEC ;/* > 64us */ +return NSEC_PER_USEC << encoding; }/* Convert L1 acceptable latency encoding to ns */
@@ -299,7 +301,7 @@ static u32 calc_l1_acceptable(u32 encoding) {if (encoding ==0x7 )return U32_MAX ; -return (1000 << encoding); +return NSEC_PER_USEC << encoding; }/* Convert L1SS T_pwr encoding to usec */
@@ -327,7 +329,7 @@ static u32 calc_l12_pwron(struct pci_dev *pdev, u32 scale, u32 val)*/ static void encode_l12_threshold (u32 threshold_us,u32 *scale,u32 *value) { -u64 threshold_ns = (u64 ) threshold_us *1000 ; +u64 threshold_ns = (u64 )threshold_us *NSEC_PER_USEC ;/* * LTR_L1.2_THRESHOLD_Value ("value") is a 10-bit field with max
@@ -419,7 +421,7 @@ static void pcie_aspm_check_latency(struct pci_dev *endpoint)if ((link->aspm_capable &ASPM_STATE_L1 ) && (latency + l1_switch_latency > acceptable_l1)) link->aspm_capable &= ~ASPM_STATE_L1 ; - l1_switch_latency +=1000 ; + l1_switch_latency +=NSEC_PER_USEC ; link = link->parent; }
Signature · 1 line
2.30.2
PATCH 5/7 PCI/ASPM: Use FIELD_MAX() instead of literals
In reply to Ilpo JärvinenConvert 0x3ff literals in encode_l12_threshold() to FIELD_MAX(PCI_L1SS_CTL1_LTR_L12_TH_VALUE) that explains the purpose of the literal.
--- drivers/pci/pcie/aspm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/pci/pcie/aspm.c +7 -7
@@ -335,27 +335,27 @@ static void encode_l12_threshold(u32 threshold_us, u32 *scale, u32 *value)* LTR_L1.2_THRESHOLD_Value ("value") is a 10-bit field with max * value of 0x3ff. */ -if (threshold_ns <=0x3ff *1 ) { +if (threshold_ns <=1 *FIELD_MAX (PCI_L1SS_CTL1_LTR_L12_TH_VALUE )) { *scale =0 ;/* Value times 1ns */ *value = threshold_ns; - }else if (threshold_ns <=0x3ff *32 ) { + }else if (threshold_ns <=32 *FIELD_MAX (PCI_L1SS_CTL1_LTR_L12_TH_VALUE )) { *scale =1 ;/* Value times 32ns */ *value =roundup (threshold_ns,32 ) /32 ; - }else if (threshold_ns <=0x3ff *1024 ) { + }else if (threshold_ns <=1024 *FIELD_MAX (PCI_L1SS_CTL1_LTR_L12_TH_VALUE )) { *scale =2 ;/* Value times 1024ns */ *value =roundup (threshold_ns,1024 ) /1024 ; - }else if (threshold_ns <=0x3ff *32768 ) { + }else if (threshold_ns <=32768 *FIELD_MAX (PCI_L1SS_CTL1_LTR_L12_TH_VALUE )) { *scale =3 ;/* Value times 32768ns */ *value =roundup (threshold_ns,32768 ) /32768 ; - }else if (threshold_ns <=0x3ff *1048576 ) { + }else if (threshold_ns <=1048576 *FIELD_MAX (PCI_L1SS_CTL1_LTR_L12_TH_VALUE )) { *scale =4 ;/* Value times 1048576ns */ *value =roundup (threshold_ns,1048576 ) /1048576 ; - }else if (threshold_ns <=0x3ff * (u64 )33554432 ) { + }else if (threshold_ns <= (u64 )33554432 *FIELD_MAX (PCI_L1SS_CTL1_LTR_L12_TH_VALUE )) { *scale =5 ;/* Value times 33554432ns */ *value =roundup (threshold_ns,33554432 ) /33554432 ; }else { *scale =5 ; - *value =0x3ff ;/* Max representable value */ + *value =FIELD_MAX (PCI_L1SS_CTL1_LTR_L12_TH_VALUE ); } }
Signature · 1 line
2.30.2
PATCH 6/7 PCI/ASPM: Remove unnecessary includes
In reply to Ilpo Järvinenaspm.c does not use anything from delay.h nor jiffies.h so remove the includes.
--- drivers/pci/pcie/aspm.c | 2 -- 1 file changed, 2 deletions(-)
drivers/pci/pcie/aspm.c +0 -2
@@ -19,8 +19,6 @@#include <linux/pm.h> #include <linux/init.h> #include <linux/slab.h> -#include <linux/jiffies.h> -#include <linux/delay.h> #include <linux/time.h> #include "../pci.h"
Signature · 1 line
2.30.2
PATCH 7/7 PCI/ASPM: Convert printk() to pr_*() and add include
In reply to Ilpo JärvinenConvert printk(KERN_INFO ...) to pr_info() and add the correct include for it.
--- drivers/pci/pcie/aspm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/pci/pcie/aspm.c +3 -2
@@ -18,6 +18,7 @@#include <linux/errno.h> #include <linux/pm.h> #include <linux/init.h> +#include <linux/printk.h> #include <linux/slab.h> #include <linux/time.h>
@@ -1367,10 +1368,10 @@ static int __init pcie_aspm_disable(char *str) aspm_policy =POLICY_DEFAULT ; aspm_disabled =1 ; aspm_support_enabled = false; -printk (KERN_INFO "PCIe ASPM is disabled\n" ); +pr_info ("PCIe ASPM is disabled\n" ); }else if (!strcmp (str,"force" )) { aspm_force =1 ; -printk (KERN_INFO "PCIe ASPM is forcibly enabled\n" ); +pr_info ("PCIe ASPM is forcibly enabled\n" ); }return 1 ; }
Signature · 1 line
2.30.2
Bjorn Helgaas
AppliedQuoted 12 lines · Ilpo Järvinen
What started as simple FIELD_GET/PREP() cleanup patch on ASPM became this series of cleanups.
Ilpo Järvinen (7):
PCI: AddPCI_L1SS_CTL2fields
PCI/ASPM: Use FIELD_GET/PREP() to access PCIe capability fields PCI/ASPM: ReturnU32_MAXinstead of bit magic construct PCI/ASPM: Use time constants
PCI/ASPM: UseFIELD_MAX()instead of literals PCI/ASPM: Remove unnecessary includes
PCI/ASPM: Convertprintk()to pr_*() and add include
Quoted 3 lines
drivers/pci/pcie/aspm.c | 71 +++++++++++++++++++---------------- include/uapi/linux/pci_regs.h | 2 + 2 files changed, 41 insertions(+), 32 deletions(-)
Applied to pci/aspm for v6.7, thanks!