Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp267926imw; Thu, 14 Jul 2022 01:09:29 -0700 (PDT) X-Google-Smtp-Source: AGRyM1toav45yN8e9yB9HhsYU8jF81EVPhUwCn0qYzLIfKijNJw4+V3B7CC1BtyWCm4kABu0MyNx X-Received: by 2002:a05:6402:5212:b0:43a:ad74:b336 with SMTP id s18-20020a056402521200b0043aad74b336mr10681803edd.16.1657786169698; Thu, 14 Jul 2022 01:09:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657786169; cv=none; d=google.com; s=arc-20160816; b=kDqQVFRxKUqO2WuQdz13lQcLWzQFvnMT4esg+iaGpabNXf6XiT40nsCYbQA95N81fh gqkMTtz3kQP2NO/tUrNiQoXP+6QHE0XOyVy4HE/IyulvtRUyoeMD0m2CcuOGq8hXjX8x eueMOxSgsSUFzzXpY7eT1F4fQrn5luEknK1QlbTQ8YIZK9bRpDCcItqe7Qs2HZHsf+mz 4XldKvXGnHfB5nZD7X9DNxY3dyD/dhdp6pb9fU1sOU0E5OP+DZV83o1Fx7V01YS3wrLP pBnYCDBw/IBeDj/Pcj3G9UNe7WMtKG+wuBBvtVs1w7wHXigUBRH+e1u8z9fQOX6DvQQ9 BVBQ== 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=RslEuBvXsDljDGnn7Zpf09WLGVe/sa+Xk8YI26T5XJM=; b=tqCsUPlbCIAdBBmrGs6ZksDFwNB/S4NnJGYedCWsQMzV3nhnNi8r2uFY/13W5x4azW twWC8dZkO1gkO7MVCt7z+zAnLKfzMRpXHE+0BsUyrq09nBk+qNk1yQGAxohTzFF5E2Ac fOXss1XrriPTF3tWdaUaXdnc8XWW0C+0aTukSiSaA7yTSOLXocZ48PPy0axb5Wl+liqQ axu2HI8Ex4ORnhdKi3KtMnuHMGKDT8kyRDzZOSZTdwNfNskX6Gi35tNsYqy5VKtE503d X2nJ/QaP6r5Nz9v2CnPizlVJu9Atpz8Q2uE+L0qq7+sUPZ3brYwN4zPggfVp048m4ZwC 4QqA== 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 hs13-20020a1709073e8d00b0072ae569d6a0si1225437ejc.632.2022.07.14.01.09.04; Thu, 14 Jul 2022 01:09:29 -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 S237609AbiGNHrm (ORCPT + 99 others); Thu, 14 Jul 2022 03:47:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237491AbiGNHrI (ORCPT ); Thu, 14 Jul 2022 03:47:08 -0400 Received: from inva020.nxp.com (inva020.nxp.com [92.121.34.13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E90239BB8; Thu, 14 Jul 2022 00:47:06 -0700 (PDT) Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 39BE21A204D; Thu, 14 Jul 2022 09:47:05 +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 F3A891A2050; Thu, 14 Jul 2022 09:47:04 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id 4984F1820F5A; Thu, 14 Jul 2022 15:47:03 +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 v15 09/17] PCI: imx6: Call host init function directly in resume Date: Thu, 14 Jul 2022 15:31:01 +0800 Message-Id: <1657783869-19194-10-git-send-email-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1657783869-19194-1-git-send-email-hongxing.zhu@nxp.com> References: <1657783869-19194-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 Call imx6_pcie_host_init() instead of duplicating codes in resume. Note that this also means we do MPLL setup again during resume, which we didn't do before. [bhelgaas: add MPLL setup note, pointed out by Lucas] Link: https://lore.kernel.org/r/1656645935-1370-10-git-send-email-hongxing.zhu@nxp.com Signed-off-by: Richard Zhu Signed-off-by: Bjorn Helgaas Reviewed-by: Lucas Stach --- drivers/pci/controller/dwc/pci-imx6.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index eaae144db4f3..2b42c37f1617 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1034,9 +1034,9 @@ static int imx6_pcie_resume_noirq(struct device *dev) if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_SUPPORTS_SUSPEND)) return 0; - imx6_pcie_assert_core_reset(imx6_pcie); - imx6_pcie_init_phy(imx6_pcie); - imx6_pcie_deassert_core_reset(imx6_pcie); + ret = imx6_pcie_host_init(pp); + if (ret) + return ret; dw_pcie_setup_rc(pp); ret = imx6_pcie_start_link(imx6_pcie->pci); -- 2.25.1