Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp1180542iog; Tue, 14 Jun 2022 00:22:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFtzTFABt6mikl9tMEZeNM7nlae3mv8/qIF0fGYmzHf/DNPbMkujBxYtJ0+MiUcMjaN+Pu X-Received: by 2002:a17:906:a898:b0:70f:efe0:bfc2 with SMTP id ha24-20020a170906a89800b0070fefe0bfc2mr3044130ejb.59.1655191377962; Tue, 14 Jun 2022 00:22:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655191377; cv=none; d=google.com; s=arc-20160816; b=dRw2d3nvzNPdMEQB1j1EYORYbbKO5lVVOj452Gh2mXFmZ+SVFSRUXn+nJBC+2u066S t1RRdkFGHFNX3HGnpU/jOEoV3m20mMdY+MnaEMUTUmdNxLz0JQYcy2cErJtSc61mbQju G8PDJtofo7S1y7RrWDkzamN5wmzdFdjMwUjpcu6LXwOXtTSpFyvabb+Ti+Aszi6K/lQG LhwnbS+cqZcSVI2GFzDT20qwPcciEgwBsQ1JUzxzFGCqtUwD5ht1rkTWYA0KoTZJP1PN bidp7dBmR4VxP2gzlHbe6LR6WXxF1jxRsOhrLlSPb2TBK91PYpDe7OR0VDZtRianiCf6 1fCw== 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=iobMldE2D8N2lE3QBUaDZ6akWr1CXgTMhhp2lKS4yRc=; b=FfTlOtGjqrgRMBnia331i289FnY7Z9JPefSDH12Xg4S9eVWvItW7ljDZokZVmR6Nmp cPrI617Z2JYYAP51XXklaKw15D8Imap0OW6GQG4IVsaRv7myT6QAaEO3yEFptLt1tCDu aLdYMs9KOFtQ3mXxdLZk2fPx7mcfA7B8qnxFGJJo0Mv0kenzpZNfmMGw74c65A1KjFsv HKOk53Xih/yNPOcFL9A/sk18o0yRC903XAbUUAAQhwEFXV6SicVrpk2WX25w+h4PIRdf EC8QvM1RIBM/amk6lzy0AyFSy9I3shT5/D1zhG9HPIPTyzDGQpZBKyNAIE1ubzfKw0jC qzaw== 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 hg7-20020a1709072cc700b006ff17ba1a4dsi11246631ejc.275.2022.06.14.00.22.33; Tue, 14 Jun 2022 00:22:57 -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 S1353891AbiFNHN3 (ORCPT + 99 others); Tue, 14 Jun 2022 03:13:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353512AbiFNHNC (ORCPT ); Tue, 14 Jun 2022 03:13:02 -0400 Received: from inva020.nxp.com (inva020.nxp.com [92.121.34.13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95F9114095; Tue, 14 Jun 2022 00:12:59 -0700 (PDT) Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 0A7331A2788; Tue, 14 Jun 2022 09:12:58 +0200 (CEST) Received: from aprdc01srsp001v.ap-rdc01.nxp.com (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id C6F141A00CD; Tue, 14 Jun 2022 09:12:57 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id 346581802205; Tue, 14 Jun 2022 15:12:56 +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 v11 6/8] PCI: imx6: Mark the link down as none fatal error Date: Tue, 14 Jun 2022 14:59:00 +0800 Message-Id: <1655189942-12678-7-git-send-email-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1655189942-12678-1-git-send-email-hongxing.zhu@nxp.com> References: <1655189942-12678-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. Signed-off-by: Richard Zhu --- 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 c05974abd954..68d0bd703bbd 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -850,7 +850,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. */ @@ -886,7 +888,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"); } @@ -900,7 +904,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