From patchwork Fri Mar 28 03:02:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 14031587 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 B9A12C3600B for ; Fri, 28 Mar 2025 03:07: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=w85Arg2OjRBZPur+WTYJDhVtQFvjoNOh/Hi4YXciWlU=; b=Ds97MDAt3J5zYA0mvdoQGDjyrZ ftGMx00XOZKJY/egjWxbfWqaBWwWTz6WNtE69JUrVQjLl/2cDKCzncBq9lZ/q2giwyGqawG8EmVns qy9O4JHIWeWF4tDQX7bFz+A8Kxrqj9JUVOtAXvDGx0m7AUoXu3jpD/s/qk1zsqU7cAbP5tcBLV9A3 O57a2szAkjLj2Zf/0HOhWmjC/eDWo2tD3rJBi90m/LOh8/J8IlRbU7pVxMddH8cRpN4f8lo1peqEI gB3JbZkGJ0H9tWJsaDrHYsaH2z1h3M+tl9Etk+t3EDNbex3lhCbPNOv1Dgk7nLMiaO+fCZOaFdOEA fHM7yyTg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1ty03q-0000000CTK8-3daT; Fri, 28 Mar 2025 03:07:10 +0000 Received: from mail-db5eur02on20616.outbound.protection.outlook.com ([2a01:111:f403:2608::616] helo=EUR02-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1ty00Q-0000000CSi2-0mFF for linux-arm-kernel@lists.infradead.org; Fri, 28 Mar 2025 03:03:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PCJryuMADG8DeHjtrDtMfjQE2COkEtOYWwVZRwsDRrFQWJJqqBBJ9zY637CJ9ysTAqyHVFAuE8/hiohkXTTnMudepISfgwJIzjBG+vRKeXxWs9aqzZCBuVRNX9KHDNAQ0eU+vScTChdR+0WVX0LfMw9BCZ2qRUJNK1mV+5Bs0FIUq1jZNYXf88WH63LBlptiPYTSAsn4k0cEaAhCtKethFf8O6UoarikC3KldyUI7JkcAR4m4mOGThMUgoTpgSto4Uj23PmJtUGcG6f0ksQtvhRtHNrST7cD4QlMkxZP4ETWjQZXfl6QAlbsKstyDaG1zZMnwtJcSa1s4hfiwsXz1Q== 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=w85Arg2OjRBZPur+WTYJDhVtQFvjoNOh/Hi4YXciWlU=; b=T3qyrzkAHHJQ9myxSqWETPjgcwKS+ssGC9bObMnoW0ac1x4r7Z5JYXJyJkXm+LMMGVlhH7x4TDW5NMwyUvbxrZ1qlFNYnGC+zMu286Omhxe/85ZlVEEHwfE6NdtclPNEf6tbZQwjYD6Tzy9KrmubUyS/OzId4WVhTunm34je/DiMwh1HpK+M92qoCx49tT1bdpX6kTKBXyXcPROfRnhcPjrClHIog+zmQOjAjSMJ8griQbIporK07aXrz+rD7WmYZvVN+l1AcipsrhDIv1AIBbGqqaSFPVUbRL9Qh+qSLIHOUfchQw1zmuYYQoPMJfQWjkInIOY1zBPKR7/o5DtFRw== 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=w85Arg2OjRBZPur+WTYJDhVtQFvjoNOh/Hi4YXciWlU=; b=dHhNEDDloBfUTq/xRq4c5r2HKHL5B+OEzMYeYna2UWlhuI92FfLY9lutbJB98Q1HKLJ63tOjeig2tCwJLadiiHa6n7e3ZLH113asM0xD+dt8F5lvwahjqZdNjbPp2UxCa00gSDFpZUg+RF3AlUIQvnemzbpwUrDQl2N2/59hggdhMnGgPw1HhKTyCDaRqfhP3v3eezI5vjvo8EhCbnFe32H5o1M7VF319nE2TY8YEi2MM7qtYQ4yMuzvjWpLaZGidXUH5ZxIj5xfhs4CUvfEWUQuqTYkGDneWJ2z78PrNlWLZ+0ENDpMhzxL868AR2iX+L0e1OmY5wCbVIn7LLByIA== 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 AS8PR04MB8961.eurprd04.prod.outlook.com (2603:10a6:20b:42c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.44; Fri, 28 Mar 2025 03:03:33 +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.043; Fri, 28 Mar 2025 03:03:33 +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 v3 1/6] PCI: imx6: Start link directly when workaround is not required Date: Fri, 28 Mar 2025 11:02:08 +0800 Message-Id: <20250328030213.1650990-2-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250328030213.1650990-1-hongxing.zhu@nxp.com> References: <20250328030213.1650990-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SG2PR02CA0047.apcprd02.prod.outlook.com (2603:1096:3:18::35) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|AS8PR04MB8961:EE_ X-MS-Office365-Filtering-Correlation-Id: c3fb64aa-36b2-4b67-33f0-08dd6da5204a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|52116014|1800799024|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: k3ckK0O7lgQCy8Ujabo4jWga0aINXcGEnyJxOjZZ3ul9kN4W8e2tzpwqB3WdamFC3JyR+OUTsW5HL1ap+nLlQ+lnOyjbrje1OxKp62TPW/zWwXg+UV4UJlkD9icvKmfRgKzscN4sUQGwxkFr2CVlaCMh8z58HPWZ4+PMX/kfmbomFryxggpmqXTudlP0QIaV+W7YiAiChIFbAx2ONZlXMUwwP2eQ0h3xpkWYz1RPL1CPNp+d1EhtwOgy2DCQbzQmmbxBNvhwoPyBUhv/vu4Rn3+EqK3qWItu6XnvRR6oANIhLgBA4+gkhQenV5qmZRYYFeY1Bhw9hSU6lHN9lWocQ0s9E20oR6aNoJzdD8CfYN8qMbLsD8XbL5qKj+7+hCKNTGqEx3UY+TnxkR0euwZcgBzlTILkttnI37wOZ/X3E+PA4GYmAUy0uFSsdB/jaaENO6qS1UpLKzU9BX/9uiADsylMwPfeXRaK073Ow4U2vzJWvMbjxNLEGVqeZl9Osf8zXucjpsN7IOIo3/X8fpzztSCcfXGMfKZYhnGeLfnyoPyqira1sXoTYkrMRKvERip2JLTecR2nKRUFl5+5mS+8xilQNAIMMNv6KZek2X9m1Owr/IP40eXCfYLdRRSmOnUR5lXJCzH24HJbe4wpeHthw+L3GozdLX49eQ4D7Ai2i10N0erlhTpysJ/aMrU95fmO6gbogOukIb/n2GdL0LMLXMV+J+l/63gewrC/OFPGHmf4uRCFGp+3cjgK8cie7b0foDH4FNTeX+BYH2FgQT0jcqhN1DjiSvALvWxaZZK5EbgMFLPYFxHVIMmZDaw0pZBVw2MF7KZ7i/vZ93RdFWx6OByPDMUiahICCT/597Z/D7L8v3zZvNwytBmGAHt6uqX65X4IRvZTzBULs4R4ISO31Yyzp5kETvUSBpgZ6nQ3baNllJuOCrT2yPdJOPNKly5RDA7umnS0aczu38kTm7b0oRiosI9ahlgW5ngPqXQBQy+gfKXJz+KrT8x+59c3Ez0AbK16A8DYH/lXxOg8pq3n95Ria6tjLAF/fKRoX6HtBkCoWBznZNXRjY/QfEozOPs7AECXCY7mkp6FMrl6+eiWvT2CU24Vxyet4St3jOe8/WguJ1Ahwn75R5A1IEo1Qp5rkvyHuZrbxeYVqBTERfEz91uAR8nai73Kvmp93Rx3VFyGjq/ZMKtBYKMdbUKA2/wUKDXus78LHOPlA6YR4EXQJeaNFQ/XzoXxQcw1Gzh8Dh05vBP4LOj6mRtl6OtlJM5Qh41RVtYj9VOzKwMO+O/j8NY/3fEyi29kgYO63fldXj3TYqie0kbNJWChrFu05taBEzfczAF4JdzIOpp+MC2WLLAzvSfSNcl+FMRhhUg3Gy1PSVS90BbUnh0Fzso0BWH91k2dEAZdNI0zXiCbyROavWM0XpSlY+uffI7JkH1KULca3iPz0BQIr7JdAtQilom1DDE1hEkdapihcKc5RQQVVA== 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)(7416014)(52116014)(1800799024)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IGFq8+S4MDFjuR0dcncnWPOfM2GY8bd97g6rsPLr8rQ04Y3Dpr4WB7+l6G/6loPAquHYRZOV4B3torKeBtsW1Up0J+w3IZxwPwzMy7R1hWMZQbOdiQq5SFRlFsC7Qu72HzIKw+pApIf55FlQqiamAFr3gGjLhNiPSGLH/BnKW9OK0qBhoGUsaFrPGhcQkLqsJfLhalUy9H/OhOAKFnFUosu8G89QlsiWSKTYjsMbdHnj8gNYezY6yjaypeO8S5ajLCeMQTi4wLKlAPhzycaoDy6NvvuWRRB5eHuxxKGOhg0iVVu/fOwTplN9l4AHsHoPyhLgUR8YXyeXeC+AyzD+DQPtdmxPhRQgFQIpMziW6RcwMe5KSlmNwPBBr0x9pMjflZmPKLeE+eza4jK5Jn9dXMSBIQTXSruNjJiGhY/BP/2HCcLx7yCWs70ZWowH6pj8sth0qAklvrq5f7tNsX9Ak099elv6rjU0X++lN9xpzciF+xEPog5ss9zDjQr103SFjbbyKkP5sLuul+H8tAkNNUYYW80Cu0yymHtcLkqgDCxWHOY2B6HwDN0SX+rotP3CqtblO02MfDm0Hf3LuPiRqWKAad1rNoh9MVxRCQSpxwxy8hjV+2t4JoeBz0zQDxUOAPr+IAiGSuQaCsLfPsvIGAH/GqrxXZkPj38jl0TxJ+6wbdwA3yN1xm6QwTH6MPstsZT+H6K96aDytzVBBPOX/yeDHa/UD6fbAPN4ADhk4gPTmmizrqIz0YcPbxgFkwjbmQk2wTm5Fd9gMbfVPESvT1J9P+6qAqhgcN2PO90VvHna/74D/bjE19BWr4K+qHp5NigiNTAomRDg1mSHSvYeFpRy1utazoismIGlZ1r5lY1X6mTSA+oMtF4eV9snqrhFfoFY/zxQp0Zh0Zd/PPRk1qiOaGQMa6xOZ7qIH4C3Esg3U/SjxiJCTLXoyQoA3ErO6ilTeUGcZpCu6pT6LEsuBd39F0QYcGnXIvBYcJD2H6cCKPiJDpnPqmrMqPFyCYa2XjEx5lD59vnpvpDNLouKxJki5t77jG1j77oVOSyEDTYJup2mNFF8Bmv6QeTf7kZnMY4Vgw6oSb7BXdQ31ZSjkNR20+QbJDRkOKUTy4GDgbX6ssz7OvYI+HcMSPyuSWofCD50KJN2wqhi5OZElJ2lebzvER9O0VrxBkTn8gFxFmT6zR26xeCoH1GFijzC9f48TB0EUbZhdZRouV03lxDEOHt1nDDRRVoLEynZxpsnRHfCkReG2Qi4vrJGh8vZ6pQUT8F+lzm60eCRfaZNnYOWlLA7VHRUAqGBU9L9hjZvfHPr1K06cKgr6LgG1rwBI28u6g3P/Oh0QkCqC9rkdAkM1NWnqmqixdZvc3gqbfrjVpbK8YBuU798eqxlWqyX2D+2zcbjMS/4vNGueZtKa10lp8cfaF82EWxXYGUXv8qfP5ZcKe7uMtzenUz8j49tG8evkrmyE/fnsCi4/z63UtMiy8JMNjY1ItWI4O8eN+4jRcPmP+skrGwDOU8G33PEqjzWMI7IQ1s1mvqvCKHpxniMXEdA3pCjyFM1QRIGDLg30auidNuro5CTA0lqycyistaK X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3fb64aa-36b2-4b67-33f0-08dd6da5204a X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2025 03:03:33.8189 (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: b9NP6+Xfmc0LFks92IOjNo4ReeWZsXH/Z0N1OeJN5olRve4dJW7DF638DnUUX6V56ALktv3axBmWjPJzhBXI2A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8961 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250327_200338_229369_CB2ADAC9 X-CRM114-Status: GOOD ( 19.57 ) 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 --- 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 Fri Mar 28 03:02:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 14031590 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 EBF7EC3600B for ; Fri, 28 Mar 2025 03:09:08 +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=k1HBKlc4akohXR2vCAAU8ZQjNpnESt0CqhEjTdNp8hE=; b=Ejh3a7n61t9ZnCajBJv1JTRJUj g34xcUJS63ixpbqpWanG3nQnB8hxjQ5EfcbZd1G2G+xZyIQ1wrpn2WMxKMIDE846Kdq7e1M8U1/9c EbBOxkjekQYE09NCqQa4W+dIzM3FuEPl4c/TcWxGBBaLvK1Xz68bEdvXMr/SerwkGeZLUpfZs/tNw GbqeRl6Q2DKFqQ62XZ7wCYq6I6xbhvHdNm/CndoV8qUAde/Vjw+w/y/K3Eg5FByWG64Ja4Qe9ANB/ MX+Ad0Ur19ci52vXPAcyum94Ljsv82+o+9NaQcm9GHFsnq2fTSBpwQbTihLgqY0uu+ylIgKZ5lHm2 76Je4V4g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1ty05Y-0000000CTRJ-31YK; Fri, 28 Mar 2025 03:08:56 +0000 Received: from mail-db5eur02on20616.outbound.protection.outlook.com ([2a01:111:f403:2608::616] helo=EUR02-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1ty00R-0000000CSi2-2Xnu for linux-arm-kernel@lists.infradead.org; Fri, 28 Mar 2025 03:03:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UuBCjF53NEyLaSIOTnrOk/vEom18Ibh+EvX209Ps9ESONH0rsyowahRTnPCabtDqskjwJ74Wf+EvuIjnZZzEcXwvHJmeqzDaCEtryjk4E+kkfZtjv5ttUwYoxusvJyep197KxT7cRGqGz5cVDDFf7LGltJWnI7da4Lc53W9WTTq7Y708riFMA1F0IhsAqww1PaqKMn1ME4v7rEqSxEHl6INowU0dpydeOk5F0NzK984MTsvC4KlYQMcw5HtyBuox7Cziljd0ZO0ZW4H4JX4puoHCP9RIk4n/WjIG3xSz5kld11EbrkGSyCwCmdGjc/61aMM5Od/fPbLHIvbis/hjdw== 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=k1HBKlc4akohXR2vCAAU8ZQjNpnESt0CqhEjTdNp8hE=; b=DRSI3QqSbIrxj1JLWKqM5uSbTXVUpo0LCGJYSnTfWAE2LVrOYlg2s2QaKugFfYnl7ZwwxCSnp8w+hfdsWW4TtozG1S9+tNVzZufZIl62Fyv90P3yhOao/pipFjdP6h7rMQm/nfuiSFT0zq5YF8COHNjJxHb4PP+DCTa7bS+cNHzO1x/CA6mOiSB075NcLREBYVQ2z1nmhAvsx2nW/hhng8Hv/l8U9ACvQW4g/ALn/K+rT8LZb0LX1tZvHyiREv6MKFAcoZ2LtArnBTiQkf8zy/qtEc+pOZhRE0xRS8bfd7XoKSzc7ZPYXXN1aSntLX/paXVWPmiU7JrMq0nQ9uQ3/w== 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=k1HBKlc4akohXR2vCAAU8ZQjNpnESt0CqhEjTdNp8hE=; b=ZUI4ISac+AiHoH3zl618++su/RLZ7t5iDpiTMdBjdD43ak+jLgxTIXmQRfVZglu6c6R1rfBIi96tf8aFBSzJ0WysoEYTy9e2089IAIz8urPiSl70m4OQm6Pg8FJsyxJnf9t+aSggKPG0mDdnmHnSNbcwUCkZHuDDWbuZK7I9t62h53wRgz2OktCOnFpTnREMJhtvHT7gVOgwIhHxPb/jQ7i6vd3NjdMw1V6KIq0+uox/zAEenja5oL8ntzzOvCQ6oTPkukgpX+aqYhRn4QLpr7P8QEn8Y+T5U4kQ95LCbxEP+4oSU7BFlaCGrgsHhpYyUHHy80Z5/QUwFki8PUQyAg== 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 AS8PR04MB8961.eurprd04.prod.outlook.com (2603:10a6:20b:42c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.44; Fri, 28 Mar 2025 03:03:38 +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.043; Fri, 28 Mar 2025 03:03:38 +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 v3 2/6] PCI: imx6: Toggle the cold reset for i.MX95 PCIe Date: Fri, 28 Mar 2025 11:02:09 +0800 Message-Id: <20250328030213.1650990-3-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250328030213.1650990-1-hongxing.zhu@nxp.com> References: <20250328030213.1650990-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SG2PR02CA0047.apcprd02.prod.outlook.com (2603:1096:3:18::35) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|AS8PR04MB8961:EE_ X-MS-Office365-Filtering-Correlation-Id: 1eebecd4-fa0e-4389-1c9b-08dd6da52329 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|52116014|1800799024|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: R0SubXs93naHdAB4QgqlojtH5AeC5CQs5nb5dLWm1DHI2l/Q/g2irpWpUYCGl+wmbR/K6aNaTYSL3HEJqqD8/OkYD2ay5ttjw5Kv7nSGZVB9rAcHjFjsmshWZ+93fYRoF8pVMvp3IVL1RiIXZPS9DuFqGtBJ9bOp5TwXOQmVOigkzhnlKva9D8hBDAh/gg0h4EsEQCJNRxvZyWvOjfDTvmWRfzEqlUOCLjqd+bg9MV88uOcXE6ELxoty4X0nfpt8iYAU0LlnkDAC2MUlVwoxX/PtD0DRY0rGbfYAUvniYsFUPvOb+ya8gywmQgC+EcHMV9TcBxg2XOp712NN5ytdY5m2NXkDRh53PpFsaPLsWs2F8jNl/TsFZWH7oWiiFe5Bwe1M+Lrv6aeCv+NWNmP2QbBflsa0c7l1EfKTyX1W+jn2W6APCYGrBUmj4RqusZWsMpfnxSB0jXLh6tlEEseQHY3g/oTqtaI7I3CDbnwotKy4sJ2N/r5kEG7Ieo7yHHQ8+0ByNmY1R8EOBDbENR7yvj0AJvwDIK3fi6yMzUl/Sd5BmlWAhK0j3bzTByq/9shgdMrqY2uqVEVEgb2sY5dMVmAR1XhAb47v7OOA2qjBwEyURise3BqWKt9FGMtis7EMAYXFduZsVlUk+XjYOY/lWO8liFvsQHWdyd3nW+wxa8KbOCjKfaV12/QXE6lnhnYXrCifBDVwCp/9GR2jkpxAtQI9uIP9lSOhcG4r0yVWrVv7XkW1WbBvQB/+fUA28cJnp47aPng7Jedf5bF7FWxKXYtaSfhYkoiRr0LDooAIOZusYn1UJytmIVzc9uv/2KmD1Ijef/Y6p0pyvBdclrfeNr8uUHcDiKxkgeXOAEm/oXhAEPGMOCpnwK6oZukmbUr2gbVZ5U9bzm2TmjPF59nYgbIVeGRKmNELKTjKb28QAIKnd0+IgipxIOjoGYNL+XaOUrjNNJ8ZaLRG44cYYNZ7mdMxbQuAacVb32Hynd1kumsSlcSbP+NUmYlmyG1kUx+0+qt+RrEkrhVKmlZVEBVI/B6YlR4F21SZS2v5p60Vmca1p8aICC21D6iDLdA7OkYfxhlzolr3sviLnzDEPVOnERkbigxKdFKTT3phum2MhJFAJzemWG6C3QbyI9lyqhQ1b7DDxTZiFv17M4PGnqxnUa9vw8XRYk73nvDySx8Xyf5V/K8FguN1n7HLZp3IIbKE7Y1uW/goKENjnrz7EvRjn8laicEbW8kXchH+4YSUXHmEWJK8v6+4St3RB8i+h3EL0JOmz+1FOCBpVyt6r9t0GGo0jeFuZ1UYRq5XbjtnM7ETEUI+Mduzb4m6NDAQLrtGwacJ9mixZm3TtTkFgL/dg9EvrVmTL1rhAZov9bV/3AoDRC/U0epNzLR2f7g64pkd1+cIQRvDiPwFmaPQHcNzxPuYwf+dwXEsBuTlv52qGoPIe2YqCQcZs3jVZLoPRHibglQ3ZEYGOgPougCQA4GSfg== 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)(7416014)(52116014)(1800799024)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AWTKiivEjK2VdaxiFgBEU+ftLDxc6z1nZjETDW37q3qspB7Y3Jq6lWXtjWNNJhPOA932hnQegEIJQChwO5ELh/+46vABmCrC2oRKIuc6rN7WONS2whZ7CODMigY1s8rLGHAh0VNvh4Ljtp3ewRw1jVxTbZOeARm5dcGZeZUmeTnXovzWs5izZzKbw3qnk5CMaGieMGigmqK+vos9IwMBw5qu3kj06KyZHLWZL1/fEvfl4rd8g3Y3LdTJISBS+mT447Za+BvraZIsgAE5uYWTiTcU8pKmuGOcxKmI7yQ5i8GOBxqDZ+rb3Ak7NcFKjx8dsmyXVPCMsSmknkS6Fp3bgyQbASfkryNxd4dDNLq73VN8yOMJNO+EwNQOdLooVCM2W8AFQ9ve8u5eYpQK+4Co2yeMKE5LrxL9uRt2zM8qm7WvcBeD9EkKXHuWwZxwNJt8wcj2tdLjMlAAiwesDr0SVfQxfFGacqeprel2RmCaOkyPcqWBHQqljauW0Xn0cwhrY3nIZ7upjiN7OWOMBgEQrVuCfD1iz6I1Xh/qUQZ9+hoSoVx3BO6ZFTxE5yfsGywFan3OdPSF/jnIvAThnqGWr12u4FhxKwZb6gg5KlWHB0fi9EslT9GDO5gdbXKCwf0RnebkwF/QGJ57nO87TUdfn2U4NL7QD2XBMO9KSOM1ix/S+z6Xjwlhf3Ka6wPHv3b5BlKBGd74t5io9+nkl4xsqyYxsaD2aCosHBFndMcWx7gjduZwVs7vnHIJ+pXY+0JmkdRYX1YepiHeUlfl3d1cW7+VmvDzZcXjr9g/Q1JRoWoCXFYGPAA86/s2SEjdGcdLCpHy7XGG5A7bt9khrvzyZdn2OwRcX6u63h/T7mCCQUgDHj3mbJdmtpL+NwRWpwMx+yI2EGsBETCFKC7QvK/dtGFhpm1LsOyjRmfudauDV/MuMNaGNS32wvZpJ+Or2MmbSsw0YmjZGEDh1AT8ccgQd/SXR1IHwiwv/Em/NV/OXFaoxRSmyWube1V7boSe/E7yAHmlM0fkp7b4VdMOC/vOcbyRuUhZpyWEMmO+oMm6aoRlIMO560kNi0N6ARonBWxgzv7kcqXbC9sqpnvixtVR4Uclo101Q/5FomBDLdZ6CFDSb8wZREQ5uqaC/5bPzT+O9vqF5U+MUrQcbSAy3H4sTVWlaje3pp3B7TlhJkm6S5kmVSNl/xzYa2/HvS9JUrNFF+8h/9qy/xxsgm7MG8nX15WZOT5p4nSftCSA28jK7UBuyOrWv/s3JFn63E/InkUxPVJy4i3OmCipTXi0LVJoKiSHKWzXI/McHMOR0imuFGArpPZxpL5uc6A2rz15T8/lpFDgy9j6u4FOnOD8EsWJOWqVPiTgrjzJANjIecTBkcxNTGN7rvpTz8v8KfBbYQdYHY0bQrY9MkSuuPSVjG+cyLETBcF6RJ5lW6ZfrJ0ONoBC6E9sfsAEEKb8V5YRBqPPolOrGdtUSlsbjj+Opw+Wed9juQGdJR9JIojF0RMLcHbvNc7AHw6njzLs61R8hbvj6GfvIFfjQLGgpoD86cfkFQQEOZ3lqY4QSI1mat4LotS/Xb9SewkZ3h5wBnXEaZZk X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1eebecd4-fa0e-4389-1c9b-08dd6da52329 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2025 03:03:38.6277 (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: qxzPK015uO+4Gc62B1zEeN9FUCnIWm1j0wRmm/6loNbs5MrYMNjhRbBePA5DEXKLtEZ7LAqacYN8eBoxREbysA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8961 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250327_200339_646824_1A5E2179 X-CRM114-Status: GOOD ( 12.45 ) 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 cold reset toggle for i.MX95 PCIe to align PHY's power up sequency. Signed-off-by: Richard Zhu Reviewed-by: Frank Li --- drivers/pci/controller/dwc/pci-imx6.c | 42 +++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 57aa777231ae..6051b3b5928f 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,43 @@ 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); + regmap_read_bypassed(imx_pcie->iomuxc_gpr, IMX95_PCIE_RST_CTRL, + &val); + 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 +1802,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 +1856,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 Fri Mar 28 03:02:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 14031591 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 4DDFCC3600B for ; Fri, 28 Mar 2025 03:10: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=iE9P6dSZQzoDP4tohliHI+TBQ5/Orah/M6t/TysaJx4=; b=ZkFiFUSkMdHHsZL9nZSWISvZnz W7aasuJD0v9wekP1Y3xDxxuJKkHMcycfyC8+sPw0EbasftKmP2k8xZMWehGU4Qntv3lLhecGQUwzP rYxWMi10lVYzP41K4ods/cdYzl0pKlWkCLCdn4cQ7sDcCAWFhySCsm2sw3KBtgiq6a8O+kPRDPJti whI+44AswZKldREvTFzUA4km7tfBLHSwr2EBJ+XTzn1UYqxi07Nj+j2jNS9XS5UmNl05iVirh06iv 3DGh+ut0PFx3wKCWDDcKqRMQQVk9VSFBLsCdIbD1l24ZPfzFjrPStHkh6qqDpifxoW6B9q8uPm4Jk J0XfXWTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1ty07F-0000000CTZw-1vHk; Fri, 28 Mar 2025 03:10:41 +0000 Received: from mail-vi1eur02on20612.outbound.protection.outlook.com ([2a01:111:f403:2607::612] helo=EUR02-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1ty00Z-0000000CSkP-17VF for linux-arm-kernel@lists.infradead.org; Fri, 28 Mar 2025 03:03:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nCvJRywedK5zpJ3oKFZDN2U2jIVdUudqYjkudSmXXWCj885+1ON+AnMQApKxPpY0la1ohW4iZ18HN7F8OjIBlV8dyiZqyBLRE0asLPnd+i9eY9pbVOKrmFPpL6rovBMuUZ9PW2DtJhnpt6sLIUgr0EP6P/Mku9c1LqgJbFdjSDYgKpLq7r+Vh1kFP+wpFMf3H3FJQ1uVUUo4pCauxeDnR58lluJ1zn8Ed9dy8bfDYKV9zb8/+Fz5VWIqoT5uLL636HQt8Q0+IZbEx2vSsN4NRdQNX0436Teogm8pft5hNuoGm+ZDkw7RwST3P7B1UnwVmEi8/y7uRO+YZjjm6TGhJA== 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=iE9P6dSZQzoDP4tohliHI+TBQ5/Orah/M6t/TysaJx4=; b=mcFEhrwo/jLESEuIDjO7wHOcTf+NVW8ytHzpM5VEHcDwB2yRL/3w3NbjYnmKCd1NN0vNEwfPCoU3TFCt0njf0fk2cVPdckBcBaQGBlrQT6Or8SCUpqhegNFgattavd2dcu9ZqMocCHLg3CyMC/cx6X4HIqKwZEQDOaEh7690nOyHd2fcaf+0CfRyAgaCxyir94Lc1iq6GNuC2KWWCQLJqficpnD4sxjNd5cAnwPxTbrj5HW3u+vMJnmxMVAZChQ34xz9z5x8O8QdCAXEOu2GfqGn3Rq51CeRAPMtzEEWtt07E+xJBf3f+J/ieAqcQ3J6yTphnp2nUaIZ+G7plwvtQA== 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=iE9P6dSZQzoDP4tohliHI+TBQ5/Orah/M6t/TysaJx4=; b=kGBiF+uDaw91qp39HdVG/Du+9mJeehNDyVQdKtbtDBZeFbbZoq2VpNeI+Eu4cHLReo6UWX4bOjk9IovGRz51iaaepv8aaTAsK4huIkMHmLrmZsLTBW6ch33j04lp8tA0H5cjMg8Euz6zEKUfb8iwQI4LUfzVSu7e1j4CGcc+dli2X3850abtYtGbSR+GZu60HBqOTfH/6b9pygiI7i5gF4lDY4gunmRG5gL/J5mEhe/N+dMGJnSN0mG7NYlCB/dx7zj08GRETCf63ntUQ7hwmla44CAFbvOCfoUBGC5BETL7mHZK4kxrspXBS0Do92rC8gWJPo4rARZarDBO9de2QQ== 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 AS8PR04MB8961.eurprd04.prod.outlook.com (2603:10a6:20b:42c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.44; Fri, 28 Mar 2025 03:03:43 +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.043; Fri, 28 Mar 2025 03:03:43 +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 v3 3/6] PCI: imx6: Workaround i.MX95 PCIe may not exit L23 ready Date: Fri, 28 Mar 2025 11:02:10 +0800 Message-Id: <20250328030213.1650990-4-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250328030213.1650990-1-hongxing.zhu@nxp.com> References: <20250328030213.1650990-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SG2PR02CA0047.apcprd02.prod.outlook.com (2603:1096:3:18::35) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|AS8PR04MB8961:EE_ X-MS-Office365-Filtering-Correlation-Id: 35de3c3d-a994-49aa-7332-08dd6da5262a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|52116014|1800799024|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: lpRGhnVSfRL2ITIo/rZFruOyIh9sTSkKn4BJpImRfFVFMPs6fzL5OHNBylVHerTjcM/Xd4MtTu7IfA5RN3llfbvIZQisca4ydtQmVNgk6JagKw4f8+3uOBTbBCYHOdyRcLgi7+S6Zwh5oH1oLMWpBL/tYwvchlWzzH6tM0jBTbZf16XyfoXfbnZJ3a+7eUHC1LmDiZCKaXrQ/whTa+PNX0C3qbJbyq8dJEdHu4ME3uqN3w+1gX8VVRJ8jkNzMyirnNghxeqWc+dSHcWTAWTTM8RxpcBgJMYwyTnZq9M8Tf4VBFTa08h5NY4YMdpGTh9JlTt16qhF7jb51AQAkBFFwnmFnc+eiD+ytXcgCErI4++sUMM4ssQsiEA+KZk+v5drOoy6+lgZg/otE04nGkIGjpJXbxgBKGjk95++D63XunfUGAjLjQHZkk51aOB0gcwyLK+Iu4ZvjKLQ3HAmYdkt5UTYXp/liWIbvhxWdX/j4gUYhxDt7Hs/i6e331UUgeTxRAp7BifJVAK9wg/a0BVaeQp7YDR/EeTIJylEql+TjEVBMs5mX+6EF7XNESdfFGAKmBE7EXWuGdz06W/j+F2ZKyBPU2AETvzhWOG1+wj+XeCyTnxpoh+Vq8KIVI6JfbO7ZX3VwM8U7/aRPKY0xqpp0YYl1piJEjos1qhftD75H3uikgHO5sv4utJNt4ot3vPb/3BCskVXdsw7ui4cIYst3fKiaURfSltKwlcbF/681wYuc6ccmlycmc4MaIrruOQkV1MNWnOBvY6oUeDKAaWiQ2VNoz4vuuq8TGtj3pTpHC0H55ZaS2a2XG5hrCOoffoJW9vhLAncjgy3qXSu1Tf/Gl/Iu5i4YJQYFRuk2UPJx2kQfW3T3tMUezHlgI5AkYk3/fFaDP8OVg8knMJ0gOgclUCOVzvgHKNZrRaPuP6xga3+V8KSy2OMdRhCvYKj0y0QkdVEbYO/ieRJAicl6sUwLJfzz+eMpFfeWTKkKvdkfRUL7msroeQqMGPVvNRgz8gJQwfEgbv1XEWNny8ysFhAc4zqQr5toD4KrxHjSigG0misjXGyMTSGagMNx3kVob2G4qUTjB9xy9nsFLQytYfUcFUQFscBV93i6DEBKKZTx1uVN6M/i1YejSREy8/joDKAwRKo1c70QupCL284/M3LVEmXMa5Fm/voGcXuMlS0jHFvKuyGxU6ykB1lINV7FOy1+tYjFQAg6iE7IXr2CkGu1NWltdkOFQXSlkVEko3XgABbb6gtZ9xWkQq7v8O3h4aEtCfXpxhVhNpFBfOwI1T45C/ZIWRRlvj88hTzF/oTnuDTQ6tNIe1gwKfhBEdfdAco3xmFCNEahsngi9WGTC5t0HjLMYFOqw6Qfy2cXIEYMmyjf+fY9YYowl0EUxW7DAPWaIafgJXaHTvTpqMIGXIefggTamdZrASFfWrCklgy9lS01SGjhZsUpynEvMnyJ9fmkYA8OdC/sIxrCsE6aTvDjg== 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)(7416014)(52116014)(1800799024)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9oTxvdGrBAc/wt+9jq314awuNiTbMweFKttxIjlFARPayzzuCjnIdfQHb+6ZKWfaCXOc6niS9p1/ajwG6d+O1lIHNTfwwG2gl9mevyWh7RjNqciEkVnGMZiI6Nd/28QVMWxFM0avSGMoC589EMJcOGcrXyKWopZBTJp1nTp24Z1pg5bSFpPBudDGD0QxWtmRQlf2gXX1VgzaOxjlVLuyqs59y1sOWvK3iiiPjzlmtMIYKcMnTqFQXrLECFfHh+B1PoxgIcuUjkVsOTBQQH4M64Cn4HnJD9zPoxgopA5uTBHbiP7QIeC10AZ4u21LwtBcDqIMg5yO64YyQGmdJ3Z9VR6JreFyni1p1zC4Es2L48U7/pm/qxQZjl8q4e/dhTj2PA6+9BfMGtV0JWgUqAt1ccdodDpdKr41SD5V+QGQ7A3t9F4hG8EmsjotVjT5rdLj+G+Ov0IW+8zyYzPOyKXytOgIPnsFafz+ARMnOaUG6/EbvOosE8Xsc/zEduqjLUzMR6e9e6HiCkrAH25T6n5X9zDiSESneeJXqNQmcof2BrIF2g/qDGlv8d1DxqlqY4cYQdbq0+aRXJK0f0x5q/8zB4icdjjWLVLLvmhsys/j5fTNcv5d1Eu6udzpJJNtETkAjkrBoS1Bkx1nGlv61cRCMQRmzVLmD1znOIq7R+y9KB6PQQgheTaCIFwqdPQBz2zWLv2Oi9q5L2mHxv44SaT0YflncPa1MksqmPEX9ZZ2iQdOcwSEMcMnWPdQU6IsHh2YS9wqJEUHgksUScyJNxZLc0x9ZDbTYUZvN7oP0DPSaWoJd93Bu8skowdMvldnLbVBr1rEvheqzkBKsCWETuS6wFtH2ZukljiwcCDL3+0xLPCbjJfOmXgrmCP3D5WqTzA4n9jstyqT8a86vMDnT6wZmcujK7tfEU3LDP2r3jSTG/sFyUP5R8v2e9GmM8Z6vqPQEL2AS0U3qVVBaK9J140sCk36Q744HrneFp9ykqCGmwsxzMkUNGxuP4YJqCBB39LBERpHJm6wcJXGonou7/AxdI28G6y/D0TJR+XDAozpGppryLK46OHTFGwj6qolTGN/D8xLI8hLOxXXdDBIoex5kyXXLCIRNnWquldz6yTOJliBTt1LSZct9CpmXwAUyDhyUKJqN1jBzo9KLjmP4QgN0XLob2imNmzKZB1s2TlVvwIgf879lHs97CgESKKBx9sdUtBOeNgwP6AVhWJDQ815ZGdWBN2bhOB6vC7FfbFItb+T1/EDfxZkNYKu+eSDEmRsv9rrva28mn/W5Jv4+AQUm7Z8yj7Zg7Hrq2qVXLqHBG6MK50Y+B/r0PSVYve49ykSdpF/0mhcZ9yX4yw7c3V1h8lCZWkU+oiqIyHOGvgz2gTN/5tVtsQACJIsYwyXHBPq+PRQJGts2SoU/jg09QTmgUVpQbYYw/nvwDKWy4tHv0mmTtbxrBmE3AnqTP6FGf5TACJudkhUFTQ7jLNwXOvkp3ur8pP6Q4JZ7Rff7M/vGB2Go3blUjwHZVW7KfhXiGbccOfZyf1fA8IbHX1+t5ycY/Zsc/AWqPcF+TLkuk0FwfbweGBtHW0hRBtjjL+73el8 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35de3c3d-a994-49aa-7332-08dd6da5262a X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2025 03:03:43.5425 (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: byOp2zo0MDWr7Gkjf6SzhTMyi1C6Atzc3gvocf9VwPebt1XKhJADhZRJeFwX5Yo/iixLohkgtv3/Y+ISFCerwQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8961 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250327_200347_307128_9CE6A646 X-CRM114-Status: GOOD ( 10.83 ) 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 6051b3b5928f..82402e52eff2 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 Fri Mar 28 03:02:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 14031592 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 839E0C3600B for ; Fri, 28 Mar 2025 03:12:38 +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=3WnF5MaPL0vkEvqmEIuMdyzOkw6oxR0mcwbchi+5rt0=; b=Zvb9FSitxZvIiX1Lj19LtunTvz F4khc6La0mTnwyS6xZalHZkCVnq9dMbZybPwCdC6kgI1VZA9WH8g3ghc1mC83Nq5uB0z6iBzY6/9X ff6LnN7kSi4UpACxAzIKrtx3KEVd8HFdOENmlhzIuoBWnXwAyosLMxjAJP+hyppuQUZ7mw9XyPwyR hfxaxIPyafB99BcL6TfXI9wx3gN6VqCxXQCLvZEfguB3zjrHxPAyxFOLXcAQMEnZWj43Dm/Heaj6c MT0YOOjSexGRprDx87HScS5+1F1mXuE9bzZPhowT5hD3ZUj95oq1TBhWvwgFRHZ5SF1vIXpROuZau GKKM3J3g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1ty08y-0000000CTp2-0c0X; Fri, 28 Mar 2025 03:12:28 +0000 Received: from mail-vi1eur02on20623.outbound.protection.outlook.com ([2a01:111:f403:2607::623] helo=EUR02-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1ty00e-0000000CSm5-2C2m for linux-arm-kernel@lists.infradead.org; Fri, 28 Mar 2025 03:03:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vL7lDo4573K4ZuTZ/IpEcFPGzrt4zKt2wKG1ZQm2AMYt19/kZgZ4VTSTvjW3DhCFEAWBHwoepbcbx6tVNRjPUycB62G+fB7wBj+b1Inev/+TfTh4Ldy/W+XcuDcilMuirskLvHTQnL5iQQRXy0zBzTbxZwwG2Oi7c++pbWNWA4rCNi1RNQQ+rIeL0k1xa8HzQaFxIh1FakaRGxoBEOPJuCSkwDkNRGsarbiB64ZE3mAZLqbRqUe8Hsftr45qp8MKYrwPB2B+g4GiZ2vAXzPY3MRNAH6fkykdZjmSz112L2Iki7tWx/lpisRVlntqP2L34paeLjymm1XKNdPvgBoJJA== 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=3WnF5MaPL0vkEvqmEIuMdyzOkw6oxR0mcwbchi+5rt0=; b=TwS+9OnHUwoE0TmYeIqtIIIy8MoDNC5cZz1+CQvq2x/baQUvx4gIqy2CBi2aabGuUHKwCZpeqpFFes8AFh6mV35C4Dz5t1c2a2b8VoWlSuB01UMxKiYQ+Jx4D3i2o/9HNtJpEMrUyrDgUsQb2NUDie4JYE9svwVMJwSZW5wfBDNr3Y8x6cFh1BVjOP6fWr/E1le/GfeiZU5M2m0dymT1FmBL2gWXZa6Bw8L5p1417Tdw6/68YgHfCEOz6yKytiEkxXyf2NCTwcC+C6EqbNGMJuouvgafYiwLlB3IlIgDlfq0HJ38fWjIc1G1TPrfjtkpa2rW62GEwqmkhWOFej/86Q== 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=3WnF5MaPL0vkEvqmEIuMdyzOkw6oxR0mcwbchi+5rt0=; b=Aj6x5hzRYsL0iTM++i05dqcm+hPv8wc29go+WrMjISlnRLEh9o6L0I3Ccuh4yb1ux947Kh3nxJ9WjT+dxjIPjjF7zPcmugOow0PN8s5HuCjyNi7wqfxe7XV4tVl9KmZfUGCo0mbY1OO6YjI1/kjhKx9AjyFzHrzrO41iTu6Pn+HJ2hITXcjLvf6fXiHZ25m6G/pUmeoU+mWH5vEeYcIDS1ARtfVS8veM5JiGzWyYW/lRs7QkeEnKZHcrYN1xXeF+soEHu5ztA2cgAqQ/b0qR9nfZ7Pdg0kBpzX+x2mqDt3v9CodlXgNHSWaW6PAIeJPTCNy5t8L+9DGrNI8HSGRYJQ== 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 AS8PR04MB8961.eurprd04.prod.outlook.com (2603:10a6:20b:42c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.44; Fri, 28 Mar 2025 03:03:48 +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.043; Fri, 28 Mar 2025 03:03:48 +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 v3 4/6] PCI: imx6: Let i.MX95 PCIe compliance with 8GT/s Receiver Impedance ECN Date: Fri, 28 Mar 2025 11:02:11 +0800 Message-Id: <20250328030213.1650990-5-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250328030213.1650990-1-hongxing.zhu@nxp.com> References: <20250328030213.1650990-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SG2PR02CA0047.apcprd02.prod.outlook.com (2603:1096:3:18::35) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|AS8PR04MB8961:EE_ X-MS-Office365-Filtering-Correlation-Id: b684d01e-40c8-4d03-c203-08dd6da528ef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|52116014|1800799024|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: QbqgTWeJhcs2+0VlH/Mu5BhsUm3S7sjzqnAl7pB4Srs+ELFjj8qf+/JHemWhvyG/IBRq4Y2ZA0GhqopLyDbz3pmBp5zW6jfrdlet+JZv6MmYsGjCjtDz3E9eS5p/3FynWjcOUAtBucI+/BUU3Fg9YQZjK6Ut6qNsbYcyZCYYmCuAaBVK/kaEvbVUZk2DXU3T2GQLac+46uYgaFw2ZhFxGr9TrOaoQ9U5xF8ffyOK3SXV0pZNkS8F1sCwl5xJgkQJ1M2uCkkfFQWBQGhHdQjmy27SUx1246k6N3/aUIyKUtT4ytZP727i5A82t07fo0aurrIaeXOC4nKXiHYvPkMSTYKIkrX/JWiEnhFWO48gEHj7KTPUhVWvlfnrY65mcbkg7GyTGtapWb++YgtPVvYWooJijfp/fPc+xc0k9YmDY6dBMZdzReW92VDInUiHA5Xse06eGZWOI0tKvzwlri9oAIS4RqAegtO0KJhON2jkjXF9oA+TmfgvJKGL3tMYkx6XyyAdByRnVLq9Pgxsl5w9TRfwfteEaF4j52C+NFMupZINAW0xUPAG8B445uAYJDXXbtZ5ET5ztTGTzFtcUZ9AAyllCKrjc5/M99fsXQsoiatynFgfYBVwKWT/PCR9wV6p8gOWDN3rmE0/66hfSvPel1W2FdBIaPIxSSQUPKbGCi0qd5QsF30Odo+BcCWm0xzFTyqH0nRUPvo3im5yQhmUxuX0gdDW6BH6sl/c/+gCnZjvAQxyGFKv/RdKS1kvewjVm2tE9MbCPJX1CfxglpwY2KdRGncR6ncANbLvtSZVW7DMNHK4CSv01ZVevVQ9tTmIkmdFMR38Wwmvr61BwLZCFAByroA00Fnt7yxfxrn9QBBut7G+OiyGD/EhH+JksY2lqiF+rf7+FmzDl7LRxXvhljm4iMFArPNQfTf+VfZCtx6N3BaqPJyzZ1EEkXOGwzoIQM8OjptxQNcAT4PEL/pguuvVLBSqTI/JsJQejUfn75uPTmd6940JslPTbDIrelhWoakp63b+1Sal2fMOyUrRoMdGtey4++qw/namk72AWLGh1R98iFHcsbMZb6BFU4Psuq8ZNZmrayrzeqUYClwCctYXDLn+qZZj6H6xtd5XHUBKWodXypAbZr+7KDvsX34/8frwXze1tEwWBPtYUPX0j6dtc1ce3Adil7l3WxUSK9ZNlCjI+5kKVnzO1KYHJcbN0DTI2BjRifYCk9SNVCXVAkDaIdsorANZQm84bHINnsfYYcJcamYZ5if6bJsB7JhdlBJktIpYpTRbvGBkXBfNpruyebIC8pEgC+e6hCjNvCwg4Kf8frRo2gg58APT2RCiJcV/Mn3rMdQGPYk1j93vw1YC4mHgjZ3yQLHWL1Q1bQJUw5nsaRhhUIWlNfBPSGndBQeelFsB6q23tdJASnQK2HZKaYe2yg5Rc9FVTJZEzdGPhVC6oxw/gfhKUaSxgwXbgKAOAf5V8TE3pPulWPKxKA== 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)(7416014)(52116014)(1800799024)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n8nxeOeitizUlQEjAUMh0FHZxVEHjCL4ijHVUyh9uQy5FW6fmBZ3AF2ByrkDY3ha5Ygyl/ONsJReTWFlPwGihS57bGSdnB9qAH6T4Oa4YouR1yAbmjSOSIacpziVLlxXuXyv8/0ZtMlg3CSgOEiTXH8/HK4O71iIeYaiGBptIX0QYfDIcvR+fy09kw4xHBYJi75FlK9BPVROWw0cifL+yOk6jxLWoVUERdtk/iJdjuNb/z1crXZsjWSgKABcZ0ELzkqbWjQesN4/IBevlHsS73cu6KB6sZs9zT2WWWNivsKLcl+9nfFzELzqSlSML94KqTRZzlD6T3zYRMQJSFqwOlDYYZ3pdfBVobs3v2nx2AH3t1/5tNMaqTYuQN0vBohSK5ZSVh4vh/jXVd2pYqju9TdPPa7ZCXbYGGnhvJnxpd5tWhZ+NnrvGSL74yQuZzav/smXPLXsY68TnIAQZ+28awtT2PlKsnJ2RKYzWYw3keqiuArK0aSgBV3Txf0Hevt9vautICKDXOqzeDM37+m3gbE7bgBNr6Uow51rowpBvAaWKtVWNKK2xTqS4+dEwhCzFKjcfwcO5NsHOiw0YFLxJl9JPec2TnodtH3Ra7zkixXA0xDCG4jkKOTpJh8E4DyS6+/UIhguR0+yu+IpjOu4cWb2p7T8X2bm4m5AJMtLPMXVaDDJNGeVQ0BI6fnhsIrEN9IGRfNglTzo3tl2dN2ds+8g7rU6Kl6n44mtjML9HebSqnpTiOfNID0fiKii/Ndm5ZW4DieeAxFq7YUrv13AgnJSGV+QWmr2Z2GOXJEMl28hgnTHBDkeSihfi2D+75dZgIThlBFtneiVlhr6ycV+E8bUwIkdqlGZvJvYvkA17H+D+e2m3aA56SfjIWxbwXkbYjE9gXo8YKiXL1hx3aKpsM2jGkC6mLq1almL7RoABwMilZAqBWUsdgwPspWbdzFWB0BRiphANn0M8ly2q/l/LRmMx7JDwjFG5qAD82k7k7MbuP9qOeXQftTOkJwmv3xIFZr5VEWfW6kug1uOJWZa3kZswYDRIUqSKm2HsghURjcK/X1awt5dsh77DTnpC1ePc6/3M25yXGWQFR80Upp7Om/nxjbSBHpdX206xPs7qyVDpm6jUPsfyfl6RfjiZbIzny/spvWAdtNeSpS557vzZkupnG4Kat2D8Bz9Swsfw/tTbrnPPQTxeCkTXIlcLVireJcCyf/f63sjAM6Eqi71cF2QdH8h2Ge3GEAk73b/EDgkLkksFhOFuLIsEHZn5UKxxiCspKsfAMEJaj+J2pCXUC0uYakkS4T4ebz2cslkBGWPvAdJ/b3AiMaeJVzVsI+RvzRhYDwEr+Rakbl6DIP6WuFqxJrEhXVAVV8cY6cOycgp3qbnyDhfGnOaFKV1r/a79bzKl9K6zH8GML6vSU7jtPF7urU8ixPxgV4woaUcvvLEnfbllFHrfKXj86TZWeKgBPgjbxwY3uiRUmcgg6BvV2yKtSkpJYFX+A2ewA8Qc/OXkAP/M7FptJDxKcyVXvl1EnrbIxCNTixfMYPEz1VZogu0vEt33U2soVch/LiqOZnCKKG36K2IDkARnoECCph1 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b684d01e-40c8-4d03-c203-08dd6da528ef X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2025 03:03:48.1898 (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: 7OQQPDT3bkIuNOEdrKiYrVZUAyUhjyDdAj48D51TUcg1tfWCgaaFsD3l/fNXi9xJxdKiJ3Q/N/Zmg5/+2WobFw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8961 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250327_200352_563568_342B851F X-CRM114-Status: GOOD ( 13.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 Reviewed-by: Frank Li --- drivers/pci/controller/dwc/pci-imx6.c | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 82402e52eff2..35194b543551 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -110,6 +110,7 @@ enum imx_pcie_variants { */ #define IMX_PCIE_FLAG_BROKEN_SUSPEND BIT(9) #define IMX_PCIE_FLAG_HAS_LUT BIT(10) +#define IMX_PCIE_FLAG_8GT_ECN_ERR051586 BIT(11) #define imx_check_flag(pci, val) (pci->drvdata->flags & val) @@ -1263,6 +1264,32 @@ 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; + + if (imx_pcie->drvdata->flags & IMX_PCIE_FLAG_8GT_ECN_ERR051586) { + /* + * 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); + } +} + static u64 imx_pcie_cpu_addr_fixup(struct dw_pcie *pcie, u64 cpu_addr) { struct imx_pcie *imx_pcie = to_imx_pcie(pcie); @@ -1304,6 +1331,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 = { @@ -1403,6 +1431,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; @@ -1812,6 +1841,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .variant = IMX95, .flags = IMX_PCIE_FLAG_HAS_SERDES | IMX_PCIE_FLAG_HAS_LUT | + IMX_PCIE_FLAG_8GT_ECN_ERR051586 | IMX_PCIE_FLAG_SUPPORTS_SUSPEND, .ltssm_off = IMX95_PE0_GEN_CTRL_3, .ltssm_mask = IMX95_PCIE_LTSSM_EN, @@ -1865,6 +1895,7 @@ static const struct imx_pcie_drvdata drvdata[] = { [IMX95_EP] = { .variant = IMX95_EP, .flags = IMX_PCIE_FLAG_HAS_SERDES | + IMX_PCIE_FLAG_8GT_ECN_ERR051586 | IMX_PCIE_FLAG_SUPPORT_64BIT, .ltssm_off = IMX95_PE0_GEN_CTRL_3, .ltssm_mask = IMX95_PCIE_LTSSM_EN, From patchwork Fri Mar 28 03:02:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 14031594 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 02260C3600B for ; Fri, 28 Mar 2025 03:14:21 +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=fZF5VMuyND9VoiyeBcaCL6u7bYuMlrmMIbrnDbkkxEo=; b=1zF5ZmiGGUWWC0gq1pejzh3FPy Cbh+uTKvg5jVdxkCl7bS50wl4pIBYyllP2bi60ob8KnxexeueYBLO10qvxm567QDIYnfOEAJwK1ua XYcUAdbzpBq/zxtLFNpwizRR5hZXBbS53quBoAsaIRbYMJjxsjSoHUSDYQVQbo7E8lxAntCWcJRBk G73PJDDd8wFHUe1egrEvtBz8nWPwLnRn2lsL31nNMEfqNv5h/e+c/U7noW+LbJMAjYQXPotGD6EfF tSSY8ruuNyQRD28ZzHaQvY8QcrHoNn7r3ozje1X2DSHb+eA59vfUqEXAQDtiFnY66BgTL7w9gUZYr gJ1WIdlA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1ty0Af-0000000CU1c-3Tg9; Fri, 28 Mar 2025 03:14:13 +0000 Received: from mail-db5eur02on20619.outbound.protection.outlook.com ([2a01:111:f403:2608::619] helo=EUR02-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1ty00h-0000000CSmx-3R48 for linux-arm-kernel@lists.infradead.org; Fri, 28 Mar 2025 03:03:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PGQO74s8xhHjKgkZl/YywX7JnussVlQVAku9KG3I5AeejxOFvrbYOamcp+1Y1IXUzHLRduzIiKONQ+13axz7DtY3OgaqXPSGA2f5MDPWlxQgB/StTz2Lu0o7GpZ/2OzzNBSfXXuGKbv6xC961phu1370T/aEPoggCQXBiEQd1uys0gSfgQ+nwZqvesh4/TsNOxvaJRJMd+fyazIwlqk4sTPDyNl7nAj6WXNXpAeyh0YkNEaJV6PbYCbw9QU0fz1MnpydMsEBWDPA1J+P5Pdyylx1st34P/dygpA23OfUs48n71e0ysArLel5Auu348i52R6e0HP5HYENdCCwm+DDNA== 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=fZF5VMuyND9VoiyeBcaCL6u7bYuMlrmMIbrnDbkkxEo=; b=COHh3DyrtAkk4Tuq7ysIFOr3YH2HvzfxKOTrHcmuMODvtTT2syXcHTDdXeE2tleFKmEFDpvYjsV7wSANA27MX2blXMA/4B5zJQ+smyskFlRJZBE431KeD/nWYKRquDeDwXgwlJ8SxbzkHrcXIkRy8kj6M2gsIuqY/ojLd3xOEEOzKgA+fG3yHPHYZnkGRDpD9EJd1Z7lX+hTzs0tV0GzvlDlxcU65425bpTcIFDYNx27Jo3pX89u0jgRXJ+hP05SUyThjSZrDJ73a/ca9WZj0F9/fYxy1Dw7B+k/qGnPgXjW9Cb6gytRjsD8YRgM2Xk2rgLGvxQkvHQTbuuwZbTzhg== 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=fZF5VMuyND9VoiyeBcaCL6u7bYuMlrmMIbrnDbkkxEo=; b=aYLJ2Cc7C7qZT5SpERJSiR7kOF1ANGcrwGU/f3LagCrNOpEmcigtY/gT7hO3xDW24gwL4Ce4HFf3XAhVz3W37Xy6RxzHLsSZw/fK4dhk1JW6+dlgRBXkrK6qpjkPoBPIK9ZTXhw+4qD1m+qi0dlfKppcqpN0zQdKNQg4GVe4K+lP6tsZrEoPTocTBzviz6ftFpj/iCq9JVbviayYwdQMREaE98FABAXqPLD3MWiB7WOIj0bhRltnSHxuW8LcX8c5yPeksxW39boUkFZrSDWFwig9t48UI+MUbk7Bkb2Q5srjT+IsZE3FuACg925sD7739dBHEtOfXB6aAMcNcRpbAg== 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 AS8PR04MB8961.eurprd04.prod.outlook.com (2603:10a6:20b:42c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.44; Fri, 28 Mar 2025 03:03:53 +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.043; Fri, 28 Mar 2025 03:03:53 +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 v3 5/6] PCI: imx6: Add PLL clock lock check for i.MX95 PCIe Date: Fri, 28 Mar 2025 11:02:12 +0800 Message-Id: <20250328030213.1650990-6-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250328030213.1650990-1-hongxing.zhu@nxp.com> References: <20250328030213.1650990-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SG2PR02CA0047.apcprd02.prod.outlook.com (2603:1096:3:18::35) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|AS8PR04MB8961:EE_ X-MS-Office365-Filtering-Correlation-Id: f42a12cd-3a24-40d3-66c2-08dd6da52bed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|52116014|1800799024|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: CP3yGYLiinFSDzu6xHC6IFJJTlxCp3ifQhu0K5iZcJ+AmctVxYaRcIcD+U5MrGYCDmtduCls9Pnbr2kg/DedQwt1Naqw7KjzyXlC46Ue0hbu1BN5iPO7tynaR0QXN4sfLA3wdiwSEwC+lXnyRMIu2OB9VU/Dunfe+7ysUZBWgyl3EySp01OKSPka5Nv2d5o+aoqqrqVPZFrCSRe9OMmjfJSDjqpik98mNLBz27yGxy7H439G6NXRQaJTiVkqg3H8XGLs0YQMhtgmh4DX0kX4MmQWd/rif9AfJqsuIQ4RkbU0osIGDV3vxfEwqMK/3ES1M5nK9d57zeiuZ1bZO00X79ced8dMxpxrxhlo6Xq6sHJOkAHtdJkFDcVfgCnkwcdf0AZzDI8nBdvAdDkkPtFKb5WFgMEu8YvhWK0Hr1z7vBFVERUMYJcKmbAi7DnyrbLL3KqhHTWP2avAY0a+yB69U8S86FYaj4muu8WU+guOMSCu62vB185ttr1T+UcFgXeQkCUyWPhAHzW9fPYHQAP3lJvgGd6am9HxImHuLVrWff54OdjOP4lBDiza13jiSe6IlJPtGFZkxZysiasODihFn/c5gZ3imktiHsLxGS9kv6xNXhvZD7t9rRrMdiX1uLTyArwjbh4XeEN956wXXeGycUicnqval3uHQbO8/9vx/A4ypdWK8YVbLJje8vQN9rRwe5yG+AwAcxwuYxccIxn3WTjCFMq9jx2ADNOKSRhXz7AdwyLlkXEt6r/mWyDGQqXxnaSKKzfAQhouez2FHobJW51l10nQ5MRH7sE2G00E/QDEL0nqko8NKakExBlMrlEPo7VOSKmUMUgFcn0M5oenDYRIpzNUQ3ji5TUu+cBuGj9cCb/wFD5DkcFujuQ34DIaJqbkPcgqU/WPqyCGYNh2KVKyRqtsx3we+H5guG/2kFL1bGBWGU4GLATaRsaV4NgcdexFv8ZcED7Aat6/nsOH+hLFqdSWsagxkUxz/U/zfyxqy8VIR2T0lyR+k7Bbyg9vHENf8U88H6dwnmMYjSb/gcQUOymJsa+AkJ8V5ecik/PEc/OXZ56Yb4XfHwng1oy8B70sEAtv5rGnKqpHPQZtGj3W6JvGmQAuH2JFTFozMcKJZq2bM0+q0XyKPsldS2xX+03ioeF5n1EwU5MYrbcEacEOTnciIrGBQzQIFf4EhKAIWQnwZRwuhCFyawuEbtZCN2030KUTE1RbSWejcPL4oo5osX7jFMlp+xbueoCcibJbx5pXp+u2Qb9PcnE6KEZf/zsA2/OZ1kcdu+bWzFfQPLJHeI9UC3S46fqKHc+X+GkTuKn81+CxKPlnD/mAZQN70xCOSqTZxBpyG/ZKfnTptWfq03oEtZVP0xKCsvgn1sLw6A8hxpP5DDDKkG+uW6zPGAxk1hkTFNXMVRvqKdM5fBfn8c35S0AldRGEVs53DdKZKNhQbpG2UfZ7fLsGOZ7AiHBddoxo3Wt4JIhSuzU1lg== 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)(7416014)(52116014)(1800799024)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NeggUbJqeGbi9DUy5emLpFdvFcrxXlPCuBi0CgHHyfkfnDPNi5Ifnuy5dWlx3w/UdjJFP4dOTSNxY1awllIiv29iy0XMj2y8fy6L94kQHxhhGxCvZUkKJrhc5+CMisg4pyQC541lKcDcVB9n1/RNa86fEQEtu/umRxGGw4/nZnssaGQFeW4A9Gk0ygfMeXO/4Ao2M//BI7i3bWLLNv7bHMEr1VcZxhMM2vRwzGLfbr2HmJHgYj/cUJpTPHra4BDHcfYF6UO0JgZn21GDATIFRg6t1VYrQ/FMcWjX9RUhp4lFdis/MUx7YcJeVJ5RRIxtH11j1M9jSnfIvAoV4V3aPtyvUFt6KaN+kxVosVdBljbRQ6Qyw/tyqxaJpCQpcQImkMCvegYXliBTPjN6C+v6GclJNLygkOcmkg2QRQNxLmrqxkfBOdkoyhkJxd58U6pn6MjZLIhgNuE9R9lY9OuhoAAzvauCRL/FbzcoUa8mUSWfQ5r2O6aRh6YlEVujIRdz3WspRb9zoPMva2XNJmF4W2+fuEnKXnEmeQnEztClcX7KD4d+y6AZVd3Lnb/vpmEkoHhr53k6Xhac+SNN+DzZ2X5V8S/1sU+q43/gNSt2WHOghlSLuDPZ9fbIcq7+cP+5bXRuLJpCbpqnSYv40MpVIsjQvfVKFzVPuNU5ol11Ah0TyKowbAI/vEL3KVQA6YgTopSz9Cl3OvbS5t4t8IsIwd6YZX6CagiXPemfaggBAppWldAENPUNvQLphYzV8R03YGtoweElBS1PvBP7pnsrCX907CmGL+3NQyOckl5YI85gStDIrk3L9NQOfPM05Zqx3DvSq04P7+h8d6NPzImhl4IGcqNnoJap4WKcsMjTXj9F75esadmA7YFsD/iFp9Y8RUifwayxDqFCHz/NZYPEXkGx3UYQqm3Y+3mydH0H5XLHPS/XNDFaR7DshOjjAg0jw1Q6if8Ko/TfzsAK7oI+kkkStUqUhYJ9TKZ7GDj/F53gYY5e5N/ObG9VphsmD/UoVCVdGYkW9sKx1nWb24KSQ/+egrPvxtTmWfqXL2jTZd/XhEIfE70uKTaK78JCaJv8sb5hvirfDC+gzCiSRUm2BgkPjSN+G2fouG1m/smADau2EXU0/O/CIfG5N5XI/CshONihMtFAa6HGzr2EU/JaJpwZMR+NhZzPjSUAC3HZCvRmFfBE73u4y6YgkK9UA5BHPU741h5KibM5PStiEonk9PUfmc8HUUqO0Z6mJnXrP5lTm6ButOknfIAlDI41RTXGLb+CaDFlunH69t2CO0MhxXsKcZmuLl13Ju4pVPvt061TL0qWQkWCTkUvfSgEjmNcvDLcbjwJJUyJ8/D3P2XL5/Oe2ME4tnGTJKSf4Tk6tDc5qLW5wCRKtuBauJVsd8B3pbA5hj3IpZlgXPVXGgYVBxeweYPqeHq2EtUkf/BBif4Iv+Zjd8Qk6FL48ZA3p7eJEqYhJpm8/eFzdXj13nEYMx0TrWunARR44QIZmA4amIjcihK8Gxx5xYg0FAf7uWe19pQ/W44Pn5OspTbGnYIYugTAUqvL2Cbmc4X/vP4qXly7Q6SyXdpg6TcsR7+dapj+ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f42a12cd-3a24-40d3-66c2-08dd6da52bed X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2025 03:03:53.2523 (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: yWkGyoAwJuT3C2oEbuMar+l2+sEK+vIRtuorpKyMr8VG67mPIT/j210iADAtGBB6hqPXDrm+KiDmQnZzgKM/WQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8961 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250327_200355_858086_BDDBF5C8 X-CRM114-Status: GOOD ( 14.78 ) 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 35194b543551..40eeb02ffb5d 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) @@ -479,6 +482,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; @@ -824,6 +844,8 @@ static int imx95_pcie_core_reset(struct imx_pcie *imx_pcie, bool assert) regmap_read_bypassed(imx_pcie->iomuxc_gpr, IMX95_PCIE_RST_CTRL, &val); udelay(10); + } else { + return imx95_pcie_wait_for_phy_pll_lock(imx_pcie); } return 0; @@ -843,11 +865,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) { @@ -857,7 +881,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 Fri Mar 28 03:02:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 14031595 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 D137CC3600B for ; Fri, 28 Mar 2025 03:16:11 +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=HdLbJI/a8fEfSLxMsAJ3X1/n/Mi4R72cFi83T+J7Mx4=; b=nDlL5NsvLemjBSsi8KMRR1Axb2 x0YLbTzcZ/Wt7KhGvxzgboCKT/yHNu7yE3wG1S/y+Xp0eoeNQKf8qVM8i0IFJfomsjWSzFiT6RJ/6 2vppKXjCQqTZCbOvleKCTxfLfvZhZcWabgfuefuitzvTviTn7N4GAzA+7O+FrsvcjDyA8/HKP/NmO V7DG+uW4rsKZSXp1rMDSFGmuNf5mJbbNXO49+mn8EwMJ5r2lZROSRk3+3ybB/G1stcXa7hIXdgaPd Ub5BIXzW9Nsc8fVG9NcQwC6sbvhlVCJkVFBRBNRlC2QowL07iNpAUQeaKqRAK/enNsQARUrvr0YCF W0T3yqhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1ty0CO-0000000CUEX-2Ub9; Fri, 28 Mar 2025 03:16:00 +0000 Received: from mail-vi1eur02on2062d.outbound.protection.outlook.com ([2a01:111:f403:2607::62d] helo=EUR02-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1ty00n-0000000CSoJ-2XGk for linux-arm-kernel@lists.infradead.org; Fri, 28 Mar 2025 03:04:02 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WsDumoW1xXNG9MopLKN6UEOb/FPv+NtN25uFBVPtIK3jkKKdky/QPC55FGLfwL7xmJKWOIweP4ZbuQcT/H1+O55L890sw12RMlc2clgpsrhE4ydO5hdjpgqkhD4xjDrRKCV8BsDAWLPI/vZNV5JSAxl45buD9lED3ViFIb/LJIZe5lraIBFzEDUm6VJPxHfHz57Pt5mpujyazEknAbrsNswhKLcqb4SmjM4h/yKuhftvj6ZmSyQ2ssXf36uvJ9f5zTyorBBhMFSPuHOUO5wu1D8c9Jb3CuGAzzBkoyhvgczsSoHYxijDJm8KTHLGwpxRIdQUB004utNH7tXRNKVnmQ== 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=HdLbJI/a8fEfSLxMsAJ3X1/n/Mi4R72cFi83T+J7Mx4=; b=efy049nNO0Z4ZtNBLkJffkY5NzSg3jfzXkmhH/OwSTVsL+IouH/MzcQphCf6n0+VJiEEAB1fPus2Ge6WGOY4udUy27Skf0xegUkheUBJ+ZepiUAxrIQcET9ocTVd8nT9//r/O/uKWeTU/b5KdlGckZyUWH0cyxDvJOgn0n5UxVjDty0Ea5VdsynVJaJ5i6pL9yiIerPh84Cb7qHGqAnqMJYcMFDkl6TuY4fGZ09iqE9usvPC6qwf7Kil30o1J0qbNtZ2b2ED4UvFYtmXyvpYaveWaqm1jI38244I2/iHoh/rEBNKNY+szJhnL2kAzsgNa/NgYYdZV83ujpx+LKhmeg== 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=HdLbJI/a8fEfSLxMsAJ3X1/n/Mi4R72cFi83T+J7Mx4=; b=KhDOP8P4UnjiohV6A2mmylagHUCyIBkI075Sm1vJauhJiED5u965t5WDZ4naf+K+2cZSerBWcMx91TXBB4GPy84RH4Yof9xKwOoGvu1S/nJ18S2rSQypzyTbwH5xZQ5mLeoH3QOd7I2c3gHBZgiFq3PiSCLzNNzA/6vbWUw35Yx3FxZB589tLg7mi8DF4k1pcjUuOI04I1Jp2uEF2jAZasM8UPkF971NNnG5XIrYhWtr2nLe7hXxAUzEqVATsB4JPCbtcq4HEZntmBQf/LFNE81f1OlSKlBawoBdrxOOYUYLZV+ZSXIX4HZJBSjL33wp3+FpvLVqek0o4DRD1lvSKg== 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 AS8PR04MB8961.eurprd04.prod.outlook.com (2603:10a6:20b:42c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.44; Fri, 28 Mar 2025 03:03:58 +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.043; Fri, 28 Mar 2025 03:03:58 +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 v3 6/6] PCI: imx6: Save and restore the LUT setting for i.MX95 PCIe Date: Fri, 28 Mar 2025 11:02:13 +0800 Message-Id: <20250328030213.1650990-7-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250328030213.1650990-1-hongxing.zhu@nxp.com> References: <20250328030213.1650990-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SG2PR02CA0047.apcprd02.prod.outlook.com (2603:1096:3:18::35) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|AS8PR04MB8961:EE_ X-MS-Office365-Filtering-Correlation-Id: c91dea09-7f74-4ff2-9ee4-08dd6da52ec2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|52116014|1800799024|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: wu/mpfWS1PuZtVIl9U8Wb8dIeR+kzm68jsxzS12EnY98Ryc9wvsvTO7PZ/XgsWoey7SfnsYPGThJ9bC/qv1Kv2hzxPdT21low3d2AV/v5s/F5BFoBshDa2JuSprikvENho6TvfI27vT4ZbFtS+GRm6AAMuDEV+9KV9i4+hHCTcgMqVd9jxMIA1XRgJUBQ2+Yk/u23GgGVsH/WB0e+4bR0vp5R57/L2dUCsD1J5B4YrW4FpXGZvQFSegC8c4pnOtylnatNj1UiFQuvRJmN61MMmL8XUp9Mpd6ybwknARjITc4O4+wYiR5nCHDPLfnIz5W78rIoOdVz3VoqhJswTEM3F2TOFFH4K1CJUv75MKN5tiZxoWG9q/17QBaLx+FOEJoDCQgtrohVKsmE+S78CJA1ZOFID8I4fDfJn+e47TmGRNd3Hy+vUq+XekpV2nqt/mHiOu+/JZd9zVA0Std8Xnmojfcz8fTXfAbima3kvvvxezl63xeio9lH8OxySwC14H3cyIv6soGhz0AexWr7KD6+JdxC+389upjHYf01BSyCFIyT6WBZCvfvktQTMt2gtRiY/0C6QHPCjMo+nnPeEUe4u4jdHBfCdGiPUc3+vSw1w0hvouj037Cbp3x7tKwwaX3I+z3DEE9jFxtKIa8h15KhGIyCSRrr0K11pbq2lVNyAUMSVoBvY5YNhaJbmvHt7ZTnsne3hpRLeqzmzbDaSae3u34O5gzRAiFPcx0UlO3ml0CbCZ/KqkKudXo9xrPW3/m4AVDGoIGI1n18AnwtltS8jpKNRXusBhGf1/fOGfK/n9i9HZ/S8Kuo3RFi2JbABr5DGEObPWALFXGc7sUxk7/UJBGxG7SY/cV2fkQdgxXz1mo8lJKBke5nHPkl/N4oGa4iXCTXTcvwViTm1Q1G5ufvOAN/fJSZfCPctQkAucxwg1OlUjzlZUN1X01B8zQA/M3kMYuelgGQWP4ILz9d8S9ZXNq+tqLrgt5tn6ppXJ4xs+eDNG1x94vr8nux2sQa6g5QRpj/g5GvmF+3rKMLpEy+EFrNgkzJdYAmln10KiBTUsTgegTMT3BX644Zf4R4wQ2LHtI+/R4k22qDo1sL/Af2LUd4+i8tLyR1uJjvnbsFVfrY+7J5/cz4GM43ME8dJ/Tnx24MFXLbiLdUnmjLweAcoYZAvtj5zjPxqNYKS6S05B5yIOyd7TTsEdUIaUatvfHOitbaUQW6J8wLg6kvfXV//J0qsiFfXoTWaEdVU1OoSSss12b9CdhiDFFv5q1hpPoFexWfvnGmS1naPQZfFcES8AUGSigb98gsvS+Nf0rAuOVotB8IIpJ2XyUV/ifJNReFtycvDZmV/Y/ju3/EDAv/LijMbJKqzv+0Qs9cBDSmq77zz/dfhRHPHyzNv67QWAAr5hB97fhFlPtvSZpS2oQABm4lhX+QNm91zOwgq/M8wIz8076wMuMW07NYQ52ktoe8bDQwyDycGTDk2oFI8X6sg== 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)(7416014)(52116014)(1800799024)(366016)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /uUtDcaIsm01622mKaWm8k0RviGmEUkzY1e7XChpDbwKY+Q/PVeGsNbt1ZJKcDN39qCBoFvTjZ+x3veSQWE4DXAhPOwMHeVW8Bw6/M14UUGBLqOosUWs9kx7BL3cPGBX3ch+OdgchO9dT2CDDG4Go2pXikFJSTjYQOwN2xWxeEpJxsRXbjnmf4FjpMUkGmHz4ec9NPjqd1dFbrHhRY5aWJjkHWynqnQIzUKneElu4eIxAYsE2i3rXmHYa+N5C88RZJPCAnyJKBB7hC4MaTjT2HQWGP+hJAhT2LNu5aF+pcb4UMGIQWSeHVD29A+dvWn/4g3ilCthx1aCYkIdDfdFhxQTm9bf0fCsnZChuT+6lP+lAoyvIM1gNnUhPcVSQ5ZIKWsQzwylQ9vG1g+y0ppjWLRWNBCq38idGPTSnEc5hxsvPCGsWQeVzLRECk3uPHAfVzwzJX52EUXAMbX0O3J+jseoutLnE0Plxt0+/XdZsInbj1lT7g77n8E2NM3e6FK2IUlKQ9RaJFRiGHobvb4KP1xTHuzPOe3BohH/c9wM1LqBh27lM4n2LM6YQYULy4K8YBheLqxSUrQ0ai2qbFIGP1U20uY+WnUecUwGlczVqrBxH0kCSlTEuiGYuyyqnPUAt/wLXllxfn4S63AgljfAFTarT7rv2rHKirzNKYcGrN+rI4QqiuqaM5dccmut+5aRz16QxwOMgf14kQRTLZXdReEoAPBxvGhn07ml3nCC9WJpw3lpWxH7s/CprIkUQlNhQt0dCCzCJzq2hqZS90oWY8iS9vEPDd6vVdNa34Ev3dGmv4gDvJe8DgRZJQ5+nyfSvO5RCnnlmoHLa7BVXezyLxTeus5nKDz2ywrsTKsryTC/ygDJeyc9cwsJhRil/jwhZdpQl2v5l7mbMChnWjuySzGwL1q36ocl6COYEUpY5HVxKkwQFr+eZBoogtDjVsPloH0RkFo7zVfMNckGBMlxSr60tDVabwdtqRC+d8JheDAtak5i4eazlVkmeAS3dSwpMAwEcgQfmSY7CQv3jbqk9wTXjFjazzybXtktKj6TiW4FGnqByZi400KdH4QMLbjew/fga3FgYsM+ctII2PxRcQJ7PeL33bHYgcS+ti4IFvj32gHkur8Am3z1hGrimE+zECYsGXkKu/Wr/syKUCyDgeRuPWobFZ+0xBbhHngmXt8Hlq5+tte1FNHa+qb/y0RBudjkaRqR2wQPAUJxC4moqc1Qhm/1G4ILHTA2ncsDiWad7FMlWh61j9eqPBR5CiMFiwUzTuDpinNJRzuFfDI8Bw2vjN9KhLwBoVO4SOFFVxUVVu3MtgtZtWrgwM6le7ZpYYBrKrwHgAhM+u5e1A4vF7Eu5xeJHlkL18VwOhtmCNeL+UDnbHQ7kyP6SmM7LSb/uL9zXredcS5vAv7BlDOMUWhPbnXIj6fhpRh+Qrnxj+ZcXruSkhdexbvYzVf52cgx02lv3Q1FLG1ZsPS5yxJES14X3Kfzaw6Vh2cOj/lCkPIQVx7cTB9MfA2Ivq+FNQv5rzijeWmyCszpHz2GxWOL+Isbg1OQvIGY/qWkxQD1GA/mkusmuK98TdNqKb28S8Z8 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c91dea09-7f74-4ff2-9ee4-08dd6da52ec2 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2025 03:03:57.9719 (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: r71XkNOE1Ia6ry4ZFXJql6+gkJ1VDja/VuYV5E9zP6bz8C5PHVRTt+QNfng4ZpyH/DoT81xYXNOvq7yyQbLCJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8961 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250327_200401_653738_02AB72CD X-CRM114-Status: GOOD ( 17.03 ) 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 look up table(LUT) setting would be lost during PCIe suspend on i.MX95. To ensure proper functionality after resume, save and restore the LUT setting in suspend and resume operations. Signed-off-by: Richard Zhu Reviewed-by: Frank Li --- 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 40eeb02ffb5d..d8f4608eb7da 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -138,6 +138,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; @@ -157,6 +162,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 */ @@ -1505,6 +1512,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); @@ -1513,6 +1556,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 @@ -1557,6 +1602,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;