From: Vidya Sagar <vidyas@nvidia.com>
To: <thierry.reding@gmail.com>, <bhelgaas@google.com>,
<swarren@wwwdotorg.org>
Cc: <kthota@nvidia.com>, <linux-tegra@vger.kernel.org>,
<linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Vidya Sagar <vidyas@nvidia.com>
Subject: [PATCH v2] PCI: tegra: Enable root port specific features
Date: Mon, 20 Oct 2014 16:34:51 +0530 [thread overview]
Message-ID: <1413803091-10824-1-git-send-email-vidyas@nvidia.com> (raw)
Enables root port to advertise its ASPM-L1 capability
resulting in possible link entry to L1 when an ASPM-L1 capable
device is connected
Enables per-controller & per-TMS clock clamping by default
Enabling above features result in more power saving
It also avoids PM message truncation by waiting for DLLP to finish
before entering into L1 or L2
Signed-off-by: Vidya Sagar <vidyas@nvidia.com>
---
v2:
Removed rp_read() & rp_write() as they seem to be redundant
Moved port disable code under error condition i.e. it the link
is down, corresponding port will be disabled
drivers/pci/host/pci-tegra.c | 50 +++++++++++++++++++++++++++++++++++++++-----
1 file changed, 45 insertions(+), 5 deletions(-)
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
index 3d43874..7f32b07 100644
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -237,6 +237,18 @@
(0xf << PADS_REFCLK_CFG_DRVI_SHIFT) \
)
+#define NV_PCIE2_RP_VEND_XP1 0x00000F04
+#define NV_PCIE2_RP_VEND_XP_LINK_PVT_CTL_L1_ASPM_SUPPORT (1 << 21)
+
+#define NV_PCIE2_RP_VEND_XP_BIST 0x00000F4C
+#define PCIE2_RP_VEND_XP_BIST_GOTO_L1_L2_AFTER_DLLP_DONE (1 << 28)
+
+#define NV_PCIE2_RP_PRIV_MISC 0x00000FE0
+#define PCIE2_RP_PRIV_MISC_CTLR_CLK_CLAMP_THRESHOLD (0xF << 16)
+#define PCIE2_RP_PRIV_MISC_CTLR_CLK_CLAMP_ENABLE (1 << 23)
+#define PCIE2_RP_PRIV_MISC_TMS_CLK_CLAMP_THRESHOLD (0xF << 24)
+#define PCIE2_RP_PRIV_MISC_TMS_CLK_CLAMP_ENABLE (1 << 31)
+
struct tegra_msi {
struct msi_chip chip;
DECLARE_BITMAP(used, INT_PCI_MSI_NR);
@@ -1859,6 +1871,32 @@ retry:
return false;
}
+/* Enable various features of root port */
+static void tegra_pcie_enable_rp_features(struct tegra_pcie_port *port)
+{
+ unsigned int data;
+
+ /* Power mangagement settings */
+ /* Enable clock clamping by default */
+ data = readl(port->base + NV_PCIE2_RP_PRIV_MISC);
+ data |= PCIE2_RP_PRIV_MISC_CTLR_CLK_CLAMP_THRESHOLD |
+ PCIE2_RP_PRIV_MISC_CTLR_CLK_CLAMP_ENABLE |
+ PCIE2_RP_PRIV_MISC_TMS_CLK_CLAMP_THRESHOLD |
+ PCIE2_RP_PRIV_MISC_TMS_CLK_CLAMP_ENABLE;
+ writel(data, port->base + NV_PCIE2_RP_PRIV_MISC);
+
+ /* Enable rootport to advertise its ASPM - L1 capability */
+ data = readl(port->base + NV_PCIE2_RP_VEND_XP1);
+ data |= NV_PCIE2_RP_VEND_XP_LINK_PVT_CTL_L1_ASPM_SUPPORT;
+ writel(data, port->base + NV_PCIE2_RP_VEND_XP1);
+
+ /* LTSSM : wait for DLLP to finish before entering L1 or L2/L3 */
+ /* to avoid truncating PM messages resulting in receiver errors */
+ data = readl(port->base + NV_PCIE2_RP_VEND_XP_BIST);
+ data |= PCIE2_RP_VEND_XP_BIST_GOTO_L1_L2_AFTER_DLLP_DONE;
+ writel(data, port->base + NV_PCIE2_RP_VEND_XP_BIST);
+}
+
static int tegra_pcie_enable(struct tegra_pcie *pcie)
{
struct tegra_pcie_port *port, *tmp;
@@ -1870,13 +1908,15 @@ static int tegra_pcie_enable(struct tegra_pcie *pcie)
tegra_pcie_port_enable(port);
- if (tegra_pcie_port_check_link(port))
+ if (!tegra_pcie_port_check_link(port)) {
+ dev_info(pcie->dev, "link %u down, ignoring\n",
+ port->index);
+ tegra_pcie_port_disable(port);
+ tegra_pcie_port_free(port);
continue;
+ }
- dev_info(pcie->dev, "link %u down, ignoring\n", port->index);
-
- tegra_pcie_port_disable(port);
- tegra_pcie_port_free(port);
+ tegra_pcie_enable_rp_features(port);
}
memset(&hw, 0, sizeof(hw));
--
1.8.1.5
next reply other threads:[~2014-10-20 11:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-20 11:04 Vidya Sagar [this message]
2014-10-20 16:52 ` [PATCH v2] PCI: tegra: Enable root port specific features Stephen Warren
2014-10-28 14:51 ` Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2014-10-10 5:15 Vidya Sagar
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=1413803091-10824-1-git-send-email-vidyas@nvidia.com \
--to=vidyas@nvidia.com \
--cc=bhelgaas@google.com \
--cc=kthota@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=swarren@wwwdotorg.org \
--cc=thierry.reding@gmail.com \
/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).