Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp303465iog; Fri, 17 Jun 2022 04:04:10 -0700 (PDT) X-Google-Smtp-Source: AGRyM1svGou8Ens3o6AtyPJM7t447BgPJDawozfoFHi9HHieYKHi+KQU+u2SQ4bHKXvDIVHisOIj X-Received: by 2002:aa7:870b:0:b0:522:c223:5c5e with SMTP id b11-20020aa7870b000000b00522c2235c5emr9551865pfo.6.1655463850460; Fri, 17 Jun 2022 04:04:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655463850; cv=none; d=google.com; s=arc-20160816; b=f3wzOdwgGWxP5vaS0lGLfty4FKEW5yR0icrlCYMJ/azZB7Aml6aXfbOLvxLZMWtbTj vEkYVNoIUfkdcUyenqG+n4UqRQJfjsaCFQmOndjXywUStLGMNVkpuI1Uszzs37wW9DIi 1hgm/SEjTHcFDun5jSZqGtamrhosd/qRz+GWWV+bPPsLEcoospd8gaE5/p3Xmfo7xlAB WPaFbC4hUDgtusP82VCzuKsvOGKxnLheCGJ+BDljpk1sh0ZWnPeQhZFnDK1e4fy45Tyz 9gKXSqb/hbw16fQUbQFq+dsvA6rdBM84UQbDprmWWobGtQ4oaKCa6Z6bTLyZWbay8z+u uCWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=kngfGfO8IOMiSznHMlB8SattwLujVitQIe1kM2YdG7M=; b=cYOcNn4Tl93bfFw/PVoR1nxWHK+q+QJ91jVODw4QLxYS7ZFQEJttAyZi09gqNTQIIk RpsI69JpCmet9cll3V0FNvN7ijK98sYLK90BH0g29xg07Z2UAiiAsbkjK0By3gprKUpn YK8WoWrFy/5AlwHfXkjVlbpGuOJ3rxnvCBRHZUtZXTop+IwUTjOkvXqQRayho+J1+DuF fTMlA5mXxsS1//6qN/WbIq+apa2l8AI+VcnOCbeAl5P3q25vUdn8oSGd5EHGoUXxyCum aiFIygQ1Knsilg653TObLBYjN4gW6uaFkJV2O+3naOccZca4se8tbB0LDCMmBdqU4zkL 6XmA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g2-20020a635642000000b003fc1bb74001si5245681pgm.54.2022.06.17.04.03.36; Fri, 17 Jun 2022 04:04:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382172AbiFQKp5 (ORCPT + 99 others); Fri, 17 Jun 2022 06:45:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1382143AbiFQKpj (ORCPT ); Fri, 17 Jun 2022 06:45:39 -0400 Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 999E96B7CD; Fri, 17 Jun 2022 03:45:29 -0700 (PDT) Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 1439E200026; Fri, 17 Jun 2022 12:45:28 +0200 (CEST) Received: from aprdc01srsp001v.ap-rdc01.nxp.com (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id D0E28200007; Fri, 17 Jun 2022 12:45:27 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id 40595180222A; Fri, 17 Jun 2022 18:45:26 +0800 (+08) From: Richard Zhu To: l.stach@pengutronix.de, bhelgaas@google.com, robh+dt@kernel.org, broonie@kernel.org, lorenzo.pieralisi@arm.com, festevam@gmail.com, francesco.dolcini@toradex.com Cc: hongxing.zhu@nxp.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, linux-imx@nxp.com Subject: [PATCH v13 12/15] PCI: imx6: Mark the link down as non-fatal error Date: Fri, 17 Jun 2022 18:31:11 +0800 Message-Id: <1655461874-16908-13-git-send-email-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1655461874-16908-1-git-send-email-hongxing.zhu@nxp.com> References: <1655461874-16908-1-git-send-email-hongxing.zhu@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Let the driver probe successfully, return zero in imx6_pcie_start_link() when PCIe link is down. Link: https://lore.kernel.org/r/1655189942-12678-7-git-send-email-hongxing.zhu@nxp.com Signed-off-by: Richard Zhu Signed-off-by: Bjorn Helgaas --- drivers/pci/controller/dwc/pci-imx6.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 0b168f0d57b8..e236f824c808 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -836,7 +836,9 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) /* Start LTSSM. */ imx6_pcie_ltssm_enable(dev); - dw_pcie_wait_for_link(pci); + ret = dw_pcie_wait_for_link(pci); + if (ret) + goto err_reset_phy; if (pci->link_gen == 2) { /* Allow Gen2 mode after the link is up. */ @@ -872,7 +874,9 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) } /* Make sure link training is finished as well! */ - dw_pcie_wait_for_link(pci); + ret = dw_pcie_wait_for_link(pci); + if (ret) + goto err_reset_phy; } else { dev_info(dev, "Link: Gen2 disabled\n"); } @@ -886,7 +890,7 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG0), dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG1)); imx6_pcie_reset_phy(imx6_pcie); - return ret; + return 0; } static int imx6_pcie_host_init(struct pcie_port *pp) -- 2.25.1