From patchwork Wed Feb 12 07:27:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 3634541 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 58F079F369 for ; Wed, 12 Feb 2014 07:28:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D6BD20160 for ; Wed, 12 Feb 2014 07:28:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8176C20123 for ; Wed, 12 Feb 2014 07:28:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751115AbaBLH2Q (ORCPT ); Wed, 12 Feb 2014 02:28:16 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:34571 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751087AbaBLH2Q (ORCPT ); Wed, 12 Feb 2014 02:28:16 -0500 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WDUEu-0002Y9-HO; Wed, 12 Feb 2014 08:28:12 +0100 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.82) (envelope-from ) id 1WDUEs-00062u-RR; Wed, 12 Feb 2014 08:28:10 +0100 From: Sascha Hauer To: linux-pci@vger.kernel.org Cc: kernel@pengutronix.de, Sascha Hauer , Richard Zhu , Shawn Guo , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Marek Vasut Subject: [PATCH] PCI: imx6: Fix link_up detection Date: Wed, 12 Feb 2014 08:27:55 +0100 Message-Id: <1392190075-23204-1-git-send-email-s.hauer@pengutronix.de> X-Mailer: git-send-email 1.8.5.3 X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-pci@vger.kernel.org Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is broken since: | commit e6daf4a5e1b813bc7f85507ec83b8c2452c121e6 | Author: Marek Vasut | Date: Thu Dec 12 22:49:59 2013 +0100 | | PCI: imx6: Report "link up" only after link training completes | | While waiting for the PHY to report the PCIe link is up, we might hit a | situation where the link training is still in progress, while the PHY | already reports the link is up. Add additional check for this condition. | | Signed-off-by: Marek Vasut | Signed-off-by: Bjorn Helgaas | Acked-by: Shawn Guo The problem is: Before the above commit only the PCIE_PHY_DEBUG_R1_XMLH_LINK_UP bit was used to determine whether the link is up or not. Since the above commit also the PCIE_PHY_DEBUG_R1_XMLH_LINK_IN_TRAINING is used. This means a link still being trained is as link down. The designware driver changes the PORT_LOGIC_SPEED_CHANGE bit in dw_pcie_host_init() which causes the link to be retrained. During the next call to dw_pcie_rd_conf() the link is then reported being down and the function returns PCIBIOS_DEVICE_NOT_FOUND resulting in nonfunctioning PCIe. This patch fixes this by waiting until the link training has finished before testing the PCIE_PHY_DEBUG_R1_XMLH_LINK_UP bit. This is hardly the correct solution, but I don't know what should be done instead. Signed-off-by: Sascha Hauer Cc: Richard Zhu (maintainer:PCI DRIVER FOR IMX6) Cc: Shawn Guo (maintainer:PCI DRIVER FOR IMX6) Cc: Bjorn Helgaas (supporter:PCI SUBSYSTEM) Cc: linux-pci@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: Marek Vasut --- drivers/pci/host/pci-imx6.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c index 866bdc7..9b6b501 100644 --- a/drivers/pci/host/pci-imx6.c +++ b/drivers/pci/host/pci-imx6.c @@ -449,6 +449,7 @@ static void imx6_pcie_reset_phy(struct pcie_port *pp) static int imx6_pcie_link_up(struct pcie_port *pp) { u32 rc, ltssm, rx_valid; + int count = 1000; /* * Test if the PHY reports that the link is up and also that @@ -458,8 +459,13 @@ static int imx6_pcie_link_up(struct pcie_port *pp) * as well here. */ rc = readl(pp->dbi_base + PCIE_PHY_DEBUG_R1); - if ((rc & PCIE_PHY_DEBUG_R1_XMLH_LINK_UP) && - !(rc & PCIE_PHY_DEBUG_R1_XMLH_LINK_IN_TRAINING)) + while (rc & PCIE_PHY_DEBUG_R1_XMLH_LINK_IN_TRAINING) { + if (!count--) + return 0; + rc = readl(pp->dbi_base + PCIE_PHY_DEBUG_R1); + } + + if (rc & PCIE_PHY_DEBUG_R1_XMLH_LINK_UP) return 1; /*