From patchwork Thu Apr 3 05:39:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 14037145 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EB129C3600C for ; Thu, 3 Apr 2025 05:46:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zIKvW5Z7CCntlQ6t55uvbzUhSENfxtmYxFMVIi6OOAw=; b=SjEaYfr/AIR8Uj89eQHr+4hXZD oPSdHzfsOsACxVOP8eeQxcEbDzmVAW9p1OUI0vax3fgv6ZX9+o3eSN54fwu4xqvFYp/TSxVov/AZ3 JdRC69z8zJSYQdSVnD8nIve0B8QHoCYJkvMPpvt28/+RPlK55g45rpEHKrb40/oqzwMeREMt+7/ir Vk51toaSODFC1fFPO5nj0t3iAbUxpI2XIYr7CCTps14w5nb/J9yMzWSZvSQNuNk7gELvnY7CsHwtR hJgOioCw3bzV1Nox2wNe4I3ebrleAmpKdazeVY/4FbFZKSnI2pxOdg8DG6wRPQGh6Sq2p292UXNXr v767e9HA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u0DPJ-00000007q14-1PU3; Thu, 03 Apr 2025 05:46:29 +0000 Received: from mail-vi1eur05on2062e.outbound.protection.outlook.com ([2a01:111:f403:2613::62e] helo=EUR05-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u0DK7-00000007ozF-3it2 for linux-arm-kernel@lists.infradead.org; Thu, 03 Apr 2025 05:41:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=g0Ueuch28GC5qM42PC8I2gDF485Sle2Z/GOHPeWIAmpEle8SzjGv87wetQTkEBt/tfji9lirXS5W8tsyvrXANeNObRUMvqrdwhjMExbUBMrIlDLmVssENxTN9pma+5LsSYmteddrZV35pvQE4XglLuk16kB9mSmas1FJWWukcl4Hi3gVjJeMkByVo/ilU+EpucZSWly2/IRwxkBg0xWoUzCI7z1Fwmr2u9pnAJM9hIdEzMdNs74J+P/QQwB8EHk1VlVaXziRwycH3ms4anOT6OLoJQ8UYbMJoZSrpyNyRPGrNJBkEsifCucCXnddqQo4iv8hhlnGno9wVmwpOVSRFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zIKvW5Z7CCntlQ6t55uvbzUhSENfxtmYxFMVIi6OOAw=; b=mcMsymBvohI/9bam5hRV3W9iAas9C/1bKXafgh5F8JBLEv/y23M+AkGHEMeIaQ4h492neQdfixsb0QwlMyM00lwInts3CLXqljMBeYLkeBI/SiqjU37OYNJ0CNsqqIzVUMThG7Brdydn1ExEBcvRe1IQOS9UBiyWO5zM8atT+6dBkBZrgbbTDxstOYzC7vwTfXhMwM138z6wcKk15PP/wF/9JBYx7jIbnpfT7StWFjCtr6ZGNu5yFJLhNaPL73S4tr0XcnGf6VVRv4GJRpM/wZlbvGadtrvXx+1W19AKKvVFddNDoctzE8cdWF1CQqIYHWhlUUlqthIdR9QzWjC9Tg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zIKvW5Z7CCntlQ6t55uvbzUhSENfxtmYxFMVIi6OOAw=; b=JFjLW80E6zjN7jC6Lpji+1X9ssrSalfh2AKHvzFbzQK8rKj9uCtzq9ta9yztfYxfmw9IKq86T2VTd9TrCHZhyHuB1sWbGl9dNvmmagA/Wm1lQDfwapoKI4muPJ8PrNraZTmsXOB5A7kxm7+kqw9L9D1jptExTY7gs8Z3pPo3sO6Q/tF33vKmykcX7BEZgsCEU/w/SW5BSVtWRPCVxDg7wDuW73maENaPU91MurE4fM/aBkfHZBBdxSj3dBrDyrsL4jwsRqf7OoOaEkvbqO6VccWs/CNBylv9wXMgWgODaADZ9sqC4qG6U6aDz2g2pUVprwyPI+9SHZNaVeh3w1+BhQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) by AM9PR04MB8145.eurprd04.prod.outlook.com (2603:10a6:20b:3e1::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.46; Thu, 3 Apr 2025 05:41:06 +0000 Received: from AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93]) by AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93%4]) with mapi id 15.20.8583.041; Thu, 3 Apr 2025 05:41:06 +0000 From: Richard Zhu To: frank.li@nxp.com, l.stach@pengutronix.de, lpieralisi@kernel.org, kw@linux.com, manivannan.sadhasivam@linaro.org, robh@kernel.org, bhelgaas@google.com, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, linux-kernel@vger.kernel.org, Richard Zhu Subject: [PATCH v4 2/7] PCI: imx6: Skip one dw_pcie_wait_for_link() in workaround link training Date: Thu, 3 Apr 2025 13:39:32 +0800 Message-Id: <20250403053937.765849-3-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250403053937.765849-1-hongxing.zhu@nxp.com> References: <20250403053937.765849-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: MA0PR01CA0042.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:81::13) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|AM9PR04MB8145:EE_ X-MS-Office365-Filtering-Correlation-Id: ad0a638b-3b80-46f3-98e7-08dd727220c6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|7416014|376014|1800799024|921020|38350700014; X-Microsoft-Antispam-Message-Info: qxLwaHmxx703ildiLPokbZ/SojRlZI5wGwqcXSkdc31rA+xCPSWkL/9IdeitXyQt9Tr+HjQclgMfBVdJq+mM6VMWcCEw2e8nk9Fpd4f/qAixPibcSCoiMwWImFS1HU5gwJRi8mKoJrx9MFDaYOvUtw+kiGvdB+7epdZ3MTldXaODjAQ4e+0mCm/6f+/xbo3OivXr2d5bmPVf5V19UuOCPcPXCGPqpcyqYzrv68OxW3qbcxHSsmjfnWFroznLblR/qaPTKPZgGRKdRXH7GhQnbJt+Zc6YBbIgXbA1tWdzj+bckAzNJXezxs9aPufJOSqN1/0kkPCciZEQVjEcH8tIJLBZ+PfCsa1n4xeyS9Lkz/hhWGPoAh6MbT1TW2vI5OauZjZ053/YdyreH0OOi09Kb7oOP3UwNqLjcCXHrUa85uVfO9g0DGwASpHBGdktR8pAmxwbxVAJZku3Je1R+xh1J98maNYIfqPS/wyE95PYSLbtsiizgdSqRVxQEDq2g4yFVb7YHE/x4Stn3e7ZXbEtwB1B4T1I5ThL4xP7EfqqogzBfAfe7+OY8jGiUhAVFqi3XYgOze+041uLQNbxfWDCZmYsPPT8E99354pc1KV4P/TSYwUEgYTiyUGwYMq5PHHGMTB9jqiDE/ytX0ytdYCPKIhAboee37v17P5t3w74izydvVJVT4DTXw0HGLZaDkdpovsSfbPxV2/FnBlryQxrF9k0DFjO3hzlK/wHGWtv8/KWDnFrd/tzhMps733QHZdnk4/zjlxkwjrQytzwumNakDp9dYv8+cjClv61F5rGet6ae06xfrRAR9tHAU+vsYab1pHaOtllRhYth4WQkwybmSH+yTu9Yyq94QYXH+fotobOR8l3CUYCh2xwBQE3+IRAuRZLPFmXwL8qEcieafNI6hwyu5rQRHSN7aBklOoovNqumudOqdYiNumv3x3JuDdsVQ9uyvv8MxWglhd+7zSezK5slp3Dxl6N8DqpvAQwyJ6AIhm/LqLofyDId2hGqEGZa7LZ7xz6UZnBxRBkOkIEqyOI4mPK9fXR9oroIe6G3PqVk5I/zpL3fccIIjB6NQMr+4cCURmGKppm2f9xTupydYo7/wJhz5Uno+rZ8xroNBx+V4hTbgilSZS69+bphvpSwYe/WbLB2bv7LngUe4Xw9NjpXU51bVaLnB1mlNk2tYKq2BsqCaz3rIV8jiLwbSTpDKXnPI2PqxoRPLgCz0TovUeDIrhbypwUgw4JnleWgdURdZev6Mb6BguWcHZ2R9Ue+nk+vZxmcTexH2iI7gw2ylblLWm0Ga6rf9GKjxSKVZE1uQsI+gMhsXeFWiGBXjAAvqhzvW6MJDy9s2C74k8RbeQvX5ZFGLOxrPuUtf2TXLsB4LOsOXZDUkBp15u90jVpi0KRb8fx8B8PSsIOdNHVCo/+7cj3Cz4Ok3IIFpTOA3Hct7q3yv7L0XxkBQ7s6X+Toz04PZLAYa8RGGMcT3rwQQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR04MB8676.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(52116014)(7416014)(376014)(1800799024)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xlPSpl+PWccTcMmlxXLXJgnRdpQAkZ0gjDXQkrJpsZU2866j3ZVpgaVFXLKQKf+cFb3RdIQMsKQK9Mf5pvYlYhKDvn6IU3UdveC+gjTn/YhFE72MGKA3AFksSk8i6KP9ipO9MJw/ivKg/QD48Cg7uS5DFKTsOtj5NTm5tylaIlt1o/mnKmXF0rQq0l/B16qrd5AUtwjc05KZN6s2fv0W3C2Zg+vHWmciJGn2gs1g5Q6cZOmQDnv6n3hsYLCvQj/E9vgOdb6KZ5WPzNyGOjB9Tc4gWEMr26nLyTjtg6o0LJVmHR4+GcDf6eHwsqw4RMCm1GH+GFaXzJZkew7SC4zrCeZNO+1VaFA3zuNTp6eF01R+R0a6imAP6cAPjf0gCCmOl4qGNRO7xKZAfruUZfurHMaDi8Wvj7ztbKYe1BRZMcEgG8ynxnyuJO5e9bQTYZ/0zh28EQUoEsoVHJZEo6QZYLUK9ezJdgAMe0vmWp/4YwG0PcGD7U2AHP0eT5fCLJaFCOJXYloo4tc+QZVMSktuOjNAlW3og3OO6Nc092BqIr9cENa1tGIxtWc/6yLTvNdEzUWt0pGbDa0iPmtzrBwKzArRKUusEGqW0/M1lZ15lz/Bjp4w0QAT0SzesedIGVxcqbNIie+Oq0ftbZEo8WxCDY7krUK/1xEtnP7QtjdH96cKcT5kebIgtgT5jHscNIIpAmiLO1cXbTj1x1H95FgeMBPgLl4E/Wtir1fBCLPEyIw1rXMKwII41n0XmkI6snKpNbmbdGsYiqzoecgNtibXDXO/R9ujDrNISSeIzj83ygAlfuLPhzxQZ4hp6/F2kuKiTP5Of6g6dd+Nmg+PtXsBZiu5TVq7zcNAkX3WCUinU388fhhOLm7Hk1tjE2SOovBPVL7B/iuq0eaM9mjlsLzn5/6hrfyiVA1XDF5+OmIU5kKPhKQe5A7rPGA/J7W8zutnW236f16MaAwGftuU8/yRocySMphjX/uJwDndKYWakC/R+XUtamZEPwWZ8wPDYQlbfn16KCNqu11f0ZumPd5GGf7xsfwBoUYSQ7OJfsg0aALchKIuzK7DrWbwAUr4wNSu5aUVe+HBY3DwS6vsTKnykn9RIT90hZK4MWeOyAMYC1epp+jgxWFVHtxRw+p1JX0khnBfOv8egQy818I2rotuYLGiBeCtyS1IecPZsaxs6HLfpg/nnj3d3aDXTFaq8V5lnGFUMPEU8AbgQ8DWk5Z/g7cGa6aB+rtKnpQtlYpxx+jdOmyYEIdUcyAEEdD/xt7V2T8vOJjZdVzyf4ftAAvIi4sJCWvj4vvYNpz0qJdmn17N9jU5nSwcxWJ//w3IOm3b2pxjfsMTSjBwh9P+3K/lwqUJ6uX3X3yg6luMn+ss33l30xe3xwZEEIuvB8Cr0vl+BNoWxPQ+aMHya3kEDnbprbCne4r2bPuGlAAHT7ihLjscO5XGV7sC9iXKRCq/x47kDbPtx+n4QcavmOsJVet5ZjLtbxvmraaWS3kEGQg+/BKLPdAD/3sBaHer8tLt8DzPgKzxyNORG2TGLdXBygjVyz8xSA/5kin0sd42MbDOJqKAxXYxzO+HhqFy+GfEYJnP X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad0a638b-3b80-46f3-98e7-08dd727220c6 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2025 05:41:06.0507 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3FK4ivIra+XcwMHsftitwT5j+YoeMwNuZ1++rl0nPiHGx0khArZxLuQ1EYT5+XwJLs7TbUjOagJ7FcAwh76RZg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8145 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250402_224107_925593_13B08DDB X-CRM114-Status: GOOD ( 12.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Skip one dw_pcie_wait_for_link() in workaround link training. Suggested-by: Manivannan Sadhasivam Signed-off-by: Richard Zhu Reviewed-by: Frank Li --- drivers/pci/controller/dwc/pci-imx6.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 57aa777231ae..84d2f94e3da0 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -881,11 +881,11 @@ static int imx_pcie_start_link(struct dw_pcie *pci) /* Start LTSSM. */ imx_pcie_ltssm_enable(dev); - ret = dw_pcie_wait_for_link(pci); - if (ret) - goto err_reset_phy; - if (pci->max_link_speed > 1) { + ret = dw_pcie_wait_for_link(pci); + if (ret) + goto err_reset_phy; + /* Allow faster modes after the link is up */ dw_pcie_dbi_ro_wr_en(pci); tmp = dw_pcie_readl_dbi(pci, offset + PCI_EXP_LNKCAP); @@ -907,17 +907,10 @@ static int imx_pcie_start_link(struct dw_pcie *pci) dev_err(dev, "Failed to bring link up!\n"); goto err_reset_phy; } - - /* Make sure link training is finished as well! */ - ret = dw_pcie_wait_for_link(pci); - if (ret) - goto err_reset_phy; } else { dev_info(dev, "Link: Only Gen1 is enabled\n"); } - tmp = dw_pcie_readw_dbi(pci, offset + PCI_EXP_LNKSTA); - dev_info(dev, "Link up, Gen%i\n", tmp & PCI_EXP_LNKSTA_CLS); return 0; err_reset_phy: