PCI/ASPM: Remove struct aspm_latency
cover PCI/ASPM: Remove struct aspm_latency
From: "Bolarinwa O. Saheed" <[email protected]>
These series removes struct aspm_latency and related member with struct pcie_link_state namely .latency_{up,dw} and .acceptable All latencies are now calculated when needed. No functional changes was made.
MERGE NOTE:
[PATCH 3/3] depends on
[PATCH 2/3] PCI/ASPM: Remove struct pcie_link_state.acceptable
Saheed O. Bolarinwa (3):
PCI/ASPM: Remove struct pcie_link_state.latency_* PCI/ASPM: Remove struct pcie_link_state.acceptable PCI/ASPM: Remove struct aspm_latency
drivers/pci/pcie/aspm.c | 59 +++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 37 deletions(-)
Signature · 1 line
2.20.1
RFC PATCH 1/3 PCI/ASPM: Remove struct pcie_link_state.latency_*
Inside pcie_aspm_cap_init() the exit latencies on both upstream and downstream are calculated and cached in struct pcie_link_state.latency_* These values are only used in pcie_aspm_check_latency() where they are compared with the acceptable latencies on the link.
Computing these latencies right inside pcie_aspm_check_latency() where they are only needed will remove the need for caching them. This will not make any functional change.
- Calculate the exit latencies inside pcie_aspm_check_latency()
- Remove struct pcie_link_state.latency_{up,dw}
- Replace references with local variables of struct aspm_latency
--- drivers/pci/pcie/aspm.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/pci/pcie/aspm.c +13 -11
@@ -66,9 +66,6 @@ struct pcie_link_state { u32 clkpm_default:1; /* Default Clock PM state by BIOS */ u32 clkpm_disable:1; /* Clock PM disabled */ -/* Exit latencies */ -struct aspm_latency latency_up;/* Upstream direction exit latency */ -struct aspm_latency latency_dw;/* Downstream direction exit latency */ /* * Endpoint acceptable latencies. A pcie downstream port only * has one slot under it, so at most there are 8 functions.
@@ -378,7 +375,8 @@ static void encode_l12_threshold(u32 threshold_us, u32 *scale, u32 *value)static void pcie_aspm_check_latency (struct pci_dev *endpoint) { -u32 latency, l1_switch_latency =0 ; +u32 latency, lnkcap_up, lnkcap_dw, l1_switch_latency =0 ; +struct aspm_latency latency_up, latency_dw;struct aspm_latency *acceptable;struct pcie_link_state *link;
@@ -391,14 +389,22 @@ static void pcie_aspm_check_latency(struct pci_dev *endpoint) acceptable = &link->acceptable[PCI_FUNC (endpoint->devfn)];while (link) { +/* Read direction exit latencies */ +pcie_capability_read_dword (link->pdev,PCI_EXP_LNKCAP , &lnkcap_up); +pcie_capability_read_dword (link->downstream,PCI_EXP_LNKCAP , &lnkcap_dw); + latency_up.l0s =calc_l0s_latency (lnkcap_up); + latency_up.l1 =calc_l1_latency (lnkcap_up); + latency_dw.l0s =calc_l0s_latency (lnkcap_dw); + latency_dw.l1 =calc_l1_latency (lnkcap_dw); +/* Check upstream direction L0s latency */ if ((link->aspm_capable &ASPM_STATE_L0S_UP ) && - (link->latency_up.l0s > acceptable->l0s)) + (latency_up.l0s > acceptable->l0s)) link->aspm_capable &= ~ASPM_STATE_L0S_UP ;/* Check downstream direction L0s latency */ if ((link->aspm_capable &ASPM_STATE_L0S_DW ) && - (link->latency_dw.l0s > acceptable->l0s)) + (latency_dw.l0s > acceptable->l0s)) link->aspm_capable &= ~ASPM_STATE_L0S_DW ;/* * Check L1 latency.
@@ -413,7 +419,7 @@ static void pcie_aspm_check_latency(struct pci_dev *endpoint)* L1 exit latencies advertised by a device include L1 * substate latencies (and hence do not do any check). */ - latency =max_t (u32, link->latency_up.l1, link->latency_dw.l1); + latency =max_t (u32, latency_up.l1, latency_dw.l1);if ((link->aspm_capable &ASPM_STATE_L1 ) && (latency + l1_switch_latency > acceptable->l1)) link->aspm_capable &= ~ASPM_STATE_L1 ;
@@ -593,8 +599,6 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist) link->aspm_enabled |=ASPM_STATE_L0S_UP ;if (parent_lnkctl &PCI_EXP_LNKCTL_ASPM_L0S ) link->aspm_enabled |=ASPM_STATE_L0S_DW ; - link->latency_up.l0s =calc_l0s_latency (parent_lnkcap); - link->latency_dw.l0s =calc_l0s_latency (child_lnkcap);/* Setup L1 state */ if (parent_lnkcap & child_lnkcap &PCI_EXP_LNKCAP_ASPM_L1 )
@@ -602,8 +606,6 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist)if (parent_lnkctl & child_lnkctl &PCI_EXP_LNKCTL_ASPM_L1 ) link->aspm_enabled |=ASPM_STATE_L1 ; - link->latency_up.l1 =calc_l1_latency (parent_lnkcap); - link->latency_dw.l1 =calc_l1_latency (child_lnkcap);/* Setup L1 substate */ pci_read_config_dword(parent, parent->l1ss + PCI_L1SS_CAP,
Signature · 1 line
2.20.1
RFC PATCH 2/3 PCI/ASPM: Remove struct pcie_link_state.acceptable
In reply to Saheed O. BolarinwaInside pcie_aspm_cap_init() the acceptable latencies for each device on the bus_list are calculated and cached in pcie_link_state->acceptable. These cached latencies are only used inside pcie_aspm_check_latency() which is called right after computing them.
Computing these latencies right inside pcie_aspm_check_latency() where they are needed will remove the need for caching them without making any functional change.
- Calculate the acceptable latency for each device directly inside pcie_aspm_check_latency()
- Remove pcie_link_state->acceptable
--- drivers/pci/pcie/aspm.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-)
drivers/pci/pcie/aspm.c +8 -19
@@ -65,12 +65,6 @@ struct pcie_link_state { u32 clkpm_enabled:1; /* Current Clock PM state */ u32 clkpm_default:1; /* Default Clock PM state by BIOS */ u32 clkpm_disable:1; /* Clock PM disabled */ - -/* -* Endpoint acceptable latencies. A pcie downstream port only -* has one slot under it, so at most there are 8 functions. -*/ -struct aspm_latency acceptable[8 ]; };static int aspm_disabled, aspm_force;
@@ -375,7 +369,7 @@ static void encode_l12_threshold(u32 threshold_us, u32 *scale, u32 *value)static void pcie_aspm_check_latency (struct pci_dev *endpoint) { -u32 latency, lnkcap_up, lnkcap_dw, l1_switch_latency =0 ; +u32 reg32, latency, encoding, lnkcap_up, lnkcap_dw, l1_switch_latency =0 ;struct aspm_latency latency_up, latency_dw;struct aspm_latency *acceptable;struct pcie_link_state *link;
@@ -386,7 +380,13 @@ static void pcie_aspm_check_latency(struct pci_dev *endpoint)return ; link = endpoint->bus->self->link_state; - acceptable = &link->acceptable[PCI_FUNC (endpoint->devfn)]; +pcie_capability_read_dword (endpoint,PCI_EXP_DEVCAP , ®32); +/* Calculate endpoint L0s acceptable latency */ + encoding = (reg32 &PCI_EXP_DEVCAP_L0S ) >>6 ; + acceptable->l0s =calc_l0s_acceptable (encoding); +/* Calculate endpoint L1 acceptable latency */ + encoding = (reg32 &PCI_EXP_DEVCAP_L1 ) >>9 ; + acceptable->l1 =calc_l1_acceptable (encoding);while (link) {/* Read direction exit latencies */
@@ -662,22 +662,11 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist)/* Get and check endpoint acceptable latencies */ list_for_each_entry (child, &linkbus->devices, bus_list) { -u32 reg32, encoding; -struct aspm_latency *acceptable = - &link->acceptable[PCI_FUNC (child->devfn)];if (pci_pcie_type (child) !=PCI_EXP_TYPE_ENDPOINT &&pci_pcie_type (child) !=PCI_EXP_TYPE_LEG_END )continue ; -pcie_capability_read_dword (child,PCI_EXP_DEVCAP , ®32); -/* Calculate endpoint L0s acceptable latency */ - encoding = (reg32 &PCI_EXP_DEVCAP_L0S ) >>6 ; - acceptable->l0s =calc_l0s_acceptable (encoding); -/* Calculate endpoint L1 acceptable latency */ - encoding = (reg32 &PCI_EXP_DEVCAP_L1 ) >>9 ; - acceptable->l1 =calc_l1_acceptable (encoding); -pcie_aspm_check_latency (child); } }
Signature · 1 line
2.20.1
RFC PATCH 3/3 PCI/ASPM: Remove struct aspm_latency
In reply to Saheed O. BolarinwaThe struct aspm_latency is now used only inside pcie_aspm_check_latency() Since this struct is trivial, it can be replaced with actual u32 variables within the function.
This will not impact any functionality.
- replace struct aspm_latency variables with u32 variables
- Remove struct aspm_latency
--- drivers/pci/pcie/aspm.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-)
drivers/pci/pcie/aspm.c +12 -18
@@ -41,11 +41,6 @@#define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1 | \ ASPM_STATE_L1SS) -struct aspm_latency { -u32 l0s;/* L0s latency (nsec) */ -u32 l1;/* L1 latency (nsec) */ -}; -struct pcie_link_state {struct pci_dev *pdev;/* Upstream component of the Link */ struct pci_dev *downstream;/* Downstream component, function 0 */
@@ -370,8 +365,8 @@ static void encode_l12_threshold(u32 threshold_us, u32 *scale, u32 *value)static void pcie_aspm_check_latency (struct pci_dev *endpoint) {u32 reg32, latency, encoding, lnkcap_up, lnkcap_dw, l1_switch_latency =0 ; -struct aspm_latency latency_up, latency_dw; -struct aspm_latency *acceptable; +u32 latency_up_l0s, latency_up_l1, latency_dw_l0s, latency_dw_l1; +u32 acceptable_l0s, acceptable_l1;struct pcie_link_state *link;/* Device not in D0 doesn't need latency check */
@@ -383,28 +378,28 @@ static void pcie_aspm_check_latency(struct pci_dev *endpoint)pcie_capability_read_dword (endpoint,PCI_EXP_DEVCAP , ®32);/* Calculate endpoint L0s acceptable latency */ encoding = (reg32 &PCI_EXP_DEVCAP_L0S ) >>6 ; - acceptable->l0s =calc_l0s_acceptable (encoding); + acceptable_l0s =calc_l0s_acceptable (encoding);/* Calculate endpoint L1 acceptable latency */ encoding = (reg32 &PCI_EXP_DEVCAP_L1 ) >>9 ; - acceptable->l1 =calc_l1_acceptable (encoding); + acceptable_l1 =calc_l1_acceptable (encoding);while (link) {/* Read direction exit latencies */ pcie_capability_read_dword (link->pdev,PCI_EXP_LNKCAP , &lnkcap_up);pcie_capability_read_dword (link->downstream,PCI_EXP_LNKCAP , &lnkcap_dw); - latency_up.l0s =calc_l0s_latency (lnkcap_up); - latency_up.l1 =calc_l1_latency (lnkcap_up); - latency_dw.l0s =calc_l0s_latency (lnkcap_dw); - latency_dw.l1 =calc_l1_latency (lnkcap_dw); + latency_up_l0s =calc_l0s_latency (lnkcap_up); + latency_up_l1 =calc_l1_latency (lnkcap_up); + latency_dw_l0s =calc_l0s_latency (lnkcap_dw); + latency_dw_l1 =calc_l1_latency (lnkcap_dw);/* Check upstream direction L0s latency */ if ((link->aspm_capable &ASPM_STATE_L0S_UP ) && - (latency_up.l0s > acceptable->l0s)) + (latency_up_l0s > acceptable_l0s)) link->aspm_capable &= ~ASPM_STATE_L0S_UP ;/* Check downstream direction L0s latency */ if ((link->aspm_capable &ASPM_STATE_L0S_DW ) && - (latency_dw.l0s > acceptable->l0s)) + (latency_dw_l0s > acceptable_l0s)) link->aspm_capable &= ~ASPM_STATE_L0S_DW ;/* * Check L1 latency.
@@ -419,9 +414,9 @@ static void pcie_aspm_check_latency(struct pci_dev *endpoint)* L1 exit latencies advertised by a device include L1 * substate latencies (and hence do not do any check). */ - latency =max_t (u32, latency_up.l1, latency_dw.l1); + latency =max_t (u32, latency_up_l1, latency_dw_l1);if ((link->aspm_capable &ASPM_STATE_L1 ) && - (latency + l1_switch_latency > acceptable->l1)) + (latency + l1_switch_latency > acceptable_l1)) link->aspm_capable &= ~ASPM_STATE_L1 ; l1_switch_latency +=1000 ;
@@ -662,7 +657,6 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist)/* Get and check endpoint acceptable latencies */ list_for_each_entry (child, &linkbus->devices, bus_list) { -if (pci_pcie_type (child) !=PCI_EXP_TYPE_ENDPOINT &&pci_pcie_type (child) !=PCI_EXP_TYPE_LEG_END )continue ;
Signature · 1 line
2.20.1