From patchwork Tue Apr 8 02:59:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 14042110 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 62495C36010 for ; Tue, 8 Apr 2025 03:23:30 +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=YtIoim1NT4shaG+Gqi1UcPk3ddWkehNUGAtFBt+ptbs=; b=P6shLhJRNZiSd7a1ESKWwRd2YA PqLAoRU3xsM0fS0CRAI59nDQYCfYduh2emLwN+DUlH7FlQoq3YfUFIIjOf4gAsysFumDliCo7Kb6V 9F33S0HMj3x6SxX03TqdgNTaC68ge3alfqNz84pPlLcKtdSm2YRlYkrZzJ2geq29gdD3WD0SDsTXE eHmlk9ptKbSKKd4/Z8P3Hkhw8/L4Elt1CVBb9SchXILudYVsTLJevc0Tt4ER4hF7Omomb4syhPnwb z3nU3BXby/qLFp7j+Dw5dtOAWG6kOKQVAFkC9q2DmdttwP5IzATONUzAxLCD1jX3ajsqgme5BdnlC 1UEih87w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1zYW-00000002cH7-0YTo; Tue, 08 Apr 2025 03:23:20 +0000 Received: from mail-northeuropeazlp170130004.outbound.protection.outlook.com ([2a01:111:f403:c200::4] helo=DUZPR83CU001.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u1zDL-00000002Zix-3v6L for linux-arm-kernel@lists.infradead.org; Tue, 08 Apr 2025 03:01:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=txvU7OJjqpzbTNMp0K+MC3WKQQKvlaqDpJoSgWQxyElghlZGj3IymcLbqhnVbikjmqcnYlTQR95WbeY20YmUkBhmqRopPilGC5tNsVK4pk7+fmM3jWZOqWTJVCeFnUOYCxThTUCzhNSXyQgo0vNKAK09JAPVIyQxjuUpA2kAUm5wDS38qLh/Im8ZZUmi+6kfiDpNMNQbJJOkFiIsdnwhiTfjA+Y7+4s+ZMYG1T10WgUt315QwWMFZxEyeH/uTtlvjlRnvebJdTZ0XAk42P+FQBQsJObri/SDVnkr14/otPjrAPET/gXSKOJS68scQQS5k+qOshBITfuWePuWrn8rnA== 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=YtIoim1NT4shaG+Gqi1UcPk3ddWkehNUGAtFBt+ptbs=; b=U/ARsJsl30VJ3WbmqqCWIcpcBmtQUYdseDhIiCEzlLPzJoOBkfHtxhoQk0nF5uBLBlEIu3jUDdgXrvWvrXgBIxbTUNBp+Az7ytrQgRNcGSzVIIcFErbWxKpA/AutAratYVKS84tlyFz5t/3ts50PgQ/L9OvyCryN0j5u5GR/69ro5C7AZPITcp1iiBeM/JcXfO0j7axZTtsdv6vgEjJOa3m5PyT3I01JLrL74TmZUQqBoDQinBi1zroIuR+KZ/4P4h5jPhRNr3lOly+J9teJnBXHc/4hWyfAj/uwMqzIr1IeVM3hXaXpmBGXDJtPlIb/oa565jIXIb2CMxjoSYydEg== 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=YtIoim1NT4shaG+Gqi1UcPk3ddWkehNUGAtFBt+ptbs=; b=XvVbpTE0TUMYxJzlmGKYM7yIEaqyoK2iAAO5xK1SWEpbCWPR7oq2B2+K7XVrn4++9i5hREvW9+8Snm83WMJN9ymKrNJ3ylA/XTzEG3vlSrRfIlcxOYt3joJoZuZyV0BYFePMNwGe8pWaUi/qHCigcpomKdj+ljw1psnfi+LAKtJXz2gyC66DWo0MNG7hjy+44JNKSkNwVWVxPYrYM8MzPQRAGgA+QpYTwiikRhI/Ss3TIGJjcwP0/FG2QNG6aTdbGYbkzidkiHKPiSk/OLNulpfjV3crseQfML53Njdf/yEJXTXlLK0vDkox62XcXrVAI5ll1YNGIlmrnXHk9Kz1Jg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) by PA4PR04MB7536.eurprd04.prod.outlook.com (2603:10a6:102:e1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.31; Tue, 8 Apr 2025 03:01:25 +0000 Received: from AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93]) by AS8PR04MB8676.eurprd04.prod.outlook.com ([fe80::28b2:de72:ad25:5d93%4]) with mapi id 15.20.8606.033; Tue, 8 Apr 2025 03:01:25 +0000 From: Richard Zhu To: frank.li@nxp.com, l.stach@pengutronix.de, lpieralisi@kernel.org, kw@linux.com, manivannan.sadhasivam@linaro.org, robh@kernel.org, bhelgaas@google.com, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, linux-kernel@vger.kernel.org, Richard Zhu , Frank Li Subject: [PATCH v5 7/7] PCI: imx6: Save and restore the LUT setting for i.MX95 PCIe Date: Tue, 8 Apr 2025 10:59:30 +0800 Message-Id: <20250408025930.1863551-8-hongxing.zhu@nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20250408025930.1863551-1-hongxing.zhu@nxp.com> References: <20250408025930.1863551-1-hongxing.zhu@nxp.com> X-ClientProxiedBy: SG2P153CA0051.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::20) To AS8PR04MB8676.eurprd04.prod.outlook.com (2603:10a6:20b:42b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8676:EE_|PA4PR04MB7536:EE_ X-MS-Office365-Filtering-Correlation-Id: a4c20b40-2236-4e58-af4a-08dd7649a6a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|7416014|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: pTX99bzTZPaPO6fNAbf4aY28YYGwVOKHRQtncxiLuJZduqL6p4JsKgfA7qluqBQ/Jxdxqxt7UdiEk2gDNyQrBNBf8z48yJbcnwdMdVacxyM8E/5OY7jNsubC/C8rt/EfVS0GeHWq7YRdQ+pvPtBugRdfuEglwQFq6tAg7+DZ1deSGm6HMIN6gBtphOIFlE4DffDA7cUIsv6UR4ZSlJhtcLF+os+nEq7/JhsMIlJyCQaH9vt+6vQEM/RFe+up5XLMQIiWIPOcrRU/NkjrM14Nlx3doFBVCpCKpdAPDGFOiz1Mv3B37d6yoCy1Yyp2R8wtrZE35zo/sF3wFgvbOBLWqqFBYEzV915clo/SS9MCSoEEm5Et/Dv/TaYpHMh5ZQrJCWbMkM1ckIHsT0c5svOGFjJS8iXdrzZ8Fmg3KW459Irt+hvbCbnWWY97FCkdTFlKteRXhaPShAxyP5Ddp4Nz7+nDqGGJRyc+8KXBP+pxvjC9E0UTROecHrnzsoRm3rcePdLbcELPcLyCmOVJUb1MQctW97LiWcL1rgIq3XxXjR3xFr/gB0NbCTgSiRLT0BzBn4YVODVuyZKjaL2Zo7LbMnEn7MejuxuE5jor9tJBGbwl5Crztz4B6jf6b8eZfHwlrc/KqYKKyTsRQ4N9FMNy99JR7ZQtkeuERx3ASQx4AJv2QIEFmltgT1fTqAjlAaAw4stckBJq11JJAiBZtmNaM2X5nrKB/Z1che7Q9uRf0z4iIl9g58QVwTruBglrpgWqR05GMSbovX3haFJRfebFnvUcKORzd76kXBB0ojWigyJTRcNJfNp9l6k8woh6nYS0EBlGaVbmZHQGH2Lia/WiwRYiRa0lJzNzQC5dIIDiK6ubQga7LzwnST126IUYnIye7D9ENWTHPL0ZP6S5RgdTPo21oM8x/GevEu47njtIA/rpsDO6mmOoEJM9QTRzhJlqGJlk78TpeYqZOmFFFsKs7wHRZJ7oxbnO0iZzpY6miqK4PAWof0ct32zYiP1AoKRh8aDPa0rlFpoU3EHwI7wHb94cBwW5pkb/67ABUarPydB2dy4zReh9MRC8//7Bgphqio6YGPxc1yxqyQZKntj62iXwp+ErnGdFANCtdSa/LSA+uP4PIFqIPbU0T9PBDFv7I8rWDKf/HT9ig+yI8MoTQuUknMgUG0VjfKFIxtYdZKpuq+Viui5swf1U6bGGyd0glSfLSVsadbtpHEzRIhV334eYDy5uxy/y+QNGeNwRctVoiFPamZ/+V3X5FV0h1vID02Epi2MYryC45cNBb3809CKDK3A2Mk4SdJZNAP5vfPRnRsaPrFJLqiVSsfPQL4nU9l3K6SNDfMNULQh+uQ/48rt6iVOT6bAv3XiBV2ZKH1RyykdMdlr+Z92gQQwD903ByIas4FpC2bfywiuuVRGnymJiNEPkOj1wu5NAVS6FH4P0dEXtJiCV++uD5s47WH85qfABVQFcum2wNEEGxiiD3Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR04MB8676.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(7416014)(366016)(1800799024)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FdR3gjRPoD0AUgV43FKAC0PLKR7wOB4BFxM9XDIHS79V9IPa/ZeeWy0L0fU7Rayn57esGedQjxtz9xlmPxGBksywmAb23v3NXEgm230zMCyQU3HKs3ghfqFhhEiaHNtT+ay9owdV2Qot9RPdtsMkZ8uvxYIyPsYpFnnbFRPEf/16BRjV5TXzEy1zdub64lclKKynaP/CGpCoUd6zkr0JxwHxuR6dabuAzJz2Fs//uezeU6m03lsRfQOCmbeuRi+yhGYfsi33Y/+E3bMwmvLBnC628cRqw985fTMM9ggrnVqk0fbF2FqyNnl+A0pnSJ8SIU6baqA7pLvzMD1+Fhckat7FM56CRrhmXav81MVG3x+WIEVhEiBwu5mPUzrFrTRNfWeQvmEvPg5cHr/tbVHwy2Du6EnPrjhmy7LZHcwKh8J3VuOs1zTdO0pLcj5aPeip6EmbXKEStejMCoMw4/vS5Fhc6Kz66+DOP0HN/G70CQpuIZfqG8iELNom0g9AfAeR8+VCyldPUn/H4UDtjg9ZLVigaE9VthuBKKtC9BpP06KUAf1CN82sEoP9rC35faEp/lJl+JrhMKxNzvKZUsQCUDPJg0xSPR41w96MfNov0ADcNixQdYMXZnACUeHRWBkpkN0JJeb5z6vcyqiE5JGZNDZAbl6H+CNKnaFm58ZczXBby065Z94fE/SvSBs9sWhO4c9aWK4vP6tOAnBWxvFztYpoEehize2S6xT3PQ2aWH8KDFDRJZdKIvUAJz9NMKQsrLOaBgYWJiB+rcJHTffpjts/nIxG1nvQTCuHsCl9EWq0+NT+SavS/KgA5vxiTqFS7ZuSSHMJ+ZR39IgSS95hyhjQwA6gly7PXU4qha1F2NeDri4NrFH3fKmqaRtx11SY4rz9v6yXOnJt4R4uhTM09g3c9Pw46AoLzLrbKtPAGTbEZAY+yDZKpoR7Jo6LXDvCFNNmbpf7G7XmE/OOB2UyLyBjpX/ABMfzjxnGjJAJVKmjODXiaAv6afu8YKNgkb9DUzr0ZXC9OIHnXX/mOsUAALreBkdYLGjKBve2+KLcflLDjKYVOSSI0Pm8brXGScQHfMnXwGI5B0hqTJAKoJuUxiGRD/R/T2c7+8Dl4MO3LWLB0E6kgye4BhbV2c17+9/thEMKdJc5SSumejTVB1TZzS5DxyNcEAn6JHCb8EFWOzlW/yuZY8e2YXaK+ImSBvKWum7TUxxPcwfrMxP1WxyiPuaYlnnzb4DW2ZYSaYzng2yzd0PmjxCC3EbFBrILVl5TNHCv81R1V9Q12Zz5gNCDNrNkZ0sa+/WqOA8/upJ95MSd9xmP8jyNd4H49TH8BKiTIYFyx8zyMUtQXFW1RKgb49a/tc0Y1Xjw7NWUJCulz93OLBU75+auIrXRnkaf4v0S15Ulv0+pM7YQEwCHu54kLxoNqHIaZFkxBPMVmX5Q18YoJ+ydUfbTB8GrgqU2RzcfFIkvm0NkYgpzvX0JrRIzqbgdLvRotKd5Ee9PauJbelqudN4/1QPbXrZwmCKBuIheeHpNjvmVQf6ajwL/o+SEdwXMKyCCZDOrhL/PRJuEr093XY3Nf4PpwGmB475OnkIA X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4c20b40-2236-4e58-af4a-08dd7649a6a1 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8676.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 03:01:25.8622 (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: UCVQWpjRrGssgMYvxTaKiAuFmJPzvIyiyS4v9fKLXdyP+jlcbBD7d8bHZDXoylQiTOM9qnljMRVhx54Ctg5EEw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7536 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250407_200127_974548_C35A72AA X-CRM114-Status: GOOD ( 16.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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. Fixes: 9d6b1bd6b3c8 ("PCI: imx6: Add i.MX8MQ, i.MX8Q and i.MX95 PM support") Signed-off-by: Richard Zhu Reviewed-by: Frank Li Reviewed-by: Manivannan Sadhasivam --- 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 c1d128ec255d..523bd3e11ff4 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 */ @@ -1481,6 +1488,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); @@ -1489,6 +1532,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 @@ -1533,6 +1578,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;