Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp303066pxb; Fri, 15 Oct 2021 06:00:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeYj7cwxTje7pvmnmahgf7IZZ2Hi5sjRkK+lGsA/9Wr8ZNFW4sI5JtzxNr1HNMSxpaZQDb X-Received: by 2002:a05:6402:42c8:: with SMTP id i8mr18226453edc.349.1634302808350; Fri, 15 Oct 2021 06:00:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634302808; cv=none; d=google.com; s=arc-20160816; b=UZTaPjH52BUTP33XcIdm131PxjBmLd1CxXCmtilXT8Ftsesh3enTj+AL1Zxh+sRxsa NceQneWibW0lmTnO5rypXBVl3KtBqq4+IfpTbNtV2SW8CS7pLV0b4ArfdI/sDx6QWdIW siydqTOXcW3I9y7cHgUQFqruNHlc/jecCpBWFx4/gJFXZqQivT/BB2Hr8uM5bbpa+bkC Sfm5c4TvX54atsBnwR/2+BmwrqTirfGVbPS2T6/KVkZYvcAXyvdZS8V8IfeNcCwwN/To yage9/ET8K2OCrLWOT+RfE0mzISR8aqxO4M2aBzkWf6IjM6AVk5BAJnbxw3n+DS6sd75 hRWA== 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=q7Lsri4y6CWGd96yxRKRYaVjvxwGgeRJQDC+jZ4oI/8=; b=01vAbLhZhyqWWwEalc+T14o6ebkEBhQaLpcPfnM1mfd3UHadzL05sM87VGYAXkAYSH qh7t1duVe0w8PVa6ADosQQ7EmfexgrSpfxAncrhQ0nUoRWrA+jq1arIj+duBje8fim6o xUkEULL2jEIayOEHHZTcoZN6PtgM0hsIsIXNm+tiBiay9qKy9Y54qJZJLkdJ2kOarKZq g7NBdJ8Ek7T3dVBhTEj+Id5JLv7OEm0NMHNc02oB1EvkEiBfGszwG7LfOXy6mNfVjJA4 ipdwPKa4dQXDboweJH0dpBAN7St5f9aDd5EF+1Y1hWIBWaY2ilXLk2EhluCTEHoyvXXi dC5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id kx10si7813481ejc.472.2021.10.15.05.59.17; Fri, 15 Oct 2021 06:00:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S231838AbhJOGcu (ORCPT + 99 others); Fri, 15 Oct 2021 02:32:50 -0400 Received: from inva021.nxp.com ([92.121.34.21]:49790 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234441AbhJOGcr (ORCPT ); Fri, 15 Oct 2021 02:32:47 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 0DF3D2016CA; Fri, 15 Oct 2021 08:30:40 +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 C9EA42016AD; Fri, 15 Oct 2021 08:30:39 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id ABDA4183AD27; Fri, 15 Oct 2021 14:30:38 +0800 (+08) From: Richard Zhu To: l.stach@pengutronix.de, bhelgaas@google.com, lorenzo.pieralisi@arm.com Cc: linux-pci@vger.kernel.org, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Richard Zhu Subject: [RESEND v2 2/5] PCI: imx6: Add the error propagation from host_init Date: Fri, 15 Oct 2021 14:05:38 +0800 Message-Id: <1634277941-6672-3-git-send-email-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1634277941-6672-1-git-send-email-hongxing.zhu@nxp.com> References: <1634277941-6672-1-git-send-email-hongxing.zhu@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since there is error return check of the host_init callback, add error check to imx6_pcie_deassert_core_reset() function, and change the function type accordingly. Signed-off-by: Richard Zhu --- drivers/pci/controller/dwc/pci-imx6.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 1fa1dba6da81..3372775834a2 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -527,24 +527,24 @@ static void imx7d_pcie_wait_for_phy_pll_lock(struct imx6_pcie *imx6_pcie) dev_err(dev, "PCIe PLL lock timeout\n"); } -static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) +static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) { struct dw_pcie *pci = imx6_pcie->pci; struct device *dev = pci->dev; - int ret; + int ret, err; if (imx6_pcie->vpcie && !regulator_is_enabled(imx6_pcie->vpcie)) { ret = regulator_enable(imx6_pcie->vpcie); if (ret) { dev_err(dev, "failed to enable vpcie regulator: %d\n", ret); - return; + return ret; } } - ret = imx6_pcie_clk_enable(imx6_pcie); - if (ret) { - dev_err(dev, "unable to enable pcie clocks\n"); + err = imx6_pcie_clk_enable(imx6_pcie); + if (err) { + dev_err(dev, "unable to enable pcie clocks: %d\n", err); goto err_clks; } @@ -599,7 +599,7 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) break; } - return; + return 0; err_clks: if (imx6_pcie->vpcie && regulator_is_enabled(imx6_pcie->vpcie) > 0) { @@ -608,6 +608,7 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) dev_err(dev, "failed to disable vpcie regulator: %d\n", ret); } + return err; } static void imx6_pcie_configure_type(struct imx6_pcie *imx6_pcie) @@ -858,11 +859,18 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) static int imx6_pcie_host_init(struct pcie_port *pp) { struct dw_pcie *pci = to_dw_pcie_from_pp(pp); + struct device *dev = pci->dev; struct imx6_pcie *imx6_pcie = to_imx6_pcie(pci); + int ret; imx6_pcie_assert_core_reset(imx6_pcie); imx6_pcie_init_phy(imx6_pcie); - imx6_pcie_deassert_core_reset(imx6_pcie); + ret = imx6_pcie_deassert_core_reset(imx6_pcie); + if (ret < 0) { + dev_err(dev, "pcie host init failed: %d.\n", ret); + return ret; + } + imx6_setup_phy_mpll(imx6_pcie); return 0; -- 2.25.1