From: Sinan Kaya <okaya@codeaurora.org> To: linux-pci@vger.kernel.org, timur@codeaurora.org Cc: mayurkumar.patel@intel.com, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya <okaya@codeaurora.org>, Bjorn Helgaas <bhelgaas@google.com>, Rajat Jain <rajatja@google.com>, Julia Lawall <Julia.Lawall@lip6.fr>, Shawn Lin <shawn.lin@rock-chips.com>, Yinghai Lu <yinghai@kernel.org>, David Daney <david.daney@cavium.com>, linux-kernel@vger.kernel.org Subject: [PATCH V7 4/5] PCI/ASPM: save power on values during bridge init Date: Thu, 30 Mar 2017 09:30:35 -0400 [thread overview] Message-ID: <1490880636-30542-5-git-send-email-okaya@codeaurora.org> (raw) In-Reply-To: <1490880636-30542-1-git-send-email-okaya@codeaurora.org> Now that we added a hook to be called from device_add, save the default values from the HW registers early in the boot for further reuse during hot device add/remove operations. Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=194895 Signed-off-by: Sinan Kaya <okaya@codeaurora.org> --- drivers/pci/pcie/aspm.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index e33f84b..a38602a 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -505,8 +505,10 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist) */ if (dwreg.support & upreg.support & PCIE_LINK_STATE_L0S) link->aspm_support |= ASPM_STATE_L0S; - if (dwreg.enabled & PCIE_LINK_STATE_L0S) + if (dwreg.enabled & PCIE_LINK_STATE_L0S) { link->aspm_enabled |= ASPM_STATE_L0S_UP; + link->aspm_default |= ASPM_STATE_L0S_UP; + } if (upreg.enabled & PCIE_LINK_STATE_L0S) link->aspm_enabled |= ASPM_STATE_L0S_DW; link->latency_up.l0s = calc_l0s_latency(upreg.latency_encoding_l0s); @@ -542,9 +544,6 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist) if (link->aspm_support & ASPM_STATE_L1SS) aspm_calc_l1ss_info(link, &upreg, &dwreg); - /* Save default state */ - link->aspm_default = link->aspm_enabled; - /* Setup initial capable state. Will be updated later */ link->aspm_capable = link->aspm_support; /* @@ -835,11 +834,26 @@ static int pci_aspm_init_downstream(struct pci_dev *pdev) static int pci_aspm_init_upstream(struct pci_dev *pdev) { struct pcie_link_state *link; + struct aspm_register_info upreg; link = alloc_pcie_link_state(pdev); if (!link) return -ENOMEM; + pcie_get_aspm_reg(pdev, &upreg); + if (upreg.enabled & PCIE_LINK_STATE_L0S) + link->aspm_default |= ASPM_STATE_L0S_DW; + if (upreg.enabled & PCIE_LINK_STATE_L1) + link->aspm_default |= ASPM_STATE_L1; + if (upreg.l1ss_ctl1 & PCI_L1SS_CTL1_ASPM_L1_1) + link->aspm_default |= ASPM_STATE_L1_1; + if (upreg.l1ss_ctl1 & PCI_L1SS_CTL1_ASPM_L1_2) + link->aspm_default |= ASPM_STATE_L1_2; + if (upreg.l1ss_ctl1 & PCI_L1SS_CTL1_PCIPM_L1_1) + link->aspm_default |= ASPM_STATE_L1_1_PCIPM; + if (upreg.l1ss_ctl1 & PCI_L1SS_CTL1_PCIPM_L1_2) + link->aspm_default |= ASPM_STATE_L1_2_PCIPM; + return 0; } -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: okaya@codeaurora.org (Sinan Kaya) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V7 4/5] PCI/ASPM: save power on values during bridge init Date: Thu, 30 Mar 2017 09:30:35 -0400 [thread overview] Message-ID: <1490880636-30542-5-git-send-email-okaya@codeaurora.org> (raw) In-Reply-To: <1490880636-30542-1-git-send-email-okaya@codeaurora.org> Now that we added a hook to be called from device_add, save the default values from the HW registers early in the boot for further reuse during hot device add/remove operations. Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=194895 Signed-off-by: Sinan Kaya <okaya@codeaurora.org> --- drivers/pci/pcie/aspm.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index e33f84b..a38602a 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -505,8 +505,10 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist) */ if (dwreg.support & upreg.support & PCIE_LINK_STATE_L0S) link->aspm_support |= ASPM_STATE_L0S; - if (dwreg.enabled & PCIE_LINK_STATE_L0S) + if (dwreg.enabled & PCIE_LINK_STATE_L0S) { link->aspm_enabled |= ASPM_STATE_L0S_UP; + link->aspm_default |= ASPM_STATE_L0S_UP; + } if (upreg.enabled & PCIE_LINK_STATE_L0S) link->aspm_enabled |= ASPM_STATE_L0S_DW; link->latency_up.l0s = calc_l0s_latency(upreg.latency_encoding_l0s); @@ -542,9 +544,6 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist) if (link->aspm_support & ASPM_STATE_L1SS) aspm_calc_l1ss_info(link, &upreg, &dwreg); - /* Save default state */ - link->aspm_default = link->aspm_enabled; - /* Setup initial capable state. Will be updated later */ link->aspm_capable = link->aspm_support; /* @@ -835,11 +834,26 @@ static int pci_aspm_init_downstream(struct pci_dev *pdev) static int pci_aspm_init_upstream(struct pci_dev *pdev) { struct pcie_link_state *link; + struct aspm_register_info upreg; link = alloc_pcie_link_state(pdev); if (!link) return -ENOMEM; + pcie_get_aspm_reg(pdev, &upreg); + if (upreg.enabled & PCIE_LINK_STATE_L0S) + link->aspm_default |= ASPM_STATE_L0S_DW; + if (upreg.enabled & PCIE_LINK_STATE_L1) + link->aspm_default |= ASPM_STATE_L1; + if (upreg.l1ss_ctl1 & PCI_L1SS_CTL1_ASPM_L1_1) + link->aspm_default |= ASPM_STATE_L1_1; + if (upreg.l1ss_ctl1 & PCI_L1SS_CTL1_ASPM_L1_2) + link->aspm_default |= ASPM_STATE_L1_2; + if (upreg.l1ss_ctl1 & PCI_L1SS_CTL1_PCIPM_L1_1) + link->aspm_default |= ASPM_STATE_L1_1_PCIPM; + if (upreg.l1ss_ctl1 & PCI_L1SS_CTL1_PCIPM_L1_2) + link->aspm_default |= ASPM_STATE_L1_2_PCIPM; + return 0; } -- 1.9.1
next prev parent reply other threads:[~2017-03-30 13:30 UTC|newest] Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-30 13:30 [PATCH V7 0/5] PCI/ASPM: reconfigure ASPM following hotplug for POLICY_DEFAULT Sinan Kaya 2017-03-30 13:30 ` Sinan Kaya 2017-03-30 13:30 ` [PATCH V7 1/5] PCI/ASPM: introduce pci_aspm_init() and add to pci_init_capabilities() Sinan Kaya 2017-03-30 13:30 ` Sinan Kaya 2017-03-30 13:30 ` Sinan Kaya 2017-03-30 13:30 ` [PATCH V7 2/5] PCI/ASPM: split pci_aspm_init() into two Sinan Kaya 2017-03-30 13:30 ` Sinan Kaya 2017-03-30 13:30 ` [PATCH V7 3/5] PCI/ASPM: add init hook to device_add Sinan Kaya 2017-03-30 13:30 ` Sinan Kaya 2017-03-30 13:30 ` Sinan Kaya [this message] 2017-03-30 13:30 ` [PATCH V7 4/5] PCI/ASPM: save power on values during bridge init Sinan Kaya 2017-03-30 13:30 ` [PATCH V7 5/5] PCI/ASPM: move link_state cleanup to bridge remove Sinan Kaya 2017-03-30 13:30 ` Sinan Kaya 2017-04-04 13:13 ` [PATCH V7 0/5] PCI/ASPM: reconfigure ASPM following hotplug for POLICY_DEFAULT Sinan Kaya 2017-04-04 13:13 ` Sinan Kaya 2017-04-04 13:13 ` Sinan Kaya 2017-04-04 15:02 ` Patel, Mayurkumar 2017-04-04 15:02 ` Patel, Mayurkumar 2017-04-04 15:02 ` Patel, Mayurkumar 2017-04-06 13:23 ` Patel, Mayurkumar 2017-04-06 13:23 ` Patel, Mayurkumar 2017-04-06 13:23 ` Patel, Mayurkumar 2017-04-06 15:19 ` Sinan Kaya 2017-04-06 15:19 ` Sinan Kaya 2017-04-06 15:19 ` Sinan Kaya 2017-04-06 17:10 ` Rajat Jain 2017-04-06 17:10 ` Rajat Jain 2017-04-06 17:10 ` Rajat Jain 2017-04-07 0:34 ` Sinan Kaya 2017-04-07 0:34 ` Sinan Kaya 2017-04-07 0:34 ` Sinan Kaya 2017-04-07 16:46 ` Rajat Jain 2017-04-07 16:46 ` Rajat Jain 2017-04-07 9:03 ` Patel, Mayurkumar 2017-04-07 9:03 ` Patel, Mayurkumar 2017-04-07 9:03 ` Patel, Mayurkumar 2017-04-07 13:09 ` Sinan Kaya 2017-04-07 13:09 ` Sinan Kaya 2017-04-07 13:09 ` Sinan Kaya 2017-04-08 5:03 ` Sinan Kaya 2017-04-08 5:03 ` Sinan Kaya 2017-04-08 5:03 ` Sinan Kaya 2017-04-07 17:15 ` Rajat Jain 2017-04-07 17:15 ` Rajat Jain 2017-04-10 11:44 ` Patel, Mayurkumar 2017-04-10 11:44 ` Patel, Mayurkumar 2017-04-10 11:44 ` Patel, Mayurkumar 2017-04-06 15:36 ` Sinan Kaya 2017-04-06 15:36 ` Sinan Kaya 2017-04-06 15:36 ` Sinan Kaya 2017-04-06 15:56 ` Patel, Mayurkumar 2017-04-06 15:56 ` Patel, Mayurkumar 2017-04-06 15:56 ` Patel, Mayurkumar
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1490880636-30542-5-git-send-email-okaya@codeaurora.org \ --to=okaya@codeaurora.org \ --cc=Julia.Lawall@lip6.fr \ --cc=bhelgaas@google.com \ --cc=david.daney@cavium.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=mayurkumar.patel@intel.com \ --cc=rajatja@google.com \ --cc=shawn.lin@rock-chips.com \ --cc=timur@codeaurora.org \ --cc=yinghai@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.