Skip to content

Commit

Permalink
PCI: imx6: Remove broken Gen2 workaround
Browse files Browse the repository at this point in the history
Remove 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 workaround should be added to the lane speed change in establish_link
later.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Lucas Stach authored and Bjorn Helgaas committed Jan 25, 2016
1 parent 54a47a8 commit a77c542
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions drivers/pci/host/pci-imx6.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit a77c542

Please sign in to comment.