From: Lucas Stach <l.stach@pengutronix.de>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Richard Zhu <Richard.Zhu@freescale.com>,
linux-pci@vger.kernel.org, kernel@pengutronix.de,
patchwork-lst@pengutronix.de
Subject: [PATCH 3/4] PCI: imx6: remove broken Gen2 workaround
Date: Fri, 15 Jan 2016 19:56:49 +0100 [thread overview]
Message-ID: <1452884210-11359-4-git-send-email-l.stach@pengutronix.de> (raw)
In-Reply-To: <1452884210-11359-1-git-send-email-l.stach@pengutronix.de>
This removes the remnants of the workaround for erratum ERR005184
which was never completely implemented. The checks alone don't
carry any value as we don't act properly on the result.
A proper implementation of the workaround should be added to
the lane speed change in establish_link later.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
drivers/pci/host/pci-imx6.c | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
index 3bb8ccc68792..f38aa7678868 100644
--- a/drivers/pci/host/pci-imx6.c
+++ b/drivers/pci/host/pci-imx6.c
@@ -467,7 +467,7 @@ static void imx6_pcie_host_init(struct pcie_port *pp)
static int imx6_pcie_link_up(struct pcie_port *pp)
{
- u32 rc, debug_r0, rx_valid;
+ u32 rc;
int count = 5;
/*
@@ -501,21 +501,6 @@ static int imx6_pcie_link_up(struct pcie_port *pp)
*/
usleep_range(1000, 2000);
}
- /*
- * From L0, initiate MAC entry to gen2 if EP/RC supports gen2.
- * Wait 2ms (LTSSM timeout is 24ms, PHY lock is ~5us in gen2).
- * If (MAC/LTSSM.state == Recovery.RcvrLock)
- * && (PHY/rx_valid==0) then pulse PHY/rx_reset. Transition
- * to gen2 is stuck
- */
- pcie_phy_read(pp->dbi_base, PCIE_PHY_RX_ASIC_OUT, &rx_valid);
- debug_r0 = readl(pp->dbi_base + PCIE_PHY_DEBUG_R0);
-
- if (rx_valid & PCIE_PHY_RX_ASIC_OUT_VALID)
- return 0;
-
- if ((debug_r0 & 0x3f) != 0x0d)
- return 0;
return 0;
}
--
2.6.4
next prev parent reply other threads:[~2016-01-15 18:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 18:56 [PATCH 0/4] i.MX6 sleep while atomic bugfix Lucas Stach
2016-01-15 18:56 ` [PATCH 1/4] PCI: imx6: move PHY reset function to other PHY handling functions Lucas Stach
2016-01-15 18:56 ` [PATCH 2/4] PCI: imx6: move PHY reset into establish_link Lucas Stach
2016-01-15 18:56 ` Lucas Stach [this message]
2016-01-15 18:56 ` [PATCH 4/4] PCI: imx6: move link up check into establish link path Lucas Stach
2016-01-25 22:58 ` [PATCH 0/4] i.MX6 sleep while atomic bugfix Bjorn Helgaas
2016-01-25 23:00 ` Bjorn Helgaas
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=1452884210-11359-4-git-send-email-l.stach@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=Richard.Zhu@freescale.com \
--cc=bhelgaas@google.com \
--cc=kernel@pengutronix.de \
--cc=linux-pci@vger.kernel.org \
--cc=patchwork-lst@pengutronix.de \
/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).