From patchwork Mon Mar 24 06:26:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 14026806 X-Patchwork-Delegate: kw@linux.com Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2072.outbound.protection.outlook.com [40.107.22.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 94CFA19004B; Mon, 24 Mar 2025 06:31:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742797904; cv=fail; b=Wnerk6LnNYxnF7/oRb5gVIPQsPTxNa0Zsi6eARDNwcWJUuIw7mCTEhv3UUrc4cS1GOqsG9/6t/mvdg18WbCtl9mbtar/dlhnPQ1A0J3sbnbPN796WnlLERExYJbUo1S7u5AH9ArHyipIwyx4AKqqdF7Dy1nPwzcFFkH5iVxxYYc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742797904; c=relaxed/simple; bh=vpeLZs4ofURN9Sx1yw3GNSEA4qmRP9nG5pFnaTwyrZk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=BIzO8I2EkEIdrpXxrGbhurQ68e56JVb7eDa7ODrsg+g9ibWHo1K39LbTJZpuKj9WvmSDX1oArP/zKgVMDJZBhCQpr4MS15Mvtqj0kQvHZDboMJKsiMuZ4daFfrt8TabHH864VRkQyod0/yTF3jDOfe8b0MA+jSqeTRalp6Y2/bQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=a3CiFbmt; arc=fail smtp.client-ip=40.107.22.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="a3CiFbmt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pXyBTvY/l+XwNn/DqQliBsV1TyTCSh8I/L56gB4ZV3dDjBlGwdkitc+uSaQyVPWjSiKCYKWmKFkmCFI8ND6OtTXCiQW1knawr295HlodCS+aHftRe9DDiiDaccCkWdE/ucXvewBppdNvUBCQDctYvxn6bzVFvlQngskSZpZOwVyVW8A7HZ0Ec90frCwdM/38fy+j0SKMljI2gtqffiWs5TLAT9ZLRjuK9neh+90ic88OXrJR9d9SOGjPn0k9RIgEgfvcMh4nn/37NGwswzuWgtEzkWDjgRbap4CtqLXUBG36G9GpiY+U6JTO8WCFf6wewcEuZE1XjW2Xb9HDWbwzZQ== 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=7u/8aeTnOHrKyPorXG6aIfsLmL3nz+vi3LNguUR7wtM=; b=reJrs41DKaLdkzeCTLXudwAiMcR3gaWiGVPktaZo4D6+PM1vjZfijMi7GGd0gqPUhi5+W6eDrAmB8w297/0caR3zcGnzvVdoIInN7prUQqabRuOfvrLBdW1EUe67MWaV7ZarZlmeRBfJP2DLuvm5oPEowOtZ5x21bDA55PVHvWJWFbLsdVdKbO7mAufj9BHFggTnoUif+xZoSMo0gLZWtv2pYIxtRuBeai6CC+6L2DUYPvbjNB1ANdhFBoWhBsf/HW7StCUErWXuOS+Ce6YaAbC2w/u4UaQbe4r4Vr7gFckuSKzqlDlovAawUMz4KA4LGMKGWTy0YOp1zb+N41KSHw== 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=7u/8aeTnOHrKyPorXG6aIfsLmL3nz+vi3LNguUR7wtM=; b=a3CiFbmtjivZOeT5zXNdMxP94LcsEpEuz6pcnQ734TCgPTdUqg8cWMCWWe+SbviCfdqYu/vyJAhEKP52T1YmSR1GUoUfpKLlMvpiDESD5tX21XYxiiUE8eEXAPgrJNwKUI2p9KP/jMiuN4YWZRtCpk/gDUI3CLxTss/4FusQDyXK2QjLuqV9s46ptQZFQ3FOLeRiyS5zwWjehypP2uX1Qv46Mjo3zdage2abn950x6ngNdpnCVH5k1YiBhOaeikucGu54q8vxBrW8CXte5jL458Feq9dwKf21QATs6zAQ21ywCZ224a82ZD/VOfRQnEjqyCGKIRbuF0oe2w2vmXtmQ== 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 DBAPR04MB7366.eurprd04.prod.outlook.com (2603:10a6:10:1a0::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.42; Mon, 24 Mar 2025 06:31:40 +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; Mon, 24 Mar 2025 06:31:40 +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 v1 1/5] PCI: imx6: Start link directly when workaround is not required Date: Mon, 24 Mar 2025 14:26:43 +0800 Message-Id: <20250324062647.1891896-2-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250324062647.1891896-1-hongxing.zhu@nxp.com> References: <20250324062647.1891896-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SI1PR02CA0013.apcprd02.prod.outlook.com (2603:1096:4:1f7::7) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|DBAPR04MB7366:EE_ X-MS-Office365-Filtering-Correlation-Id: eb8dccc4-fc1e-4761-1c81-08dd6a9d8917 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|7416014|366016|1800799024|376014|38350700014|921020; X-Microsoft-Antispam-Message-Info: C1E6jQ2OPKrgWx4Uu/8Jg2j2auOOolasLOs5rFDLjI381oCuLZcENycLGt4PZ6In4G9mbM85j95SRJvrvpB9xrXuwpADrJAnsvpDgHHu8mpfbz+bSzp2pBjuLmKx+7vGDm07wBHAJhSqSxYxo5PF4ZJqBJfyQqQSe4BAWk1yxiNTT5hP3ym+6ZAJG6evSJef19zPdeuPEsuFTFxCki839/ynxu6KCjxLjLFu715GAKVAbDhHUiJ43rxy2liuuDDhfhDZJraR5K4+KWJ9kt2zp0/R7R6+DK/zLbjBBFvN/iLxRruwRaPYn0euPGKL3vTTsgx1zfJ5M4MCyp8ME8SW+HyQJ9+MkdOMMD2mx92CXCSPHJm/rj4+n2t/vWFAS5aGdJLfA4dAQCjipe0Qvp84UPOw0FzHhF3dEA23TA8s11aAZ3M7tDArKLslHoyVPIBzeMWdg9jUThMQgcoLKatLPot1OvS2eoFyc7e4AivTi6g1Rpp/go6j60CiBRuvHBVr75UN6SebPyzp56rAEFBk9p0Ifrkz+EDRQ+9FjeDqdkstdgom5ORQ5LDWl2fJ4jAHvEnbnj073VeVzM5s/uCO8jpIUAh/+UCreswJnYzpgsI77tId96CTpbaMJpNDkmTBBnwSe2yCnIbgJLnr/a8x0CF+xF+g2Sgz5m2HPAyP2jJzJywlt89MlxI69qu7SVq+15BBy7CeVqiXX4jebdENdqHJBhyWIeX1KXSuT28309xvd6UbHzEMlGw7pNulcRvnw65eOHatgmzNf8NTN4jRUG/DaIqvv/UDXY0ahANee6Shed9Y19PdJMF2CVox4xk4NSLKtaDuO5DdO3f1xAjbHqUNSdp0ISBQ25N1ktRWSmV1fzctOzM5CrUd2fu8bMFsTm4AmUd8fVaDhqGBGDPS+IAKcP8SwYwYTePGyDr4+bqybsNzpi5bywPSpgKPZ8ujJBW23in2pbAX7j6s6biD8aD71Tx342cKMerXxNPiyh6/jArDx5ShkBYZllRl4BhL3afns1/zgYUtVO7h9qhj9zE17BZt8HhkBQ27dvz0qYJ1UO6KFvZAC3apxOimS0mmqYFKJwDjm8sVp/dyTQpAvejRM7rmsBZr/bAf87RXH42t84X0UXnbOVWrrtKcCnHLXq1Bg8QV8fhxrohpXhyfgREGihWt5lKCoFdQTJxzW8SJZLSUKwmHeO9KU7GsDPt4YPzByJeA+wQRU/w2cDgXEsllz2K1izI0GR4T7+766rN+kgtCkr9jJri4XKwQQK9W0IUwHbVvSoKNA0Bn7QQnyOhoMh3xMRRvgbi0Hi8KBAMn6k/djH0FXQWSkEBXkIKBbU9Uc8XTRA1flkR8BVMSmszNDembalM3Zal6pNykY5f5WFrwvjsANEPt4an/17/Yr06Dp2C4DhZrrZ2MdxvxPud7ltPN0YArFcdjc28I7rz5S08RB2r9rA2yit67WPQ5gxGrhSizinNwJYzGIqftHg== 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)(52116014)(7416014)(366016)(1800799024)(376014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: B0cAzdMV2QQPn6zgzqiRQFYnXClWObnO7EUeUeyUqeizn12PFEpjilkxUFIaOrXeszgTPDMO4nZrbjT62uzCORWQgNTE0RmRhXmNY2JfFtYpiuZxfMQyZyDhaP6pI65kr/4+41V0E6YP4VDQsnNm/0t6ewYpGYcLSizg7ysT0rST0cfJxZCgo5Szin4YpZFtwWV8ZZLxbxBzjEa1eJjLTYwlvvvTj1JCIgph9CsefK/wkqkUayk4QSxj7oJhpD5mmNgYg/EeQgyfBhsL/kcymdNfxe/+iPVaxGxAM+oz4kuq5mnzfcDjzpBb6d1loMwmdfQUEiSnz/OVzClf1yS3diKZfzh2aZDRuOpkR63QvuIgEQmEqoXK/D6gDKcW7xVvhyt8zc6vRSWM7+nxGbnrbDhYHBTfofFW/hRfe60/l8gg4RIGrNQdCRLV+pSJ8+Jvr6lKaRuJrUwzXC9F9I0tuTx3z82FOV99OSk24JP/lQ4OJsKprYCs8Ic3bPFGl7uMhzt9Bj94UcQYJ7pH3Ke/bPxezHORYeE9GjRxQBtvK5KYvy8mCG6ZO7tNkHgz9zm51K8NiCzvEtO6fcqmmwTplsMehXluMFKS2YfmTi8o4Otfodc+FK1zSonhQTQWn2SUP5uUNLFW7n/Wo2INlw8kVpP3T8wCOF6sm28iFK9t/1MuVCtIlO4RQPERvumuoX4NiyILvtTdlCc8nTiJZoBd3423fdsw6N7sYxkLQvAk/2ou/NEyL2rN6CtYs5S3FkOgiA9ldfy0B5tl5jsWtMF1UPo14gCLNevk/lMNFlITtt3G1/xYjHCE6EL58E7Cz5vhzGhTnAsdcT67rAL4DpzU6MXP4bltzELeUKvfjrz6D61yT+UFMsohMBqXhUU41QHKNlliie1DepclzJMHuC8lPX9hV5aluQQVt+SKjpvhe94wmTWR3r22nPeiIioNybhLydNHcrp5nc1ss8X3CARrEupVhPRxWfy4CQKk0qsQ2D0+Ldiib9GbH28N8bDVx6knTUpjk2DMPywXpVzAiXzwRhIyRBFKU4OWOwFVp+Dfv920JDW7vcxAczPAcBEg16Bnl9weAXCuC29GZ+dRcSIj5ihhDfw3w+BaRDKPUF7GMUJkusM3jALAOh6DqdHIK4aQq09ZyITtdxX2o2QSTyVtz6qJ3Np0piRHnpsvJGVSRSLkbykQkubqeRpiuRKBxoETxnDpJ2ZTFSMYukOc1pUaOJXNq+vEztwLiFOAsxVVutNWwdUt52bIiojYNFD/h+GJBwMCGs/3DDauTyDzdkYr82+0HEfcIbhKWeSTLId4gk3+e8rkhoqXng2sUqapC6wAEFHiQyxDPxzPUhmGnubWfsGISXHUfC8KmZb+5kkMsbb88wDRO48/onQqxuiKvmeUWdZmiaWjRxjKk7Vx+NuK5xuilrdboWiNrk3f8gHtBXZ8fPBJ2MoVljaV4wKCiUEvV+hf3Yu9Frej10/ckS215PK8C8J9lCBEAT5FNQzy82fSbaKhBv0XLrja3hDgsammXGYg17JBvPtQDe6ggLE7WoGMkhIIuI5aZb0GRXhPesT1pr/VSOpqCbxMO8Co463u X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb8dccc4-fc1e-4761-1c81-08dd6a9d8917 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2025 06:31:40.0937 (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: +OnV3baPRo7URDZfzj/YJBUF/oZvhy66/wgY0+gPWd3V3qat0tocnybOmjLJ/GuPqHvzbXNuSMaIpo6ivXQfEA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7366 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..aa5c3f235995 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_WORDAROUND 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_WORDAROUND)) { + 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_WORDAROUND | 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_WORDAROUND | 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_WORDAROUND | IMX_PCIE_FLAG_SUPPORTS_SUSPEND, .dbi_length = 0x200, .gpr = "fsl,imx6q-iomuxc-gpr", From patchwork Mon Mar 24 06:26:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 14026807 X-Patchwork-Delegate: kw@linux.com Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2042.outbound.protection.outlook.com [40.107.22.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F70319415E; Mon, 24 Mar 2025 06:31:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.42 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742797909; cv=fail; b=g5T6obxKWbbwlXTLQ7/LHSUS87CAuQcddysi//j9BodUscTOswtK/8hdnZxB0aGh881d953J2o2/KRyKPxxvjBdou9Gbl4+T2fimAsbp1Z72K6TzKJWQRPh1Y05b+niua4IKlFCeVHNdaAquL7afOKSVERChZirKAnS8u06gFgg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742797909; c=relaxed/simple; bh=Tq9ihE5J4+2GeLqYEZU9HSg0fRjK/tJW1b5riywU0dk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=BeWHZLJpHFCgAUJQqt6NELPlM0BX+g7YX8aRwlc9wIP+wjuuqIb/lh/F6bmNVOXxv6QWKSgkk+cdYpzTdkfWxywys/p1zobMiByqg4g/vyWUKe2W3EMYEO7ZS5LPmRBhLX8SvJ3RBUiOCH73P90hamLTEsSDLq4w8DNS58sdw+o= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=I0Sn7A1o; arc=fail smtp.client-ip=40.107.22.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="I0Sn7A1o" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Bes1nNoURardqeXvD5sTO9qlyTHf9EU4MFy5R2HpJi15M1Oo78CV0YTq7bk4XlSn77gd7F3iLPqqooi9T5VgRakWgI9cHCj0VJoVJnw0z1B9k0JZA9GJodyTT4bde1TRAaAXH/QNlsLgiL5zJ/WYqAOZZZG/UFSw8+DrYMr32jsILAJqN1WfDfppPrXve6LqyOI5KURiWnv4FbaD3ys8C5Bc6X3+Moxt0MpchBmTPMab4WW97hNqjul6+dWuwCvtRcyVCM2Yuof1Z/+i54Bl2Jao4Lbo+FNkWHn5EtALyKiJzns/4ihbqw2eaP3WWG3huQfi+bNK8JVMHu0SqDm4Fg== 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=/5YU9D0UFrVDk9buDYGrr5WAFjBFZ3/gURYp8rk2TvY=; b=d+rhN6dGp8PXsGZn0HaB5d3EF6cT3Ulyp6XJTFOQjP0ykaKnxk9xYCpJALHTiZZVnRWjy8lZgdTME0r28CILLNsMBZ0u+IfxwWEac4CbLY9b3CGjzxI737wKFcpfu+SshHvGrvqr7hE0sWPyCZ2/7JCXuS0PTOYaaQlGJf+0QkKha5gcnFQE6RPJdOsUecDkb101QWyIT2k4deWYstpRs0JNrZVy3pIy7U8AG/bMPLofOdl540gwt9pIPt7aUjgSWSfYL8LTG8hws8qxOFebzkpT0WwAo3VPzTXFvl/BbeEibS0AfDREummxz8XWdJOXl9E0v3aaBdO06K9ReSWpnQ== 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=/5YU9D0UFrVDk9buDYGrr5WAFjBFZ3/gURYp8rk2TvY=; b=I0Sn7A1oKQhHExIROBakLtJ2OpZnkRSTUBPryCzR+1wuA4Z8UDGaNlOyfXWMpVDNo9mBiZsWjrhHaMTpJ3FdOjTYE3/NllmiOhy1mlUGNsYwpqt9FMfI1ssQd1nw2CS8f2lBIKR4sX44iYO/ST9k1wEa+mKTzjMBDrWmGWx6HxnC7b0Y72/rvl4IteCPd+hDRT3YeobMegLLaMtfPtR1ARSAGOmgjng56MNRyBDCjuBJ7lbEybVtMgWvvQhDrSM+2Dl4Mmbl22wNKwoltIZ75RVr7nJ8vTfZn0BoWIVq8xafYMuK/sToc2h+DurPf10ePlWKpwbxmNZSQdS8QALF/A== 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 DBAPR04MB7366.eurprd04.prod.outlook.com (2603:10a6:10:1a0::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.42; Mon, 24 Mar 2025 06:31:45 +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; Mon, 24 Mar 2025 06:31:45 +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 v1 2/5] PCI: imx6: Toggle the cold reset for i.MX95 PCIe Date: Mon, 24 Mar 2025 14:26:44 +0800 Message-Id: <20250324062647.1891896-3-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250324062647.1891896-1-hongxing.zhu@nxp.com> References: <20250324062647.1891896-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SI1PR02CA0013.apcprd02.prod.outlook.com (2603:1096:4:1f7::7) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|DBAPR04MB7366:EE_ X-MS-Office365-Filtering-Correlation-Id: f7f2439b-17b2-472f-d383-08dd6a9d8c0f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|7416014|366016|1800799024|376014|38350700014|921020; X-Microsoft-Antispam-Message-Info: C/4P/KIHzJYbIJrC3cEOG8rHs+ERFODHqIh5EPgYBjOfgGEe0VTimppTHlb8o1csQLzGxKIeGlAChkQNDiBw30wSJgyv4d6oqyTVZhd1tTOFTi5/9LgCjxw6u5t98IJKuzf101mgjZ65412bNVWwqkFGtyPOUGeVCjjBmo55z+kgOUQVphfQ0/YfBqJJfFbOrv2UWp70UivEoiWjOBvDqYx1PGPEm9vqJ4InbjyH0VuOrPKDfyZuQbO0zsggJdt+xhLQ4HOWwPNXXdCKCUhvD5ZfD0gBjeJEZMNqS9mpyGe2qu02xPmDkYmwtiwKda7LUitTSG63P/XQNQB6L9QA0DJnigLv0nU57cvaP01wBLi+OfYRthyqpxjcueqvvuQIpwGXGELVEtKZZZXzz9vNeG2GkBT23tPLwaa+KFe2ev9cAoTVt6PIND3kExms+R4DBNnhYTiePmXhEVmPOEbPcNvh4St/mV6gFgm/XeR2I+8Q2P3X7lfuzMsXCibin/YY35XXvEUHqtz8TIuLqeiD0+MxdRU7paVTwc4KDfQmGTjlvEc6Ny1DNHwGHAQSMywq+TAB42T3jJuPaLG9yfe9v5wsi7mdFNiIOXR1Z47TGl/RXxpXXEYoF9+bLjl4Nt+Vb6qlT4Sgesxckw9ad6BNQrvXqiRjcFrp5McAVeoV9Hbl6WLtvrqdH/WbkNIpSVJXdMsnysxwqIp23jdcKSlT7PzjXVeA8u+qdibSeeaeoYYiq+0Nm9+GPIYyUvZaDusixoaPUpLaDF91fJRzY+CAqPZaH8k9+HpLtDFIIpBO0gM0UOiXOY+A4QAdcyqO/kEStbdXq2C9SoCUY2HQl+U0Lqsx8KW+9dtKEdGhwnPep0JfS1Sti1rmuf6wjtSExLm/RBJjVcP1ojzK9JLEttntfxQxTBw+35QswyrbMNXocZnzKr/G+HRoPhVDJbfUaeTQLAXufcSqcDv8uUg4FT5ADRhjRU5AXJKmK3/11YwYQBX9GTm+VeXiqqpoKhnQ0gwumUuywKoDc3zpZ2zMidvohqsisAaa+EgnI9qm2S2R6Al3VZznZ+idw8sERx+fo2QtwhNfOv/4Dg5LI/Yl8f0K5EjBMrsrjNhcy2dx13O9S0JwI/CiF3Uxu4bdUmjBz/nff9/vGIC3he4X0UoCS9mHIfxGq4BC6pxjA6JBJnK3KStLdemBUoSgTpJmlnq8AdLzYxjjdAF+/srCJMmbTJwOWLYrXxm5FQ539dAHsut+NxfJ9v43r6cnktaZt0/gzvnA58dhfXk/EOEd9kGkW0Eiwee1ZBVNvTf/bOQxJMpWONABnT0ofvkl4i49VEEWQ65XoShGxqM9nYYZjxfN+GjIAI1BM5Y2KmcEMxbSPC20nKfr/0pi4uuYe4Vp2Qah2zm0QbSr2DgF/idX+uryvnh+kVRWAaYqqml20s/KLkuVPTEUvxgbRG94FDZQwLiN+dvoITztPRSUq41zqp4BBADT5w== 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)(52116014)(7416014)(366016)(1800799024)(376014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e5iDNEa8fMiK9iNOZ1LFgJzRbw14N3ylWOSrHxikUjnxrZHEBqRcocEdii+Hwm8aF79IAXEQr7ZEAJzLongSjstCRQ0ID1h0HmTDeM8f+oKvVydNVKLwoy/tGezd67Yrgn4rcDnuv5TaDPbqv3+ilNmsgZyokMjKGi9cuUfFTL01bVnxpFeLiPD6lhmTEyV75q8+vph1D8b2ARA2zSVS2IkYTh3+P1y3Lh7B+0uy+JDVk8STLjv80NcHET2lI8nGe6zn3hfSifxIxIMSRfnrJZNvRHghHKyHA0CRpBh77/QfHBLtBmNY/608XyhdHUIls234Hz46Y4eb93jr4xW7AaHyRzkYWjXhMJ64++KBNjnax/13vvMiFr2cl/QEVkvbsAgqkJYlfZVS7uUPT3A8KK5zSbw1Kds0WWnwcdyQmKTeO/XYhVVyOyg0xDF90kcN7+9M4/KU3eiP+OTE4jUHYzvfJGjRVRMVuOnaf1tQ/ZM1PvT2vKb/GqSDDfQoYhZ8ntl0bCMfKlWu1RWQNdnrn/JKKJBLOIInb9Z5TC8q4tQthc3l3MlUW7nl9XDf3sSqxmUUmnC9ULgfL1+msOn++AwAU4d7xzd10JEgHI7IXN4Ovkln95VQzsKAGdMlicmDZVUohOVIxu071HUxBMdK0ojBZhlOV0Co53CYmYLaXb058TTnJopNSSSK/Vc8YfnFD5TeHNV8pJ1xgfWRmzdLqda6CKgYBhtVy9Ha5rcMlEU8kHPSEkc5iSUOamO994hwO/CyOsejMQLnWFJWOD3YlWATtzpOEnzZZAFN1D45mX0h0sFknU2+yqUrmuH9gt6HhbKhKBrfanQuaMWfEuRXBA+YnCGeBj0QnwPA23Lh3LbY3PVIF1FiyXZvzkCI4JhukPwpe62MrMmma65ZXbjEqV/JuloHBT8mnZIUB/2up96uFAB4TS9IMpKihMzJ8+Gb4sEaDH8Rsq4jBFEKvIG/gX2/5nOL8COCQtQhfBwZWRnl0f0lVUi3G9jcH63idGKXI15rL4V8x09OctBa7tzr7anuafu5zPeTIiVD+0LpvsORTo4arN5kLkrdBbcKo26ag5I0kLFCt7ZFu4PuT7xcDnlpdSaZD7PNt6IjWH97hdMd4f9hswfvaK8WW67cvN836NFIY2Zjzqtl9/xjVNsW+YON7H3iGoYUbI6BpFg84IbffTyviAX7q1sBLbowxxMWtylEisa9NjLQbbVBtX6KybsTUNi1tKT5cwKrJAqskw90bJQ30HRHNdC78dmCA+m4V6KR2ymHZMMKIjA/lGNHbgnmQb1Oy8Gh49QBrR2qJnQ6nhaPzSnRlpgYsMlZZv9jAWE2pvR643T5Wb2PQ/joFsmCazuNrcsLjZRAO0Zqxo3OLHWLFO8vxtjY9pWL2qwO4S7z/0s9XdlnieCWQBnh/caG0baAnu+zJ7z3n6xslIwiLVDOk5N0LeR5W669h2w/phW2J4r0j9SKH+ztO50TVrKmeNC9OyTJojqD+kbxs/YEpqw3WArxdylKOOt95YNAvX/gEnUhse/k7mnbcuQJghaxOCXlOGUlDORLh8ywkXe3OzBB0ieaNN3U8xx0h5To X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7f2439b-17b2-472f-d383-08dd6a9d8c0f X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2025 06:31:45.0587 (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: ps9XlsFhhP8maNezdfMzpFOcwLzv/N4ziaRu4rue/ob5Fh6z2n6Tji30g+hxWmpmoGOySGfp9ZD6g4bCLIjMyA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7366 Beside the power-on reset, add the cold reset toggle for i.MX95 PCIe. Signed-off-by: Richard Zhu --- 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 aa5c3f235995..0f42ab63f5ad 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,32 @@ 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) +{ + 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_update_bits(imx_pcie->iomuxc_gpr, IMX95_PCIE_RST_CTRL, + IMX95_PCIE_COLD_RST, IMX95_PCIE_COLD_RST); + udelay(15); + regmap_update_bits(imx_pcie->iomuxc_gpr, IMX95_PCIE_RST_CTRL, + IMX95_PCIE_COLD_RST, 0); + 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 +1791,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 +1845,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 Mon Mar 24 06:26:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 14026808 X-Patchwork-Delegate: kw@linux.com Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2088.outbound.protection.outlook.com [40.107.20.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4334F1990AF; Mon, 24 Mar 2025 06:31:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.88 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742797914; cv=fail; b=MTeCpq4j3S5IkfnfjRvzuec7q8HfbPq9qTrT+tvyvnhSvkxbhV/YvIZW3C/6gw8P/Jw0McFyE/OxCpr55KM40FLoB5U3tq02d3LzEn11ybXsAtCJJNPPXMUufboEwrEQtzuYip+km/Ds95Wfi1//vpw/5mI8g6BXuuYaM1Q6+Hw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742797914; c=relaxed/simple; bh=u8Yj5F5WnNUgcYeTmzq7WUykAx7YZ8qaNuFMgEGc+DU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=fJc33Evyj95P51+YjZnlgl4M/Sw27/zeyGxN5u2mWD23vugq8vlUjm3z2SMqZrOd1G1fjeddEinTvPPeoSri01pzIFjFCOvX4KD9oA9hrgjMyTt8BrHiRd6+Q4FFfk9X7A0+r9h0Zso6YU3cDjbdCMnc5q1o5ca2mZe1Q1hElQc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=Y6+nn7Do; arc=fail smtp.client-ip=40.107.20.88 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="Y6+nn7Do" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vXsLSYVj9oOWBowpWqXUZAcgTbDfyE+HLfwGeEj8TyFd61X5qGNccb5321BAHHE57jVcyVYDoXm33QKvS/yGQTuEPR03JSec6gu52YjSc3R3fSSoIz89VHATPuyV21cz8kmLplYfKtFn0fpp2q/VK3uw724DbZ1ypGvtYiaYKr56H8q/xMGdsk29FAWE8c8yhziUX+95wo9d1LtrAgkVXL4D2UbrlNzj4PxfRSAXQ5Nmv+20XKcdpycfwaGFoffXWlDK3PjFHarh1wTQ7MqDaCtno9xUaOySfu2UXqf6pW1V0W7XuHYe/eKvbySXaoYygOdd9Y9mthG78IxdDZSXgg== 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=iWJ0No6zk7h4YLzKpJkzg/71mpMBUmXrG+ClUjRbsVw=; b=eqEjE0WQd/2zL+GabX/58MLpJP3AuIgDJvY9+MSeHkspol/npmKH41IbqpKB2mdyUaPXJBQDJd2tZ4xLPs61S02OLtW8LEI72h1rAkK142ahs+0iCyG0UhxEpkfNeVk2BQ4AR+144HTaT2Rm/DDabVcQz90r7wt8SpS5bMPWY51pLE+nk7MJQVzkYYY+FbmPWkBdAu5yHj5IgZiUAxTr9oss5T83UINAFoYIdMCbO1QTjIiazLH0BxKa28LikCi8rkXuXecByaGg8Hnt4OUFY+bx8wQfEWcNh7R8DBdkMiOx59F0LN62YFz+WNYdFtKkawt+stV6fZJWB/ohI/SuMg== 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=iWJ0No6zk7h4YLzKpJkzg/71mpMBUmXrG+ClUjRbsVw=; b=Y6+nn7Do799F5yQo3zZawwEgdujwCfsYbElQazgpxEBtTQk0pQPEEHpYRM21uSJkV4NMLf+9UDEQ2vZqOtmum8hsvcI2xNPfuvJB/zS1n7d5y8OlREgfirQEGCqbVasG/009WK4jkwvKSMZgG21LCcujtC5K8AjsCJ81l1IOInQ2EwEZtABcpwnBS0M3/M8GnWtwjwMkTR8bgjZY+2gRjMxD2uk5/NuK1uPulV6MrmHwH6V7jezywPqrjuZ5wqHr0+/hPJHz9t6tINL2D9SKM0fPpI5iq/9RY6RXVl4KTDd6pwryb0fdwlrDNhpVXOICsRCivig8vbiUYFagozna1A== 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 DBAPR04MB7366.eurprd04.prod.outlook.com (2603:10a6:10:1a0::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.42; Mon, 24 Mar 2025 06:31:49 +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; Mon, 24 Mar 2025 06:31:49 +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 v1 3/5] PCI: imx6: Workaround i.MX95 PCIe may not exit L23 ready Date: Mon, 24 Mar 2025 14:26:45 +0800 Message-Id: <20250324062647.1891896-4-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250324062647.1891896-1-hongxing.zhu@nxp.com> References: <20250324062647.1891896-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SI1PR02CA0013.apcprd02.prod.outlook.com (2603:1096:4:1f7::7) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|DBAPR04MB7366:EE_ X-MS-Office365-Filtering-Correlation-Id: bd0f5dbc-6ed7-4fe6-8134-08dd6a9d8ee9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|7416014|366016|1800799024|376014|38350700014|921020; X-Microsoft-Antispam-Message-Info: TnAYoAol6Hhay/5I4xbdZd1cgQWKC4WJGYpttmPBpgCuE0qGa5U2OqWzboelLV3T1YrPCGj7cmD7+reQ4tNAnlCoWbJLyQ2oqAdDXiB/AQEVtEpERkgjQ2JH8+WO1iK/5444fnmKXl12H1BWP3QVM37DeobyUvFmjUsdcCdWlsOFEBJ2aDBWcoeGvkYJtDUb3ZKtkjmoH5fJ8dxPi430m8DO2DR3/JrKPToIJHI3j+4NlUDYmzAjsTA0dwebqF7TmqoHPWtc4uE44oe/+mbOdmPOW3gOYnfk8DqrD47nMKi6zOgD8mCdPt3F89bdho8hMTAqBxHzTtTdnsPRWD2XwEAS2zc2vKXTR2xM5wzMGXy7pUTiCLH3klqisSYEYei5ESUIQVsY3xvvwhsAo8BMFtIl1EOnxWyyDXjMEz6jkjpN9110B8x3RcqEzlWDfbouSDdt7E99Jf84wg3UGifje3bbXR2h9/+0rNDJu/OCNqeDw2eTPW2RemSEYJePkW4Cs3wFTVAZXZl8cPh56mqXWwk7sTYeK4/helhlSSuSZFw7vSzh426cXpSs0iIJlOiyWF0meFSfuh9BNfCVUUQNyLjqvRN+rCvMckXqU4xmTWhnC3U5hhAy0oXn0JRmF3DhKTTZaA6vvMSaDU+x09PS8ysnpp0HZtchq1Qrxam+enfeIo6bCHJNIzWX53dvUwsEPcbnTUB0OiNzOYobIuBLHKpPEKp3x5c6XT/dVY3KcrNhLmf0tR/ZtlCYNDQHu6vHznF/Kxta7/UOt24tQ3qO88fU6yczfgj/C0pUH1KtdmXIdzVINXk/deBh9/ryYdPrsP0oLNT971Gs5b3/mMl7ZEfSp/8DKZ0V5eC1+rXP2lxwGbhG4CO/1vhqAnl2dY23AtGti5eFUIZt9n2UVr2UWhlvS+qKXAXsfj2RXdIEu/M9CMbetjp5dGLngZKxdpELtI7CTZXYVMy4RxFSLSUBtDf6Pjo+4UqxLYXssb1XZj6RrGSNWmW1tAKqzKVnCvb4ELE2UxyUOcag0FV4CrX/WoeNzHXCS0fMFJwiMsl3TdELnyjGakN/o6DLkje4KMUUr9yvnzmGE/YQa22uLwEfSTSqk84tpZuaeM9vVRhF1dTuIyIrC0jYwfV/JWnU7qXjIbN+sMgE/3yT5FXOpidquOmdhEMGhjf4BfBvUcyrYbKSpWrozlQMHszwvNMuZX3CBUAfxn+xMhh4MDYa3hluNexknNjbRu+ECojEv4plRlkCLj2n6WWJAA/G07B54xJiwCY6c41JZO8eI2lgG2N66PabcseksPDROTz8VH+Bz4FjMDxUgIVyoZS8oTv2+oKhSdCFX9KqBHPeDKDdP9NHrYk5/zOff5EwoMxQmcsdnp4LRBplwkQaHI5UN11lHNcOUxsWQwDx2GDVSQEvFfI5ZvlX/vVlfhJcyNiQsCZFH9OkFku1PDlDlvzdHTkmoaQTqEgPTP8iHnF9YMAOClzQOQ== 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)(52116014)(7416014)(366016)(1800799024)(376014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pdovFiCDz66EIvDQKcFFOQvdkBlsh7m34DtS7dmG9gFqGYMxSfYha9cXu5KM8dhWq1tgISu3Jz2cQgoTiNrHKQHvw4X09+sxpbqUrsHIgGskR0k3MscGUFQUwKqduwHD/uv0rVnCPueJFAHILqLFtv6nXhA1R9ErkARWzGsSj8yjS70FaPhs9X+pBFUBAOsFVHFDM8XouOY9dwMAjV5c+GfAfFRH22H9h4bivJjgCm0vBj0d59d9YGYr4TZUJh01Q4W+JuJnnCxylvNG9ZOsSgN5Rc/icQjl1AVQeaD0LVIlU5uV/UvHBO/SFLWrvM6UiME2CBLWnQq6JsmYF49FmYNbRHFSommGqFd4ZlyZnWu9DatE/b+9fGhkADddyk1RK+gaQHmL4tydfDWIkWb3U6Ky3837EpRhDpG2tUX90k0b/l9ZbIcG9neavHypqgJ0yFMjtJWsVuWa9GZCu4UNkvB9vXQRuH6bm4O1FpU2xTZE3G80gg52ihoeGYXHkBs+jQ+vJZxN3d4hVTWebbPN5xFwvQ/G0DiFLmfXTWkFzsDacadJ0VTE3/GHFOzDM5cjq2/A9c55klwZKoZwYucvAeHpxc/CG+bfgzftYuNWJhNnaWrTZvxv9QmX7vE3IED7RFU0FGxmwd/HRrcyo4I90tT4gjoNWnc0NO1QFy+nGRSOraEqo5FOO6x65vUTOYwbuLDO/K04TJeIn5PaVPbp1EBkKYtbR9wQtEd0pRt/eT9aSRRCr90Tzf1SZs5bchF+rSynu//YPfr3C+bMo7508mYvQchoMZC3IHplgpSP34iG3QsJ8ikoax0LziDjlZygsWBzd51/JQCld8n23KvIpXzYNn/Nn66IoX855jv+fpfSr1DdrVZ1Gjg9cYO/0sOyJrZTNMq+6kgDGkCM5Dgj7fqlpCy2t3eaMvmSIV220ONwpXdHI9OqIfZxZBw+jKBBsElTSjaWgw0XEZryCSrwgbvNc6mI+X0bL2+3qW+3ieAMprq1e5vc3DoUbwYutrui8i+qUpw1nRo5GjZ4JGxVu3eI4mD3deXe7GzxTa1Xl2RDe3+8DsAlzaY6tJbbUiSamD+AZJAG2CD7f2V5lRv1ANnJvSp/C9aVWxJupfYqqtWAbx22vFIK6hlP50/zc54qc1gZKyBZqHSqa+2kGlCPsgu8u5K7NIJfjCUiXe2s2TRZFS8bot5ffi8RUHIrNIAJ/Puzf4BqvNMcfBZ450/HL29aM8hdueJEYbtt+67d9z8cweD5J2gbDAL3GEhplK+KrOikms1sA52KYIkP7+kAYRJyq/+rZT9mn92DSV2CEBuhJUprQbri0B3buyFmTUabLVmXpDtWvIZaIAqV3rwcHW3J+mb7MpMi93/GddMzmKqw1XTilRPNR1WcgAexJ21BPZ2zVMIXduCnAEg4PXQSlxls8loTO4ahITQPG6J2r/M/DUP6UPe3nPHGg1VS/qCy+Vli3WTUGRJXhwV2OkIOfYxpoJxrf1ttfIXpfDWtr3I2ipEiCFvLaeCXfXn5XE1HmECx2Mb9VpksY+8bwA4Ebuzt5DG5dFVswxb3fz7aDKw9Z8J4jLpqTpID18mJ3Qa+ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd0f5dbc-6ed7-4fe6-8134-08dd6a9d8ee9 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2025 06:31:49.8432 (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: Q+klHnbAWXsHdZvWenpw2vxyqvXweJrgi1nW+PZ03ezRMC5uiTHWTYMRnwlEcAf/0JLLbfoRZxM7PLP/yssfeA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7366 Workaround for 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 --- 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 0f42ab63f5ad..52aa8bd66cde 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) { + /* + * Workaround for 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_update_bits(imx_pcie->iomuxc_gpr, IMX95_PCIE_SS_RW_REG_1, + IMX95_PCIE_SYS_AUX_PWR_DET, 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 Mon Mar 24 06:26:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 14026817 X-Patchwork-Delegate: kw@linux.com Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2071.outbound.protection.outlook.com [40.107.22.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E520319C54C; Mon, 24 Mar 2025 06:31:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742797918; cv=fail; b=hd/vMaTUU83ccq5QaLaaFR2VYes4F4MqAuU84Xv3sQBPbSqcy2wjBXN1SHjGSuTdoTGePX12C1eNMkOjo69b0AbV83BWpPjWgkvzDS6RzY+C2kiE8Sv7Cf1QQ/qjfayIyAPtCVuQ/FjUd7Yao/4eacIioLBezW3zJUNMbCZ7wnc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742797918; c=relaxed/simple; bh=wfIkJtcm1UxOjeEq4b5fBIHid+eY7iobCM/MTBe3dsU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=CPdBwZ8KsPQOOD/dCFxoaSFY3AfXd7mVD9IfbWoHJm9JsmSM1JjnQ5HaKx37haXdOIgLRoTj14bfr4Vz3ss10ElIG6aTpd0z28ZL66UKYiG842+p1Fm5jgL8FDZ3zIP63OWfnh42uKfVE8eyfAUrUjtWxdqso72y53/fOrKYgS0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=YbTbptGR; arc=fail smtp.client-ip=40.107.22.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="YbTbptGR" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yU9E/ONiSKJSwb0fkeJr91AfFhQ2saIS+HBqzDT47zrIfr2xSZdnNy3ngLnAYUnvaIz4XVc+1BEzSh59TH3KN51P4Cr7GOLioxVV1YvvuQKl21zx9jD2uWjkiYqgpbWQId982BedrVC4KZz7wqXqqwPEvZVeoK1Ncq9ZKK7+BC5BYFOB+3+iwhkW44uJmbnuUe4mqr850W19vuzfvp2Nyu+jzMV752J1Ay11A+OVSumws20xbnYsUHyuaLKaNC3cXE4xxmR0yhtsTy3+Kb+sKD/Zke7RGx5dyNc+noPu9EuoXcL5Wlp8nm5X85jOxyfhw2iGNYlXFenG2K6d14PrkQ== 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=ImVpy4Bf5XJdFMQwiC2OD56wfDTnA58cSEat86hpqao=; b=CKPKhhsZJ3NhN8nRNa8LmZwJaU9+3ZrWGNYtRUZITQO2HrSCpjnvECe6vHchTDnZBgGTHBIxvVCUA9VLfw4+X4riFXbJH0q2wXYTsRbKbiBeMFUUIBeKEfOLuTSi1z5TAwYjjhv63h+m/2PY9+QejvquYdPm1YG9vLcCX5hON1CKvdQALezi6bJs5XC7bd/CJzKDw33CHIAqxPgAmBpvWKzp0gse+f/fWhXNuaNav7iv1kCnk/1L1yJQ/kUs5J3Vi5YF1y6xwFvdvkkhvT2i98x+uDmPy73lyxd2Z5OXWQvKLmtQUJdkblOKqwXuUDHVkVDtz4LJUb0rU+y51rqR6g== 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=ImVpy4Bf5XJdFMQwiC2OD56wfDTnA58cSEat86hpqao=; b=YbTbptGRsLH7GkBU7lbgfN+VomoGwxbMcq99I/lxZ0uX8AxHNePEjlcnAwRBn6pZhD3WpHelqOAAGpq6M/i3Ont6IBG9a0K2f+M6jl+WUfSRnj3+mnzC5PoelCQpi1NnGb3OSoP+oh6WuEjCI+lh9Gqm0uougDigyvWSRI0kKKX6qMOyb8Hrtp/oTBIF5tAFOk+7t5zzInQ3Mlnc7V85+QfM8PcqaN7Bd12fC/cEd8X3bbSdk6hgqa58G4RhaDGTXDoYyMoYrSCPBiHLTrVUPvDlewqrWMIQxdfW1N43YS4J0nai54grQvLPYCeYkmqIqZCievXt9pdXR8zxTHsb3Q== 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 DBAPR04MB7366.eurprd04.prod.outlook.com (2603:10a6:10:1a0::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.42; Mon, 24 Mar 2025 06:31:54 +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; Mon, 24 Mar 2025 06:31:54 +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 v1 4/5] PCI: imx6: Let i.MX95 PCIe compliance with 8GT/s Receiver Impedance ECN Date: Mon, 24 Mar 2025 14:26:46 +0800 Message-Id: <20250324062647.1891896-5-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250324062647.1891896-1-hongxing.zhu@nxp.com> References: <20250324062647.1891896-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SI1PR02CA0013.apcprd02.prod.outlook.com (2603:1096:4:1f7::7) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|DBAPR04MB7366:EE_ X-MS-Office365-Filtering-Correlation-Id: f10e1f1a-4b70-4963-43a9-08dd6a9d91c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|7416014|366016|1800799024|376014|38350700014|921020; X-Microsoft-Antispam-Message-Info: rIrXNHZXDHvxTMBrSSDldUnb6nKG5UTl8kgvnwbRPa1cdi772Hch64KBMTQBZG5O7JFq+JsF8MFU1yE4oE5Pc1OtM3qnoS0l7IAjCbIFFSoOfXPmtWZ6Ld8doKFWxxwkg6Svnpi0V9knTWIJfzXDy+tmFKRutjF2QrkRW6hv4tX4uiQZlUp8u+Uq8g0WjCE0zUMOiWzEyyP/ZfMRkt0NwIO90QM8JsKq5dqrjEu47L9LcN7oHdAyCKO/PlnBLVUaqIDXOW7Fh1BHzLp0z4zwA27L7txEP5jST6sOgLALvJD2CoYrhQO1GONIBhOpVmUjokzsFbqvXc8NDvhJuXaSv5t5I3uH34smF+WXwl5kNfOUhXefCUFGTmi22THb7ST7fiR5BceqhvyN6cDNZZoGG/kMY9ZYyE7WvgMuZS187E9agV9unwOpvu2dwHx3HyRrm/dGEDT9B2mJkgFr0NTrIqo4rbY+oHY4BWFUj9Q2uZHXtY1bhsBak1X22mtKIksIbQ7rB6TGntCRMbbAbz9LOdlrR7gVB2a1Vy8l8Nk0a5Csf1NBkkkinhlvwGFYLoVUSgxNIrWYNQKLhGC3ofyS+JA4xRfI9t9A9PYadLZYoXO7/2hWouZIyL85g6kjZIdo7sL9jcPKqp0ZFYXm/wjyby7YvHkL5jBt6U+iiLTnN2OKuX3xfMNHzsepILoTg3JG/rh9DFGhodjQRSFVMG1wzqH2aBT82DXzDi8Jgilw96kaIztK4z6I00cY4B51ohCT4cE0uG3bNw7kDrtiQS9BbJbnJcwNg2wBbgO1jWQ1oFYLa487ZaCZEXqb+m5G6YNNqy0ruKTb3bLsWQDj3tZFFSMJUnYHhn0QQtk1J4QJBgHXN2lxHrNENla2UNUU6V9BSI4PShbf0YSJBKNjlUYbWeuWR1Os2appe7Mxw94BwMnuVcmce4oxfsZsNzZCMhT1cvEVYKlwr3/j+HSc56+9Ui8w7wTMZL1O4PI4HKN1edC+jlC18QyRWBQMoODtVVq+eSXmcdLH+LnVzwk+nXAY6fl+GseBjX6EGvmtLlhIK21BBKRfwYEacv2IR2Kfk0ckO7cPwPzbGfJ+d2fszon7twB5bphqjSXZWiq5hYskDlADq5nEDkis7PeiLeKlsDX1AGdw+5+cPRK4pASaBk/RsBj3MLpwUio4Pf0XtxfsTBF7A80V7hoMeTEva+yY1WP+N3hr9ntXvNpoEZ0YHGloTrusWUYpNA6g4LgyZe2tu1O+dTJqYiUbldhQb5i/5lvd4PFNpfEloPjqv+jF+XR/y+Lsfp/mtqHJZ1p8pQKZf0Fatr3tlHEzEAODovyaY/6NvpPXoWSGurdzocPUXpkx4dMGEGMN06PmiAW+Co2sro5wT4c1i95udzkaYNNbgCMbeWhmRTB4eyz/9dmu7dqOcRul/5G93wOFoVkHSPt04qrWOYSb598PtCM6+z8cT8iBppYgWRhkT5Tlc5IDpufdlg== 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)(52116014)(7416014)(366016)(1800799024)(376014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GAqtPxxtfqr9Rve7HDgnPqUbIQ70037G4gpO00vAAkRgag2qWoi/wzLJVzTKrb3+kapaFelF4MUbv3Wm7ssurVNcR+LqWs60mtzlcGnBZkbAWURSun0y8ufV0A75fHq+Jt4MLHu3g/1NuyANAX+vw1KWlPeebM1+X6YLfTq9Pu8uF46sm20of6nNHAXkx3kIhuQQSrIhjpFGi4wzIUGaQlKVU54vlI+gXpUpja2Ug44XiuZzdeC1J5w2RMBstRQld+uts2eSKx/kyk4gAPk/Za/+X7r2mbDG95neWbDszBRyY88E8y0YtD3pSGliI4vY/1ScwWZZ/GVYosFAx0+4jJdonxJBZB2t9MDX4/z8vKo3LMWw+FaZRRUhR3UwIRalLTNgWLOi/ldozB3VOcokVbH4SZFzuCCZwPad5/DMuaJknYtZidbs4hVVTZNmfHeFYG299ozLyK63ZDOBrK1HcqnAFsVHKWBZm9TOAmZFeBlehPWWeBCekJgxq05b/5C526Djw2y151ImPzu7CDwXr1YHaKXBwTv6NtrQCSqBTihdYeM1BcrtY5NsJF9QH6gcxxVIXObfVp8MZuTSWHKJR7T06V00K/zSi/V1zfZhn2KL/QR9besMR2q/LV+JdWC26qZNaSVCYsuVNV6/d0Hk7shhV+Mzk7sJ7/47N9FCow+t0VIEIsIiGQyPYVxhOpnPzHsjor4Ahp1NKfSMB4Pk3ZwWlH0fpIhBPvdUqmeYL2nYcXRDfJAhRcs09HZRjEtr/Wu1hkfPUwK/P2GNxRAmLtuISpSThDTyQU23QEf1U9KczwOlyG9qszWHTcSiore6ny0ah5+qp5TDK/V6zd6gVSwXeBG5VS7tyIuIX2VWk2Ul+9DkqXRaeSf+Bol1mm4cdGaoLf79FsZHmHdEHCutHuvQ23nqjGIYWY4vAH3o+aUasu4mNpAQo6vLrsELfDyLSHwWbdt+rB4OFpHVemaTnUfd714Jj+z2OnGq8j+hXGgWeD+8wreNWEcy6GD10kdjo4OeGqTRKdkyzYtNkBoyJI9TXKZIhtJ3+0YyRmNh8q4I4hhPML+D1gRI5UUstzXyIxHeg6tQALccA05NPcMWn2ek068QHKh+O76RWlwTFcgAUyuaFHt3zR0sGEkVjamW7AXHMzZp1UCauvWlgCFVHNNlqhZuoGjZZHWvn49292GCBqPqJ4rw92/ms+SJ9vS5W6r/8RG25gXxhUj/2jnmpnertS38/G9SdSmzIJn4RHcEV7mJrEm+nm4szNmkDJcP0oeax8lAV/WjwTLmO4mHSeBeADw3v97pAObEFgWvksUQq14ffaTPEy8v8Rpo1stZD07bpeZBomkIFFV0auapavHUtzlvkXA4EpLPvCZE9//GmK/HA2Aci+SNePOLoBYYkfx7oPc1x+ewQv+E3UG/9lCWTwmIaMrxTyzWQIz3kJjBGeIj6WngS9eaumjvZA81fH3HZpGVaxOJD+EOAYQy4XOZssz1OEjAi56rk9rYcBzkoN/cDFWIupWP89dPVvKC7xfk3p+op/IZRqeX8d1AGwtGOfDO29+Izn/q5aYy4u2j4Xq1NbxYx4r6F+1pc/Wr X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f10e1f1a-4b70-4963-43a9-08dd6a9d91c3 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2025 06:31:54.6372 (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: wQnzhOJXWDfKHhIfedutQtdRvAEwBfS4voGjQO5MDHcdObjI+SjTFtRDsmSkAbd0djaebiqOzTqM4NtmWgVnUA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7366 Workaround for 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 | 29 +++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 52aa8bd66cde..dda3eed99bb8 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -131,6 +131,7 @@ struct imx_pcie_drvdata { int (*init_phy)(struct imx_pcie *pcie); int (*enable_ref_clk)(struct imx_pcie *pcie, bool enable); int (*core_reset)(struct imx_pcie *pcie, bool assert); + void (*post_config)(struct imx_pcie *pcie); const struct dw_pcie_host_ops *ops; }; @@ -1158,6 +1159,29 @@ static void imx_pcie_disable_device(struct pci_host_bridge *bridge, imx_pcie_remove_lut(imx_pcie, pci_dev_id(pdev)); } +static void imx95_pcie_post_config(struct imx_pcie *imx_pcie) +{ + u32 val; + struct dw_pcie *pci = imx_pcie->pci; + + /* + * Workaround for 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 int imx_pcie_host_init(struct dw_pcie_rp *pp) { struct dw_pcie *pci = to_dw_pcie_from_pp(pp); @@ -1222,6 +1246,9 @@ static int imx_pcie_host_init(struct dw_pcie_rp *pp) imx_setup_phy_mpll(imx_pcie); + if (imx_pcie->drvdata->post_config) + imx_pcie->drvdata->post_config(imx_pcie); + return 0; err_phy_off: @@ -1808,6 +1835,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .mode_mask[0] = IMX95_PCIE_DEVICE_TYPE, .core_reset = imx95_pcie_core_reset, .init_phy = imx95_pcie_init_phy, + .post_config = imx95_pcie_post_config, }, [IMX8MQ_EP] = { .variant = IMX8MQ_EP, @@ -1863,6 +1891,7 @@ static const struct imx_pcie_drvdata drvdata[] = { .core_reset = imx95_pcie_core_reset, .epc_features = &imx95_pcie_epc_features, .mode = DW_PCIE_EP_TYPE, + .post_config = imx95_pcie_post_config, }, }; From patchwork Mon Mar 24 06:26:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 14026818 X-Patchwork-Delegate: kw@linux.com Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2076.outbound.protection.outlook.com [40.107.20.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBD2D19DF41; Mon, 24 Mar 2025 06:32:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.76 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742797923; cv=fail; b=S0thtf7RukKNl2tMY5i3gRfMgiyi2oUjOnuDuqdBe5RpcK3w+iGC3BH4Ur88VJFMvgcoiFvL0HKIRHoKItHZ0B77WrQredT+AN1929Imx2iFt5TjCWAdpqz53iOylQHnzBZZ6ib+JfBHwAwC1xZgoTe3Ja64kmWi2BIJX7auguM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742797923; c=relaxed/simple; bh=jFLAW2f2cKOsi8QlYcWGQExHjhI8utxfErqyHzAjGdg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=sVCEB/5tu1q/A23B5visBWLK98w3XLJvFcTXQBJIWDQAVIA0t3Fg7BkFs/W33StROYhYMFzgU3GoET6eJmBUiRfRv2GVJo2evLTe0ZvweVi3XIg0tUkybcG1s31OOfyE+4L5tar1qn6y+9GtbWVR4/LfFCMafHM197awkRj5hh8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=Ma/NsqBg; arc=fail smtp.client-ip=40.107.20.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="Ma/NsqBg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PZjYtFKresMYqCX2QPZM+q5j03Mki4IDuUx7UuKOxnNbX5VPd9RdZuNdDw6Snx3bpKSukOcQ7acaAd/uufzX+rDWGMopMfkUUd5cQSR+NuHyZrL3AyaxSX/grGg39/f6LHgulj1Y2DLbIg0IzOLMrQq29BRkEB10S378OfKpm1Oh3MlYdvCIAiehx5eRBkGp08jGq/58Hkblk/TZkREtsSb+vxukHCF1pAEZbnL6+VA0JI9D5G2k+5xPKRQRUO5jQgtWuQk+WOjGowbVzu1ijW3lMOgwk2XQvV8e+2VS+mMCOXLVW942weByHyZaFCCQTJbzRfI8NBwZr/NACAQNDw== 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=PFxWWJcxoHRrYnpXOG8x7dcCBKKTSrbc+plTP6+XOLY=; b=vAu+/fzhEDrIjlXWhvDpGh1MK1W2bn6B86GMpXgMqN48KlW/t8AlGxYiTeekWP6jyFgyaD0n7o6reRGr+vcBlPW4qdlwf5smN8EszITydKkXha8eaewDD1zNVa4gl/qfam4ncyThMjX0DkS7cKAD5VUjUUCd5Icu9MAF/C6Sm9lNGoYSU4kjlinaCS0tIo6yi8pChvQ+Bl0kEyrrCwcUMc+BQ29ItKVc7/njIbrlONOMfK8jQLW3wJAZRI94Jx8BzxvwQ5Dbqz910ReCSPdOp0HJ+XxT37ttHBh+emC5YA3yYk8/oDF6IpSwC6u5LTZ7YmC1IwCQ+1Hm0MD01/6yFg== 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=PFxWWJcxoHRrYnpXOG8x7dcCBKKTSrbc+plTP6+XOLY=; b=Ma/NsqBgYMQ0B1sjNJrFJ5ay8rtPPDT9tD845nX4kqaaBieLkXzM0tPNn8/fWLxsHtObkp0L5iX209IFGCIs4uH7w1+7Krzdxl87W65FeubEeUl220NJc6DgRP3s7emVKjM2b664Eo5Bg77GSD3aHIbrqlei9uhRN4XkhxXEEhBQxji7uNPEhVKkMXFribEMHZNW386QeDjrhbj6m4mGz0Jnf9eV9kX4nUyoTARzwHmdmrjj+oLnK7PfkEBfnHoi4dvkqBGFH4gt3sy9nYmldPOy5NIENyaPazTFFesqHN1JGL0QrT3rvcjdZIYNMUPFwDNRaI10slXM4tFezuUD2Q== 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 PR3PR04MB7436.eurprd04.prod.outlook.com (2603:10a6:102:87::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.42; Mon, 24 Mar 2025 06:31:59 +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; Mon, 24 Mar 2025 06:31:59 +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 v1 5/5] PCI: imx6: Save and restore the LUT setting for i.MX95 PCIe Date: Mon, 24 Mar 2025 14:26:47 +0800 Message-Id: <20250324062647.1891896-6-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250324062647.1891896-1-hongxing.zhu@nxp.com> References: <20250324062647.1891896-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SI1PR02CA0013.apcprd02.prod.outlook.com (2603:1096:4:1f7::7) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|PR3PR04MB7436:EE_ X-MS-Office365-Filtering-Correlation-Id: cd5336c3-28f9-4995-4d09-08dd6a9d94a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|52116014|366016|1800799024|376014|38350700014|921020; X-Microsoft-Antispam-Message-Info: GDwvxFEnC7IwK5FdFBciOHMcgUmHAtoSaYKQ521nuCdC8ZTl80FB/O/wDend8uELAYKPmUt8585vBUKp0oOoHAB1VNiDIg376aWVKQkWhvLT2qYTjFl+dcbLjtt5LErvceVZxgSTm9R/NLYYvtUDB+SyodNKqoSBdnoIROHhpQc7+5vCyeaSj+0ooWZJa6UQ0BhhNgJXQ5Mo2IzAtK5kjnsRiznlsIAQ76Hj/rS9d/E+rTWHpIA3C6I0nw1pyjdkq1Gtu2A84u7c8uBbFO/UinngjcDaVpKwvvtcFxp/W3+tHHVnjRuMqPyRtFnngVx9t5mw6k2qi+rcNwsW7MpGkkcuUVX/5ADCyvH68N5MTBeWHKkmMJvAXcXS0aPH1j/1bi5K/IaeXBVYoyM/rc88ymfFsBA41RuhBN26csGsRrLLEMMG0bR/rnIjXf+86tU6x4IsW4HamV3XA5VRyzwEOisHOaUobbTPVhxbInjneje/IR/a7FSM1rcPGpkTzur3Qoyc94Qgk3XKj1abX7Fg0JLF1yC8hsYXTFAq8WUk+jpkbHzCw5JoSeGXvXBowogw+jpWR5dweWYC+WhWSP5Wx7llWg5DKpK1qg4b8gTAYXAu1LPPgX8PMx9XY5wBfhKq4kLiUoBcBkgQg/a8cKoeMdfAEvbVLnp8f9Mp3HdlvOLCdRw0Jn1M3Pka9d3lPCSsfJxBSvwyvEye7Q0rwxNcyIpIKx2hzQ88e82341DJ8JH7I5jAerh37WHxQfhsJsPgy5PccqqVP2EwkP+k7SLSgzLnjRMtcokxIdfqiKPA/DY/CCKaI6D5qn7Bcd+lI89dalGfpwfLrPt1D3SelATfFlPuydfPJ3Qg5SUTRqP7C5GkXtZ9io4at24/QYkR590hp6ih/ouGZjNW/24vl4sp9TIoxt2Sw+2l+7Q39dD5QKncO+HMwmEv+IxVPfH/tIdZFa3/0GBQP/8vMKGpvAFbkZyhhleNGqnzu1ALq+0oAdP8G48Wb52fGkzJYMBikfxml0x5SGx4bJJm9mNSlRmYGr6SHspsJnrcQ2T0N38RQeB57OxqrukNkJwjk6T4NSlaUhNDAPhMDGBYBOl/d/H8wjSbwhj5WD+pEXvQhDx3ySfZ3N2/gyMxElscOPvNTfQAHOBbnJCT+tM6SZhfd6bE0YIc0R+2/7MRSR462fA5xafBjN0AqLe7sGelztgJgh2ruPZSrPIaQVqF1LWS+QqQ4Neu4wLCrVGKXBrz+7sfZoS9M4lfknMWCQXmWTOY6OvSpnUvMrXgp4t3b5pK0q2/BAFdpG+me6+sD0VypjmXslHSz0t9PalTxKBHhOwc7Aj4APofqrOTjZctd76wFAXffjaU2TrV+QYK6gKfKGHD+rJb9iBFGiRyfHUU4ctGUT+/bazkJ6Tw9X4u+/gkxiJOqlkdi6mWXWvJ4NOaT1XMyp5lDSLY+zFN7uMA5q4hy7xktRagy2fU4fg9fwJF4APjIw== 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)(7416014)(52116014)(366016)(1800799024)(376014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Wd4L7sYMmS5oG/ZZUpOH+9QS5Lh54Y2wVdCWo92ipWP3jS/kczLTJYSgA94SZFtlL25D96+RQ+QxFmabCmWBVbeQPfX22wAw6j17mn9IjE+NsFGxDLkLPCu+SY0jVNN3bBuwnWi9Vp8Uz2V6A5K0jMzujweQtHBl9zyWp4JC17NFCj8vfdhBcuyiLTG+zV2hNOWwdICQlaOjv+5Cr6tWeDWWFu45c3mY09Vfl1nbiHEEfHlIXWcTcp+ZLjBrJAdLSU0p+M9el5viEph2Qdb9+pQK7JewNov5fF3B3WUdKJbzthcOfc8ObR5134cZwyMQfCWgFLjP2IM2edBsqFDBj/HLvg1yMWuJuFBcgwqvBIQclw9ESyKwyI84GMNFzjkQA3PqqbHbBLkyN7z+V5Q6WMqfzaQfYby787l008T8pdApOTj/pmisH58YNetwLkB9cD4DM/JRa/XNMzsu3OIsvURly4fM48oVBEehdxPVIWfK0rVnShMlo8+f1K9vKJzku1ca8h0o2ezdoJx4yEumzYI9aA6HvCVLiDpofllG7z0Wo9xj9a7UlssgIv8bMei53cvcn8okEyeSfW4rThJSQopSM/viD8s2g7fq+ukQXTCq3dqvgDlp7CScycwKvjlAiqTWN3ihHPLqCB1MfYYO7pZFv34NNeq04nPrcDGJ4QtMBEZNJWaLI6F/Gnd3wNEacNchO7Uot8+zFTDd/KMkncFiwFWlK2ylYIb3+6CNEI1yGGpfx2RoTe5k6u9DcDQR2kz/noMHB+X36RrfzTaZXeTugCm08hh4KUk/R/QQeCA0WqbV8NNH6Rm/p/l0y1rdYqs6cy8e+1095fih04ExZOOv6Xpn0dzndkCVCaAPPP+rdYZ6KwJU+SW3NAe9i9dpuEsIFRr+B+pb0o2gH6fccjzEqBOsDC2HhUatMb9KILn/3zsi4Zjh9MjibODvsoJtmQ1HEA3GAtPoibZssyjwc9gsZfBhb2Fuyfz3GZLY/V+qOuG1LVEysJT/3SprRel6XtT3b1bXTerTnu+JHgcGA+xg5OJSRosYOvTCJ0pBTTB+SOaSNNjNT0AAOFpwApaCy5GWr4nU94KyB9X0bezx7AaZNCFDCKVX5do7kHE6cnBd+jOX5UmYpZUJLung+UDV0bC1T/BFsaS0ITH/4NqT6zGHtYRIDAbUW3Ho018kJMBMyJhoyWGXQgHzTz6AfBiZZA7kjpitql8m6k2AdzikisWuurFTTteS6n2AbtUiuq2nRZ5uBVrxlL46svsiCf51E7L3yNGf0jhx9J50D0ik7D6+kyVxx0wpQtIvydFxqbdRqsJGKaNjzodBUUuFbt8tUL6SZZeOdqRxmsVHni/PtvUg3v+6f7eZfvfGaz5gUnYBveEkSD6EpV0j4N/OQiQmA4txSB7H+PES6OcF8L6Cxqq8oo7v8bVLnu2Op5rIPTr95c61ULknePNkI1/hDoMqIwLeCUaTOklYmiWQRyhxfDiD2Cpih9/V91q9zTGXPg2Bep+QU45NrKVX4EbhfQBDop/gkTZzkktsC+ypPOn3YhLPadxAjRkZj6GnHJ/1nvDJRcDnsO90WrMJyuibwS8Z X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd5336c3-28f9-4995-4d09-08dd6a9d94a1 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2025 06:31:59.4340 (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: jToMQD7VMZGZ6J29sk4PRILjWuhZMyhgV4KGuJHDmhgaI2aRDXztwVZyq4C6IBfqq+gwGHSyUbrK8MIJBnHQig== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7436 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 | 46 +++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index dda3eed99bb8..a3a032cbaa3c 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -135,6 +135,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; @@ -154,6 +159,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 */ @@ -1468,6 +1475,41 @@ static void imx_pcie_msi_save_restore(struct imx_pcie *imx_pcie, bool save) } } +static void imx_pcie_lut_save_restore(struct imx_pcie *imx_pcie, bool save) +{ + int i; + u32 data1, data2; + + for (i = 0; i < IMX95_MAX_LUT; i++) { + if (save) { + 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; + } + } else { + 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); @@ -1476,6 +1518,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_restore(imx_pcie, true); if (imx_check_flag(imx_pcie, IMX_PCIE_FLAG_BROKEN_SUSPEND)) { /* * The minimum for a workaround would be to set PERST# and to @@ -1520,6 +1564,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_save_restore(imx_pcie, false); imx_pcie_msi_save_restore(imx_pcie, false); return 0;