From patchwork Tue Apr 8 02:59:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongxing Zhu X-Patchwork-Id: 14042104 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 5D41FC36010 for ; Tue, 8 Apr 2025 03:11:00 +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=GzkuEuF3vxATR0qlAIIOxYhvBuAcc3gluQRBVeS2DXE=; b=HtgMhZRbLXlJsFWdNviSF5hvM/ MBe7FsEkZStdE7sWWqxsAkI/vJiHaKKgO7+v3gr4tdYC5BbOcfJb7RB1CnX0JnJzcpwOWbqyGG5Nw R3kTcIk5h4pnEPA9iVsEAvmrT8NxKn+bM8p9xldIUvVCOE9pKpA++raEyCgFyoB60SUjJNpdWmI8W 0wuhgxhz8orssCWt/ID2vP0K8Jf0w9njaN8Ill6rq7hoOfO2juZi1aK6nof9nx3a6HcAxrEmzN1gW YXVdE4ooJyNngMHDj5hbQGA9wbo9mbJ+GC9yrJjjWVCC89foTaaumI9Yi4C7arI0GoAgxp3P1bD27 jW6UlZ/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1zMP-00000002b0p-3j9l; Tue, 08 Apr 2025 03:10:49 +0000 Received: from mail-westeuropeazlp170120005.outbound.protection.outlook.com ([2a01:111:f403:c201::5] helo=AS8PR03CU001.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1zCs-00000002ZX5-15b1 for linux-arm-kernel@lists.infradead.org; Tue, 08 Apr 2025 03:00:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=q+pE+R15Q/4c6lFZ7LXhz15/yb8hUjChlcprcOp72gYf0VO7MjRndb9UexHYvJ6QrfLdB5hxSg8hgszL33aZt4p3cUHmzkV4ZkdC2b39kj7N0gpQvfdifS6zoUe7X9+7CkCrqALaK/HyeJyO4ATQZfNtXBD8I9ZcF1kXX1mbFfxsfS/UgsBYxRHeZrMejcgy4v+Wftj4mXAJzSYdMKE3OdzkqaUi9CKDqwFp1uTr35iWuMPin3F+FOCOV/M+HXueTNnwLgrVydKSeufB+NuS+skDEYSz+62E4zAISwnxfcvw92ME7HPDpzxwgsZw5E2NKxvy+pHWdwXSYVZAPpNFEw== 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=GzkuEuF3vxATR0qlAIIOxYhvBuAcc3gluQRBVeS2DXE=; b=FMyG2flhp3b7sxjvjHZUw4lDPISIpX6WWOB8RdfkRowSY4NFxsc/Vn6GVZaQI3CrtLeUw0lTBJgGLWrzJDOvCFpwjmYP+am6J17aGJdZ6HHJrl9OI4AcHlOawScMEWxNDjH7i62ghdLBkQmt0xAgClu5WAuITdA0W4bb7q2zjVDHCZ5AvoMRpbx/g2Q6XmjMtG9E2mtoxy6kkEwvPUprpoz3XY5y+ATTKnIGsv8gd28ZpMO5dcqBzLjcga9U7CQNo+8InY3OrH+JvmvGdbQBZJec2BCE1TASYjtGPXNzWtaKLQEeEAADiGKgTJsNiuGAJSm8QT5d+NOBrtvZYuOm0g== 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=GzkuEuF3vxATR0qlAIIOxYhvBuAcc3gluQRBVeS2DXE=; b=IVOOH9qBTeWQstimUOo5quDkAL3GB0KIJs98d4UtKjElPY1u9nCrxmankggpXqmVp2bnsiHkbeUnjZMkDWqRvza7KEN86G7mRokmZJw9FqPr8ISbbVWNt9kX/KLQz6fc7aPVZKugEU5e2T1sWDxkPQtXDQUR8vH8i4KwTIwf2WpMz+SbLcAO+myPrypoUXBHwGxs8OdfaJve/qOEQwb48pVMbB181d2oQe835i/UkEDgr0FgiXmg0O4xJpDWHq/ceZm5UMwVvJHHkTJmNagn+P7r04Kx5WL3YMC5lfVh8R23r51QOnSP5DRim1ek4N8lUT2E9hAL7rOQFZMpEIOHWA== 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 PA4PR04MB7536.eurprd04.prod.outlook.com (2603:10a6:102:e1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.31; Tue, 8 Apr 2025 03:00:56 +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.8606.033; Tue, 8 Apr 2025 03:00:56 +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 , Frank Li Subject: [PATCH v5 1/7] PCI: imx6: Start link directly when workaround is not required Date: Tue, 8 Apr 2025 10:59:24 +0800 Message-Id: <20250408025930.1863551-2-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250408025930.1863551-1-hongxing.zhu@nxp.com> References: <20250408025930.1863551-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SG2P153CA0051.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::20) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|PA4PR04MB7536:EE_ X-MS-Office365-Filtering-Correlation-Id: aba080f5-a1d2-412b-4671-08dd764994da X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|7416014|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: owXhqqKGWrtmI6wDuXEqiXv4wmib2p8RL2Mgwao0bjQ0E/FRpxF4S5F05ZOrO+95djaTvukYoeVM2pmMDGm9C4UBwYx5E7BRHxkVk3z5J0odyAbIH9WwDyd1UIrRnDlngG6UcuvubxJYA3jZuzQTzm88xS7bAUi5g1oTHJgzZ9Oheqex3Upz3/JcaHc83+qhpaDP+tOh1RAYrctbEktR8xuZPm/eaxCbVTolMhB/4ivKPdDorpth1hmAM8jQHyxuy0OF8y38mcAS13aMlydjW5Ar7Ts4vROT6G/UCtvqiSpUd2+kEA7zQ0KiN7nxPaGLatn7gT+RpJmR9OlSJz8zNR5cG4A6kCPgDxZmwADXOlLzTpjUBvmUhDUzSMkgXRA4qc8BCvXj8YK70W/iHSgGb3ya3xsOGMK6DHeHBdedYI2Az7B0sNnr2BovPrExd6aUvrg/cKX59cV8/ZPevucHMNFzATFQSUKoWe0wpDBYSqwU4m8C46Ru5BRtQGPMr0KF5Ueyqz8EIoElUYyZnCM6yLIQxX4dUa9P4jaUrQgdHtWyDlsFpcd7mBcC/nC1IzeA34S7JzQNviAMGk+IRR69efhyLkV31Tj1au0FuPaswFEdmOhjKDDRxB5DXW3/xfJCdOKcEk73Xlvt6iaHTeE8+RV2v8pi9neimslrsKzKPvnxC2bPnQkoi3QbrxO2FHZsO4+/bbfHc1EwJvBTRcIt16sNhqY81c1mJsG11On9xxu9k1N9ffe4djKHXxwyS4z7mEGYCN6NKmn+DmR0uV6r8EfVcjNSwDYl0xNApCivJlhcZdsT0NpnBM59143lkVdeDxMAQzf2UuzwSiSgc7DCWVe22tIrehISUVkUGUzCgrBAoLf6r8F5BrIjZ2k6pqo+28ILBjDKvwdAhQugLKePNOi9Ar/r2+xYRWrUODGvvQApWNNGwjZvmOlOKMm1KLn8M0j4rOssKvo4bVoJ4/WelNSt+2lRPIt+KswBGfaamMGUJZJ5S6CDyqOcGLh6Mq/FwMA8MdXubkOVuelWM6eeCiR+xyW2p0XNjC/NqSAnPreLnbuor67Et+UTMLNmTbsCZ5S4IuqCT0FRPRvSiGuFhRUxwH5LmE4D+K/sDjg779KJNXWHKnlq4DIdk+7Ti2LbZkLf3B1k2oOdT1iYqAgSHNVPP2jN7U1q21hud9I2Jr2whVP9eW17c4JuuMHpiUZVBfiO8F2RD0ifpzSnfpjuT6DXFZSKGUkAqfqD1QUpQ8uVZqHW/yV7ZGFHE4qzP9LEGgMUfCRwXjYG7wTITmTaNQ3bcqoMGm8Q+uqHKT2k/TGid8/vBhHVQhfJgz5k6HOM16/dXhnNm/OOeXIdCXWNohU92JHdvQg+oIy9OhGyl1I42WQ3VHmRgrLqk7jxeHZQ2vRY74OdeSwchdh5rdxNW8mDwD/oEhqvP9Zbv4bLX8vnjbCix03W6M2OCjjZkP6mct+rmUsdQbv5GXY4DlMqvg== 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)(376014)(52116014)(7416014)(366016)(1800799024)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZQJ4+zE4Tx2RjS/Ue14bzGzvzkZGbx2B5ysqVqKICvGe3PAOvoOtpvIHLVRxKWSufWxavBf5/sZRCMo0j0r8QfR9hYHhbYYkaZSI0fobF0sRy0OE/uLkCMEXLD+isLl5PjH8A3Vk3yRrhhgr36X9+XbAx076xlgkurcClGQAzfEnNgl9KrAN0x10MkkMdnIdRTvbOmR/jPN0jiA3mAcLytUtYEdpkPRGWBCj3XT8jR8CBDOeCcBmL0NyABZP/WP5v2S13QEI8dj5ySTUhCM9Zhl1y5o4fTNG1BkPimIKt3unVEZf6Za7UfqszQuABAfNMIzvt768uDatYquymOPPMp206SqvCNboD2vpjyEL/xVqdtyb+xbSsKl2mWV8FKHlW2c1YKzngb6kR1EUCyhQJ7l/eerFoDR/GvFvY9GoyJwoa1CUEbHBQV9+Y2zB8b38n9nPCxKAM1I0kbjNq26StttAz14ANubDvf20qTw162nb5h1Cs266vIdCFbrhd3AYgJf2QyIh3D4vLd7s0Nn96Q+ocLn/HGUXb0fZE7tp//nPrTKyr/wl5o6RMzFJMO45Bnwzcxbe3c4Lrz/6HB9DusjhVK8R335D3m3+pXUIbyFE9Wq6zYRUBatDAnq9JZ46nUpSE89voPKR6FXp0NZZtl+yW+oM3dCrs9356EjCbaxSnN2i2ucj3PhqNurfvWZQjt2M1bPZwDPZsOPag8/OwmeSOf0b9NRYVzp9H3u9Y23iKSfUVxh/3zWGuXiUsu6O3EGV1IOaEXOgD5iFrBr6e3I4iGEVhhLugj/Bgvn1EWy6SgTW69iTEGEPQ8UwiQ++3TE0rMRhZ8mXPU4WQFHuViRjpqkiMaBNkUUCOeYEjaMiicequq9vJ/LajjgvSb510SRQ8AC4fozIswxydh4PObPC6f7+shCeIQpSe7xiXVcJI7rPdBca4RdhWHnVeHxgFGo35jqiOrDfRJQ6QrCKRSZ16KZCvW8IWy+Ulqvtci8TruLhHEprw8MVYKChEPte5KoPdeRsf7zIWEQm7yRTha+4eHbpZcSwkxpZaWCQk3VHYgn44xqzOc/BWsyDlMne2a+5ojmy/IowzVeDIrQXHf+4a9j46hgoNIpeekbQjjS8LAQN2Ca6xz61q/+ZeTHlKtFdG+CNF19PdS1cN/C7ws4OItcs3yVm/2cqV6GqhOevz/6luknCgwToDvZ3HMkoBZdmwyGkhwOvHqnbJInLSs86h28cF4z3NzVoBGU1F9CmaKcM3HbizmNm0QbsrYUHeNKtdTtalBaoARQil+IY3HryXbpyzP817X3t+IBNL/LOPwA/FVZj/gz98f/pXRGWhTu9COaQ/Go4ZBMIPWs+dBZ24QwN0QNKzGuJazJmldROyAmZdJTY1q+NssmfQURzRbdoI0OifdH0mEj0iUDEGivXcSIKICbEfo74kMCnzo/pFZhIklsfRFmu7nfT0o1cMAIBzU4mQXeuc8r+KUgAPpXW4oKzhIGmBDimx9uDT55nkBtNgH0xp/utsVFiH1h8bBV/cuItyXP/n37QLNn2ld0tBtLarvfK+v06KMLu+p3VcGii+iVKWosqgEwzQGh3 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: aba080f5-a1d2-412b-4671-08dd764994da X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 03:00:56.0237 (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: piTQL/MlCiikRXZzxXMUQcYpryYZnvdjin/HPKuN04jDVUfBNlS/otz8TLi7ZizUZKmUMOFYDyhKjFKZmRK9IA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7536 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250407_200058_298448_2DE7EF87 X-CRM114-Status: GOOD ( 19.16 ) 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 The current link setup procedure is one workaround to detect the device behind PCIe switches on some i.MX6 platforms. To describe more accurately, change the flag name from IMX_PCIE_FLAG_IMX_SPEED_CHANGE to IMX_PCIE_FLAG_SPEED_CHANGE_WORKAROUND. Start PCIe link directly when this flag is not set on i.MX7 or later platforms to simple and speed up link training. Signed-off-by: Richard Zhu Reviewed-by: Frank Li Reviewed-by: Manivannan Sadhasivam --- drivers/pci/controller/dwc/pci-imx6.c | 34 +++++++++++---------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 5f267dd261b5..a4c0714c6468 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -91,7 +91,7 @@ enum imx_pcie_variants { }; #define IMX_PCIE_FLAG_IMX_PHY BIT(0) -#define IMX_PCIE_FLAG_IMX_SPEED_CHANGE BIT(1) +#define IMX_PCIE_FLAG_SPEED_CHANGE_WORKAROUND BIT(1) #define IMX_PCIE_FLAG_SUPPORTS_SUSPEND BIT(2) #define IMX_PCIE_FLAG_HAS_PHYDRV BIT(3) #define IMX_PCIE_FLAG_HAS_APP_RESET BIT(4) @@ -860,6 +860,12 @@ static int imx_pcie_start_link(struct dw_pcie *pci) u32 tmp; int ret; + if (!(imx_pcie->drvdata->flags & + IMX_PCIE_FLAG_SPEED_CHANGE_WORKAROUND)) { + imx_pcie_ltssm_enable(dev); + return 0; + } + /* * Force Gen1 operation when starting the link. In case the link is * started in Gen2 mode, there is a possibility the devices on the @@ -896,22 +902,10 @@ static int imx_pcie_start_link(struct dw_pcie *pci) dw_pcie_writel_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL, tmp); dw_pcie_dbi_ro_wr_dis(pci); - if (imx_pcie->drvdata->flags & - IMX_PCIE_FLAG_IMX_SPEED_CHANGE) { - - /* - * On i.MX7, DIRECT_SPEED_CHANGE behaves differently - * from i.MX6 family when no link speed transition - * occurs and we go Gen1 -> yep, Gen1. The difference - * is that, in such case, it will not be cleared by HW - * which will cause the following code to report false - * failure. - */ - ret = imx_pcie_wait_for_speed_change(imx_pcie); - if (ret) { - dev_err(dev, "Failed to bring link up!\n"); - goto err_reset_phy; - } + ret = imx_pcie_wait_for_speed_change(imx_pcie); + if (ret) { + dev_err(dev, "Failed to bring link up!\n"); + goto err_reset_phy; } /* Make sure link training is finished as well! */ @@ -1649,7 +1643,7 @@ static const struct imx_pcie_drvdata drvdata[] = { [IMX6Q] = { .variant = IMX6Q, .flags = IMX_PCIE_FLAG_IMX_PHY | - IMX_PCIE_FLAG_IMX_SPEED_CHANGE | + IMX_PCIE_FLAG_SPEED_CHANGE_WORKAROUND | IMX_PCIE_FLAG_BROKEN_SUSPEND | IMX_PCIE_FLAG_SUPPORTS_SUSPEND, .dbi_length = 0x200, @@ -1665,7 +1659,7 @@ static const struct imx_pcie_drvdata drvdata[] = { [IMX6SX] = { .variant = IMX6SX, .flags = IMX_PCIE_FLAG_IMX_PHY | - IMX_PCIE_FLAG_IMX_SPEED_CHANGE | + IMX_PCIE_FLAG_SPEED_CHANGE_WORKAROUND | IMX_PCIE_FLAG_SUPPORTS_SUSPEND, .gpr = "fsl,imx6q-iomuxc-gpr", .ltssm_off = IOMUXC_GPR12, @@ -1680,7 +1674,7 @@ static const struct imx_pcie_drvdata drvdata[] = { [IMX6QP] = { .variant = IMX6QP, .flags = IMX_PCIE_FLAG_IMX_PHY | - IMX_PCIE_FLAG_IMX_SPEED_CHANGE | + IMX_PCIE_FLAG_SPEED_CHANGE_WORKAROUND | IMX_PCIE_FLAG_SUPPORTS_SUSPEND, .dbi_length = 0x200, .gpr = "fsl,imx6q-iomuxc-gpr",