From: Sinan Kaya <okaya@codeaurora.org>
To: linux-pci@vger.kernel.org, timur@codeaurora.org
Cc: mayurkumar.patel@intel.com, David Daney <david.daney@cavium.com>,
linux-arm-msm@vger.kernel.org,
Shawn Lin <shawn.lin@rock-chips.com>,
linux-kernel@vger.kernel.org, Sinan Kaya <okaya@codeaurora.org>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Bjorn Helgaas <bhelgaas@google.com>,
Rajat Jain <rajatja@google.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH V5 4/4] PCI/ASPM: move link_state cleanup to bridge remove
Date: Sat, 25 Mar 2017 17:38:13 -0400 [thread overview]
Message-ID: <1490477893-9517-5-git-send-email-okaya@codeaurora.org> (raw)
In-Reply-To: <1490477893-9517-1-git-send-email-okaya@codeaurora.org>
For endpoints, change pcie_aspm_exit_link_state() so it cleans up
the device's own state and disables ASPM if necessary, but doesn't
remove the parent's link_state.
For bridges, change pcie_aspm_exit_link_state() so it frees the
bridge's own link_state.
Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=194895
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
drivers/pci/pcie/aspm.c | 20 +++++++++++++++-----
drivers/pci/remove.c | 3 +--
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index f48bb29..db3fbd9 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -947,6 +947,21 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
struct pci_dev *parent = pdev->bus->self;
struct pcie_link_state *link, *root, *parent_link;
+ if (pdev->has_secondary_link) {
+ link = pdev->link_state;
+ down_read(&pci_bus_sem);
+ mutex_lock(&aspm_lock);
+
+ list_del(&link->sibling);
+ list_del(&link->link);
+
+ /* Clock PM is for endpoint device */
+ free_link_state(link);
+ mutex_unlock(&aspm_lock);
+ up_read(&pci_bus_sem);
+ return;
+ }
+
if (!parent || !parent->link_state)
return;
@@ -965,11 +980,6 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
/* All functions are removed, so just disable ASPM for the link */
pcie_config_aspm_link(link, 0);
- list_del(&link->sibling);
- list_del(&link->link);
- /* Clock PM is for endpoint device */
- free_link_state(link);
-
/* Recheck latencies and configure upstream links */
if (parent_link) {
pcie_update_aspm_capable(root);
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 73a03d3..7e14ebd 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -25,8 +25,7 @@ static void pci_stop_dev(struct pci_dev *dev)
dev->is_added = 0;
}
- if (dev->bus->self)
- pcie_aspm_exit_link_state(dev);
+ pcie_aspm_exit_link_state(dev);
}
static void pci_destroy_dev(struct pci_dev *dev)
--
1.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2017-03-25 21:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-25 21:38 [PATCH V5 0/4] PCI/ASPM: reconfigure ASPM following hotplug for POLICY_DEFAULT Sinan Kaya
2017-03-25 21:38 ` [PATCH V5 1/4] PCI/ASPM: introduce pci_aspm_init() and add to pci_init_capabilities() Sinan Kaya
2017-03-25 21:38 ` [PATCH V5 2/4] PCI/ASPM: add init hook to device_add Sinan Kaya
2017-03-25 21:38 ` [PATCH V5 3/4] PCI/ASPM: save power on values during bridge init Sinan Kaya
2017-03-25 21:38 ` Sinan Kaya [this message]
2017-03-28 4:37 ` [PATCH V5 0/4] PCI/ASPM: reconfigure ASPM following hotplug for POLICY_DEFAULT Sinan Kaya
2017-03-28 6:02 ` Patel, Mayurkumar
2017-03-28 12:52 ` Sinan Kaya
2017-03-28 13:04 ` Sinan Kaya
2017-03-29 13:18 ` Sinan Kaya
2017-03-29 17:27 ` Patel, Mayurkumar
2017-03-29 19:09 ` Sinan Kaya
2017-03-29 20:16 ` Patel, Mayurkumar
2017-03-29 20:36 ` Sinan Kaya
2017-03-29 23:08 ` Sinan Kaya
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=1490477893-9517-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 \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).