From patchwork Wed Mar 26 07:59:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongxing Zhu X-Patchwork-Id: 14029838 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 F2DBAC3600D for ; Wed, 26 Mar 2025 08:07:50 +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=0wqROT16cmOcLwkLe4j47wYUaikGjifvx/AJdlKi3JY=; b=O2rmsm+pdWpRhoLYB/WcspNLP/ 7DBsQygOMe0ngozt/yWFq8WTcNb3daTLUpTYIfF7NgDbKmuUuWYYPT0OUgqYp0KfpMBXreNayM/6m rbcgKWhSRJ7bjvEBVRa989iTm1qSAikLN6GrylOzrfDkXkSr5XAdJqUJk5PaxMCR90dAk63iB6FAX CRNdjEejUPtw0D/OxBOd6YQFGFr3iJafYwK1LkKhZcG/WGoH1J4u3t+4p7yh2CMaDRwIk1ef6MqGj Uc9uhZDlX06RnddOS1fVT4K6ThIUe9GMYSAkt1+R/GkbfJdPIrSjESVgYcsD6FjknE6JMCIpce4ZZ 6G3LXhDA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1txLnW-00000007sQj-1sJK; Wed, 26 Mar 2025 08:07:38 +0000 Received: from mail-am0eur02on20601.outbound.protection.outlook.com ([2a01:111:f403:2606::601] helo=EUR02-AM0-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1txLgl-00000007r5w-3A5t for linux-arm-kernel@lists.infradead.org; Wed, 26 Mar 2025 08:00:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gKPdAEnQw+7mM3aH5JHVimHfOosHjPAaE2aZFCd4FCiq8PbHMVgYGLeEIFq/17ZcVBbuua9AJGNkgqAfPkw75aC8sA2kdbA9I5ul1MkZZOXCykTQlVYU3gM7ogGO2N3PXyzkXjS6/kmGCx6IacPfwyajinog1iYWOWYCa8ORF98b/82OHZAwNRAK4YM7/XXTG5RilLf1h5lnb0ZkZDStjqpbsnUJoVhHvkAV+wS3wkNWn2cFhKNqC0YdogAPoQaJ97AhmBOlTDDCSHEsL5oyKof2Uou9S0PylMrMJlpgkh6CiPbUnmpSsSknT7/TBQ1XxyAEOaRZk5xzXxNDNYU64g== 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=0wqROT16cmOcLwkLe4j47wYUaikGjifvx/AJdlKi3JY=; b=o3r6Ox6jiuAw8dm90qH5k2EHSv+oUJxF7sPSzBhNIi6hO84LC0cRoLWCkfc6DMQABqadgRdvGKEmY70EfVizcgdTEC3UeDXFgGyv3i0hAhElWgwf+gGc/if/70VOxJN6SB5n8PuVYTZPCjqKthuHnekDX2icqosjAra847wHh/+Nzw2Z2AHy6bgxFU4ZEhyf+xcwJSLSwZ+qEY279UlBYKIRsAnBbZQuvANfIb+6PAbyrNbRfXiFi3NEBSB760vGlbgtQ5JfGyEDQ69OR0WCQ9gcyZpha7KYT/N7E/majDojQMlojqM0IJ5s063FPmvBkB73d/wdI4PQ8zHqSmg8Hg== 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=0wqROT16cmOcLwkLe4j47wYUaikGjifvx/AJdlKi3JY=; b=lda86WL/8WQVxVje7a9mBTrXBS5Qf9U8G2YobdeqEJhJVef2UxZKixx7/hCM35GM0iVLdl4/YA06uXJhQrHArrC8KJz8tJ/LQNRSV6PzauPeXn62PTG1apI+tXuWfwiAWx4wPBXTLMb5jkOi99zRtqeuRknhoN/oOtagw7VlTC5UEVCcmFqTN/G5pweYNAFQvp9Omhpb4TaXamlVYBdlqPbfDcBiWHvIs0mZiiUhtpzsz4xOWtzcJuUsEJY9g0kiGR6sHMTz/mF75y4iUWhArKmPuEgOwlhH0qomMGv+I0W0FSfotImZlfTTKkaDHWoxEyfKaFLf6oHXM0Avgj1Vqw== 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 AS8PR04MB8948.eurprd04.prod.outlook.com (2603:10a6:20b:42f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.43; Wed, 26 Mar 2025 08:00:36 +0000 Received: from AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93]) by AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93%5]) with mapi id 15.20.8534.040; Wed, 26 Mar 2025 08:00:36 +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 v2 1/6] PCI: imx6: Start link directly when workaround is not required Date: Wed, 26 Mar 2025 15:59:10 +0800 Message-Id: <20250326075915.4073725-2-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250326075915.4073725-1-hongxing.zhu@nxp.com> References: <20250326075915.4073725-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SI1PR02CA0059.apcprd02.prod.outlook.com (2603:1096:4:1f5::19) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|AS8PR04MB8948:EE_ X-MS-Office365-Filtering-Correlation-Id: b34225ae-03b9-43f1-ee9a-08dd6c3c4a52 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|52116014|376014|366016|921020|38350700014; X-Microsoft-Antispam-Message-Info: TnbkZ4FBMZNPrvkkQgoe0S5zudCTKmCbgM51jvTn0Ur2H309DwmaY5IZ6LJ7SK3HFu7GJ4llIEH2jxO+DVwmcPrZgNZbhYSzFEtRseeLhrcLeiLSDVVjDYKTQ0Tyf9gfenuvWrZZ4GZtjLMbIM4XOUq3mhnkJxFAJMjTGpjljiHyEbDeisvkOPQUiRc7+ct2wNtuMgsHXIlBb72zv+jEHqAusTLnyGCpue+MBC6+XaKiL4DRpZ4qlN4yL+Yps1IyLHc0mWac2xoRfapMGsVP993y4weAmIeNQv85HFyP14SM5acvumTmpjLIP2Zf7mW7HlUUVqYbZ/iulexw9WidZNtq0sjhRRxgXuBvd/aTiO8+1FlvBNJ7L6/744XaKz1/Njzxpq14pWuYI0ZyyaWwSSuLUqHqTvO46im8T3wrI03xb735iTO8BhysqtQEfhBNuexjHAnrtBmESwIrH1ZXxKlZrcV0xhU6vEXHDjvtO279THHJSHdY/Rgj9BxfAp0JFAVQsp2skOyUAyJRm1C+qlBs406rjbPy0mD6E6PsAZ88i21zXWJl4Z0xWEl5dlw+ENMI7mem6jPw9Je+lw/75U8bmUjGe5JUB8aScgeXo6XvX/rwqGQb1EBtAR1+qZv5uKalByqB8rxPJW4eLwIMSBReKqkEUR5wAjo03IOUe+uZB4Jp6x+8XnN4lQvQwWGvaIXxgn6bUm8FgfEc2fIn78+aOn02a4zE0PYx5s0l5uIMT1j385Qo3St8aqvaZtBfSplyCMkGlpRtFVLA+266SkMAc4n+Z9pSE58z/7HCGo4pzblIXY5hv8uBf48CCnOeFUGUXmRxt7tSHNFxuhARE6ORe3tQKcjYd6flpeSWJ8nzz91egX3mloVS8ujriHrmGGd2LPeXneFA2RONMrRHf0MUudoAUUE/UfjHmxw5Lj8xrH+wjBGgPkp3JYub81ErareR/5LMARaegrRNQbiUsSVtmcI7mggmlrR3xMBW9QhattTbGVuKl6iWplOTKPwZrihyHptIyifcSRKRaYDwPGiBmstQ7gTLQOP1QGpbLjhMLGQnYITHBhXQRO054zhjq+kdL4PrD8rjvq7677fFVeCS3+otEzAdj/BmiX8bYwzI0T3zy53SsMdP3IPGm9H0j4DxVjZlbTIpDF6GjXN9fgfA8FvOhJZq2lNmQuvTbiOffIXwSiCm48WkUtbzwIqr5gS25Wn+r6fvgTBx3JU05k2iNM+i9V7C0COIhCYBwAeJfKO6r/OEORVDhM3u+DABaTZ7D0hHmB9aQ9wvJrzW2aNYiLgMDa/sWOqwi3pZC759EWylpxRS6BwRdHugynmu14Prb1G1lTK/MdJITmEkzyYVmsDWQVsB44qntirqigktyjMGHLM/6T8ub2zoL5iaOUJzKEoBJKnvakff1NdIYRKgTtI4krLT+5QY/MCg5BcSiyAEkeSXMrqReR/y4rPqFwSzJ8TT9HFO8CtZD8YdEw== 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)(1800799024)(7416014)(52116014)(376014)(366016)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lBXgUlvs8wLlusazkxw+773EMuNJI0zGIMnVaBTPAsrK7XbLEzjfIJs49ONRNp1SoLpNoEcF3ycvhZXrpe0crmQBBcTf6SCjs3lcbImQwy4psdav3MWb8B29gvMGvHjiNmH41/cJdU22qFlrd0RqqOPT4/xxcDaOsO7jc8qkS2z4QRjxuPkZ09PoZ4i6pRSxF81yHIuLn2ZPxmzFb76Fy8vklm7jPQExEd+Uei9hxZzaIptnQkZPuUuogHgjQXtpHSsgb3Bn2NYNsXLpuS1YqdWvfkHKG482s390FL6e4GprvNohXODZCIu52KyWhsrnSQdpcL33uiHgpRRlsB3M5KkoezTBa5lr3CJZqiLiYNMaOtkJ8nEtjUJwznRP1kkP/NoJMwAv6LeHAeEAXwBxa8jQlbKINT9HiAULpSqk1bm5fLFWkBXjhONA+V9aT72ZNWi8kwnuqaw6sXHyyTW00xFOUu75u7LSn4fH0rrI8BtLk1IzR8QPxcyp3roUbXJj/jDVM3oO3jy+8Bjb2vKwZ5CA5gg0lIPoEYDbRezkfzmick45vva3bW8rLKA4btN0kkQvu4WsDMwq1nT9ljlWop6R8kuKWvNVF5NjH3eI0NQhYPpucJL1UtfkSIxaNEYL3bb112jKkvSTkcNAVBfx2VFKWZQ+JHUlZBh3BstsoE9RlIYOmgOUOuhCUNBI7rhMBeD4M/99ttJT/UARBm/1m2xa87r8SM7oF+eRHTJhGIoXmjAap7O0yJ04Qu5RqXL9n6680qBqGzfvxCa56Vt5v6twt074FawyEOJaAxdo7QoLY86Acds3bHh0zZ0LQkGz3STPGzIxiL25bQqZBPEPSbfejRxUOjM+PXt63iedetPcTpV9q8m8fYOo0chhXnzzNm4O99tytgW9db0PKHnVyzyGUhjeQvpXMQ/A8ScCh21vJ8q7XCbrgzJ8t14Kc1OOFSybMXId9/Ktj353yXwWo6MZOJogL0L1WhPjNuWKC8Z9o2x77PQosWY49/CW95KX5pBubgzQLbdBqKdXltnNQvCp4FblS+fF/qF4QV2KweY0Sg9GzQ5Jj64dqgfZe4ktv+DBzFT/hYNZySKQTAl41yuus+3D9+/PZgd6F2De3AJCf8KVFKS8u3A/mwMyCnSSEBE4WHFL6EfVld++qF5J73Hz6HPRXM+eZwNIuajG3CRXkn8XtqPBlcF+fldpbfOxsmD4uxZV2mkVEBr1pFgjMkyzNpljHat73xHOJiUmG89tCSSytWMtqx9sS59WO0GL7HYErTNOM+zA6UnsxQkTqLAoC0opFJqa8pjKbFw0G+FdreLhRYeCG6xAkeQkJTO6k7/W+04tc624wih2ctYJyUsWnzbUODD1GkYVl1o1r2gosaRT5ZM+Keu7khPalTgUgNcijKbGv00IUqmTJjNpfbSU2PoiLpc0AmhmdMrNB6mTsOHmQPcALN119N4x1jN22zb8SPaQ5Usax1yeF6phYtMOdJjcAM3HUTCHGlmeYTAczBhdzU2I44YoqIlIRbos57YWyvJtucdY+BXECP7w8/p4BGO0SDqRkKPrPKzyoWInc9/WF7EGZPJ6IsHC7R1m X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b34225ae-03b9-43f1-ee9a-08dd6c3c4a52 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Mar 2025 08:00:35.9843 (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: hAZdZYOKRwrFMRs5ShWB3j7AeT/GdedZ594s0CV1ryqTWzyb+FhkLYK8qrmohME17/Tac0o1cHR0p6CD22WwGg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8948 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250326_010039_826895_7D3FB765 X-CRM114-Status: GOOD ( 19.59 ) 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 more like 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. Then, start PCIe link directly when this flag is not set on i.MX7 or later paltforms to simple and speed up link training. Signed-off-by: Richard Zhu --- 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 c1f7904e3600..57aa777231ae 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! */ @@ -1665,7 +1659,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, @@ -1681,7 +1675,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, @@ -1696,7 +1690,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", From patchwork Wed Mar 26 07:59:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongxing Zhu X-Patchwork-Id: 14029853 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 3C817C36008 for ; Wed, 26 Mar 2025 08:09:34 +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=01lUZ5ND5Xaz0Sli9opUe0Q+CxfG6MY2HFgv79RuFGI=; b=yKMa8JhkZD/q144n5ZMI4wmlMu 5GAEMBnD11c9CFExW/tcjABG/7loB3442HNWjy/07eN5gahajqnLYsWRfsr4BCRN8E1ueEad2g1ke /wrXOvVq5DH6r4G4zUpwhMzjGrivr89PPGwOiBfucvcKYvgzojvSS5CjFCJm+nvjutY2ONiX4YDvA wNLqvaf4y6uuz/wWjPG/UkYxcwaQez7zZv3afO3NyfwAX0o6mgw/wbLlb0aFjYcyWQYT1CkYVOTgH ePMcgRQzA49XWvsLK5iBhfUL/An7APTNd+FUwq3f1V0bQEpdZ4kBsYDCNsK+Rh5dLmy9lNE7Zg0Vz SH/DIRiA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1txLpD-00000007scx-0wdm; Wed, 26 Mar 2025 08:09:23 +0000 Received: from mail-am0eur02on20612.outbound.protection.outlook.com ([2a01:111:f403:2606::612] helo=EUR02-AM0-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1txLgq-00000007r7q-2WAm for linux-arm-kernel@lists.infradead.org; Wed, 26 Mar 2025 08:00:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qxzXu8Uco9UvMnRLEItOG4ZsUIhek4Y0vOI0LO+aY4Zg9f0CKllsFF1rtl7Y4wh/LoT9NbXCVUjayIwc7/VIZ9BOJIRIObgou7StsmVdAWjFwPh2C/iehwhmh/EfTVdJhpJeZHUUOVzJBhQoO80+25Z3pgpOmeXDtbb7QidA/II1r464UMMouJlBATPDbTBUGlMwvBQLpyDW5VMViNOZ/+foDbj7MkNn0wbXECBkLZ4hfDsj0Pu2a+EQRzaQQPAwhTxgKi12mK4Sf2WeWY+HuFq7R9WGRNBCmR+cDVWuAfbC9OFA6Tj5qcy0N1opelA3KImYnJ7uti60oekfXLVT+A== 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=01lUZ5ND5Xaz0Sli9opUe0Q+CxfG6MY2HFgv79RuFGI=; b=fz87QyXg+dYlUYg3BCKVJCrqXX2ozZJ6RAqfWxx/DB6YGTK8Oc1RN4hNBG5UsTn4E6Zhm3jgX4CcqxlHLXprnIAuEmzrqaOVrtoVx1GGnKH21w2brNRWnvsGMxpiLIV9rqWU7iY8yL+wFQV5Qu5We0OIUyTXMzWE26pT3gBnDFhEwvC9Bf03XDNt0dGGUoTlS+QrZpp5Wvo959AVClfQ429hF7msDBkgg/eDcLJkeG7Mth+Kp4v1+uz8apJGSVveAXAZR61hGmC5d2Kawx7pjIXdb7qhiQ3dt/K3Sd+YUdzREHDEdT4SydWHhbAuQqCBBq75gNwI2P54jLVnn00Gng== 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=01lUZ5ND5Xaz0Sli9opUe0Q+CxfG6MY2HFgv79RuFGI=; b=Xn7ccwdyLrF0YX+V9F/bKSsRZm6WrvWF9GcB+Uql6/EiGXZhlrldl6LLz+ASe4GhxQMSXXg4qlLh/09++ndlpVVq7nA6NeIvYrHSjf9wbH1v3JHp2pcWC+75ywUf2l26Isz2hj51hv/39m4x/g21WaRSByWfcHslLfOPXvEpQwtSr85TNWmwYcazBH/VciiKU6adFbUWyCNUxtVSFQ4Nd6OFEwm/+UEDh+gYigm+6EQaWJH5nZUEu2H2chwr3MIRC+jJ7UaAgJ4US4t40i52yprELPQFPO+FO1yPPVGzsknIjql0Q07deSOn5/DSfBXVb7rxYpqXJ6cvdUTE59d5Qw== 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 AS8PR04MB8948.eurprd04.prod.outlook.com (2603:10a6:20b:42f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.43; Wed, 26 Mar 2025 08:00:41 +0000 Received: from AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93]) by AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93%5]) with mapi id 15.20.8534.040; Wed, 26 Mar 2025 08:00:41 +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 v2 2/6] PCI: imx6: Toggle the cold reset for i.MX95 PCIe Date: Wed, 26 Mar 2025 15:59:11 +0800 Message-Id: <20250326075915.4073725-3-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250326075915.4073725-1-hongxing.zhu@nxp.com> References: <20250326075915.4073725-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SI1PR02CA0059.apcprd02.prod.outlook.com (2603:1096:4:1f5::19) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|AS8PR04MB8948:EE_ X-MS-Office365-Filtering-Correlation-Id: a46d60a8-0281-418f-4429-08dd6c3c4dbd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|52116014|376014|366016|921020|38350700014; X-Microsoft-Antispam-Message-Info: D6cirggQwh/2uH0ujFkgRiJPnHbiC65YOko2m0pwOSWKCisnit40icBTrso9AggCZUns8Ee+bQ2zWsN219oYG6jdZBcxZNAtFuNC3iUbU/yFD6VIVtXjR1li2SDnchh6fk7XmawK6qqkBUslM0Av416V8X39YZTjTfTSaKJF5z5f0YrzniWtozDoO/b3W5B5xBGfvDvpTSHCUXenQhqNLT40o/3rQvyepAKrstyjeY8A0MlyNwZ3PdydUAa/anmeHKPSEwwhsiLMdflKRHAWHgk8B8cQuWkqQo1Sh4JWCSrMEUTCXPTnAnyvmm+0GKXuvmF5kOQkAQRZhRLekyfkOYYLF+lCQTfZO5kEMNAvPW/J63RZNh5k95Emq1pgBwYFqYsrKf9bsaYQOP5X4uBMkoxKleSWnES6/tVq1/ZBqn376GOnv14O4L7o8fX1nBrm9dYAxZsJ1CHVNUTYgg0Da1GF1EZkU4Wnf5eMkMXG7lpCTK6yq1UHQUeDFCcasejTmPKXerp8lRYkeyQmxNCILRlrkonGwUOPSikSsNDZLUbsaQLQVaOKrqoyKF64lmMPdmyNdqBVU73UDRYtBGwrH5wJB4TaOqfPf62k1BNp7xj7OYEBVD66CCaA4m7+/dzPZ7k2RlN6HcGMtFurMrMt85PUSWbSKZpweUobC0vGhaaD2TuWXkutPOt7kYpHcqjgkbuAsZeUwixIAk36MhVUk7kQf4l85aPrMVhQOWww6z3zzVT14NPPl3m1GVuCQWA9xzMC56ESAQcdKCw2x0lF+XWK2tGxVhKItLF6ZKVgqShZHMkAPw3PKNU47DYn+n0c2tuQrrHQ3Zi/Jle7dn1h1hirSBLgbEXoEhgnusdlSWTzm8PuQrRHx30gYNajy2Xc8Lh8r4fr+1cZuf6NwGvbA4kOJc+K26tQaRVkSa9eR9G5FwL2pJ9lU4Kdt4sIBj4cwY9KgAviN7XsQ/GIw8Vy+VbbgVvmjWmeTCUezaykhTIaSMn+QiQik8sSE/YGUMchjPEOrj+GuCQTgUAbYW580O0L2gxSDE/83Slkne6TK3VEvOPdcUP1qR91WpDAOOSg9t0zGnfhXP+hZgoPjygCMfRrWvaikvjt5a0DDYd8x9dvkP/Ly+Co4ENbpbv9dkNgv3Ng15S2xls7XPD0JDA61wUP29Hj0sBvdIo+F8z7KDWzrsdPg6q/ZQy5mygleliWHbFe5zObA5u4BiVYub1X0H5yODV8cBMYk/upbfmIfbpADZGuN+RHDiuR1jNjbkjX5zJrJ8+mPPDzHXoxin7JkKugpHF4sirGRi8PPdXBN9gm1V0ggWeaa1Z9O/CwY3JQV2yOKSWwk4F7h6mUHDaZCRVvDAWBDIurAwWbqRJ5SxKSmuoJuOPC0JKLMJMePwK1+SztazPZ/zoZ9r1FRpf6bJLNH2SYUCldRQcQ3qoKowGEIpUHG6aO0b86TRFqf/cbVBB0j/5LCveM90nFAKB9fg== 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)(1800799024)(7416014)(52116014)(376014)(366016)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: un0dRJhozEp9jQHBztBl011nH1TsEmxLLpDo0j3OJX8Rca20KjvcNcfU7jjOVc5CxeLhJZNJ8VmHwDQurIZYqsGVRiohLCNwD/jpCRh9fM45aRmrVWxlrqWUYrpzcuOyJwwbPpfSfTcaxtICHi2ipikkDh4q98FAjSYQtqC3K8LrpsNDDpqy3TAvrqDF7QnWs+IEi8LpyHo03HB0c1TtZXWKeDy9Mm25zWv+93p45kvonoiBNbBWf/Kh2cWmqJ82eWatPXL9fhmyED/RnZ/NjPmJMoEQDCgs3xakvdNUnUOhma3t1yh/94iLYwdOwsrcAGDXsygpN0FM3QY/AWYRXF1P5PzJg0RL4CvDmq5ap2Snt+BbC5JO5yfaLBtbKd6PsFOThKOOCZip3X/btxZEHXA8Pkbo3R/M7uch5oeosXr/GcXzw0dpQWa52Ox/UkBYm+vBxDUUdwiDvxfpEchC7N/rIYhIj3m0At2fn4mRoBzzyWermztGWu9KaNQJUF7uFkKdsur6e20jnAogz7MKjbXxL3N183PwjVPCUOhvCYC9xFA7aTqjsb65lRWtqvbiKLQ2GQ6nAqYU/q4FTbdOQtL2Bf7bzPRjzr+zVhbC5dnLlPRuQ/XuFWl8RsCa+N0UTwnkncngGh8I+KVnCgVjZCJCbACGlMrQTE4G+9h8hQzWzhRHFKkTk/oD9U766Sbx8GU9eAwIZRG7Q6Pz7cNAn+JS4t0NW0mM3h8UxsY6jpvihW3PCK93G0DU7qEO/MuujGPCvJTcFwLK1RfhdW4aqph94WSbAe6dHgh/K0+cXMltJXBmJ8Ty2qh6lL2PVeMSwZOoiqMlkNyzr/0AZi4xzokD/ZzlrRQTVm/S+IXGOIlirF73/ID972e+/HjHl2rLmJGrt9d/+MTHpVOa95Q/k2vL4vKfho+G63KTE/80eIl4mcLlI5KbrSYP2SIojUmzll7mjJvkKhG3ZWLtwjoC1n343/EKjBEblooUWdZbZaCg19aHdFvqUbWtjn87FH0i8PvYW2LoshHZFnhdRuGgXKzT7ozbAIw+NwXzeTeXKL19aUOt3Z2ox89pedkkcyM8hyplg+Dww4w48N3goeOpleW0YMbwmGaQ7Sshuu7mhRaeJ2hwakt+FkB118svT2pR1K85kiHIfVnJDNkbhuOvdtxhl8t7kc4RK0YlBB/tPTl2zy9nbGxliTn2klOMomRBjV9D0XI6rjAG0B3pql0ncZuThiuMqUQhtCGIRzypV1C+auiX/EOYa9pRKrfTXdQsmtzDPv0hgYo4xSb/Iq8hCVf2AJIcc4iX2RsA6xraCjvQNsf7mh1IKf1foKphR/RFqYHVUo4pZUMVzDYzIak++w7rfh/9t1WvwVOCAhsTG1bwmcMt76yL2Q26oZba8XQ+Nz5KOcTZPtdtvVQEJjtsoTluTBY9rFyy3hgWH/da+yVykQo8F4+cu1AHEfA1wVNdDPy/CEEoKGZx4LkhclXXxxSsag5hLzAni3q1H/Wm7pgvdB4rkDUzbKqvx4TNtwFkf8gDtY5mPfFy7/49iPAAFaYAi0WIRGaQhye65dYQQpbKQgPL1IEpVo8GdP5gC+if X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a46d60a8-0281-418f-4429-08dd6c3c4dbd X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Mar 2025 08:00:41.6546 (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: OLGdCPNGR80FtGCyRBMlME2Fakd5MFUacBFwbhk8no+D19JBGZQVkgvYyuFu00Nr4o3ROKdXlMLvk0ND2G/Zdw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8948 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250326_010044_638656_7CDE086E X-CRM114-Status: GOOD ( 12.60 ) 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 Add the code reset toggle for i.MX95 PCIe to align PHY's power on sequency. Signed-off-by: Richard Zhu --- drivers/pci/controller/dwc/pci-imx6.c | 40 +++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 57aa777231ae..13e53311cc0e 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -71,6 +71,9 @@ #define IMX95_SID_MASK GENMASK(5, 0) #define IMX95_MAX_LUT 32 +#define IMX95_PCIE_RST_CTRL 0x3010 +#define IMX95_PCIE_COLD_RST BIT(0) + #define to_imx_pcie(x) dev_get_drvdata((x)->dev) enum imx_pcie_variants { @@ -773,6 +776,41 @@ static int imx7d_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert) return 0; } +static int imx95_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert) +{ + u32 val; + + if (assert) { + /* + * From i.MX95 PCIe PHY perspective, the COLD reset toggle + * should be complete after power-up by the following sequence. + * > 10us(at power-up) + * > 10ns(warm reset) + * |<------------>| + * ______________ + * phy_reset ____/ \________________ + * ____________ + * ref_clk_en_______________________/ + * Toggle COLD reset aligned with this sequence for i.MX95 PCIe. + */ + regmap_set_bits(imx_pcie->iomuxc_gpr, IMX95_PCIE_RST_CTRL, + IMX95_PCIE_COLD_RST); + /* + * To make sure delay enough time, do regmap_read_bypassed + * before udelay(). Since udelay() might not use MMIO, and cause + * delay time less than setting value. + */ + regmap_read_bypassed(imx_pcie->iomuxc_gpr, IMX95_PCIE_RST_CTRL, + &val); + udelay(15); + regmap_clear_bits(imx_pcie->iomuxc_gpr, IMX95_PCIE_RST_CTRL, + IMX95_PCIE_COLD_RST); + udelay(10); + } + + return 0; +} + static void imx_pcie_assert_core_reset(struct imx_pcie *imx_pcie) { reset_control_assert(imx_pcie->pciephy_reset); @@ -1762,6 +1800,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .ltssm_mask = IMX95_PCIE_LTSSM_EN, .mode_off[0] = IMX95_PE0_GEN_CTRL_1, .mode_mask[0] = IMX95_PCIE_DEVICE_TYPE, + .core_reset = imx95_pcie_core_reset, .init_phy = imx95_pcie_init_phy, }, [IMX8MQ_EP] = { @@ -1815,6 +1854,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .mode_off[0] = IMX95_PE0_GEN_CTRL_1, .mode_mask[0] = IMX95_PCIE_DEVICE_TYPE, .init_phy = imx95_pcie_init_phy, + .core_reset = imx95_pcie_core_reset, .epc_features = &imx95_pcie_epc_features, .mode = DW_PCIE_EP_TYPE, }, From patchwork Wed Mar 26 07:59:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongxing Zhu X-Patchwork-Id: 14029854 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 4108BC36008 for ; Wed, 26 Mar 2025 08:11:19 +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=GOEIwg7INvyRztMhsQOiqa0ncWqXo6oUqnagiAMoxQ4=; b=YxgKK1/VyfCqc8qPIjOtS6QJYX CIBCHrcKy5uqLjoOalM1P66w3MYmQCqUeZWHxl5osHd+Lux3x06Rw5m4bC/dII1T41II4qZfnzsnM Pqcbu5T25KuriPW4Ur5Y67KUCkoRYzTVmEdVLc0RX743gtZSrPZNBiWXQFvKnsG3qziSPVp7/ZVuQ 8mnKiS6Djbk5F7V/P1KaLm/hHvNQZHenzLXCHdiH3Gnxw5Z0vXkijlbevgaIlDkt7mKhz6HGQWxI/ 8nZ7mgH9sfIszHYhfv0ikPagpHinRoFwvkODsC8aQOuX0UpjOzlpHCWUCYSSdosjouz8rKZSKpdhP LlZw2pvA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1txLqu-00000007sra-3jIS; Wed, 26 Mar 2025 08:11:08 +0000 Received: from mail-northeuropeazlp170130004.outbound.protection.outlook.com ([2a01:111:f403:c200::4] helo=DUZPR83CU001.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1txLgv-00000007r8l-1h4k for linux-arm-kernel@lists.infradead.org; Wed, 26 Mar 2025 08:00:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qxXQd5MV/+GqKxC3k/tILfHArkGJORjSCpIkFxci6yiMEI+wDuVZrFC+wFT4UkiHFSt0QJdtWn6s/I9ft5CZOXuLX4a9ef9RLWZToYeefcfgAlsZF6oq9p4vdxtg8581p8XpljOwr23uhxqT5wL7LgPWGkLs2sJLxX4wM+fPq0C06bU6wKdExExcxrO1gWa2R1/Rf2CH2wev26rh0G6Eu4BtPybWEgSY8AKQVBlQb8l0xmhffNslhly3gVpp7Xa1qJnIaPkmB3UZxW7fS1zUMQbO8xcvsqiIjkvOZFn/duhmbnfMz2QnjRFhp3A/zteKZjekJtaSs+2p9wgdZNCA0w== 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=GOEIwg7INvyRztMhsQOiqa0ncWqXo6oUqnagiAMoxQ4=; b=CQyMZVNTSPWITeJIOJZi+jjc5pD9OcyDTVeAE5yNDYX1Ns8T74qJMSyqHorQTUuonGAK9ICrvMwhuxMMN37Km8x8Bap8Wk1Y1KgO6L50bd9y50oMpcASlsBhgrTmVBT508ADdzW4AC4nndxi88aVLSyl0EYPswMB6tlDCjnu5QLqwPXiiPW6TYoo8wZPYYe6tw4gkOG6fZk9Gwjh7UBODOiliPxz1z6g1UWpG4674aMCu4T0pcCEvNwo2CbQYbU89LhW3uZn0hiG6b43r0WAOUnGKIIZq0Az4IEGIdA30nePbgPD65jBPt4zpqQDVSC+9FaEr6lsKGbjxd47PbHXpA== 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=GOEIwg7INvyRztMhsQOiqa0ncWqXo6oUqnagiAMoxQ4=; b=mDKHoKA4kJyl5yAe/uSBlaU6mzb5OJmpjv6BfzcpM+HWZiLiYR8FvwUhbD0WkJKyEGI5XJ3a9g+np/Kd/s1TC+tblyKOnhvFQ0mw1MixJNt2gzJ7gJdGR2TkwdDXYTKOm8NQMZa34IM9mvUgrkEdZKDa7jM9iyLuG5mWC0uNIMJhDR6h8RVB4zt7qe64x+mFlfh85mx0ZwCQs04ravJg6Rth1Er+Zj89NV9Tjzpp+UGNWdaHowS71E5R+e2FCJcPYPaqR2gp58/+6g/X1rdsRQovs34U0DMOSGTdf5fk6y88fcHutEnFlhGDFOk89ygFR0R1k3qcg4QjGWFiTHjvFw== 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 AM9PR04MB8828.eurprd04.prod.outlook.com (2603:10a6:20b:40b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.43; Wed, 26 Mar 2025 08:00:46 +0000 Received: from AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93]) by AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93%5]) with mapi id 15.20.8534.040; Wed, 26 Mar 2025 08:00:46 +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 v2 3/6] PCI: imx6: Workaround i.MX95 PCIe may not exit L23 ready Date: Wed, 26 Mar 2025 15:59:12 +0800 Message-Id: <20250326075915.4073725-4-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250326075915.4073725-1-hongxing.zhu@nxp.com> References: <20250326075915.4073725-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SI1PR02CA0059.apcprd02.prod.outlook.com (2603:1096:4:1f5::19) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|AM9PR04MB8828:EE_ X-MS-Office365-Filtering-Correlation-Id: 7d556d6c-8f4c-4de9-412e-08dd6c3c50cb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|52116014|7416014|38350700014|921020; X-Microsoft-Antispam-Message-Info: vfryXl3TMyrKlUb4eWXyz+CPBQlEJGEoQxIUhx3ohZW5H8rehjxMNkrFDoasXoCMr/g6d5BhiD5c+K29wo5Of93GKofs637XIxMH3g4ADIMl6OaaHTpP5h6w/YBvPddVkkj08woihBivHW4+H9QPzRcPtx4Kee44YQDQqtlodze6mkvVbNL1V9y2XVJ3uOwfIB9yhpjEf68ex7KSg6CZPpqZIsgUReZB6XWBhda3wwzaa6SctKafOi6dz4ZH+AuOACcu6W2FHUmDVa7rtG9D/s4OPVyVTcCNnKnyMTrAkLCy9XcyeYpsbJhwg/WRmJn1nQyFG6K6t+4jmOIuj9AY9G/2gzmdtfV/N3XzcNm5AH3N5qk440jXXVzALARCXF32m+tDM1iA6WeBZiML1Zfg/rMUrYNOsnTjEIe+j/w0lLjfVB6yk4hqdv+bnXy32UMsdlQquJKqHEFsT4kJfCAaJx4lpjfdFfQMOHfXrBS1A+QFDCfWgBQWADfIOf+xkpnHjS3Q2kBAfUA4F/4Geili6w6nAfFA2edoYmWWFKaVAHPTFVUSkYhPq6IE9XjC3FUQ4gskf69KBGcR+pFZuT41ctYhBHLYu+Q9becvGb9gqVRXi8aVX+4qscNrMnzqs1FCsy3LauoMTzkMVCVI32Bjn1kFliYGPa4seyoarqZvVy7LMCD8QVvNuy27tdl4cp+NA+lhlWxk3/Pbce8PCY5/mE2nYjkezp4piCpfAlnYRFDnR3zOSFZPYiv/cBtfHl1JCKsm156lcu2+659pVJ8zWM53eaZQyufTuLCKGFqBYxeCKXNOEo71eYuqdXr3R4TAj5tRbsiPnWDfAJs1JJgWm5NJPWc/9lSxcm838Ztg+6BFIrF1o0HTIuiYDLdVU8fKLgfCb14Ofxo/p3EVC3f97cV3FuimiU7pD0OjYwbBKmUfumZCOSZvn2UGv/jSXLIWfCbcjnqAMd5IRXVt/FFIVh94MDrcuZEAD0vpGn4jUqxJCCFFVxTXmW+mTq3x35cMy3vm0FGKMwEDQZVRUji71r3vNVFG/2TkqknydN9bQsa7CPTXlTTBeu07JYEFVvVcCrl31N5N8E4HXFXXJwjP186zAH6gPPXYMoeoWaW5Glsb3A79UDvY/wuIhcS4NuW4Us4BRL1CCF+1BVqliuaaeUowLjGUXHMfLd7IOh5T9ll15FL7lH92i8+r5ZPV9s7Z4hotT/oLnqCHQeCeFwwKJnyRFEr57uZfUua/SpWFtrG2E/0Srzr9SELChiEJVqQVQr+SyN8P881sA37KGzUoqoYVWzfCA2iKXOAMJ3DFavQPUkNxCXd1wtwpVua6oxBzQKYqj+ogL/uUJOac5w39fwbv0yyN+nK1zWpaBY7lOwSC74W9l4Z5zOZukl/3vDyz09OgNunHGExoUGO4OgRbq8mumwBeKnHst1Dr8p7C+2bbvC7J4TgwMk6wn9HmFQotEl0NIjMRSmlQ67M3jArGFQ== 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)(376014)(1800799024)(52116014)(7416014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Hp4hVEO75gr7dzSAsYCofSlkoh/HaBMapb7M9LLe4ZcvrlG5yO1waicTTT5keDCVBdkG0bWCAx4evSjB16TOkYiBefCFMQJhHFETR0cVu4i6SeZaDh92xVchUlWYHD0ersL3NMO98h8XT6BZ7ec771Qwg/YIQCTAgMexrg6D5vY/ACN8T3R/R4s6uEjMR7ZnWEnssCJi8305jiohI3Ot2i34mNhfKBtkeq8/N0bnhkrkYOm6DnNZ4kbAaynIcGXNW2LnwfXmAVKB4xOdK7dhOayQ9gTu/wdvXyW6Iwt91NaiI5K2GyJjDWBLOKYl9ukchtggASGV2YQeDgcE5Fp+Ngf6S0v91r8WBpmtrbD1zUAzBSI4Yn5496YmvS4f7Tre0qwv/s6X6gThFGNYNbAaRglyX5N2k7PBZimRG112IBpvlvQWyJBcR+K/h3i54RL8wPNORLRqTdNC5+UGwUSw9lOxSMuQFBf7acvqXwaQhDaMMJjXRC54XmKpL4PwNm0GwrFUdpbFCqklHj75SbwVtbrzhiPHA2YCdYKhiEZYX2CIJ+64tlf2/OLCQq5A9rUUWAHSM5z8qIfO3Iw1rC5oe6/tCH8RQIG4vvfzYl/L+wiuC2Sfr31VVNkO49wsG/gqpzhmeu7FEB/Z6EpbeOpR0gbmL4B/IB9dFKHkRTrL2sOQ+0NN3ffobuVKwa02udl61Sv19+REEC2Te44AJby0YumE6tOFDx5GVAbyqzAtZYKr6+zt/ujEVgNbyhdlzgQ3BuFKBBJ0+hoo183Sjegx1ZJBJTRrtM8TwERDg3MqQ9zzBXLX9Mq6FgJbVVmJi8DoiJh9pQ7pdj54dVDEKVNunnsMRRK6n2T5k/cIU0VVkgm9Fy3lDS6zYS5tCWYMqH77GjAnfNzHqQseYRSbuf5kLYMGmlP9BbCYjOSSHucnf3cFasO3ITRtBaAYgc6/mJ6wVebd9p5h13QnmTOmMagZCvX+0shQwFpjv7cZ51KdwKKyrQLk6dr45fObTJoyh5FDcgEc8tr8vcO8MLEePEaZQvfKdrHUf1H/LD8u1ihG76JsuqwysVMRSsD3KRyef4IuoHzDmP3WCTkzopRwfTMBUf30S/CrT06A5Hmo1Pj04Pqwv59yWQw168lvVFchZ0Fi9loWuGz+vvw4QOUUEvsRPVAhT63U4xyL9PgodBepdyrtHzi7FbTH1EwaApj458gR+VgfpBX25COxRZeS812foiYHNzobltQBW43sHdC7pf+24RuScLcaKtY6E4q7BQ9cENEtns3L3e3TEfIPf2Xa0KNWU8lrPWMyJMy9ErGlPksKlqVPwl5nwG/RQZGutZMhDwku15BW4eX0x1EL5ZFC1TdZgZVV78dbZwyaoYy7X/lD7yg4nqkKpil7zav8m/8BrpGlN4j7zzKMdPJ3qeTntLjLICfuXUjrO9BAEuhOo2nIikjOG2h9XNDdZxq0XRotiWqLS0BHFdEM+ap/xnWnLBxX0bQV+dv9qKWiAZqvbrrmVTeOvkAPrMtVQICZlq3ZX98FtSTi0AK6U9/gkE4VsCUwMgtNNdxU7/oD7YouAEgIj4PETLZvS/maWrvLi79V X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d556d6c-8f4c-4de9-412e-08dd6c3c50cb X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Mar 2025 08:00:46.8072 (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: xd0se8B9MovpIsgcJXiy7av+lZFBx8RTzPWpD/QaixRnKXGKWHRGiH7ZTBDaUq9DfTRpi7UystVxiUfkIlcGMw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8828 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250326_010049_443707_109F1A04 X-CRM114-Status: GOOD ( 10.87 ) 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 ERR051624: The Controller Without Vaux Cannot Exit L23 Ready Through Beacon or PERST# De-assertion When the auxiliary power is not available, the controller cannot exit from L23 Ready with beacon or PERST# de-assertion when main power is not removed. Workaround: Set SS_RW_REG_1[SYS_AUX_PWR_DET] to 1. Signed-off-by: Richard Zhu Reviewed-by: Frank Li --- drivers/pci/controller/dwc/pci-imx6.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 13e53311cc0e..fbab5a4621aa 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -48,6 +48,8 @@ #define IMX95_PCIE_SS_RW_REG_0 0xf0 #define IMX95_PCIE_REF_CLKEN BIT(23) #define IMX95_PCIE_PHY_CR_PARA_SEL BIT(9) +#define IMX95_PCIE_SS_RW_REG_1 0xf4 +#define IMX95_PCIE_SYS_AUX_PWR_DET BIT(31) #define IMX95_PE0_GEN_CTRL_1 0x1050 #define IMX95_PCIE_DEVICE_TYPE GENMASK(3, 0) @@ -227,6 +229,19 @@ static unsigned int imx_pcie_grp_offset(const struct imx_pcie *imx_pcie) static int imx95_pcie_init_phy(struct imx_pcie *imx_pcie) { + /* + * ERR051624: The Controller Without Vaux Cannot Exit L23 Ready + * Through Beacon or PERST# De-assertion + * + * When the auxiliary power is not available, the controller + * cannot exit from L23 Ready with beacon or PERST# de-assertion + * when main power is not removed. + * + * Workaround: Set SS_RW_REG_1[SYS_AUX_PWR_DET] to 1. + */ + regmap_set_bits(imx_pcie->iomuxc_gpr, IMX95_PCIE_SS_RW_REG_1, + IMX95_PCIE_SYS_AUX_PWR_DET); + regmap_update_bits(imx_pcie->iomuxc_gpr, IMX95_PCIE_SS_RW_REG_0, IMX95_PCIE_PHY_CR_PARA_SEL, From patchwork Wed Mar 26 07:59:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongxing Zhu X-Patchwork-Id: 14029855 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 E66F1C36008 for ; Wed, 26 Mar 2025 08:13:03 +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=BlgxNsObpDiEWZ+wlblsAe3qlMrdX+CyJfWuSHKWzEo=; b=yC0gqHnmPKRQOibc/Sh4J8DOjI sztGFAdbn4ToOcb0zY/vXxsAi3JkqT4HI4wKFxilwGURnSrcoCZqMYZco1fOI9593xnuGujADHZ6p iV++f5fN5sXuUVTKeABixaYc2hBdTBRgVI5pr3y4TlwPKzqoxZ5s2aDt95ZvHl6ksHo7Cz7/niepG UmNSbUKyl96xaBvcsWkiYAf+pWRQ8mPS6Z7h04CzOX4Kf7MVF2QeaUmTtRBqXujcw/KWam3WMKvO7 TqBs5Ngb2DwBvp+2DHZ7h8VEezk7Yk+zOWLv54wtXxuhOHdLwN0rPUgkaMnjG+UFWvy8REh5iM3sY g/gaWBIQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1txLsc-00000007tEv-2mDx; Wed, 26 Mar 2025 08:12:54 +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 1txLh0-00000007r9Q-3HgU for linux-arm-kernel@lists.infradead.org; Wed, 26 Mar 2025 08:00:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pHZSCin8ej8xOD6/XSHM5/e/lXHWNlUT4I7Xd6i6or4a41YHdXr6fU7Zo6SLZgitDv/P+uK5ouSYqUyCT2TkDn20oRreTht5LajRSJfwFwQXt8WTg+cSaAvFKLTg5IhA7cJ4c3txHfpgJhqxja0+Eg9O27IundfvtEStj4c6KYQmlwFLABYe2RgDyectfFgUnE/dsyXDdyseToTitPlmAb+GJJtwMNwMiPQpx8DA9cKBYNn2dcdNRTLU/Txtm7PgvrEIUu+Q4OdFCvbNxnZ4q1SMX6GbU1TG/xozDTkbm4jNcCi4qT0YhzFssXOEplyr4EOJBMnpQL5wwZV9v+bz8g== 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=BlgxNsObpDiEWZ+wlblsAe3qlMrdX+CyJfWuSHKWzEo=; b=O+6K6mWZQqRol3ZI5DW6utdncfVBixc53N4GHGdxO11EMqoPUGmvc9eUX4QD5NF3url+tLmw2SAUXEfprHDryKFsyaA3NhKhR01k8C4zYJxPO1S1J8bCrY3h3Wh1nc2t900i+wwmfQJNLED5INBGdWC0lLM0cwDcnZaEL50CKsa6F7xf6FTXePkX+peQzboFndxLPlru4MiI8I8GyQKJ56mSYsFnoLneQOUxQtvRha+cK8tH9GqnX2eLuWKUFeTrV74TBSApPK2NYl/MY3nbOyqwvulHywZLn3xozufd/M+Mg1bWClVNB+EJu6v/HIiar+ukY55YhJYbUhhp+IbK6g== 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=BlgxNsObpDiEWZ+wlblsAe3qlMrdX+CyJfWuSHKWzEo=; b=bqRWkRCrUWUokGe4b6O88dUxaUFQJgHgXbq4lKNNpVXHk6ZWhVggJDBZ7qPMtlazV0MKbXm3KeQJgwb5GNOzMwGtfEsehLjDj6j4zL9QvqfU9OFeAyF4TRvRHiQYn8o6FZJhuGQA+Dm8slX6Aq2wHtHMFdGfkLxFYyH3wDkaQ5tBU4y9NqAqgiOU1vwuZvE3oxhJnrv453G6ooxGHZjmPJ1HtPDR5pEB4KumI0726D/5utBDg7Cq2m9EDf+bftnUc7PorFF8BkUgcWxFd6tNMTTeK8DcAT0shyXQkGM5v7GAGzmIA8oTjqNE+VzEYQF0hxzF9Hs72A4mJ6htwlLWJg== 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 AM9PR04MB8828.eurprd04.prod.outlook.com (2603:10a6:20b:40b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.43; Wed, 26 Mar 2025 08:00:51 +0000 Received: from AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93]) by AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93%5]) with mapi id 15.20.8534.040; Wed, 26 Mar 2025 08:00:51 +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 v2 4/6] PCI: imx6: Let i.MX95 PCIe compliance with 8GT/s Receiver Impedance ECN Date: Wed, 26 Mar 2025 15:59:13 +0800 Message-Id: <20250326075915.4073725-5-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250326075915.4073725-1-hongxing.zhu@nxp.com> References: <20250326075915.4073725-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SI1PR02CA0059.apcprd02.prod.outlook.com (2603:1096:4:1f5::19) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|AM9PR04MB8828:EE_ X-MS-Office365-Filtering-Correlation-Id: 59302409-e97b-40f6-eea3-08dd6c3c53ce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|52116014|7416014|38350700014|921020; X-Microsoft-Antispam-Message-Info: UqGh0qzB0kNqjSrunPUAkN9YhZjG7TlDTr3q4C5IlmnrbVYRDGJl9FnV7bpm4W3qvFZ8ZcjEzeVBBuqAKkgt7QZnU3ZCm9BsCSrMTTtE8wAUqxvirfRcw9OBPSvPgxDO6BcgvDlZIqoEUfNgSkhpNSpyQ4PZbSKm+WZxKio7ZuOdhUr2C7zT8ZsH4Fo6MM+QCAGBJBDAdsAY1McgxFfXyoT+x98ioa5gtJbkKoCWdTU21bIPwuG3rbFU9yunNqjqyJNwegn7U5FhQJs97ZQGpsv2II3L3Z0layhhNeS5M6/xVYlJbg6pJzAJOSyZZdkoZRxU9GIS9ecI4aW87nRswCrRPInIYEMd1VkECkEYBv9rP8QMUPMJvuMwHZBHS9GCOwJsiLrzzOdQ+hDBdlP/xyrcCbF+2h+oIuXsYAFbDWcFOemJn4IyPoTaN/Gge6JW0sysM0b7+eAoT18rizvtaL0vMrTwJSUAo0VUKufii0Pr5vdTRnMTFK9LNyCQflrSCgF5F2PA8U3Dpnn+qiwIyEt9Mm2RP4YKLA20KGTdwREBKls/BcHOKQxkfcMFehVszJMZeZGDT/G8wSzk5ZCylBiJANOxpxbsOASDAniFw18a8ck/miHy2JxQDrid9YpxXxITzGkkW9rxzEEXllUM7vpXvZsvotcyL5YbniwJSgk2ejpZcHur7PXVE334ZSfDwptq603GEynxAcBfgmsUuXowZkWA2OzZ7BkmQvq3J0rjxaNeo2emxDLgMIhoutf1wpTJ0SoWJE8J02QkcIvqMevBVzsAG2txpSA+yEKryQ6oD8SwT4O9XLFtDGDy9HccbGuiyK31GtdhE6kS7fGJkoJG+w2/dSuKCi1y1H2o6/N84bEqrupp5+DkNE7qZEO2jV8VqVKp9X/939Qj5t+ylGLZi0Er/dMdg79pIj3u+Xrx+UocMY5f11RwvpuDVW0dxWEv+ta9MxdQCia7YxkBcUSnG0EsM5DDNcA8RcxuUeAT5tu/yiVgSCQLIOk240aZ6gFqUfcu9ki7oc/TnyCJQP0oj1ZDnbZfuhI+5gKjXil3h+IizfYKH7uwKjTHZdbzS1wQrrmQVo9RUMgPhZ4GOHFEo0I2Y9P5cOpVWaPQX0KokepzUd7oMeq38JQaaBWKByMB+VOFj0xRmTD5GspouoZPG8bAj3rSeNjd69qpKVcnWQ1khtQsQGxAS31flZHW0kwSUeCRfvo8DLCuxB/S4O42RnEQ80viVHlgLArBsS+Tjdf93DWBTUSM5zPDvWoMMZzawiValxwRhmDJ/F958iTUEzfe4nksP0IamAaIdrw5ZTTvqL1jJvGIh7N2c5291CT1Iwb4m8JsTh2z31hnhr4aR++lUJS/bPvSxMJV4yAEfZEOTpAzGf8MNFVWN/VXMZmczjt40FIEGYhSbj7vAE+uc/j5tkPjFWHfCNQLtS8cM0psEzDiOq2dAIcel4xM9Y8yEm821tBU+aeFahd+eQ== 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)(376014)(1800799024)(52116014)(7416014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HR6obf1XkJt6SKpvpIrUQ/2188gOylex23zpt38WcURdnNEyTL1Qyco2lNpw4cjVgxt1opfywhgWD2FFcZjYeFBQ3wCjaBlEiIq0bn1ujpaItTAqOhHZOT2HOzlZB7XKCf0JXa2cAiTRlSmE6NgDFxUGiEn+ea74jbs/9DZlB+VtfwgRZpbnF4XRtI3D5q+AFhEogdWl2cpoNJsMTVk86qwhUaRXdfMMJM8/05r5TcAfp9sxPa40aOPeH/WxcfciE6D14V0hgd/6OamR8Y/astBJbWVD0AgioIqRnu0n6FIzxf7iWyOiOXDypV2KxCLCqGUSnAFMwBU3KaxpPJwJFqa7/40dt7SJ8ztjAp12T0sLVv208VjPrdLsM82HecEJgr3UFvqRdpBTzxXuAL2Fvo1IU5VHn8aoQ+6LGOpHCbbyJTiy+M7g5UnNBi4nfN6fdM6wvTQJXHSmeQBWgW60a+e7qCKqPJnddkI5I6idEvWpX81WBarq9OG7ErmodGNlDUnhAayXtElVG/JaLw3xghjC6vJGvjAVqB6Tv94fZYYlAQySAriBXBPr1T+oOxvUzOj27gpdFYXfOdTRPo07QL0vxtPaCnTc+Z25+7zQ+swXW7Q/aCF4IQppLT8LTterBlknbK4pTaH2XP64e9HdQ0Kz+69NWp27L+M3pytFyQ3DLsW9g67gqS5nSer9IRNU08Bh1pkWchYypCiuvLz+z0M4cvliZfED7OwuQ122p4vllpu5YJyGMSK/5O3fsZDlKbQhY3oGXEiwS+UYHhOD1hOW4HfxB+fKv43YDTGiDILGN/Dk7WsRo+IxFB8+vhR6KAUOhKuqAaUeOz1UGu9goCM7WwnFiBgayh8GIRX8MYhgTrVu+ub0JYFFYeyDWOXuS5v1RP0U7hL9rFiGee2YKONA0iAJj94C+kyQQlERSHue/o7didSlgGeX2emQ+Z/pmY+CZ3u5im8LTj9mEqHwO3XwPaB+vPhVqgOo8tjsbUMUTl+FvIfcGXWLB2sDaWkhRA/g2VRBdZCrd/976v2tG6Mz/2heZwWBwQGHD5l693OodIDAg60vetg6o4qObmTbxQdfzPvrm/7xTBzqiFafbwz3fRPY/Zzyx079mKv9GusGmNqIvRX57ynAKqW8h1qlLbqeMDLEDIVcgJTrsyvzG4DrUpwLV6cM5D9ftzHS8koH0KNN9g7+mSBpgj37zfkjr/w4BRxJe6cnzMRyp4rCRGV9lhBgmOa+Ppozjp2QvYj5crcfv+coI1K3o88VbIVApaTUx37ia5t0zL3Km0YvcExvdA1fSy/7nJgDOdIkqr0lsMt8kv33l200UG8pL2Q6p+6JkHjsZ50o+c31eKA0xveIP6KH0PCIrKkgGPeJspiINgLTYBH2YrV0dy3C+qjRuZrpxwRMPcZ/wA2r/TMfNvL2zHaKasGpojV6g29EzUkvhhE3KzfN8ZGznpJLt9SpqlxzanXdvp7zLUWanKWAc7P6WKHQ+x+kI+yGSrb5P5zwgpwI1IbO/DNAFpT+ADiyQFmsWJsBPoumxoXL3KT92avJEAqBKehyEVI9Br/HY3W9NOI72lVBlXinkcXoXZG8 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59302409-e97b-40f6-eea3-08dd6c3c53ce X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Mar 2025 08:00:51.8409 (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: BkQyCzJejQrUdifHRTU3wkOWEJtaPqbGmM1CUKnCyOK6MZE07/LfDw3hd2gtX3Z/DUsLiIi9PDyF397sUxUxuQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8828 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250326_010054_820959_25CCA977 X-CRM114-Status: GOOD ( 12.96 ) 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 ERR051586: Compliance with 8GT/s Receiver Impedance ECN. The default value of GEN3_RELATED_OFF[GEN3_ZRXDC_NONCOMPL] is 1 which makes receiver non-compliant with the ZRX-DC parameter for 2.5 GT/s when operating at 8 GT/s or higher. It causes unnecessary timeout in L1. Workaround: Program GEN3_RELATED_OFF[GEN3_ZRXDC_NONCOMPL] to 0. Signed-off-by: Richard Zhu --- drivers/pci/controller/dwc/pci-imx6.c | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index fbab5a4621aa..42683d6be9f2 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1261,6 +1261,37 @@ static void imx_pcie_host_exit(struct dw_pcie_rp *pp) regulator_disable(imx_pcie->vpcie); } +static void imx_pcie_host_post_init(struct dw_pcie_rp *pp) +{ + struct dw_pcie *pci = to_dw_pcie_from_pp(pp); + struct imx_pcie *imx_pcie = to_imx_pcie(pci); + u32 val; + + switch (imx_pcie->drvdata->variant) { + case IMX95: + case IMX95_EP: + /* + * ERR051586: Compliance with 8GT/s Receiver Impedance ECN + * + * The default value of GEN3_RELATED_OFF[GEN3_ZRXDC_NONCOMPL] + * is 1 which makes receiver non-compliant with the ZRX-DC + * parameter for 2.5 GT/s when operating at 8 GT/s or higher. + * It causes unnecessary timeout in L1. + * + * Workaround: Program GEN3_RELATED_OFF[GEN3_ZRXDC_NONCOMPL] + * to 0. + */ + dw_pcie_dbi_ro_wr_en(pci); + val = dw_pcie_readl_dbi(pci, GEN3_RELATED_OFF); + val &= ~GEN3_RELATED_OFF_GEN3_ZRXDC_NONCOMPL; + dw_pcie_writel_dbi(pci, GEN3_RELATED_OFF, val); + dw_pcie_dbi_ro_wr_dis(pci); + break; + default: + break; + } +} + static u64 imx_pcie_cpu_addr_fixup(struct dw_pcie *pcie, u64 cpu_addr) { struct imx_pcie *imx_pcie = to_imx_pcie(pcie); @@ -1302,6 +1333,7 @@ static const struct dw_pcie_host_ops imx_pcie_host_ops = { static const struct dw_pcie_host_ops imx_pcie_host_dw_pme_ops = { .init = imx_pcie_host_init, .deinit = imx_pcie_host_exit, + .post_init = imx_pcie_host_post_init, }; static const struct dw_pcie_ops dw_pcie_ops = { @@ -1401,6 +1433,7 @@ static int imx_add_pcie_ep(struct imx_pcie *imx_pcie, struct device *dev = pci->dev; imx_pcie_host_init(pp); + imx_pcie_host_post_init(pp); ep = &pci->ep; ep->ops = &pcie_ep_ops; From patchwork Wed Mar 26 07:59:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongxing Zhu X-Patchwork-Id: 14029856 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 550D4C3600E for ; Wed, 26 Mar 2025 08:14:51 +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=5IpZqI3nXfgNLmwZAq44l6QT+KM6WKem393AmhzEw5g=; b=OVP9dQoA7vqso6knfzAdmGZlIm kjlY3nrLADxLQ2K1zcQF1njD436XD/2vasWItRQ/qKwzlI77jS0pd0IXTMwu9/l6vl/cXRQsTxKWJ LGbP3RxePIXDSbYbBxvWbl4mUedLuV1XWFUAVcn5IR8fidQRbhf2gAPVhyA6r/JJmLhyPuadjYORr oH3s8peEjf+PCZe0LcgGUdyNlcujXBp3Wm4FPSqGOACXtsTZnAXxJ5s+vPtzOI1Q8emVKmzD9ZLsL p/y9m/TMFiBoe9icj+RpJlsld2QLLUjRlJgK3VdGuN2SUT3zePfrEjXS3KDEml1ZQsdwhcuMxeeIj OZb934JQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1txLuJ-00000007tUC-1XDD; Wed, 26 Mar 2025 08:14:39 +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 1txLh5-00000007rAL-1e8y for linux-arm-kernel@lists.infradead.org; Wed, 26 Mar 2025 08:01:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Cvj1ZKGJQyXMvqUSJY3NP8eBttQ8JVfFFDkn0O4zSqaEvETdjPoifeAf4UqZgWrCTrLROoZfDRf/HCgQuWLdVYGNbnMKrMy08FdYQHuJPVLT1oEEI/f4eJl/IJLKdOBiU+h8+YnvBRtmoJtmx+ONTgx/+YA1PbbduSVdQYWFc6+yrEIU3KgVr4xUSUM4BMWevV93Qj5PWDYUAce9I/dZ/kEsTPeCwognIqWvWElpdbDpKrCF3aECcBwbKhETl1L+xbahl9/3Amu581e18k6j3PttJgSKTtWxRc/MZmsUIb9CovNVqvqaPhGKcp2Ip8OTalNtSytUS4TEl64ZJ1ckHA== 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=5IpZqI3nXfgNLmwZAq44l6QT+KM6WKem393AmhzEw5g=; b=d6MuXtFQ4tOl951foQlHrt6aKJGOH6yz6TALaDZRjuXk2WukLdoVp/TIfmluk0CW76xaVakzJcNrlEo14dDGk4mvM+RexDosdVtyyZD9EQu9PZmVAdYwETdqBTtb316XYUhkeURL92HyKiuqvjAdnj8qDdJ+WlM2C7DJLQ464cXb++MmNUJkMigOhLzrdu+RPwaYI9hiBRKLHUg8+RwclXPBgl1V4UcY6q2HGvGV4T6nouQnSm+Z4RW+2crEObrtWqX+7FZlQI6qL/6z1uBNV0ArwMqyRA+EVHJF46ykOZjSyQZpVMFhCi4LZ+Imd0yRchjPFktTsggivBo3rjP78w== 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=5IpZqI3nXfgNLmwZAq44l6QT+KM6WKem393AmhzEw5g=; b=iGeoBiIT2X6gfnU9ngFr1307SkBNePXUDtvKXP7hBdOXifve45mjAb3t/EeMv6hhT6JeCCu7p/ihHwpPNcKIxSfYoMkJpocmPtAeY6V/3aeirkt9SI6WzeYx3ABBzRxDv4S3WZtQPBNxAk+bLPzq6Xm4ZExgmyO5bHLQQqbVKNCR//5owIjJQb9vOfQ0GyEywnhECxNkYnt/plaKUtqOFGJWr+1z/Z8fs/2uBh2pA0xaggR+olev9WkCnnwPclqXRtG1VeAE4YVbCvsDQ6FNSbmKBZTnfwwKJi0BvSrMREj0ecgiaZLHO5LgDh1b/GLrZrwHbVukPPYmSTi0TKQKIQ== 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 AM9PR04MB8828.eurprd04.prod.outlook.com (2603:10a6:20b:40b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.43; Wed, 26 Mar 2025 08:00:57 +0000 Received: from AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93]) by AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93%5]) with mapi id 15.20.8534.040; Wed, 26 Mar 2025 08:00:57 +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 v2 5/6] PCI: imx6: Add PLL clock lock check for i.MX95 PCIe Date: Wed, 26 Mar 2025 15:59:14 +0800 Message-Id: <20250326075915.4073725-6-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250326075915.4073725-1-hongxing.zhu@nxp.com> References: <20250326075915.4073725-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SI1PR02CA0059.apcprd02.prod.outlook.com (2603:1096:4:1f5::19) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|AM9PR04MB8828:EE_ X-MS-Office365-Filtering-Correlation-Id: 25bc1ac7-3fcb-45b1-a3e0-08dd6c3c56d9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|52116014|7416014|38350700014|921020; X-Microsoft-Antispam-Message-Info: rxGX4kuDONUziv0z6WJxARTinRVMVwXQSn7xE26qKMTUtaukZV7tcb+oEZhsfSfBiRX7NNj4C4NBUCGcxk6IRAGZAP4A8xacvbySkO7BOX/BFghnhe9QjfWzyBSj6rw/rX2f+uUQ9uqRgHbOWimnNXHCSKB4KJcG8Qcj3Ie1Kow2sKPaPIUDyWmP1+zX1iPc0NC8UBWbz4AP5HiItkTOMMFED5/kv6Ct2GQ2eZEeWgv1Fm9xU9wFeKNWPvJNa4+Qz0jl0DSzYZ1jdgSmHJD/GXvHJeKg9oFX58WWHUWnR71owiW+xwxZji4ZiXIAwrbkbTHFWBCamgNc3TOrBKJHYCGm95XIvAy9xa8Q0gAvOdWrfV3h2SUITTFlzwXCLIFVvsI1DFbeBmINzDzRHN6RBm0O9X2L1Xx2gl4dVKTQZ/YtcVsxqdu6UZLELmNqVXoWfkDMFJ+dIyG8citDKudbd5uFXJxRp7dL6d7oK7wOzzS5+Gwlp2m3AKelY2WybHnvrl/fOqzm1fomjLnud0TQmgq9gPQxmtiklOUj+fwIdf967UAxSwntmNvKEapl6AxUGUSS4AW1tl/8lcQ5fPf99VaHn3+2wfIszFin/zLZjn3AegxOr+IdsXtf2aNRN6CB+EUqZsAHUHAzln19hyqfPmymrzpdO/H1jI1nrjaf7/6eLBPSam9N5qlXA9nFa9YZDLJRRyzaMM1qXGWJj2DXYPpXS3Cfa9090C1GLvHfNZKXka55urD09ESklV0SyZ5+e4dbwx+hckRkL9S539qJce/UrczR74QnpE+gMCIgfnIHGYxdBeLXjgeibb/VkdsuA2fI7err+ShXiUbSn00BrGSACfM8bQx8dkW3Sk8ZDpHD0iR3enVOXly3Q3UmQopFfAIhl8lrPcQJ2IgOoiQk2zpBF9Rm73e79h8l0E2x9OmJuVQK0wSuL7ha5RdUQpVn4Plr+s9y3uB5Bf4uZ/xRL3u5p2o4pSNgaHGU25u9Tccbiaimj9m2NBldsKQfWakH6eXzxOO1Ak2XSpay+TDFP3Vgb54fQNL5X+VVJhqWJK1uPQ0C76O53qDNqekyDnLcRhEo15ITvgEj/4nh3V2OEVFdg63RNWEvxnt6YITapPgnJuDXgEiyXRHJzelDJ3bLMRT28VT0SG+wiMs6hlXRaUPNmvUzhc2tzzUvA5JH4QibAn44orNj89CaQhTywTs5QmCagMSuZMgqWhhrqoDizJQzuy0oVKfhMPhNpE5fSRk8keXwM2sj4rl0FWo7VVUXovOHpZJIRfQakwcZNe8KbkoEjrTZNfXkulAnt/xe9e7Xr9WIT4a8H/SWwgXrUACVDKqX19zqjxytus7U/y7dY/PhT5Qw+MuI7djNIhW9rnasmQxIPX2TXwR6JWeFcm4unZcMhJZNvBZMHj51cCysKzHbi5EIdVR1qWDWfhAgZEaL6IQ8BQ3ky/vXwS0EXmxqcjw8yGZq+U0aFc43Swd45Q== 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)(376014)(1800799024)(52116014)(7416014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vILVjFJyjL6Q5A5x8zybxneOOoTNc2xjpBD14w2ksXAMTg+EpRX0THlR6fr+g8DiBomJAiIEBtmACP/F5b3EP0xuQK4l8eIVg8kKyELc8UDxIRWlTWs/gmxElfDjtAv4IoZjRWMYglOjx6CGJb5b7arqy6qnX2PZgcZzvIk8k8XmUyq68POeNSrtB2YcDE0BxgElO/1wn+ES2BFT/Edezll6/P5PH6HtT2Vndbqh+QhLxvZF4G9mDbjP+7nJjGYQvzvVOIRdb5JA5O3jq+2Tcbfm47c/meAzUGBfM4kqjrhIYkzURdcTxVEOUbbmDiDRfZwoRTpWGfeHhoL0bDaUiuAZEM6SSZ9z6puOBdC7eapb3ODKBlaC9j8GTkCP+tCJrODErKN+Ar23pWx8fEhX8pZIXh4YFSSD+PE5ERIN3U8LO1oLPE3Ti3R6nrqJC+Y9EwkICcF3BaDUouEQyMYgKo+WRqb46RbjMO+28MlsV8+/lit9pwQpoPzxqqPNwaqEi+hZglT2O9C0uDUtd4NhDGoRua3qTbt+HFPZplCnTxuTrp3VuCKaGFHMRVuNrGRbl8HZhjoYXJn0NQSm6gDwmGWhTc2jNJ2xVpFGj5UpXKhBKqN3Bizy5OA/6On31HB8O2UhQg8dEYIYDyXff0Jj9CHdOdlfGdgiQy+nhkW/lnl9xF+04SDEeB2RqKORolUWbhHFBxqftk5oodac8lZMLkQG3iJm7+uzgNIKp2Qukuw2wWQavRu5aa9RniwhcaLnMZ8JV0j5uj9neSFjvcePL68ZPgEGkNBshsLA+Ia4dqy0ErrbG84FMtj7/+VxHV9FrQLrTCkq64IhCdF4ObmjIT2BZba+QaeNOK/GCwOgXoz6lMSTkIRSyVKWXV+Bhx3jPvuNw1vJvWTqYd77FQ4lo/zCjRmR3CSm8lqckc/IOF00BmamDr7awJBwMqO5DyY3vqYxPDe5Ve8Ak5yiMQ4HoYiUrXhcA01FM+dVbEDy46rtLr1eUrZaAKcr7a9QMT6+CDsd+gECNr3P6bzrqJAt3gn9Ud3j1/x4tzfEaUGQSyUsngKZTsex+Pb2AQsym2eYEQTt3noNIXUH70NfH0EGdZtH76nEcZj+pJwv1dcEgAk9S98KyTkEmQVt9Q9clk+W4V1IMhiOfJTp1uH++2Fbs1aKSnUT6YLBQyzQG4YEg51kn4cfbW37V3oQYyVEqDyA1ukQ5pFKDmZFcCxYb8OONUvCJ0mhHHvZ+EfqCrvowyuTUGOsHSzFAMnoqXkRXHQEXTb0MoXBpOOgIY3qj9x+zDvOvzMeZu3k2H9U3oRUHfL5Ok/W6Mut5C8g89gtjuuPDRHusG/xdhp8HiZNqHyY96eWuAAv/r9nQNHZ5YPVAMvWDxRUcCfdK50sJFV3sJ1CmO2RpoBXBCqRxnQDLbhkW6KwncMUgUZLmpaKUAeoq1aTmzSI0Hnpfqdcq2t0Gb/+gKYC+zE2vo610OcqtWTt/OekTYxl6/WtlzfflopWVI4kwMIjxrvu2JCp/g9i2oXsmNyiAqZMDJmQI2NWgMKP/DlPx3sjX15SvV1moqNqwhRjXan2IpEHq2a+1SuAn8DT X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25bc1ac7-3fcb-45b1-a3e0-08dd6c3c56d9 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Mar 2025 08:00:56.9542 (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: YGMBZGZmxeolpbaeO4JwQSuBhl3pAJ3k/wgPsWaC0GAkCtkuyajYTQB8PXZBp+dWf21bBxanba84qS+wS40Q1A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8828 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250326_010059_431763_18DBBDB1 X-CRM114-Status: GOOD ( 14.92 ) 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 Add PLL clock lock check for i.MX95 PCIe. Signed-off-by: Richard Zhu Reviewed-by: Frank Li --- drivers/pci/controller/dwc/pci-imx6.c | 28 +++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 42683d6be9f2..1c8834fbcfd5 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -45,6 +45,9 @@ #define IMX95_PCIE_PHY_GEN_CTRL 0x0 #define IMX95_PCIE_REF_USE_PAD BIT(17) +#define IMX95_PCIE_PHY_MPLLA_CTRL 0x10 +#define IMX95_PCIE_PHY_MPLL_STATE BIT(30) + #define IMX95_PCIE_SS_RW_REG_0 0xf0 #define IMX95_PCIE_REF_CLKEN BIT(23) #define IMX95_PCIE_PHY_CR_PARA_SEL BIT(9) @@ -478,6 +481,23 @@ static void imx7d_pcie_wait_for_phy_pll_lock(struct imx_pcie *imx_pcie) dev_err(dev, "PCIe PLL lock timeout\n"); } +static int imx95_pcie_wait_for_phy_pll_lock(struct imx_pcie *imx_pcie) +{ + u32 val; + struct device *dev = imx_pcie->pci->dev; + + if (regmap_read_poll_timeout(imx_pcie->iomuxc_gpr, + IMX95_PCIE_PHY_MPLLA_CTRL, val, + val & IMX95_PCIE_PHY_MPLL_STATE, + PHY_PLL_LOCK_WAIT_USLEEP_MAX, + PHY_PLL_LOCK_WAIT_TIMEOUT)) { + dev_err(dev, "PCIe PLL lock timeout\n"); + return -ENODEV; + } + + return 0; +} + static int imx_setup_phy_mpll(struct imx_pcie *imx_pcie) { unsigned long phy_rate = 0; @@ -821,6 +841,8 @@ static int imx95_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert) regmap_clear_bits(imx_pcie->iomuxc_gpr, IMX95_PCIE_RST_CTRL, IMX95_PCIE_COLD_RST); udelay(10); + } else { + return imx95_pcie_wait_for_phy_pll_lock(imx_pcie); } return 0; @@ -840,11 +862,13 @@ static void imx_pcie_assert_core_reset(struct imx_pcie *imx_pcie) static int imx_pcie_deassert_core_reset(struct imx_pcie *imx_pcie) { + int ret = 0; + reset_control_deassert(imx_pcie->pciephy_reset); reset_control_deassert(imx_pcie->apps_reset); if (imx_pcie->drvdata->core_reset) - imx_pcie->drvdata->core_reset(imx_pcie, false); + ret = imx_pcie->drvdata->core_reset(imx_pcie, false); /* Some boards don't have PCIe reset GPIO. */ if (imx_pcie->reset_gpiod) { @@ -854,7 +878,7 @@ static int imx_pcie_deassert_core_reset(struct imx_pcie *imx_pcie) msleep(100); } - return 0; + return ret; } static int imx_pcie_wait_for_speed_change(struct imx_pcie *imx_pcie) From patchwork Wed Mar 26 07:59:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongxing Zhu X-Patchwork-Id: 14029857 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 14902C36008 for ; Wed, 26 Mar 2025 08:16:34 +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=aazKa7WvXL7W6TtYURQGWacmQzOuIbNdKacMXiHgkwA=; b=ETP6WCq7hXLumILdgMlEd+1zba Q0P0WgKFrushP7llArDFNA6uq/V3XQ18vVv1vZCNDr7hnsOYrfheUJHszeW3IYJirU52w9UOS96Ro aqWaE/3mFiY0NWa52nC0aco71p0vhV13mVsGZvzqHXtuwhXIZ7kKIIixTyBudaNg3NnDZPYcrcMvy HN7fR3uR8cFXzIQk336pUwzwhmVATY/LoqdFmy+b7ruO5EKyrSmPN2LKCodfHRTZ8cO9mSMAIzvLZ +SyVZU77+bh7437Yc/aXxihhYZKSoPxN2RWcVDuo3qTnFKdl/FKfwxES/Pclz/kF8wbOUwNmDVQyS eW80zBDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1txLw1-00000007tmU-0GD7; Wed, 26 Mar 2025 08:16:25 +0000 Received: from mail-westeuropeazlp170110003.outbound.protection.outlook.com ([2a01:111:f403:c201::3] helo=AS8PR04CU009.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1txLhA-00000007rBR-3TCo for linux-arm-kernel@lists.infradead.org; Wed, 26 Mar 2025 08:01:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=et2QpMkTyN8krg1GA5L2XKEfOV4ZPXGhk7vYlntBBFxJs0EpVfAsAV+N6vxtDrPscXXPdApsqu7aa+Yx2otpi3SJG8S6l/MOEJX+nvkOON5BX09sZSn6AYZr9V5Be4Wi3SfNqfdeB7uVKHbIkUcm2ad0ocEeeVJJc+/kgtREHml/L2c3JLoXLtLyDdy4kFsLHe+y0GS3uScLh+81TtAlX4fQXmA5Ndp3P0B9AeFKS3+kfWU1V8O3udFEONhC6Yp++EZSn5zOL4nEEIzKOOB0xKOB7MDdLcLqtKE/FLO8D03BQJ1yeDEHrQSmi+k81DF3HWpMLmpnE11KghnbFHKEkw== 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=aazKa7WvXL7W6TtYURQGWacmQzOuIbNdKacMXiHgkwA=; b=Gc7jxenLaKC/YWlOZGYk0pFFHgXQPffOZPS+uz1f83D+cINkZTFrUmic+9CqKPd8e2WfOMJx+czlnHYbBIK1Vg2WU8mS6hNSmS+2jZOPUr4HPI5EdSdDMd0TgNFW85xWeubQ8AeKc1g3PxcUpUefLiilcjhyY2GMSxKTX/BXjRbNIFVKi/4SzZ8BI/YLji09gpHTKyEFHlVWe4Yg8zEvLrjoNYY87MSMOY9ZRKbJFuNovdwzKfT3uz8yZ8+GQimyNVW/8UFDK7ULxDyJRudmikc12mZw1RLOolNlEMef3eMPaic0kl8KqjgzoGZwZCGiYlSyhCEmAfk6wrK1F0yNWA== 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=aazKa7WvXL7W6TtYURQGWacmQzOuIbNdKacMXiHgkwA=; b=kFc3BxLmEdjtutVZRiBwz111+DQ+yTUuEFZ++Xf7Ln5ehodSfTgNFT8byZSRaVxTaWDaPfi0/lHjWiON+DhoUCbTs4kmqRhSAwB9eQdHDHTfHDl910IlDC9KoGyBfs+/rGz3psEQEBbHNAC6jgzzTSyxGbg3UoozqQuFUffogFiHGGKd+UEbNOYVEuDIruSTSXDQiAe4iVfiyjpin46t/1uZoz3Rq4koyfl95/GPrB61OmL7bbbQRINfY66+I6jFxIuXcZwyO1bHyB7PPetZZRUVfS9u39D9sdAH2psBZv2evGpoFIIR3Ex4G3h72XvhFANgPJYI2cE15LryeSqS6w== 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 AM9PR04MB8828.eurprd04.prod.outlook.com (2603:10a6:20b:40b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.43; Wed, 26 Mar 2025 08:01:02 +0000 Received: from AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93]) by AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93%5]) with mapi id 15.20.8534.040; Wed, 26 Mar 2025 08:01:02 +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 v2 6/6] PCI: imx6: Save and restore the LUT setting for i.MX95 PCIe Date: Wed, 26 Mar 2025 15:59:15 +0800 Message-Id: <20250326075915.4073725-7-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250326075915.4073725-1-hongxing.zhu@nxp.com> References: <20250326075915.4073725-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SI1PR02CA0059.apcprd02.prod.outlook.com (2603:1096:4:1f5::19) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|AM9PR04MB8828:EE_ X-MS-Office365-Filtering-Correlation-Id: e60a1fee-1553-4a45-b9e5-08dd6c3c59ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|52116014|7416014|38350700014|921020; X-Microsoft-Antispam-Message-Info: G4mLA6Tx5MzkVDUFTWa8POY72U4XTBz7oN/2Zma1uf/q1ve1l6EhHiaHMC41BsqMIy/GAI5W6Et5u5q+iobUvzp5tHnyjvJkq6Kah2V5nL/BTPC4rbWFjybQ99iIfb3itrXQxnMjU99jIQKu5U4hKUaEdfFV0IM2lJ47rdIbyKQ+1UB7wSu2jgmsL59EatRs+YRvoxJXs60bgb3onw5MoMPHgvtxnX8eAKEnUrgg9PWTmQFaNBi69W6ajXeAH3vi/kZ6cur34EIhdI2k51sxosS3Q/mQ3TriMBS/8gRqmiRAnU3Ce55DK0sRicYRAvPxYzklfe1Ki4ZIcymR17/G6n5f3JA0LzP9vzMtDtN9iFu/J63H6efhQ0UCS0Fp4ZYB6zWT2RPuexCrdPHERg3VkeTewOZZZ8VAyBj+RFNMGG2CqHsaMtuIenGikMskmlvgLmW5oWVHhAeWUrOmkz8zJt53Z0JXouNVAXDsZojUJ36+8LHnsSSRAYzmZUII+MvmVLKQMPR4E378sIHr1HJ8SKdHFBSFripjVRph3whMwrdUsnRuXWcUBWEu3LvNOzDh6gaNKax8G6HUbCxK1ZlnGvFq6M+tKdl0+0PQYLVpSRNVbn7auNJYbtDmiC0kV38Q61bzIsWrGmHGXuEnqNFAMa3Px6HyFVgch2Iu4HQXtuPO7kIK7yVK5xxw9A3KF3xalaTZemYp+6xi57kjJTLDrbnMV/CqtYS7UxA6t/HaAskSwGJlreqm6/tXl6UaMZ8WOqTkmEoaon1bEVWKqzpmeqUI/mJkRCTlEx6IydGKpTbp3b31LB9sTt4osCN5/2R4QOJH5Kg1vnPADpnaIyyQsU7Fp5A7QLTrsxYH52z3WMCzaiGDVz33PFrHijhYV0W/th+A7YRc7x5Oaj2Pcan0c3YHw1lnoYlVjbncps7A6RgsJlyjv+QdTHjuQHEZoiphzduY5gkOM/hMc3yq7RsF5sl7cCuuIPAKAai6LKL/qDlP9jXr0fAd83YlnuyDo4lNIEIH0uSG6qLGryFGTBf5VjXhmNVIqcEd4nY2gE0Qx9sMdb3a0zsHFImWR6GnvR8sR+ATDusDcR9t9LD6ODglH+iSrJXDizshZnF6eySCrpDH5ov2p4J9dB0g5oJxLXAIbLHb8edmgiebvhHRG48E/IpFRgiD6BIHFXJmPEjCDq8P6kdi7iA9Bw1VtyEKsv4egTkjHVT/Ss/eTRUonIXyp9WVNbgMOoJnkgihp3vze6xssyvCYg1WuP0DrFBzKDt/LSsbdxZ3eNBvNVeICCTOej4dZoDWXXhruatg5rfG7v1VjYQy4MPNYkLQ39Q/4P+KKwIq5ZGGbboo9N7JO9vYcwbkSnJiptYE3ySxrM8V6MWOkyeTlCTDoy/abpBUO4GbfPjKosx8xaVZtfA1Vtrr4m78JaPNRZrId/L7aZkMxkJ3GqOdhgC+7tDJNrCnmi2okOE2GH/hANU+R3bvE536ig== 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)(376014)(1800799024)(52116014)(7416014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: czkQB123qlKQ7qxFCXoR2u6QDylvg1lrvXLnmcpzH438wLBwb/DNtSoy87iLWkETmEctBqQsBddy5H0n5ih1bBExubUtfcOjQz7JMJY7Aa7/DFFNWfouQ+yeUUwrwMS/bnplLhjnbdtNJ77gCIl1N7HLhhdOvZefDZvYwui3/n8Kd0CR2PU5xRj0BMhuAvNedZZZj4Q0/FuVH60C4sKQvk1Joe0f4AnwcJSyrOgMtjWhBAi1VEKIyO+vXcy8ssdNX35DMytG3w7O51Kk4rB/Hk0wqONMktibp8yq/0QnYPp8I8aKv5Bel9ylGvAzveumt/fX5KgrYzVsC452v+ELqStzzRk6s+HYvGyM0EZuLdQkR0AvnWQbilf+gkInYnZEP5HS8du1wr62Owj9GGg3m0wo2erJ5juCnvE2y9n65tfrQn/WUWSILWzyP1W2eW1Iu+A7qxDsZi0mE/UBF3KhSY41x8aTS98i0t77AqxbBWhai0WqtTizhnKuOrKwsH+zGKrW/mjQ5NS6mxZcG8NDKUKrFeGqhhtPrVwuxQ3jXQ7Jjla57ZOj4YHI+swSLqjSZ5HmPylq7r5s9tN8YIdiO++S5A5frGhi4l1271KpS3Cu7TWwMUjki8xjxRlK7bHaXtwm20PLpKl7XXZjDvbKSZ/7RTvqBPPlTD6/1wFlM+mEYJ851tvo+z+arqDwUErjzsnuM/YBcd0toAf8VfERL3Vu+9XAXAcG/8g9Px/9LMkUsw7U2r3irE4XL2GmyJhJQ/XSDuefCNb1oyXNapaH49xWrmi5ISo8ZNot968HSvDBlRb8t/KOANsZWTC84rbAxtYyCP0g96F3fgeniU2EYTUODC4BGXIGpmQmnROsC4cjFhQggUlV24hhjeoJBjdMLBFfCh492yaT7/C1qMV+vk1pJL+hGuybYSBa4UGFLYiLdKegqU1u8BSYu39VG/roF9xxR7cBAx9vSUOYHLTrHEdoZXsEkrSxBoiQRSKzfIU47RrWqlgxbT+sofGPd5mhHwQNBrbRe91K2nYdH4fw3fz6Sc9TwGzaqRQPHARfJQ3hxRRaxjoPG5hismgtLU8MmgrSMjVp7iYHY5wZjw6ZHJT+kf2hb8HKcJ1rIZaHMw7O8SRvVmJwM6opModz1c7/VW+CL+Oqp61fg/2vsAe2OuhmGrqusQch7v2a7ehSYnMVeeBT03cvA4rW0b3uVuwDBQXzyR7bNiLsHZmUGjn7Deb4FhUHA9p2lLjHvyj35qt0674aKZGowuPs8kYKAGHbeAJVkzr4w0acNuNRj/nFFrNZYqD2NPfGtTaPC2uTcg4/B3QyB+nuspEx48XhPbH7G1UBQ5NvH1pf4vwV6+5KmUM4Poo2cDIcmBcF4MKgvsP6guxPUODfZvUkPLLhzN12jmR1GvXRixbU9yufYT7j8UCr8PUF3VIICxqnmi9R1vpMtfD4X1ZUl1RgYlUYj+anPHSAoc3EMXXlaaefNRjTbDXxnckG0JrcfUVNU5LknOB3NtpZ7pSeXdo5+GTcqdhMrdVn3HM1pH6QiJFm/rgezkPKDsuX0IaGbvIP2fFFPg8cFlmXoa882MwQQ5kpvMp7 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e60a1fee-1553-4a45-b9e5-08dd6c3c59ec X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Mar 2025 08:01:02.1235 (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: h7BeS26XUfTOyyM/VlNU2ouhlFiu5fnltwmyY4sQK4uGM5CvqiG3B/nMDrQu0FLN9QGyKcweY3+NNI5N/U83DQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8828 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250326_010104_867725_B6CA6D9E X-CRM114-Status: GOOD ( 16.77 ) 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 LUT(look up table) setting would be lost during PCIe suspend on i.MX95. To let i.MX95 PCIe PM work fine, save and restore the LUT setting in suspend and resume operations. Signed-off-by: Richard Zhu --- drivers/pci/controller/dwc/pci-imx6.c | 47 +++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 1c8834fbcfd5..dc98a04c2956 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -137,6 +137,11 @@ struct imx_pcie_drvdata { const struct dw_pcie_host_ops *ops; }; +struct imx_lut_data { + u32 data1; + u32 data2; +}; + struct imx_pcie { struct dw_pcie *pci; struct gpio_desc *reset_gpiod; @@ -156,6 +161,8 @@ struct imx_pcie { struct regulator *vph; void __iomem *phy_base; + /* LUT data for pcie */ + struct imx_lut_data luts[IMX95_MAX_LUT]; /* power domain for pcie */ struct device *pd_pcie; /* power domain for pcie phy */ @@ -1507,6 +1514,42 @@ static void imx_pcie_msi_save_restore(struct imx_pcie *imx_pcie, bool save) } } +static void imx_pcie_lut_save(struct imx_pcie *imx_pcie) +{ + u32 data1, data2; + int i; + + for (i = 0; i < IMX95_MAX_LUT; i++) { + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_ACSCTRL, + IMX95_PEO_LUT_RWA | i); + regmap_read(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA1, &data1); + regmap_read(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA2, &data2); + if (data1 & IMX95_PE0_LUT_VLD) { + imx_pcie->luts[i].data1 = data1; + imx_pcie->luts[i].data2 = data2; + } else { + imx_pcie->luts[i].data1 = 0; + imx_pcie->luts[i].data2 = 0; + } + } +} + +static void imx_pcie_lut_restore(struct imx_pcie *imx_pcie) +{ + int i; + + for (i = 0; i < IMX95_MAX_LUT; i++) { + if ((imx_pcie->luts[i].data1 & IMX95_PE0_LUT_VLD) == 0) + continue; + + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA1, + imx_pcie->luts[i].data1); + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA2, + imx_pcie->luts[i].data2); + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_ACSCTRL, i); + } +} + static int imx_pcie_suspend_noirq(struct device *dev) { struct imx_pcie *imx_pcie = dev_get_drvdata(dev); @@ -1515,6 +1558,8 @@ static int imx_pcie_suspend_noirq(struct device *dev) return 0; imx_pcie_msi_save_restore(imx_pcie, true); + if (imx_check_flag(imx_pcie, IMX_PCIE_FLAG_HAS_LUT)) + imx_pcie_lut_save(imx_pcie); if (imx_check_flag(imx_pcie, IMX_PCIE_FLAG_BROKEN_SUSPEND)) { /* * The minimum for a workaround would be to set PERST# and to @@ -1559,6 +1604,8 @@ static int imx_pcie_resume_noirq(struct device *dev) if (ret) return ret; } + if (imx_check_flag(imx_pcie, IMX_PCIE_FLAG_HAS_LUT)) + imx_pcie_lut_restore(imx_pcie); imx_pcie_msi_save_restore(imx_pcie, false); return 0;