Received: by 2002:a05:6a10:7420:0:0:0:0 with SMTP id hk32csp615228pxb; Tue, 15 Feb 2022 23:53:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJydP42FXL43nsMb1uAE7eSoVKGT6gMZQan1Q6IeozlxR0CVWRI9vWT2G1BXe917aRfcWhbV X-Received: by 2002:a17:902:82cc:b0:14d:93ce:5bef with SMTP id u12-20020a17090282cc00b0014d93ce5befmr1363950plz.39.1644998027574; Tue, 15 Feb 2022 23:53:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644998027; cv=none; d=google.com; s=arc-20160816; b=B3dZfYD8TDk6QVpDnFCBnn1L9177N9G8QbMb8IQS9w97Z6bUHaYKT3olFYZq9w4nqH l0+WP+DHTvSJ60uOi+P8yczyn5m3PGARe39YXCjUKtRGx33cG8yBEfyDFiOxHqusR5JY 3GB9IrjCMQ4yy6NRraRh/UDfquphDG0xwz3/OeA0lvoiwXYq6Lx6GuRB+sFBTo0X880E RNNyuiJtZmGoTD/9yVCdO7hKXmCBHSIaNN5diNn2SZSCT/Xeh22DRToKA39dE6naqUHR vcSm0kn0+zCYujlNrhyjHUgKA/LuXkwuZlvG9+nq60kalJ4uJCGBfxuyaNh0+/OmHtL1 M/4Q== 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=cgTCtzE72ERdNnnL/wGyYcwW9ItNEKxtSqj8aJOMKh4=; b=HjbyfbIsdb21nTppOS4ufkUiMvCK6PloMwGUTsm7L6uVmlm2M7p5OrC97OVf9N7HpM OdGXPSb/GYARvEdF4zAEEhG3nHmT/cg7iYMp0mwUKLUf5bIE0jIabZa9OyRDWjZjEDHQ zooLtWyAXXFQ0vHXUkkg/roD26/N4ZP0Mp+fVhH53MtiXYEaaYBL0oaYh/q+54OTkOBW Bthx/ZgIMzJzYfNUCiLvmHe/okHhuB7Wu4Jc0uQGcHts+bUe6kB8a4GOyLqjakjOPVO6 82RiJN6vNKBbUP0mVS5rkZtdOt4bQSzMxUyTF5nXjvmtDLQ/4lAxrAAnnPUu6GWW5f2n Dx6Q== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id b9si16802329pls.230.2022.02.15.23.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Feb 2022 23:53:47 -0800 (PST) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 90AC7EF0B6; Tue, 15 Feb 2022 23:21:13 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229968AbiBPHVT (ORCPT + 99 others); Wed, 16 Feb 2022 02:21:19 -0500 Received: from gmail-smtp-in.l.google.com ([23.128.96.19]:57230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229825AbiBPHVS (ORCPT ); Wed, 16 Feb 2022 02:21:18 -0500 Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8BFB21E1A; Tue, 15 Feb 2022 23:21:03 -0800 (PST) Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 157BA201AF5; Wed, 16 Feb 2022 07:52:58 +0100 (CET) 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 DB434201AF0; Wed, 16 Feb 2022 07:52:57 +0100 (CET) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id 976D4183AC8A; Wed, 16 Feb 2022 14:52:56 +0800 (+08) From: Richard Zhu To: l.stach@pengutronix.de, bhelgaas@google.com, broonie@kernel.org, lorenzo.pieralisi@arm.com, jingoohan1@gmail.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 v7 7/8] PCI: imx6: Disable enabled clocks and regulators after link is down Date: Wed, 16 Feb 2022 14:21:02 +0800 Message-Id: <1644992463-14467-8-git-send-email-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1644992463-14467-1-git-send-email-hongxing.zhu@nxp.com> References: <1644992463-14467-1-git-send-email-hongxing.zhu@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 Since i.MX PCIe doesn't support the hot-plug, and to save power consumption as much as possible. Return error and disable the enabled clocks and regulators when link is down,. Add a new host_exit() callback for i.MX PCIe driver to disable the enabled clocks, regulators and so on in the error handling after host_init is finished. Signed-off-by: Richard Zhu --- drivers/pci/controller/dwc/pci-imx6.c | 30 ++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 242d8ef73c1e..fe671e88ec93 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -848,7 +848,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. */ @@ -884,7 +886,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"); } @@ -897,7 +901,6 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) dev_dbg(dev, "PHY DEBUG_R0=0x%08x DEBUG_R1=0x%08x\n", dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG0), dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG1)); - imx6_pcie_reset_phy(imx6_pcie); return ret; } @@ -921,8 +924,29 @@ static int imx6_pcie_host_init(struct pcie_port *pp) return 0; } +static void imx6_pcie_host_exit(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); + + imx6_pcie_reset_phy(imx6_pcie); + imx6_pcie_clk_disable(imx6_pcie); + switch (imx6_pcie->drvdata->variant) { + case IMX8MM: + if (phy_power_off(imx6_pcie->phy)) + dev_err(dev, "unable to power off phy\n"); + break; + default: + break; + } + if (imx6_pcie->vpcie) + regulator_disable(imx6_pcie->vpcie); +} + static const struct dw_pcie_host_ops imx6_pcie_host_ops = { .host_init = imx6_pcie_host_init, + .host_exit = imx6_pcie_host_exit, }; static const struct dw_pcie_ops dw_pcie_ops = { -- 2.25.1