From patchwork Mon Dec 11 21:58:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 1874790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=Lv9zjOsI; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:45e3:2400::1; helo=sv.mirrors.kernel.org; envelope-from=linux-pci+bounces-762-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [IPv6:2604:1380:45e3:2400::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SpwdS0BVLz20Gs for ; Tue, 12 Dec 2023 08:59:39 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 3CD552825E6 for ; Mon, 11 Dec 2023 21:59:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 213545576F; Mon, 11 Dec 2023 21:59:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="Lv9zjOsI" X-Original-To: linux-pci@vger.kernel.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2048.outbound.protection.outlook.com [40.107.249.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B50F5A1; Mon, 11 Dec 2023 13:59:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ewdttP33gEaLJkkGpEs30YRT+eLecclyVOVhLi8xvOk9SNUIJ7eGhf5USfNHpJH+khakobXN+R1By57cezvE4z2WAImaATt/BQNk6nHk0ix7NGEr71VZfCikyLHoIYiJSNcsrhdWkuFSnrZylMafBZUfKqPLdwsufGKp6axn6IG0uBxonHQXlACAROluATAAbtCb8tePyF+X3PU7BLUWRjYRXEB0xVDM1QWOKlmTxT4KpIwANUjbNlgshcq9Q1/Bj6B94U/8T19u8SlDik+L+3p2sW3fd9mK02EvITbmczmcUY7dKEedvIITBrytCTI/WI2PVcVROm7hD89WwoiXAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=TbBDDahxSHbHCrG7mS9eltoOKUQdf1aRukZRyyGFXdY=; b=AGJNwn8NSUvpSqTzP80/8mXNMHmVgOTNhXfuJamrh6a0718f1d0DY/nSK7ykIaQ3juRmIVzGrrl6JNpITIwmz6jNvj3AYT8Y6ZCPvbTsnmjPVV/VxV4R0op/pwmviAEPgbDdKjxXEYJRuCBziP2m5afeqod9Ih5AN1N5sXGgqcrNqnFPUR4+URzdRjeyIYzbNxlHGYmAa7uBixncyf2yArGpJ5/asGVn5q6N+4cytucv6WdQgxDb6zktwL6KCg1d4gRZ5eJhMCkwUi6fdhfvOB5AyAjS9e++FUqeuwFOEVjTU+lLOGfXYdUZTkb8cptFU8iqE90xVPnCweLXIIm6xw== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TbBDDahxSHbHCrG7mS9eltoOKUQdf1aRukZRyyGFXdY=; b=Lv9zjOsIyayVtWYKTIBW4eeJTkICTs0ITa6b4F7KN6QHBgl5WRcNWje1CK3d5mRNYI6LAt+or56nVEbjXkYzpBKXkz47JHbpQyi99vF5QSJzdTi2b3bxnaxDeKHRwbBmZcauGD5AJ7lJWFAPBwbhGu0j9Zlf//w+qAwhJfsitss= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) by AM9PR04MB7569.eurprd04.prod.outlook.com (2603:10a6:20b:2d8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 21:59:26 +0000 Received: from VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5]) by VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 21:59:26 +0000 From: Frank Li To: frank.li@nxp.com Cc: bhelgaas@google.com, conor+dt@kernel.org, devicetree@vger.kernel.org, festevam@gmail.com, helgaas@kernel.org, hongxing.zhu@nxp.com, imx@lists.linux.dev, kernel@pengutronix.de, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, manivannan.sadhasivam@linaro.org, robh@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org Subject: [PATCH v3 01/13] PCI: imx6: Simplify clock handling by using HAS_CLK_* bitmask Date: Mon, 11 Dec 2023 16:58:30 -0500 Message-Id: <20231211215842.134823-2-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com> References: <20231211215842.134823-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:33a::14) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) 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: VI1PR04MB4845:EE_|AM9PR04MB7569:EE_ X-MS-Office365-Filtering-Correlation-Id: 2adae40c-1c7c-4529-64a0-08dbfa946fda X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oKAhGCcrRZwGo1uSBFrZ3mu6KMI6St9rxhQ96yI1jEipc8nLz2BiK+H472reOmDlDAQoOOaG7Hyv3jFiUBxTpV7l6SLkFwE/2GcpjTzBlniNJaah75kdXhknmB7ntnUbhPvrSBkh/WWaIxqKpEWWPuPGR6BDCiL4m3F2prHVD5KG9LPUkndm7yZEJ2F66spAKDFJDyf+A1hdvkyh2TsfkSLg+S/jBhX0MwxpYOOSiEgY3KScTwYR+oQvWRgiuROTltkBO03NW0qMcEgjz96A7UiWZMzN4uT0xB61STp8kHJPTRW1MrPiQfor1pvCHr1+5xwS+T1Vffx1nWJlSx5RkgLOQYiWd+w5IBOsY0okG2XSTwjkDPPE2ablhbvAIvUUi5i4EhkE618aVvWPuFiFp3/a8XkpaETeQbnm4eY6CSIOFvPccO6NQpo2aqWsmU6n4ebV8vIroPgqEufPgnwShqaz/UwgMKLlTJQO4uVxcTzUne99gFAfa1aZs5eMCXQzqMMiMZIIGOzf8zniro4FpyKT4JUAzFBOi43/4rKFN/weOwLnpVZOFlVhkdO1qiRiahWRmAl9SfYCVbXaHpK9jda6xSnNoXVtD3WdFHc+RdAmCisWAjbfw5fjc2lY6nNI X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB4845.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(136003)(396003)(346002)(366004)(376002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(1076003)(26005)(2616005)(6666004)(6506007)(6512007)(52116002)(83380400001)(5660300002)(7416002)(41300700001)(2906002)(478600001)(6486002)(8676002)(8936002)(4326008)(66946007)(66556008)(316002)(34206002)(37006003)(66476007)(86362001)(38100700002)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Fz4ObZDupr6bmWGs3vQGzDTdcfkQ1sI/ATHShFPUe02Xll3uYg/KYa43qH0kqQjcvLeDdVUx2dPARPzpLxMQUSi46freAhFy04stQdnX7kAUpHJR3s4LlUye96YvzdL7LSPGBfblF3glNBeg/U4kV0ftsErbU/PSTZybmWH31e1dYz8+qiNDw/qWPynTDVubiYsaSD5ciLs/SD3ACeO/MMZZXOHaWluvd9rKlsCLYMj64J1Y0THnvHBSnvx/nk07xa8vVvj8437NS2URNZJj2d0NO0nMXWnfhDZzLZF2usI05Vs3xfP+8LQRJp7ROPN7fZVC9wBeRJx1wI6QbIY5n3VBzNKaXvPp7wVkqxo/UtuUonwB5wJ3JyHZOZnnL0VBRUbY+/vbS2GvFK1yPWVdPipPWOpi7rbkd5c7vSulLms/aVwnC2Ti/4foApKWvsvMkoknNDrpGbe5peqqcdMwR4gDTMMbwAOax9TKgDJ1zwq8sQM7+4KfBUHk3tGbmpYa42E5FGXWhfmFfwM2oUMvtGY4DcURP5uZwPLJesRvkpn7r+yjrN7lW8pvOq5Ubv36MnqJtOFO4y0zxkxHFS4KOmVIyWjPgSiJWXke7D0VHlXhHpSYdJQdqBXFX2BTmzOOdbllBBXXKgmGGz3bSDcuw9h9mEycihRV4fzWQPnAzDwwmtwGZ7OmvSlMjkpmJtys1UZenmcGO40Rx+XEuxdfrJrDmXd0ziKtZs8WMJVeoYufOPkcBqJB6kjry+1QjvevH9+vinSMc1O419gmEjcUjOgzEjFfavcHfqBa/qSjF+hLRG4qQgSO2ybAeoktIxksmN0X3l0RGH+UGOseRkM8bPZ9eGA2v4aYnU1uHDYUOORvCNCwFY2k6DcwavHaUw8nIUGPiIZjCHQOs3i0HhtWj6VuWBmAO+cd4spifcxyXrOWEHnorYmIQ/7D2zs1wvPIS6QBYmFB3C7lukOcB3xyXy8PbjCr25s4h40Z6lJsOJsfZQTCOjbHyc5XBnrURBW7IK5GLrFStaGyJN54cEOrfWBs1wyDUeleCq9OqXwhI67IMiVOwgz4pglFTreAULy2rZzdyzJCZAibhq0SIHREFYiML+ZqEsHxT7UO1DQoMFWofPOQJw0cOuGzfcE87nbFUdeXbwL1uT7A69RkNx1eLlL6fz4J5/UKVRroJoiXrsfgd9WO43zeUtLdEDsek+XwVT3c2tnoTIxRxz8V9cwA8+XOR2GUmFIKerdHdFQ1RpDr9hYH/y/VfQ15p5Ec7f8PPHKgWaTLI9X42ad4U3TDtVLwqNUyREG5yCk8f6p2qP18p1HkcY8vqQmKRZQ2Y4HELfmsImX+aEz5hW2OcMkzG8N8nBLBvG8hfZtLhNykj33QRt9p16vRaHjK8gn1WMvaV2CWhadRwvH3GkC2QB3l7K87HIfDlj7HfgSjJEXs0CbYqLcgfs2U0kx0WFyF5nuwsHImAVXkbXX5cZb9G2uFgN5w541JUsFLVmyuYrsYBmOhPgilhEuXZoz0/i7cR6rLsaziuOgr5gFOtnZa6VsZwIiS+oOt0hX+6k9rqFrzvBUHB5+3uxZEs11z1NpP2MUP X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2adae40c-1c7c-4529-64a0-08dbfa946fda X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 21:59:24.4624 (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: esMg3kXDvfd2onBLRwOYFSn2ukRUvV+yYD9g0JVyQr1no4AjX9h9H3liRjnir9rHy3VXTxxPpQhHpOMVfSdxAg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569 Refactors the clock handling logic in the imx6 PCI driver by adding HAS_CLK_* bitmask define for drvdata::flags . Simplifies the code and makes it more maintainable, as future additions of SOC support will only require straightforward changes. The drvdata::flags and a bitmask ensures a cleaner and more scalable switch-case structure for handling clocks. Signed-off-by: Frank Li --- Notes: Change from v1 to v3 - none drivers/pci/controller/dwc/pci-imx6.c | 84 +++++++++++++-------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 74703362aeec7..8a9b527934f80 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -60,6 +60,10 @@ enum imx6_pcie_variants { #define IMX6_PCIE_FLAG_IMX6_PHY BIT(0) #define IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE BIT(1) #define IMX6_PCIE_FLAG_SUPPORTS_SUSPEND BIT(2) +#define IMX6_PCIE_FLAG_HAS_CLK_INBOUND_AXI BIT(3) +#define IMX6_PCIE_FLAG_HAS_CLK_AUX BIT(4) + +#define imx6_check_flag(pci, val) (pci->drvdata->flags & val) struct imx6_pcie_drvdata { enum imx6_pcie_variants variant; @@ -550,19 +554,23 @@ static int imx6_pcie_attach_pd(struct device *dev) static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) { - struct dw_pcie *pci = imx6_pcie->pci; - struct device *dev = pci->dev; unsigned int offset; int ret = 0; - switch (imx6_pcie->drvdata->variant) { - case IMX6SX: + if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_HAS_CLK_INBOUND_AXI)) { ret = clk_prepare_enable(imx6_pcie->pcie_inbound_axi); - if (ret) { - dev_err(dev, "unable to enable pcie_axi clock\n"); - break; - } + if (ret) + return ret; + } + if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_HAS_CLK_AUX)) { + ret = clk_prepare_enable(imx6_pcie->pcie_aux); + if (ret) + return ret; + } + + switch (imx6_pcie->drvdata->variant) { + case IMX6SX: regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, IMX6SX_GPR12_PCIE_TEST_POWERDOWN, 0); break; @@ -589,12 +597,6 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) case IMX8MQ_EP: case IMX8MP: case IMX8MP_EP: - ret = clk_prepare_enable(imx6_pcie->pcie_aux); - if (ret) { - dev_err(dev, "unable to enable pcie_aux clock\n"); - break; - } - offset = imx6_pcie_grp_offset(imx6_pcie); /* * Set the over ride low and enabled @@ -614,10 +616,13 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) static void imx6_pcie_disable_ref_clk(struct imx6_pcie *imx6_pcie) { - switch (imx6_pcie->drvdata->variant) { - case IMX6SX: + if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_HAS_CLK_INBOUND_AXI)) clk_disable_unprepare(imx6_pcie->pcie_inbound_axi); - break; + + if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_HAS_CLK_AUX)) + clk_disable_unprepare(imx6_pcie->pcie_aux); + + switch (imx6_pcie->drvdata->variant) { case IMX6QP: case IMX6Q: regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1, @@ -631,14 +636,6 @@ static void imx6_pcie_disable_ref_clk(struct imx6_pcie *imx6_pcie) IMX7D_GPR12_PCIE_PHY_REFCLK_SEL, IMX7D_GPR12_PCIE_PHY_REFCLK_SEL); break; - case IMX8MM: - case IMX8MM_EP: - case IMX8MQ: - case IMX8MQ_EP: - case IMX8MP: - case IMX8MP_EP: - clk_disable_unprepare(imx6_pcie->pcie_aux); - break; default: break; } @@ -1316,21 +1313,21 @@ static int imx6_pcie_probe(struct platform_device *pdev) return dev_err_probe(dev, PTR_ERR(imx6_pcie->pcie), "pcie clock source missing or invalid\n"); - switch (imx6_pcie->drvdata->variant) { - case IMX6SX: - imx6_pcie->pcie_inbound_axi = devm_clk_get(dev, - "pcie_inbound_axi"); + if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_HAS_CLK_INBOUND_AXI)) { + imx6_pcie->pcie_inbound_axi = devm_clk_get(dev, "pcie_inbound_axi"); if (IS_ERR(imx6_pcie->pcie_inbound_axi)) - return dev_err_probe(dev, PTR_ERR(imx6_pcie->pcie_inbound_axi), - "pcie_inbound_axi clock missing or invalid\n"); - break; - case IMX8MQ: - case IMX8MQ_EP: + dev_err_probe(dev, PTR_ERR(imx6_pcie->pcie_inbound_axi), + "pcie_inbound_axi clock missing or invalid\n"); + } + + if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_HAS_CLK_AUX)) { imx6_pcie->pcie_aux = devm_clk_get(dev, "pcie_aux"); if (IS_ERR(imx6_pcie->pcie_aux)) return dev_err_probe(dev, PTR_ERR(imx6_pcie->pcie_aux), "pcie_aux clock source missing or invalid\n"); - fallthrough; + } + + switch (imx6_pcie->drvdata->variant) { case IMX7D: if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR) imx6_pcie->controller_id = 1; @@ -1353,10 +1350,6 @@ static int imx6_pcie_probe(struct platform_device *pdev) case IMX8MM_EP: case IMX8MP: case IMX8MP_EP: - imx6_pcie->pcie_aux = devm_clk_get(dev, "pcie_aux"); - if (IS_ERR(imx6_pcie->pcie_aux)) - return dev_err_probe(dev, PTR_ERR(imx6_pcie->pcie_aux), - "pcie_aux clock source missing or invalid\n"); imx6_pcie->apps_reset = devm_reset_control_get_exclusive(dev, "apps"); if (IS_ERR(imx6_pcie->apps_reset)) @@ -1482,7 +1475,8 @@ static const struct imx6_pcie_drvdata drvdata[] = { .variant = IMX6SX, .flags = IMX6_PCIE_FLAG_IMX6_PHY | IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE | - IMX6_PCIE_FLAG_SUPPORTS_SUSPEND, + IMX6_PCIE_FLAG_SUPPORTS_SUSPEND | + IMX6_PCIE_FLAG_HAS_CLK_INBOUND_AXI, .gpr = "fsl,imx6q-iomuxc-gpr", }, [IMX6QP] = { @@ -1500,30 +1494,36 @@ static const struct imx6_pcie_drvdata drvdata[] = { }, [IMX8MQ] = { .variant = IMX8MQ, + .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX, .gpr = "fsl,imx8mq-iomuxc-gpr", }, [IMX8MM] = { .variant = IMX8MM, - .flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND, + .flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND | + IMX6_PCIE_FLAG_HAS_CLK_AUX, .gpr = "fsl,imx8mm-iomuxc-gpr", }, [IMX8MP] = { .variant = IMX8MP, - .flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND, + .flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND | + IMX6_PCIE_FLAG_HAS_CLK_AUX, .gpr = "fsl,imx8mp-iomuxc-gpr", }, [IMX8MQ_EP] = { .variant = IMX8MQ_EP, + .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX, .mode = DW_PCIE_EP_TYPE, .gpr = "fsl,imx8mq-iomuxc-gpr", }, [IMX8MM_EP] = { .variant = IMX8MM_EP, + .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX, .mode = DW_PCIE_EP_TYPE, .gpr = "fsl,imx8mm-iomuxc-gpr", }, [IMX8MP_EP] = { .variant = IMX8MP_EP, + .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX, .mode = DW_PCIE_EP_TYPE, .gpr = "fsl,imx8mp-iomuxc-gpr", }, From patchwork Mon Dec 11 21:58:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 1874792 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=PoRouyGY; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:4601:e00::3; helo=am.mirrors.kernel.org; envelope-from=linux-pci+bounces-763-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [IPv6:2604:1380:4601:e00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SpwdY342Fz20Gs for ; Tue, 12 Dec 2023 08:59:45 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id BBA7C1F21720 for ; Mon, 11 Dec 2023 21:59:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A04EB54FB6; Mon, 11 Dec 2023 21:59:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="PoRouyGY" X-Original-To: linux-pci@vger.kernel.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2048.outbound.protection.outlook.com [40.107.249.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B627AF; Mon, 11 Dec 2023 13:59:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aioDyDY1MjhoaX7jvAACOzIpbZU8X/1pMqAQmxOzcmhIvrIb3aHHIYRnVwd4+1sz9V+hBqjoXzPjXQd5xsx0EFMywUYn1Iz6RiUQ7yMksYbBP/+RzSzmbhHSx4Lm8eBvmpLOAou3bR44HiVxbWL8JF0PzNWoi8zZhtBRHiKJb7Z0r09sPEHPZGmStixD32+ShVYkiPPwirmNIszLWdsxkjd5MdT1ftDEIJLJQToPRt3EO88vLc5mnaXaQs/9JSOOtdNHDgAzXMRcqjNOZgxSbfd9b/diYQ8uzdVMWrNPFVrfO308Wdkiy0rplQCQ1N9G1e95E6E4/3o6asnZ2kUOow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=PJthTGUboJbSpiFhEZMkccKhQfW1YQa9dYwxCm20R+E=; b=lE/SRTJUi8ECAuXuMg8qALkG5tN3Nhimgo7wnv2FBTwKPpPwQ87S6zcdawuYwcnZeVHLeJikCquod6cC01ld6aj9416g7bf5h6/B6zKFpBLiJnOHK41rHrCMMC8zqlbWywkIn448m60HpdEIBzI3mgaS+vxsAWdTwei6hrk4huCrg7Mxu8ZEhCG8EAu9/prwfPu8VlcrLnRqK11E0AIyX50av1PPGR/Ymr/k2iCenWwRqNHGocXUySWVMK55ZM8UjaGmTTyx8Nl/A3tpxIeAwB1Ifx04mCghLMbJDHBJPrMBypXdF2pMZqDh+odjmWi3djgI0axXbQ2W+NjuqRGCjw== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PJthTGUboJbSpiFhEZMkccKhQfW1YQa9dYwxCm20R+E=; b=PoRouyGYOIpocxPrNTQHpUxkDzAtfMZmGEAL7NI4I4wTA78lBUZy8GnlyPd98oil2mxI8Rd2wyp/bTWSS6pgU3/FVDmDNpdl/Rl9R8+grFuqgGtiXKYVtFX/HlAps3U9+gKnuOMqM3lhD+FM/uAC44+3/W+TFov0AdOPZvxOu0o= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) by AM9PR04MB7569.eurprd04.prod.outlook.com (2603:10a6:20b:2d8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 21:59:30 +0000 Received: from VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5]) by VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 21:59:30 +0000 From: Frank Li To: frank.li@nxp.com Cc: bhelgaas@google.com, conor+dt@kernel.org, devicetree@vger.kernel.org, festevam@gmail.com, helgaas@kernel.org, hongxing.zhu@nxp.com, imx@lists.linux.dev, kernel@pengutronix.de, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, manivannan.sadhasivam@linaro.org, robh@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org Subject: [PATCH v3 02/13] PCI: imx6: Simplify phy handling by using by using IMX6_PCIE_FLAG_HAS_PHY Date: Mon, 11 Dec 2023 16:58:31 -0500 Message-Id: <20231211215842.134823-3-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com> References: <20231211215842.134823-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:33a::14) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) 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: VI1PR04MB4845:EE_|AM9PR04MB7569:EE_ X-MS-Office365-Filtering-Correlation-Id: c68c9b6a-2b42-4cc9-eecd-08dbfa947310 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qcnDG+EZCkcz7TYGEnsAMFDcaCBSg3wxYbUfSqtkchipG6dzPUrSd0x8pPn75a9MY4PgyxX4Iy39SqoIjSRpRza8LJ4k0cmFgPFpQgeGL4EGkaJYYmcao0bHlLOaBSRub/9+qtXzbVcYUUizzrmkpyKs3ADLKB+/qTXP7Gc0tQT59XUXCIHqBAxulSgnCXULH0+cbk5nlaRRBpeMEdDVJ6FPZmgsbPY31sCsz9DGTz8goQRguy6HiZOZsbFCzd1JOgKMyj+aaJpJqGw8kR+6gsr3+G/7X5QVgVzPlK95bKACHoAC0vBTbonjPCMyUtEzoqCVtcuKE0V7xdh8lE/BYKr2cl+yDFKGdv9Amg1hBDUCIxsVnzmBT8iZK9n30i6plb8elaea9xLyGHuZSBrACiUSz77XhnXqfYZWM5u6WwIn4RRtJoi4nOIfaZJ36gsuRaN/NuNJaHBheftTt/F2WKVZ9W6Qz2UjRATt7YTzP6zdlWjXzbe/1pycsIGkFSOkanLCK9wNVxPDIN+oCdExDy2yWgjOGwXOH7wIlSOidY6tMOKrO0ZCqb5HQ0J+RTuIzieVVZCjbCmxubTZX4RwImGR5/vxpmUkjA+TcwMweZ7sVI2mR8WMydltBtrrrvfa X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB4845.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(136003)(396003)(346002)(366004)(376002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(1076003)(26005)(2616005)(6506007)(6512007)(52116002)(83380400001)(5660300002)(7416002)(41300700001)(2906002)(478600001)(6486002)(8676002)(8936002)(4326008)(66946007)(66556008)(316002)(34206002)(37006003)(66476007)(86362001)(38100700002)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +2rlerO0KAcT5Jqdy/jWviW7aWX614O8YBQvHrS1GfSroVhyE0sZqVbZCQOUgdUoQz9ASyEp9pf5/TfllBy8sYIkchrD9HdHJNq5dIZjrt+ZTALEOYQFFIJryZjlLMLTzqRMz4zpHNeNhraiQihjGbcA81EIBQbHKThH1MfIhZ1/SnBPdTcO6XS4lyp/Jf04ubReA+dgi6GVvQK4QAFcEkJCtrv33hMAaXPQf6NgWm4io2HGngd49aEEtHgac9a3lNLaChB8Mfke4Hsaqd+zwQehsHdkpmGV7ZR4Da3TvvC1OqdBEgXStfA64052eh6R5RxcC9sxWSJya9fUfuJGR+VCYvjTrOKC08gLqs8gux5uk+WnIn1Pvcx30c/zcCZzbAHQi4hC9gRc3NyXqEmhwTFVu4Nbad/I22IGL3TpyOXfyYnQOpx7AoI5Vl2NWb3FECEIyYNxWXKZOCNBpmFtpn26WrkbMT2LOUB/CPIGcN8jGUj8TS85cg4x0tI1pqyZ0wp1BJtPM8xvTXnx+Jj4NniFBqoCOPNBDKKHEJyBdXXYzEWeaBiBDoFNiWsjcRYjxakrXP6+/b9HIXLFJrAOvfr3Q6f25JWK4IkEjHW1typHGAPVbS6n0m1n6Z7jBBOaCFMQtyFaieQfVR/u30s+W4GHSJuoAlGXNIcSchxajQaGMTWuYQazx7zQDIZornUxyi7pq2v+F0ptpi49njgbrNVQqVLiNMFNYiwbydRNpqj+6mNi1euuM5OusrxmK4hzIpt6alA3Tu1SngSk5loyasmMM92paNjfLh7JD5JOQwCsLyqPhHxuTPHSwKUR1rRzMV02RXpYc8dVaSC6RRgCRv32269Y48xdoA9OQ3j6VH4RIHc2plS1EZix7gEOejSAFqCHxlOSHJSmFXwt2aTeVme6KS8ZU0BGA+BBSWoiBw2k4Nd3oN/kDLVFCqUywqaLtCtxFUqo0OYDLYrjshTQ6wrm/M/WnKnnA0Z09dJptQApFEq45K6XRGmAYzmU+m40xIGDNQ7NvQFFCNW09NffvaFFuj8mvyY612IdNMu2RKulmeP0T3I+YEP/vDVQcZTNBw4vGSJEDGmsBIuxSutKwDacCFL6Df3xX6NCjP7ODTES9e9VH/Cig4N9lj9J1R/A2ij1TaOZRCbUy7dm2oqPyQJRTEXAuV2CQeADH/VXqtciqtv4a9gGF0vNOwp12fuJ9mNVg1roH5zSWOdUnllbsxi5INUKgxyVsH/UPwUWE6BRBDq0Ue7RWhV2FL0z0wCHUYpL6NakUtDobP1JdQMjcoUdw2Zbw2WlNPOoBxFvuKZCvIGic2ayuFA0v2suqyj3fSqpFm7YkHXPNqH0JsnATZA3QHwDFvI/COzjrtCS+OFc2veosagEn4vL37wbRTcb/WW942zrpJoAb+wAmKI0y6y6F64GI/PJaFHMD1wb3/QvpM6YZ1fui4Olim4P7w2+qU75WsU3EW/KYsz0ZqOr9wxS1+0PKdhJSZbjgWYLgYroWNPQumVALzoW/8nBFplfJh0U7Vyjqmxpw6eDvjJ8IcH2PWs+XFlX8cEDxBim3L8zUy+5ve0cZ2esQT23Gns7 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c68c9b6a-2b42-4cc9-eecd-08dbfa947310 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 21:59:30.0707 (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: KHrMfRaACH7HqS3Zss6U9ehGPbFI1OzhWbuFExHmekz/Epv9AJxzAgu2XzMEbthSycb4sUMO+1XTv4dbUN9T1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569 Refactors the phy handling logic in the imx6 PCI driver by adding IMX6_PCIE_FLAG_HAS_PHY bitmask define for drvdata::flags. The drvdata::flags and a bitmask ensures a cleaner and more scalable switch-case structure for handling phy. Signed-off-by: Frank Li --- Notes: Change from v1 to v3: - none drivers/pci/controller/dwc/pci-imx6.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 8a9b527934f80..bcf52aa86462e 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -62,6 +62,7 @@ enum imx6_pcie_variants { #define IMX6_PCIE_FLAG_SUPPORTS_SUSPEND BIT(2) #define IMX6_PCIE_FLAG_HAS_CLK_INBOUND_AXI BIT(3) #define IMX6_PCIE_FLAG_HAS_CLK_AUX BIT(4) +#define IMX6_PCIE_FLAG_HAS_PHY BIT(5) #define imx6_check_flag(pci, val) (pci->drvdata->flags & val) @@ -1327,6 +1328,13 @@ static int imx6_pcie_probe(struct platform_device *pdev) "pcie_aux clock source missing or invalid\n"); } + if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_HAS_PHY)) { + imx6_pcie->phy = devm_phy_get(dev, "pcie-phy"); + if (IS_ERR(imx6_pcie->phy)) + return dev_err_probe(dev, PTR_ERR(imx6_pcie->phy), + "failed to get pcie phy\n"); + } + switch (imx6_pcie->drvdata->variant) { case IMX7D: if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR) @@ -1356,11 +1364,6 @@ static int imx6_pcie_probe(struct platform_device *pdev) return dev_err_probe(dev, PTR_ERR(imx6_pcie->apps_reset), "failed to get pcie apps reset control\n"); - imx6_pcie->phy = devm_phy_get(dev, "pcie-phy"); - if (IS_ERR(imx6_pcie->phy)) - return dev_err_probe(dev, PTR_ERR(imx6_pcie->phy), - "failed to get pcie phy\n"); - break; default: break; @@ -1500,24 +1503,28 @@ static const struct imx6_pcie_drvdata drvdata[] = { [IMX8MM] = { .variant = IMX8MM, .flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND | - IMX6_PCIE_FLAG_HAS_CLK_AUX, + IMX6_PCIE_FLAG_HAS_CLK_AUX | + IMX6_PCIE_FLAG_HAS_PHY, .gpr = "fsl,imx8mm-iomuxc-gpr", }, [IMX8MP] = { .variant = IMX8MP, .flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND | - IMX6_PCIE_FLAG_HAS_CLK_AUX, + IMX6_PCIE_FLAG_HAS_CLK_AUX | + IMX6_PCIE_FLAG_HAS_PHY, .gpr = "fsl,imx8mp-iomuxc-gpr", }, [IMX8MQ_EP] = { .variant = IMX8MQ_EP, - .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX, + .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX | + IMX6_PCIE_FLAG_HAS_PHY, .mode = DW_PCIE_EP_TYPE, .gpr = "fsl,imx8mq-iomuxc-gpr", }, [IMX8MM_EP] = { .variant = IMX8MM_EP, - .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX, + .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX | + IMX6_PCIE_FLAG_HAS_PHY, .mode = DW_PCIE_EP_TYPE, .gpr = "fsl,imx8mm-iomuxc-gpr", }, From patchwork Mon Dec 11 21:58:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 1874793 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=qet+IkKp; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=147.75.48.161; helo=sy.mirrors.kernel.org; envelope-from=linux-pci+bounces-764-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org [147.75.48.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Spwdc1FPpz20H5 for ; Tue, 12 Dec 2023 08:59:48 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id D2B80B21582 for ; Mon, 11 Dec 2023 21:59:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 23E075576A; Mon, 11 Dec 2023 21:59:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="qet+IkKp" X-Original-To: linux-pci@vger.kernel.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2045.outbound.protection.outlook.com [40.107.241.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E24AC2; Mon, 11 Dec 2023 13:59:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N3aP4biEmiocpwBECS6qLhw4oM0QYWvpFaQehcEtMubhbSTxy6SAEpdDALOk7zI3tA1IZtRPrAAYbiYxjAZCXWEGsS/hW7xZp1kj9s9xVofYSEnnqJ5udiRyyn5WsbnRHmQS1xyxbMF/1ZKLHiOy5fH/M6fPvKzS1sVbliEes0lCvUhNV26pXqDqY87adIwDLNQtUAk2r5ZOzDWA6/iFdfuDlLtSGmy9zuTAcntCN5LfzNAdnEZeH2rO+YUJO45AAEOZnYStyqEHonzAVt5dtpAv/5UKSdJbLUAmc5zFbkDOd3UDlxMETnNMuU5gGCcUP90KNAsJEfqfXFQo/eoSQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=a0wXuwG17CvtxjA4Vranekpk03tGXICeznPAWJhaCsk=; b=fwN17qL2W07QiqMtBPgDhhZGo2MtsH5QumqwX/3CNYtBls3bUhS/cCo3gt9KdjI2oY/Hwu85pHLGTxiUXzlUGDa/gWQhkKLlwK8v0dLf8PbWGWIg8KFkCdkqkmgO4/RcFC8svJqgU8fC8s4EDea/9getf4oZjzPm/uyStfUZk0zxe63P/n+Wt2Upd1a36pUJscggohBsW9cTiSMDPRR0BrAswkcn6o4Y4+doyMn23eW015jV+WSgKdSiGVHGx0WgGDJbqP+vLhyjklkKnQEam7O329Z3QsClTj1Ij8zxZ5xF5xtEeY6TSRuBMVRsgmkDAerGeUCV7ogDpMTzp0ajGg== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a0wXuwG17CvtxjA4Vranekpk03tGXICeznPAWJhaCsk=; b=qet+IkKpBd0cXFn7QlyFnO02MexIPw9cjeKzvPfyzHmEtZhiwrdQpvLh/f1R5DG3DoCNHZ8Bhq2mI9w76C/8rDlho/63pH+eYseI1siySPZ+r9cuG//LtTPMxnH8Ke77NDPO5+I68SqtYWYLsNEEqvOWuNhNp9Mp9oe9tbn2Om0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) by AM9PR04MB7569.eurprd04.prod.outlook.com (2603:10a6:20b:2d8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 21:59:35 +0000 Received: from VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5]) by VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 21:59:35 +0000 From: Frank Li To: frank.li@nxp.com Cc: bhelgaas@google.com, conor+dt@kernel.org, devicetree@vger.kernel.org, festevam@gmail.com, helgaas@kernel.org, hongxing.zhu@nxp.com, imx@lists.linux.dev, kernel@pengutronix.de, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, manivannan.sadhasivam@linaro.org, robh@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org Subject: [PATCH v3 03/13] PCI: imx6: Simplify reset handling by using by using *_FLAG_HAS_*_RESET Date: Mon, 11 Dec 2023 16:58:32 -0500 Message-Id: <20231211215842.134823-4-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com> References: <20231211215842.134823-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:33a::14) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) 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: VI1PR04MB4845:EE_|AM9PR04MB7569:EE_ X-MS-Office365-Filtering-Correlation-Id: b62b6877-19e6-4d67-d988-08dbfa947668 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qtnxFHAu/GftuYIcY5Duh55WdIeeK7JtHY8sIeid5k6sXgtz8mHTR6dnR9iI4w7ErTtfIeiLXM9WAhbHo8DFV48Mf7Dbx6hrx/gRNwjgWLt0MnkMCW9BdfHk8pXm4BXG5H2IGGUlaqyEkS818Rnvn1euaNsLdd/VHPrl1Q4hkEGPT07tagKhbZiyw1i77Nt1Vq1XC9bQ34NCsKRTnxYhQOlJtKM6gxf1g2b5ellRA19JNk8nlDhgEOHSJqedPJ4uMHicbZdGaH4dnQW2bWOJjO8VxwhkLosfIGsSak7YowcU4YS6qvjudMRZ8DSeFZD95sSI0LdOFq84ZT5smXv2DCYZ5nc124nOcmGSAm1EQ7DkFMst76ZAFoBrsTAHhKvfsSQ8NEc3ns9Sj4UmxyfQBzeAQgMPzRgbyGrQDak0XV5D5v24t0cyyqBX8h5uPZeZUgmKRv0ITmoTUquYiG+1fjC9MxUQ5cuz6X0Pm4CanoE7lF6QamBGyz8NYw060M+baJWVBUm0OrWV/dCEUJjnluYZeZMHH2CS1Aa1ai3X5BlmwGNz6tkAQ2+eUKr7XwUBMQE3WhGfHgK7b5QzBklqR5t0md+z8gbpSw1QfX466nxePRBQPZVWZsC5NbhLXnAx X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB4845.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(136003)(396003)(346002)(366004)(376002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(1076003)(26005)(2616005)(6666004)(6506007)(6512007)(52116002)(83380400001)(5660300002)(7416002)(41300700001)(2906002)(478600001)(6486002)(8676002)(8936002)(4326008)(66946007)(66556008)(316002)(34206002)(37006003)(66476007)(86362001)(38100700002)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cJXVSoEg/q+BVN41fbGwotB1sS/79DadJAAqmC6puT8jMbpIq7Ql84WsuqLZtt4f42qD1Bo4L0HWFtujaci7cKDGhjvh3EAK2lRvdSaHAGw65v6Dqp2yZUytaPRAiFUn38wcU57NMkUILdtqebcJLM1XRlvYYFn76S2VCJCzHuLR+UcbbwVmzChXqN+Dm9CZ91U+7pKoac5eHy1/dw9vj6YFJKteqNKEFLs82iWUt05CJ9cE2leKwcHcXx9FYfITqdXfYUARexdvJYLOMeXhREfu9E8eyTAhRXR4TkQ8i3og+1FFq+1/9Xz7nNEpE2bcGaqIwLEGHzYae7emOHbvBN04Xptb9zU0NVajRyAhLho5lu4sjkUgGFzvsBjTSELG7OB9WvelvdtRSwi1xkuIUJObQAiKusBXky9V+qcJyCFtTzR+/sbOM4zTDl8UaHAxUffug9wXDoMN5bHAz5t8b16iSq3adTlDHeMZCGlq+uekW/yvK8hIiw98KVDWxGRdf3cMZpLbDVChzKwEkK+SHDacYUkcDD9iLZkympyxF3KFswSjwqXN+mo7SwjYhU2+BsEjPMoohlb15d6ZabynANolxopGu6CWBmcfifX+h4IpiQP+rsV2hea5lQHpWrEqjkWihgPluljbrJsW4rdKcFovtzjIxnNHgY0jgiXBFaiOdK3/Bp6JxjfoyzXuTT0y0zixfpoVhP05KO3XuG6KFU4Msc0HhCtyOrShbvLJX6sStOBHzmPHB9Dt6vnIQ0720y0WWEfQ3pxizyQh5wB4h2SbcV9Sh7J0VUc9lBfIiNPN+O4WFRJvuIjv510LiBws1onrlhNbO/C49U3GI6Z0E5uDfCn8oKNfCvDH4MdoobMGXiF3gyZCPVIVko/p3Df7Sz4AVLw3ysdRpf7t1XOhd1o2DMnecrccmsBh88jwdRrq5hvJbXQS1GLKfzBMZJkqDhp8M2MbLqz6jLs/S1wSzhHLtJdlFJ7e2RZ0vpbll55fGPit7iF2GzvZcju870aYJ+Xy1SvM3a72DANe1s09mQAL4tfAsvPYu40dR8RClOJlvTBIW8/e++SjFvQW7XrmIkF7NAiyrxtuGXU8RuRhisY/INMdKyaWmGskKro6RKRM+U0MyXUetcO5BmHi8zBZsbF49/BLXDhudt0SS2Zgm+x4H6SMiEyDC7vd+bqovD/Jz2ESoHfEmCXQzguDUmRNPk0RXBzfL0oKWVDrDzbEmwFdFGNH1kMimNvqwnNS8FgDFzH6td1R+BIuRpmfIGbmvP96vrwHxLy0LrXQXWAsi4YnEbInqYThCKhlmF9p4Ny4UGsdOefbjlEJx+Rkja9SX1EFZX8xQ7IJC/7i8dKl5nHrttPHvDDjyNd958C7gOMd9PxP5jDycs+F3e/rSSJ1W7q0Nd5BJM1i284VzdjIHOgXXfDN+mHk3gN4PbF0JBvnXUpCokaQvPSkXTeG2f299gHxCI5UuxLTtq2CecAvL/0hAANLC0XxqZx1PKzMi00PtlHuj942bgLoUolSsOV6abTGlCgH/3geoIXDyaQymdPMs917AxDxXWi9U5iA2jQ+aPfUsYL58WmDA+0TN97x X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b62b6877-19e6-4d67-d988-08dbfa947668 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 21:59:35.6468 (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: ajd3eW5t6mLiqBEyojxZ6F7dXduCgaIawh97hOj1jdsEPmNBHSD/cFIq5EDd5kpQMJ+26SJaJOKLA8A56eqWEg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569 Refactors the reset handling logic in the imx6 PCI driver by adding IMX6_PCIE_FLAG_HAS_*_RESET bitmask define for drvdata::flags. The drvdata::flags and a bitmask ensures a cleaner and more scalable switch-case structure for handling reset. Reviewed-by: Philipp Zabel Signed-off-by: Frank Li --- Notes: Change from v2 to v3: - add Philipp's Reviewed-by tag Change from v1 to v2: - remove condition check before reset_control_(de)assert() because it is none ops if a NULL pointer pass down. - still keep condition check at probe to help identify dts file mismatch problem. Change from v1 to v2: - remove condition check before reset_control_(de)assert() because it is none ops if a NULL pointer pass down. - still keep condition check at probe to help identify dts file mismatch problem. drivers/pci/controller/dwc/pci-imx6.c | 111 ++++++++++---------------- 1 file changed, 42 insertions(+), 69 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index bcf52aa86462e..509d459bdc5a1 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -63,6 +63,8 @@ enum imx6_pcie_variants { #define IMX6_PCIE_FLAG_HAS_CLK_INBOUND_AXI BIT(3) #define IMX6_PCIE_FLAG_HAS_CLK_AUX BIT(4) #define IMX6_PCIE_FLAG_HAS_PHY BIT(5) +#define IMX6_PCIE_FLAG_HAS_APP_RESET BIT(6) +#define IMX6_PCIE_FLAG_HAS_PHY_RESET BIT(7) #define imx6_check_flag(pci, val) (pci->drvdata->flags & val) @@ -696,18 +698,10 @@ static void imx6_pcie_clk_disable(struct imx6_pcie *imx6_pcie) static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) { + reset_control_assert(imx6_pcie->pciephy_reset); + reset_control_assert(imx6_pcie->apps_reset); + switch (imx6_pcie->drvdata->variant) { - case IMX7D: - case IMX8MQ: - case IMX8MQ_EP: - reset_control_assert(imx6_pcie->pciephy_reset); - fallthrough; - case IMX8MM: - case IMX8MM_EP: - case IMX8MP: - case IMX8MP_EP: - reset_control_assert(imx6_pcie->apps_reset); - break; case IMX6SX: regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, IMX6SX_GPR12_PCIE_TEST_POWERDOWN, @@ -728,6 +722,8 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1, IMX6Q_GPR1_PCIE_REF_CLK_EN, 0 << 16); break; + default: + break; } /* Some boards don't have PCIe reset GPIO. */ @@ -741,14 +737,10 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) struct dw_pcie *pci = imx6_pcie->pci; struct device *dev = pci->dev; + reset_control_deassert(imx6_pcie->pciephy_reset); + switch (imx6_pcie->drvdata->variant) { - case IMX8MQ: - case IMX8MQ_EP: - reset_control_deassert(imx6_pcie->pciephy_reset); - break; case IMX7D: - reset_control_deassert(imx6_pcie->pciephy_reset); - /* Workaround for ERR010728, failure of PCI-e PLL VCO to * oscillate, especially when cold. This turns off "Duty-cycle * Corrector" and other mysterious undocumented things. @@ -780,11 +772,7 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) usleep_range(200, 500); break; - case IMX6Q: /* Nothing to do */ - case IMX8MM: - case IMX8MM_EP: - case IMX8MP: - case IMX8MP_EP: + default: break; } @@ -831,16 +819,11 @@ static void imx6_pcie_ltssm_enable(struct device *dev) IMX6Q_GPR12_PCIE_CTL_2, IMX6Q_GPR12_PCIE_CTL_2); break; - case IMX7D: - case IMX8MQ: - case IMX8MQ_EP: - case IMX8MM: - case IMX8MM_EP: - case IMX8MP: - case IMX8MP_EP: - reset_control_deassert(imx6_pcie->apps_reset); + default: break; } + + reset_control_deassert(imx6_pcie->apps_reset); } static void imx6_pcie_ltssm_disable(struct device *dev) @@ -854,16 +837,11 @@ static void imx6_pcie_ltssm_disable(struct device *dev) regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, IMX6Q_GPR12_PCIE_CTL_2, 0); break; - case IMX7D: - case IMX8MQ: - case IMX8MQ_EP: - case IMX8MM: - case IMX8MM_EP: - case IMX8MP: - case IMX8MP_EP: - reset_control_assert(imx6_pcie->apps_reset); + default: break; } + + reset_control_assert(imx6_pcie->apps_reset); } static int imx6_pcie_start_link(struct dw_pcie *pci) @@ -1335,36 +1313,24 @@ static int imx6_pcie_probe(struct platform_device *pdev) "failed to get pcie phy\n"); } - switch (imx6_pcie->drvdata->variant) { - case IMX7D: - if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR) - imx6_pcie->controller_id = 1; - - imx6_pcie->pciephy_reset = devm_reset_control_get_exclusive(dev, - "pciephy"); - if (IS_ERR(imx6_pcie->pciephy_reset)) { - dev_err(dev, "Failed to get PCIEPHY reset control\n"); - return PTR_ERR(imx6_pcie->pciephy_reset); - } - - imx6_pcie->apps_reset = devm_reset_control_get_exclusive(dev, - "apps"); - if (IS_ERR(imx6_pcie->apps_reset)) { - dev_err(dev, "Failed to get PCIE APPS reset control\n"); - return PTR_ERR(imx6_pcie->apps_reset); - } - break; - case IMX8MM: - case IMX8MM_EP: - case IMX8MP: - case IMX8MP_EP: - imx6_pcie->apps_reset = devm_reset_control_get_exclusive(dev, - "apps"); + if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_HAS_APP_RESET)) { + imx6_pcie->apps_reset = devm_reset_control_get_exclusive(dev, "apps"); if (IS_ERR(imx6_pcie->apps_reset)) return dev_err_probe(dev, PTR_ERR(imx6_pcie->apps_reset), "failed to get pcie apps reset control\n"); + } - break; + if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_HAS_PHY_RESET)) { + imx6_pcie->pciephy_reset = devm_reset_control_get_exclusive(dev, "pciephy"); + if (IS_ERR(imx6_pcie->pciephy_reset)) + return dev_err_probe(dev, PTR_ERR(imx6_pcie->pciephy_reset), + "Failed to get PCIEPHY reset control\n"); + } + + switch (imx6_pcie->drvdata->variant) { + case IMX7D: + if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR) + imx6_pcie->controller_id = 1; default: break; } @@ -1492,32 +1458,39 @@ static const struct imx6_pcie_drvdata drvdata[] = { }, [IMX7D] = { .variant = IMX7D, - .flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND, + .flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND | + IMX6_PCIE_FLAG_HAS_APP_RESET | + IMX6_PCIE_FLAG_HAS_PHY_RESET, .gpr = "fsl,imx7d-iomuxc-gpr", }, [IMX8MQ] = { .variant = IMX8MQ, - .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX, + .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX | + IMX6_PCIE_FLAG_HAS_APP_RESET | + IMX6_PCIE_FLAG_HAS_PHY_RESET, .gpr = "fsl,imx8mq-iomuxc-gpr", }, [IMX8MM] = { .variant = IMX8MM, .flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND | IMX6_PCIE_FLAG_HAS_CLK_AUX | - IMX6_PCIE_FLAG_HAS_PHY, + IMX6_PCIE_FLAG_HAS_PHY | + IMX6_PCIE_FLAG_HAS_APP_RESET, .gpr = "fsl,imx8mm-iomuxc-gpr", }, [IMX8MP] = { .variant = IMX8MP, .flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND | IMX6_PCIE_FLAG_HAS_CLK_AUX | - IMX6_PCIE_FLAG_HAS_PHY, + IMX6_PCIE_FLAG_HAS_PHY | + IMX6_PCIE_FLAG_HAS_APP_RESET, .gpr = "fsl,imx8mp-iomuxc-gpr", }, [IMX8MQ_EP] = { .variant = IMX8MQ_EP, .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX | - IMX6_PCIE_FLAG_HAS_PHY, + IMX6_PCIE_FLAG_HAS_PHY | + IMX6_PCIE_FLAG_HAS_PHY_RESET, .mode = DW_PCIE_EP_TYPE, .gpr = "fsl,imx8mq-iomuxc-gpr", }, From patchwork Mon Dec 11 21:58:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 1874794 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=CQw3FDUX; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:45e3:2400::1; helo=sv.mirrors.kernel.org; envelope-from=linux-pci+bounces-765-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [IPv6:2604:1380:45e3:2400::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Spwdd57Msz20Gs for ; Tue, 12 Dec 2023 08:59:49 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 7D751282600 for ; Mon, 11 Dec 2023 21:59:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E469854FB4; Mon, 11 Dec 2023 21:59:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="CQw3FDUX" X-Original-To: linux-pci@vger.kernel.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2058.outbound.protection.outlook.com [40.107.249.58]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1DE5DB; Mon, 11 Dec 2023 13:59:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NlEoDjYISoVPDCCrfMvSrDVEL3loJhbnocL4dKaB1rCstPXBOhSr6fyevnEQ8Sy6cmWqnkFz9I5ld9ZlBXxjz941mCUnzPY1hhr/lWCRjSAxAAirrHvj5XW/99Ep08aUxparfA6nD6wsjRPTfFIco8C6a9ECtjRjp6Pt6egvtZq/c6D17JD4cG2b3ypIM427wtrAglhb1SDk3OiVJneBoteJE0tUDeEFnXmzXMyu9tX40z8WwPWWcdJKG9kyEZFVqCTZhaP/omg8ACS7/F9F3fBtmZH4wpXwi5YrYPfyxbJE6vaQoAcK1NKIJ8xx3zQ+QWLCMq2iKV+KBG/pQRgapg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=i+3r8CcXpGad66WuoaRxM6UCy26WD7n3iKnspLejRlA=; b=Zhp4jUtSzCcB0gfKK+rKRI4HVsLp/zkBmdCfXVRckBOTKTjMmRSiu7fRZEV0C54p0fGtvqqqFM4b75K5PHgOLg6d1F4wWyAacVzwnI3e0J4qLQ7iz/aemWD4PuXvBZzP4RlTeaFpabZzryF+2piAYRHUL45oOsW5uenpXZlil68+xuLDJ38aarzjWm3KyX0Z9vn6sbio2Wy4Vf+mVl5Fjb00fWoRNNT4V3MKbZcXbqirNVwOh2DF0NJUVGywRN60Ve1dc7qvEnD8W80mVYwvQ11mwgiQ/FK5y+NGPdhmN9TCDMqrG7UCMTrzt+kBqlyyDcRqjcI/dcxLXvVM1HJrRg== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=i+3r8CcXpGad66WuoaRxM6UCy26WD7n3iKnspLejRlA=; b=CQw3FDUX4wlwmbibf9DfpvMvLDGCEWKykNDb0nh1Rv0RxkUvd6ylOkRNT4au4wyoKXRkJrvP2gEdngjZtI31lrnbINaPT22ug3k+/tJHB5LPl2myH6A8vZClSPotQpt/PQNp52rpc7CJa2f2vyjBnqvvRoTv2D/zLBxQdfb9ujY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) by AM9PR04MB7569.eurprd04.prod.outlook.com (2603:10a6:20b:2d8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 21:59:41 +0000 Received: from VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5]) by VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 21:59:41 +0000 From: Frank Li To: frank.li@nxp.com Cc: bhelgaas@google.com, conor+dt@kernel.org, devicetree@vger.kernel.org, festevam@gmail.com, helgaas@kernel.org, hongxing.zhu@nxp.com, imx@lists.linux.dev, kernel@pengutronix.de, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, manivannan.sadhasivam@linaro.org, robh@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org Subject: [PATCH v3 04/13] PCI: imx6: Using "linux,pci-domain" as slot ID Date: Mon, 11 Dec 2023 16:58:33 -0500 Message-Id: <20231211215842.134823-5-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com> References: <20231211215842.134823-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:33a::14) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) 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: VI1PR04MB4845:EE_|AM9PR04MB7569:EE_ X-MS-Office365-Filtering-Correlation-Id: 17711b2e-47d1-4d95-2715-08dbfa9479c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gIevpNTnG75s1QmudwRLMN0KjyiZf/SizH0Bu0yRSeL2fy8JOsbBQIj9hAQ5QWAWiOrL19s4KWwT8/IeKxDOCsu92thgBkVH803v3UehQAKkrxS+ekg1fbrvf7M+rlZsE9lo47wRCobHT1yqUyBBphZxruwG+JWxd5G4rQe4fQfunlQbjerobSygTEELMee7npyYDt6AScZsTtOdNOdmt3A3Xdf3IhNfxLeuFaLk65gT5PzIb+N6xYA7SSQTid8w1lPsirTJvXAXt/rMd29dnCIQacfqd4B5NTvGNwnzqcGuqZdDfeJxMPvIFjIvM77g+8j9bdzic3xy4soHI4e/WQCyCEL3QWTpV5ikuk/E11QrsdcySWimIFbEOndU/BwlQJckuSLQT7QnmkUYIONH6zJpPhhDnveqt2swGJYN0KWiiAzaZ6fGZd1qimAe7lsTaIu0AmGbm0T8lGROKxF1oUPmFdKIqlfzO7NhNZ1/Lz0uTY22XrWwLDPiDR7jfAsWHMcDNLPKXBL+nG+fbPZkz0jtnlV4oYaHKSS4o3LlVjAztS1BM6uMu0eUEBWeKpM92+9SxcEqS9Yr1EJ5M/Pb3F7nXo7oMwshtMCwc9HV0hqMLcDaYVSjKlVEd4RbQuG5 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB4845.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(136003)(396003)(346002)(366004)(376002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(1076003)(26005)(2616005)(6666004)(6506007)(6512007)(52116002)(5660300002)(7416002)(41300700001)(2906002)(478600001)(6486002)(8676002)(8936002)(4326008)(66946007)(66556008)(316002)(34206002)(37006003)(66476007)(86362001)(38100700002)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2zriirJaXkLMfW88lHg4YZZncS9WHTzKfP4OUWXA8ecDS18tnO8dKnl9FLEwJcTXAnWIE2hw9IdYzWzu6LWBrMaKf0SAxMBTIliXJnlDbdjcXz1uDGOmLA2mCUlIAEe9Yptj0uDfjeEHqBSCznugOAyZPzK2pUG4GbBTNhhnjg22VmCNEGIFMMR0qbt0R3LxMK+UBocqyct+zPxqg5D7j68hbmHgnk1pvvLitIZJfiNnXEo0gnk91kES7IdO0ed6KREKC3rG9G16w+A7576SvDFhHWRX9WW/7LnxuqwKObmARCs39lXGdlOpj/4X4MNRAy0BY70wvKXorkEgME6OJk4x4bCOjkypJY9n77qd/axhzuaabK4Jnf12X64rIjNMBX8jBQSwvg8lRRVVnysmaR2VPS9JVo95CUbFCyDU/woG8j+t5IqhHqDm5f1HQOK4pEKbGFVvNZBZrmRoiDtC81TAz/ogSArhqGZ8deZ1YGWtdGYjAenB6nqvrjKe9GzQgJWVIwPpmI1ZPD6CfDNvrfUaO19lfqTqa0cWgB50aK9jCYF/L+70WnTeUbwoV3f9t5YQLKc6OIhPBQjfv9yw+lS/RXzz43ZJ6FujrnjPh4ehZiQ15Fonh2XDaglOCaJwMvKpqoPi407ODqA8z2VTMwcdyLsj9iQL/LMirZdjt+6WTOda72qeFSjTDUxn6/S8OP/6sgrjk4548C2DVDwtjVXxEdF6UDo0raneT13f65O/b4ke83N6OKpX8OBrVwhVc1kmzln238vvxznAVLKmZh67rvie2lp6JZRicyE1ogpsTaUD2FvlpVsXGO/lkciIrax5YeaXnCfRvDdpMXlWw3Jv71jcl+rLGKQDVrxtVl8YWmPG3FxBclu3jtUW8htMhLl5zehahGMFIu67Rw2osmcpKdIsi5TvqIIWzgnSNpANK8U7XbKuJYShGM7kauRCwxxkGZRxrSBSwwO4kkagyBjlhSoUKE88nP+pU1tdrpkhvePe0YJALgQvhpJGEnOlJJKsBozltlGnOjLzhmgSjMNoxsCcs44KO4BSIHTOv//AZfvlAtHso/HxkikOrMGO3mnip7Um5GPUED7/C/ITF7Kw5BVBoZFlV50mlo7e8S7qWBUCFZVX42DQaLSP2p3nyTPmYv6kmS7pN7d+HniIfglK+ZHCvzvKJ8/5uAD7RZv8B/sijDP7IHPJ2RtdgQ3a7lfd5aUe+INdyokQDx4oS8j1fYgFu3G/yf6zaHs304WUSWcB1nY+ZeQGp8g8jzmLCkOwqZfMt2pyLwl3Mgpa2WWM8tWNMkVc6OwxCpTscEHihbiBgFJ47NGcM0Tb1AopYAH6+ZHOz2tH4RPtlvPtegZInPotJSIzX230AnCH5iuWtDXast8o+fpocauj5a3UTmQ/HnxoNAjTcFyoyH7aqpT7RYRKow/f5jOeiM7+zkL4j08+6TmKolG3iNwRH5rFiRumYgbQjyW2QUuzp+JpUXV4Iomv3Qs5dgyek4aZLVL17mkXJ9kNLh/19R0Xp5zJKVqjwG8hUr4IU9mcMjvOSKwx6OJrocHoO+uCAFy5cV0EUyPS56fpOEPgL14Uji1F X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17711b2e-47d1-4d95-2715-08dbfa9479c3 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 21:59:41.3360 (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: 2UKnPjSkGyheOZRgQkRiUKQCR7S0RQNbITawmplWRkL3GNR4mvGSPwDx+ngnFI8dGEtqC+199DN0tGGHg9SxWQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569 Avoid use get slot id by compared with register physical address. If there are more than 2 slots, compared logic will become complex. Signed-off-by: Frank Li --- Notes: Change from v2 to v3 - none Change from v1 to v2 - fix of_get_pci_domain_nr return value check logic drivers/pci/controller/dwc/pci-imx6.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 509d459bdc5a1..548034151ee1a 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -33,6 +33,7 @@ #include #include +#include "../../pci.h" #include "pcie-designware.h" #define IMX8MQ_GPR_PCIE_REF_USE_PAD BIT(9) @@ -1327,6 +1328,12 @@ static int imx6_pcie_probe(struct platform_device *pdev) "Failed to get PCIEPHY reset control\n"); } + /* Using linux,pci-domain as PCI slot id */ + imx6_pcie->controller_id = of_get_pci_domain_nr(node); + /* If there are not "linux,pci-domain" in dts file, means only 1 controller */ + if (imx6_pcie->controller_id < 0) + imx6_pcie->controller_id = 0; + switch (imx6_pcie->drvdata->variant) { case IMX7D: if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR) From patchwork Mon Dec 11 21:58:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 1874795 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=PIVTUExg; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:40f1:3f00::1; helo=sy.mirrors.kernel.org; envelope-from=linux-pci+bounces-766-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org [IPv6:2604:1380:40f1:3f00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Spwdk6Rt1z20Gs for ; Tue, 12 Dec 2023 08:59:54 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 60E64B2161A for ; Mon, 11 Dec 2023 21:59:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 92B9A5576A; Mon, 11 Dec 2023 21:59:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="PIVTUExg" X-Original-To: linux-pci@vger.kernel.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2056.outbound.protection.outlook.com [40.107.249.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6316210C; Mon, 11 Dec 2023 13:59:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WIvYtjF9DtLl7U6ix0MVx80ojdqfrYcWsvOVYG7d6mkl2JpnNBMQ22xjvIgmjsH7KkYQkvcXhAz0qW8pxPZU0Q7odoY/DDvd9MLkZXdaFvdQh718MYT4QmI+Ftuv7tG7IRj02S+aidLdCh9HCppP0Elr4I7awSqA60k2Gm0dds4Vr33OIy4dcVmWwnHNDp/urj4Rf+g09en1/Z1ztNWMFiaHF1t3DIvj+Yaj5huS5t1jiOeVIRtBU/v7pg6FFpIzfeeu8WNJHi1n5eePlP5wSV9kTteMCjHd874QRw5X1DeK1SuASTxM/0goweoZjov8Gy0SBlN6iulqFsmUAAdsSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=oAuYcnSxfUjuXCqJViD5s14jjKu2Y6OgCA8oY8DtnJA=; b=am5e4sJWaBRfmI2A6bZ1r9uqy5DSOeQjEkWx74lN8vFU/4z5irJBd0YV0o3I84/34av5TkSeSI7s40NiijS6WLyFSwCJOmSc1Hn4SijmKoLVKYLetTbTd8cTDI59i3h81buy4DP7pr+gQOJKZ9neDWNMU8ROW95yF0xW9Z6xJI6X7tapo8hmP2351fR89HwXrepy0MTLd3FVMUz5d5ATI2zYpYYt1Cg/E/vvn6RFW0qtrj9Sb9qL+WPIDeU2NbYujmnplWejKu9SM9V6/A2O+OQnfFx/PFHd0ZjDxd9JXgz8meIkwy7KDxzKMFzq4yfY+s7OzaEtZr+e16kytSab0Q== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oAuYcnSxfUjuXCqJViD5s14jjKu2Y6OgCA8oY8DtnJA=; b=PIVTUExgwA3CrJcO2lvV4XUotInU0L+SWpyFnksZXRJnyMRptHbQ0HgC3VEXUXmoQ/7OB/qN3B8COkJn4DxR2mEUF8bQRajP/KzhZUpmUREV9c7F1uh110yIyskkUjqWtCiDXdz1C5j8lRYnKFGI5UZcvjhj+ZLqJCX+4hj7IvU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) by AM9PR04MB7569.eurprd04.prod.outlook.com (2603:10a6:20b:2d8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 21:59:47 +0000 Received: from VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5]) by VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 21:59:47 +0000 From: Frank Li To: frank.li@nxp.com Cc: bhelgaas@google.com, conor+dt@kernel.org, devicetree@vger.kernel.org, festevam@gmail.com, helgaas@kernel.org, hongxing.zhu@nxp.com, imx@lists.linux.dev, kernel@pengutronix.de, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, manivannan.sadhasivam@linaro.org, robh@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org Subject: [PATCH v3 05/13] PCI: imx6: Simplify ltssm_enable() by using ltssm_off and ltssm_mask Date: Mon, 11 Dec 2023 16:58:34 -0500 Message-Id: <20231211215842.134823-6-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com> References: <20231211215842.134823-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:33a::14) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) 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: VI1PR04MB4845:EE_|AM9PR04MB7569:EE_ X-MS-Office365-Filtering-Correlation-Id: eb3afe69-0f7f-499a-35d8-08dbfa947d60 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GlqWOI43ncdGRwjp6YhmEvZD2PtlqwE5y9TCrCngl7D6w7cwvU6+8LXzeHbqWsHVFwn6EBDvs+g04ozXU72zQYA6Z4T6lDfhiQeqG/ou1FAoT8K3Ft7mPiBYLGsN3jXyQtycT7bzmdvDQryL8OXcBDH55e5OxTgy7ksDbkX0BvSWtuA5RIRVdxODKM5pSruSXSytUd7Yl43JJuhJjNvZnmJlW7qYx3yKKzzFiGr9wj1VFH9bS9qfYJXhieV5AUmfkwXWXyAEH1R47ZlmJ3/nCbpBbBefe9MPlRCIgMCYl5yktqTM9uoODkZ5N+6vYZKK7qy7FIoOUJ7lVaROsW1Ri19PwWu+dvxLwAEKDhSlvpN0egfLfeFSE+ey4VwXoFrMbctNHKYvSqtfuzCvmt80v8x4GuhXt0cEr0D3dO71ya6Vp8oZDTC/gPQCjdUAd+8F1qMCMGCw7PtkARYJ7ldhdKkAlJXRPAshcdp0/oCudsjAKNUuF1z+NF6dAPjg8yy8EKl8yN5eMo8uiSph8dv7nXxrgJ2E48yoa+A03Y5x1lxouQgyP/WYSD+I4ObKcD2tUtc2Bish4dwKzjmRCM7bczeOUuElh9OlyO0z10ziFFKwaZzorsCO6IFC1pXt3c2K X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB4845.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(136003)(396003)(346002)(366004)(376002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(1076003)(26005)(2616005)(6666004)(6506007)(6512007)(52116002)(83380400001)(5660300002)(7416002)(41300700001)(2906002)(478600001)(6486002)(8676002)(8936002)(4326008)(66946007)(66556008)(316002)(34206002)(37006003)(66476007)(86362001)(38100700002)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FDQ8oQQq2OnH1JBEcSp7jMFp1eXIpayvIoSKloo+faYzI+j/NQmVqRbhpYgaKIZZMlI0RW7xdNumHPxlu5JfK5+KYxHzJ+wCQoVU8xuczhgh5uIuLNFcI6M40SUlZFIx9OI68xd3VTLy4TvHoXY076ufh0RpeM1CoqNIn3nHjUgIbMEbYfiIN18AOPE7B9DTunH5C7BhuwhB0wVmnAqtxjN15m2Chr80YAyoSaW1rJfp+bjtKs9e/r1eMb1s0X6SHqhAk7ZJLZAD3Adl7ZUSoWn8/Va821cRODg+I9TPYbjor+Mhgt9WWgFEp8Z69G8Ujs75maOXbUTiZBRrxs6Sls7kpuvbCgDIoyi6p+6RYEv4H151ZW8qujM/VbbBSVL4nGlF1HEnj/BSwj/8eGcgKwmLGXe7mVGGsPW7iZIB7U14bKGMirX/jSvy+P69C2LkFnDvO28n68EYWYls4kGtJ4PnjwDQwzIQTdHwCx0stQStavXJXCDE5DHi/N61LP83LAku3m6WB/tCR1txsBuDj9metbnshvQKqe0iWksO6rjYhpk+voRXGXjAblhh8qnDRvyRyIAfBkN2xJTH17gSC+NcvyN5SirBAv/tu6F4h3/wj4HF3aOt4fWKdW/nX7eNpOmMDSbyrCsiTw51BncKXWjuZiix4W8QuDC8bd+z7jfydKAttMftDMzWLqamn6hCbuBSU8W6WepHVXIUjsIg6G/dl4C0PEVoWufE04jYtc+MQ/buaNrxJ2dfqzb2cPw/sQjeQ2Glli+W7Qt18yTPIz//bZec0hcQw6TZTfnNYqDKsrh8BDi9/oDyF1swk9tfpiaN95vIQJslutp0xip8iZKmFUgS+66fyZ4KzgTsOFL56eVdWWNKib0D2eH+hRr6FjIqYj1/6hhEMT+XsW8ujSXNy+o+i4ABViQNm6jXoSr76chPYWz1+mbCGf42bTcNGYE4RRdKhWqaX79wUl9IoJPrk2CTxE4dYQdSm1IjBvRoWDETlkWLuxUxoL4ozOZmWk2E3PSTFllAYRzxo4ifDegQZa7ihy4y+6wi65ocPseqUkDpzM4obyBvcvp2/YcHCCp6qV/Q9ohGmmkRjryI2a1X/27myIjK+vuN0iSPxo0K/hYpVagwptnZOcf8sJEQJ0/bL+sjLrBGHvVqEsow6Bkhq1lnCnEugS30DXdx5TlIkh+UnmtL59aVAXxbk3OwYq78BArXRuBnfacjJpkm+TZYOzvYYgLWnVsP25RHp8PGZKiypUMqaIUdif/zJ7yjr/sdA/FqmEZJIhhtdi5N7IRFkr8eO+10OklrHbDBJeIhhmswUqf3Lbg5tusWKL/bycgtHbSjljVtbvrris1uCPp/u2I0TgpV2rubfHrBpjKs3xeshVYyf0PZV86Ruxkv29xuYzoL6rIAn/7/976Nal4p1xPMa7TvTmhQAyYuqOdTDp3QJ6LW9mXe9sDhnpVA/7DT7boQGjOsBKnJGXhfFAhc7KzDROj4Rbj1mFW+Ruuo1zIPe5sRrFpwVjjAS1dQvMMR066jTuVwyk+GcGqeK+ZPn85rFPb4KTqQ1BMUrtnmRm/IEs/OtmOsNdXt38nZ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb3afe69-0f7f-499a-35d8-08dbfa947d60 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 21:59:47.0603 (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: sk0aondQGLKEyRQcCkvMB1U0BAUDC1JKBjYVS73qjgR+PHUb4tfFw4nl8hQSw13fBpu1qK0abcJkEIuWohGtAA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569 Add drvdata::ltssm_off and drvdata::ltssm_mask to simple imx6_pcie_ltssm_enable(disable)() logic. Signed-off-by: Frank Li --- Notes: Change from v1 to v3 - none drivers/pci/controller/dwc/pci-imx6.c | 37 ++++++++++++--------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 548034151ee1a..5bfb780e441fd 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -75,6 +75,8 @@ struct imx6_pcie_drvdata { u32 flags; int dbi_length; const char *gpr; + const u32 ltssm_off; + const u32 ltssm_mask; }; struct imx6_pcie { @@ -811,18 +813,11 @@ static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6_pcie) static void imx6_pcie_ltssm_enable(struct device *dev) { struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev); + const struct imx6_pcie_drvdata *drvdata = imx6_pcie->drvdata; - switch (imx6_pcie->drvdata->variant) { - case IMX6Q: - case IMX6SX: - case IMX6QP: - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, - IMX6Q_GPR12_PCIE_CTL_2, - IMX6Q_GPR12_PCIE_CTL_2); - break; - default: - break; - } + if (drvdata->ltssm_mask) + regmap_update_bits(imx6_pcie->iomuxc_gpr, drvdata->ltssm_off, drvdata->ltssm_mask, + drvdata->ltssm_mask); reset_control_deassert(imx6_pcie->apps_reset); } @@ -830,17 +825,11 @@ static void imx6_pcie_ltssm_enable(struct device *dev) static void imx6_pcie_ltssm_disable(struct device *dev) { struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev); + const struct imx6_pcie_drvdata *drvdata = imx6_pcie->drvdata; - switch (imx6_pcie->drvdata->variant) { - case IMX6Q: - case IMX6SX: - case IMX6QP: - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, - IMX6Q_GPR12_PCIE_CTL_2, 0); - break; - default: - break; - } + if (drvdata->ltssm_mask) + regmap_update_bits(imx6_pcie->iomuxc_gpr, drvdata->ltssm_off, + drvdata->ltssm_mask, 0); reset_control_assert(imx6_pcie->apps_reset); } @@ -1446,6 +1435,8 @@ static const struct imx6_pcie_drvdata drvdata[] = { IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE, .dbi_length = 0x200, .gpr = "fsl,imx6q-iomuxc-gpr", + .ltssm_off = IOMUXC_GPR12, + .ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2, }, [IMX6SX] = { .variant = IMX6SX, @@ -1454,6 +1445,8 @@ static const struct imx6_pcie_drvdata drvdata[] = { IMX6_PCIE_FLAG_SUPPORTS_SUSPEND | IMX6_PCIE_FLAG_HAS_CLK_INBOUND_AXI, .gpr = "fsl,imx6q-iomuxc-gpr", + .ltssm_off = IOMUXC_GPR12, + .ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2, }, [IMX6QP] = { .variant = IMX6QP, @@ -1462,6 +1455,8 @@ static const struct imx6_pcie_drvdata drvdata[] = { IMX6_PCIE_FLAG_SUPPORTS_SUSPEND, .dbi_length = 0x200, .gpr = "fsl,imx6q-iomuxc-gpr", + .ltssm_off = IOMUXC_GPR12, + .ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2, }, [IMX7D] = { .variant = IMX7D, From patchwork Mon Dec 11 21:58:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 1874796 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=ULsyrswS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:4601:e00::3; helo=am.mirrors.kernel.org; envelope-from=linux-pci+bounces-767-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [IPv6:2604:1380:4601:e00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Spwdy0kJCz20Gs for ; Tue, 12 Dec 2023 09:00:06 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 21F771F215A9 for ; Mon, 11 Dec 2023 22:00:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D1EB554FB6; Mon, 11 Dec 2023 21:59:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="ULsyrswS" X-Original-To: linux-pci@vger.kernel.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2069.outbound.protection.outlook.com [40.107.249.69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0A44101; Mon, 11 Dec 2023 13:59:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BJFLEeX3sxpClFb3KX5KvQp4DzpAxuEME3c5PP6KVpMXMJUWqFRC0YdlPUtBGSlawBGlA45IQdSJ80xYvXVEB35UCS9AnzuTRjf0NecgVOKWW+J+rF8gVfZxJAoU6iy2adPeYPma3U1SdRTjVNajOsZKrS0UKMH6Y3yUKWJcLuXuf8Kl3NURbcc3L/NRGhYD/G7RBEpNWXAwmf0YqtZKoJ/4ZX1JDzay4uPVM9cRqFiNNFw7rIwK9JQS69liVl70YOntsa/6SLwzmgj/I35loP4Nk80g9+IUKZc/NoscffFfXoKp5RSkCkpDPWZ2rbh3jMD65oHSU1UTI9mnLVQNUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=+iQUXM8nMtRGGGccNHmvZn9i9sDv/N8BHO3DuQJGXPM=; b=OQkcE585R7TWsD7f4Vh9DqhyhTBE6RJLNNZWHoGMEqMaXcLJ5YXeIbgPwwSdLfvRYjpfcqX5KXKltatBhYNWTagmKwwTI4u1eHd6da7nYovKYAOuvs7Leian8SuUfU1ybcUPNc8X0BR02bRJ/qMVJaj0qsrAosM0+q8BjdmOJYMKUdNV3MyEj+GAeyQQXUWGtGZLHgPzkuelU+i5pRVn1dGoTppcY4oVrH1eXquhuGz1uSYoao6ZCddJdopx07lOjXY8NVDsS4t8mnwlviBQB9ERu0SxQoaHFz2hV3U3ElpUrKl2WD8fIkxTyvNG/FQHF4j+Pga+FtkJIKtOgChoIA== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+iQUXM8nMtRGGGccNHmvZn9i9sDv/N8BHO3DuQJGXPM=; b=ULsyrswSUSDJzM0uUZLpR0jTC7MKPovsI5l78sf0STHXDB4M86doOXqrZwms3colHV/KtrxXa69aNpF52/5M73valEROpA+V7tNCYXMwJRnQAYDuQzruSCcng/UOYCxASNjTRyzoWnvszllZ3b2ZFQuk/M7CRwkyZvPORo5dWLI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) by AM9PR04MB7569.eurprd04.prod.outlook.com (2603:10a6:20b:2d8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 21:59:52 +0000 Received: from VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5]) by VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 21:59:52 +0000 From: Frank Li To: frank.li@nxp.com Cc: bhelgaas@google.com, conor+dt@kernel.org, devicetree@vger.kernel.org, festevam@gmail.com, helgaas@kernel.org, hongxing.zhu@nxp.com, imx@lists.linux.dev, kernel@pengutronix.de, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, manivannan.sadhasivam@linaro.org, robh@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org Subject: [PATCH v3 06/13] PCI: imx6: Simplify configure_type() by using mode_off and mode_mask Date: Mon, 11 Dec 2023 16:58:35 -0500 Message-Id: <20231211215842.134823-7-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com> References: <20231211215842.134823-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:33a::14) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) 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: VI1PR04MB4845:EE_|AM9PR04MB7569:EE_ X-MS-Office365-Filtering-Correlation-Id: 01df5308-c1aa-40d4-498e-08dbfa9480a0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qFHwhZMsmRR2nnW1d9upUCIvqzndxDZ7txthh3s8GWwLbiQEj8fhLTFJ1k/7E+OyMtHitvGvoTpgm6JdU5fUC3Q2BzJMm/EDvDyIfLUB1bnJabYVNHWqeWLiywr97qid5NG05lMnVTT5qv9EPL01AqAE4Pz5otEv7LXbP49AQS0IXJ1nIsrDXeTGknGUAt5MnCoa7+KafvRrgaa0eCtWUpo+z6vqb4iO9pvTO3Ehk8ZZu9HFNn9uKslKcJdXnFdRp0dk78bk/QoYdVBqAqP+DvQ3gN6B2snEJqlYLRDZvazT0cOPtqidE3clDrlhh4vXdiXm4XHMFB3XobFhVZGw4xeLsRCftXZGrxJDJXOj1ZQDwj5FBWhGhKXGAJoG28shF7KZZRUUfSivik8uEJqAA/9A9/Xo4Zby24IJlvbUj738bEutopIkwz14qyFMqoRtybRKFi8e91q3rzUmjHgxd9TFFPixgB4jGPbAXJevvNmf/FNaZPjN/06FGMod4U64xnZnh6nAIq3iKJMIboQueHmasEUcz6dhYCiJKLAoLzUYBFnPlio4lWiCmdIxaTZMGldofYQmwQlmpn++nm1FhSl8qc4kvGcLT3ipqQfSU2Msz6P5asgJgeRyFsq50GDx X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB4845.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(136003)(396003)(346002)(366004)(376002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(1076003)(26005)(2616005)(6666004)(6506007)(6512007)(52116002)(83380400001)(5660300002)(7416002)(41300700001)(2906002)(478600001)(6486002)(8676002)(8936002)(4326008)(66946007)(66556008)(316002)(34206002)(37006003)(66476007)(86362001)(38100700002)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ai9Gnzuh2YKc843dQxy8CBGNWMbwZX2wl3g/tnbg0Z/zoAqtOc60VPGdUA3jbbJUNygnrf7PyVaw/w5cF7McdxvYbK1Oeaf3G0ZgUFNBB2938TinfANn/EGG8TycSixhk1O9B57toj/2dBIpv/jh3C8/JB7tJUKquYsLxBauyzqOl6GfAOQbaDCEvyq5InjT/S000AeJOrLweRgSd+2mkxB/FUSAn3i4TiRV2fg9DPVyJlf4dugItFhDYWBMALPvf1RqyK6v5b69OTFlul//coavEnreUYKyu/W0TS33AdN60oTDd8H9TMKa/KyV6PHm7bmMPejHERaKPT9TgeOJMDhHRY/6YGox3lJRm5KPr86c8rBF/T+/Zgkr2bvWZBSmc9GNHrj6PDt8AtKUTzHu9jUTzaye0tXe++G6/wBa3JT8sPPIay1O3H1m4iyJMzE9M+GL/xhh4WS1XxSrEF/7Aopmg92p9nMn+pnhW/SZv2gRlFmP16s8UKDTqUS1ZSliuHl+DoZfFdvFUrFW1CPlVmmSMtAe7RW+mlrsR9ArNeBb5XV7+UNU8ntpJYX9IUp+60cziqftvLN/oHXBeFOAMdiBXJGWwZgwRmNVlN3p3OjeXtcL4kYvsoeq/l9sZNOfE/E6b+z7tl+JQ4Kbxf5OP4Nln4wRsE3J99/KCeGS25q9lEYbEjjZ53LGZPrwmJa7AM6rEVpBqVjKg+BeIFS2TZ08gjxSEB/YmiW+J/0PfTN9oQr2DpcyJ/YcTU43ipOQeMIZ5Si9BU5/c9N2y0Tn1NBqYLvD/p+tFyNfDsdE8JGTMiiywfkTX3Cu2Al3Yjej4d7GRJQje09x30YF8OsQccRnxnveDDzhzo7lG28aiSSFCTbdN1MrXdxMiSoVej+A9YNHvbkohDGmSjh8BKMdyay1ZvQg6+4D7IEBBHbMkSuhm8pi2fiBjPAkKVLW2Xfo+d0EwIjjjwo2PwCjD+wb0Y4Xzmo+wnv4DGXyjEqqykzpEb5mO//RNo3KPuOo7B2WRmc6l3JmYLy/a66T07/l3F0xcbpWHc53Kkdl97tm1OLl+J28bXkwFB7HIpRY30tb0pbAhkqFn62KmfGlzlpoxQUQoscVnSxvsvWmTgep2ffIACo7L7fYNXirG1YuI8TUi4LRcxx3XCI8t84YGyD9mjZUd0fY8hG2CGr3to/f1KVTgq3uXSG4ZMVDFyUSucw0DAfOIq+ySkujla2l9hskd7vbIDpxY4Dr9lqXu5N8WSn0jb5f/65/mxDajEx+OwAZf6qeqk/cz7oBgWPtUiXtjH3MHZ+qxts5ZXcmUt81oBYPffr5SpuH7Cd484F02MyAYHD9ARHK0NY7d+NT7wh+vCb3egNUw3RuW3gdNtefc5mP+HZ4GiwywMmSG6v9Y0TA2VUEQl7CGwjUf1D3mA9PHGUivrXtfoKai7HySO+iODJrOM4lWT14hOcwXhzUKtXAKpILPpw+o0pjJCAgHJGqfMaImaLYaSAO34yg58YB/kyHCS90hOm3iYJVDmqzyVUYL/DM1/lgCyo2iFUMdek1ZswIdIUwmm6iWFPIkvcWySAGvHx3HpoGMAZon6I6lqUc X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01df5308-c1aa-40d4-498e-08dbfa9480a0 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 21:59:52.5057 (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: L7cXGTlQpPUrGcYPXo8rJgj+UcaNNdTM3FZrJNisYE/18fodt9bd5qFe8g4i0vd4WJqY+tptgksKZlw/2ApOWQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569 Add drvdata::mode_off and drvdata::mode_mask to simple imx6_pcie_configure_type() logic. Signed-off-by: Frank Li --- Notes: Change from v2 to v3 - none Change from v1 to v2 - use ffs() to fixe build error. drivers/pci/controller/dwc/pci-imx6.c | 60 ++++++++++++++++++--------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 5bfb780e441fd..1fac6129eeb5f 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -69,6 +69,7 @@ enum imx6_pcie_variants { #define imx6_check_flag(pci, val) (pci->drvdata->flags & val) +#define IMX6_PCIE_MAX_INSTANCES 2 struct imx6_pcie_drvdata { enum imx6_pcie_variants variant; enum dw_pcie_device_mode mode; @@ -77,6 +78,8 @@ struct imx6_pcie_drvdata { const char *gpr; const u32 ltssm_off; const u32 ltssm_mask; + const u32 mode_off[IMX6_PCIE_MAX_INSTANCES]; + const u32 mode_mask[IMX6_PCIE_MAX_INSTANCES]; }; struct imx6_pcie { @@ -177,32 +180,25 @@ static unsigned int imx6_pcie_grp_offset(const struct imx6_pcie *imx6_pcie) static void imx6_pcie_configure_type(struct imx6_pcie *imx6_pcie) { - unsigned int mask, val, mode; + const struct imx6_pcie_drvdata *drvdata = imx6_pcie->drvdata; + unsigned int mask, val, mode, id; - if (imx6_pcie->drvdata->mode == DW_PCIE_EP_TYPE) + if (drvdata->mode == DW_PCIE_EP_TYPE) mode = PCI_EXP_TYPE_ENDPOINT; else mode = PCI_EXP_TYPE_ROOT_PORT; - switch (imx6_pcie->drvdata->variant) { - case IMX8MQ: - case IMX8MQ_EP: - if (imx6_pcie->controller_id == 1) { - mask = IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE; - val = FIELD_PREP(IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE, - mode); - } else { - mask = IMX6Q_GPR12_DEVICE_TYPE; - val = FIELD_PREP(IMX6Q_GPR12_DEVICE_TYPE, mode); - } - break; - default: - mask = IMX6Q_GPR12_DEVICE_TYPE; - val = FIELD_PREP(IMX6Q_GPR12_DEVICE_TYPE, mode); - break; - } + id = imx6_pcie->controller_id; + + /* If mode_mask[id] is zero, means each controller have its individual gpr */ + if (!drvdata->mode_mask[id]) + id = 0; + + mask = drvdata->mode_mask[id]; + /* FIELD_PREP mask have been constant */ + val = mode << (ffs(mask) - 1); - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, mask, val); + regmap_update_bits(imx6_pcie->iomuxc_gpr, drvdata->mode_off[id], mask, val); } static int pcie_phy_poll_ack(struct imx6_pcie *imx6_pcie, bool exp_val) @@ -1437,6 +1433,8 @@ static const struct imx6_pcie_drvdata drvdata[] = { .gpr = "fsl,imx6q-iomuxc-gpr", .ltssm_off = IOMUXC_GPR12, .ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2, + .mode_off[0] = IOMUXC_GPR12, + .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, }, [IMX6SX] = { .variant = IMX6SX, @@ -1447,6 +1445,8 @@ static const struct imx6_pcie_drvdata drvdata[] = { .gpr = "fsl,imx6q-iomuxc-gpr", .ltssm_off = IOMUXC_GPR12, .ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2, + .mode_off[0] = IOMUXC_GPR12, + .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, }, [IMX6QP] = { .variant = IMX6QP, @@ -1457,6 +1457,8 @@ static const struct imx6_pcie_drvdata drvdata[] = { .gpr = "fsl,imx6q-iomuxc-gpr", .ltssm_off = IOMUXC_GPR12, .ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2, + .mode_off[0] = IOMUXC_GPR12, + .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, }, [IMX7D] = { .variant = IMX7D, @@ -1464,6 +1466,8 @@ static const struct imx6_pcie_drvdata drvdata[] = { IMX6_PCIE_FLAG_HAS_APP_RESET | IMX6_PCIE_FLAG_HAS_PHY_RESET, .gpr = "fsl,imx7d-iomuxc-gpr", + .mode_off[0] = IOMUXC_GPR12, + .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, }, [IMX8MQ] = { .variant = IMX8MQ, @@ -1471,6 +1475,10 @@ static const struct imx6_pcie_drvdata drvdata[] = { IMX6_PCIE_FLAG_HAS_APP_RESET | IMX6_PCIE_FLAG_HAS_PHY_RESET, .gpr = "fsl,imx8mq-iomuxc-gpr", + .mode_off[0] = IOMUXC_GPR12, + .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, + .mode_off[1] = IOMUXC_GPR12, + .mode_mask[1] = IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE, }, [IMX8MM] = { .variant = IMX8MM, @@ -1479,6 +1487,8 @@ static const struct imx6_pcie_drvdata drvdata[] = { IMX6_PCIE_FLAG_HAS_PHY | IMX6_PCIE_FLAG_HAS_APP_RESET, .gpr = "fsl,imx8mm-iomuxc-gpr", + .mode_off[0] = IOMUXC_GPR12, + .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, }, [IMX8MP] = { .variant = IMX8MP, @@ -1487,6 +1497,8 @@ static const struct imx6_pcie_drvdata drvdata[] = { IMX6_PCIE_FLAG_HAS_PHY | IMX6_PCIE_FLAG_HAS_APP_RESET, .gpr = "fsl,imx8mp-iomuxc-gpr", + .mode_off[0] = IOMUXC_GPR12, + .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, }, [IMX8MQ_EP] = { .variant = IMX8MQ_EP, @@ -1495,6 +1507,10 @@ static const struct imx6_pcie_drvdata drvdata[] = { IMX6_PCIE_FLAG_HAS_PHY_RESET, .mode = DW_PCIE_EP_TYPE, .gpr = "fsl,imx8mq-iomuxc-gpr", + .mode_off[0] = IOMUXC_GPR12, + .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, + .mode_off[1] = IOMUXC_GPR12, + .mode_mask[1] = IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE, }, [IMX8MM_EP] = { .variant = IMX8MM_EP, @@ -1502,12 +1518,16 @@ static const struct imx6_pcie_drvdata drvdata[] = { IMX6_PCIE_FLAG_HAS_PHY, .mode = DW_PCIE_EP_TYPE, .gpr = "fsl,imx8mm-iomuxc-gpr", + .mode_off[0] = IOMUXC_GPR12, + .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, }, [IMX8MP_EP] = { .variant = IMX8MP_EP, .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX, .mode = DW_PCIE_EP_TYPE, .gpr = "fsl,imx8mp-iomuxc-gpr", + .mode_off[0] = IOMUXC_GPR12, + .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, }, }; From patchwork Mon Dec 11 21:58:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 1874797 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=YcLJ8U0f; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:4601:e00::3; helo=am.mirrors.kernel.org; envelope-from=linux-pci+bounces-768-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [IPv6:2604:1380:4601:e00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Spwf2010Hz1ySd for ; Tue, 12 Dec 2023 09:00:09 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 49F541F21BE8 for ; Mon, 11 Dec 2023 22:00:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A535754FB4; Mon, 11 Dec 2023 22:00:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="YcLJ8U0f" X-Original-To: linux-pci@vger.kernel.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2059.outbound.protection.outlook.com [40.107.249.59]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3868C10B; Mon, 11 Dec 2023 14:00:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TN4czJmuf+2MEfoormb7Io2UVfFhzVL6u+y3j9gG+nGPYJQMlzWzTbrAuydt6Y4EYcahW76aIE5EVgxVsUQjghQnuT40kutwGuxqKhy/IevCr/lwkjwkCiGI6TIKR7/aVj3XnQCCVLq13aC5q8KdYI/aEgLZE17tIBra5ZrKPZ7HQchOCko6m6YJ4cdp//Amo1S0lgIUbGmhHr1y0NxenPCSARWs/Q9JNzPcIfWvVm41m6jU5CiFcqQ7ObVwy0fehzYA+Mt4Wya/s0rw/VJL/q9qQ5Eg0wA0xQrsB9Meiwj+P6vDOyD564bsZsEr/i1eUgOHGyMf+D511nFD5hnQsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=USVYs4/Ey2cQMssv3OIw9XzOwZ9t3+TOU2azctiZStw=; b=kIeBJ/yB30HaxfzsJAv6srBJhbj4M2EWXM3D2d4itTEctXHuped/N2LfyddUarEGTXf7jSIUvFdlUajbqOcrY05TSuw77PkBuuHBFLbgtf6ZQBna5ltCqWz+4V1I1uiLqwTAhPDI12immFHRu5NKJARxG+RezpgdnUhoo8pm3tEciEtFt5RGzpb+AdyXAYFVm8DgdOaoIjSvRRuYCQwWRtTi3qi86iPUih0YVbi7nc+ghTeKqAFNM4qnCatNyrnPBJw+ZZoWTcvyYwJmPJiSK6iYkwfRXO/JsfMjkKr0pEl4ByT/Yr5fuFcPZt7WCHMpFfZZiYP3ErX1HmiU6wTqng== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=USVYs4/Ey2cQMssv3OIw9XzOwZ9t3+TOU2azctiZStw=; b=YcLJ8U0fAZpdzwgApJ4RrNEiv+ZdSgFZV1bbc9lpQMbyfyfL2+1ppXEyT4s1lkuGfI4g2zFRTcAL7o92jlNoKmF9LusPAon0yIx4IA2WW4cmMcrvcL5mHEhJTcXnWAEJ/2E39uq/KFM8mHgAQVNVqPpV5reytHuwLZ9AeCxTK84= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) by AM9PR04MB7569.eurprd04.prod.outlook.com (2603:10a6:20b:2d8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 21:59:58 +0000 Received: from VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5]) by VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 21:59:58 +0000 From: Frank Li To: frank.li@nxp.com Cc: bhelgaas@google.com, conor+dt@kernel.org, devicetree@vger.kernel.org, festevam@gmail.com, helgaas@kernel.org, hongxing.zhu@nxp.com, imx@lists.linux.dev, kernel@pengutronix.de, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, manivannan.sadhasivam@linaro.org, robh@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org Subject: [PATCH v3 07/13] PCI: imx6: Simplify switch-case logic by involve init_phy callback Date: Mon, 11 Dec 2023 16:58:36 -0500 Message-Id: <20231211215842.134823-8-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com> References: <20231211215842.134823-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:33a::14) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) 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: VI1PR04MB4845:EE_|AM9PR04MB7569:EE_ X-MS-Office365-Filtering-Correlation-Id: f2bf809f-f7ab-4d65-96b1-08dbfa9483fa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V8XovyCmuoaGKrc/EEtFoJgWZaa/vcvoSSGvM/9+ql02F/sFCGhIbvfEEzfonJmjRw5NCRQzrLKHik6H8669JXnmzU3EhHxZ7yFlZ0N7IiC4wy+46HLdvZSS+Vx0TjoCeR5anAZ54YbjHkV2RYo5bkboyBMRjFbmXJ3fpqPLEVaIKkTaNDpIIKl5ZgmcNKoOreUw0FHGuELetHAa/gAecpepZolpz6InWsu5z06mOxZ7l+s/zeOnne3gvAYyE5EPmRa9FKNIfGkrc+54pbjZ2iNhWkS1YAKks6w5G8MiJQjjotZM63Gw4NgobDwCiGXGS3CbHUN/VOa80JSkOMgtXqpp0eLvVy8A9FgNpn87Ssa9mKYOovw1dd4XsF8mdg765881qBxpmCQKFT6EFdpRPaKZtt9Pd5TcAxUnlfDt0aXRXF/C+9ed63mayNFZ1UAKmVgsexh0l6uPtMTxnpgBc5jf0bNHldXcOcJTSNncDkxR5pL7E3tfsjUw1oLd8pmM6dOlLTaW03qEhGFQusiYcnj/w2Oo5lBwLtXHfYDQ6Ya/mGFlwnarmMb7W/Qbz8Wsmmsi8usPGOP/X7EAmfGvN0lhMViX/vHbGFTAjzITl3iFLxXGMLXsK+P53nKTmvRxQTFOx6VjMjcWZsP1xuMCzCxCULHw0ZfgbBt0ZIx5z/o= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB4845.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(136003)(396003)(346002)(366004)(376002)(230173577357003)(230273577357003)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(1076003)(26005)(2616005)(6666004)(6506007)(6512007)(52116002)(83380400001)(5660300002)(7416002)(41300700001)(2906002)(478600001)(6486002)(8676002)(8936002)(4326008)(66946007)(66556008)(316002)(34206002)(37006003)(66476007)(86362001)(38100700002)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6zqmGAZGHCVeJ5HJlu4q8BaRbyExUzbsJ/aeTb+ptDFytVBiFfFYyW3cuazVnMgtCFvmK0J5GLiuj5j9n6zfJMbPkKAAaw0nvEK9MdTSzGomwHE6kC4a20ESFDpUCCrxh28KEHIGCSCD9FP9qwU3zZrvAhM+tAU4Bx/2aEl4P8J21gEFXdnqLekhafubut9qkZuk8H/Fq29D7nCAl2k47ikyFWbie79NVwum/2mjHN4Kf69Vtpxs35G5dCDhMZL5a2LakyOzA3HpZqA4iVT5rukz2ExNo8ESugLtbQsmNXxCn9+QtjCigcwPBPMoCwiPQqcwXQ9dDeaEPg4ixzLbHssSbbAVpQ8VVEQT65v9ChewVWLw3s/ZpXKSa5yHJ8Xaf+wfD/AV0hJlva7iTMBiDW0Kh7rfIKNslUjnqMvz7niU/o2Y1NB99cOlHUQcwu1q9WQB/K4c1C2cMTvXkLjquajaCTU5hSHqAMdhg6DsOBy3tdALHycet+oQh65H9l0giD0PdAPV15n8F8/293aH3kC/ZLoKgXAwEy4N8KfnM1E8bOds7ywGU2zcCbDvaYw3IidCBBug8grJ0mbMp1hg1w2R5bwlhYkXFBjoANcndt37qQZjXi5nmMn047C3HJVJM+x0QO8Bb5f/NYIBsf1TYLUcxXKOKRgYZBPhKwxH8wXTLgPTCkXwNI6wmNK0YfZqvkUvVBN+RFKjoiZNAoi74fM3LQuzpnaPJ+aEKtXqtxFy+K2/kxDdKAM+ID1spQik/j8pGLqMFBEruU9/TrNgq+05V4E6EA880So1RgMp9eKRrUjGu7nxuEpqzwe7tZQ6rUGomGWVt/LXPUz+lL2mxFMJwmvbF7HlgYEi0F3iTHnUtnyO+48Wob32ndf55KiX+0rIfqLpJeeJXSt1FPJcsYBgALzjqkFE/7up6csPQk1uKAetHpLmRXEJ3iahoM1zhB9IxBtqmKjv+uo3VbtRv3GbPaFuHHoszaAbQjhnGNLmIXUgckcvrNP8n4AGi64wk7PHCdfsmnVw4mwVJ+LU2Eci/2XZIao65uNA2OuNrOQ8Bmw3yJqx4T+68uKhKsYkv9xL0ZFVmRtNTXOLuBkuN3wI1iVkmA81vZV+6rZBfQyU01XuWxOSKOLvYpZ+2LcR0vGuV7u662tFwPdoSxyhG3Zt5ANgZq268nC945+6QEk9dpUslmNxjhXNRLgkBNBKfNX0qkNjc87Yt35AmXRqGRLFVTfCKtviPcCXzMd/nUAJEOz5MXzC7Zr1oMg4m0jYJct1MG7LJFwUTS+hB4LI5dHclxcWzecpXvwcNSDtf/4aDeSWIikYeq84EsHgjAjAX9/SZEPkCFg831umGWfzHkPM/VQDt7WrPo6ePdRB4DLX3xzE8hsQVQQ3Gd3OXBY/h72IGFEqO432XfVOHS/JS57PREIP/1eTvp5LyhrCztSSmVxDfuSVN2S+wmWJzsHci/S+05qy8hyA5WV5+rCk40cHyHncSWLFGjw5GnvWV2Jvu4/mormIPF3klJAlOpVKvQyDVAS1JC0Y3Kz0V1CtmKkV626S22FopHOdAt3yk6EMBt/15zerP4EuNUnor4mx X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f2bf809f-f7ab-4d65-96b1-08dbfa9483fa X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 21:59:58.3183 (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: mF6th5KShC/1yKy56LmQiNhje1KnwWjwFv2ZdCObz5wrmblDVhz7XkOitKqN7q3e8BiKarTgX0ODnQ2U3f0k5g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569 Add drvdata::init_phy() callback function, so difference SOC choose difference callback function to simple switch-case logic. Signed-off-by: Frank Li --- drivers/pci/controller/dwc/pci-imx6.c | 135 ++++++++++++++------------ 1 file changed, 71 insertions(+), 64 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 1fac6129eeb5f..4e55b629d4efb 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -70,6 +70,9 @@ enum imx6_pcie_variants { #define imx6_check_flag(pci, val) (pci->drvdata->flags & val) #define IMX6_PCIE_MAX_INSTANCES 2 + +struct imx6_pcie; + struct imx6_pcie_drvdata { enum imx6_pcie_variants variant; enum dw_pcie_device_mode mode; @@ -80,6 +83,7 @@ struct imx6_pcie_drvdata { const u32 ltssm_mask; const u32 mode_off[IMX6_PCIE_MAX_INSTANCES]; const u32 mode_mask[IMX6_PCIE_MAX_INSTANCES]; + int (*init_phy)(struct imx6_pcie *pcie); }; struct imx6_pcie { @@ -326,76 +330,69 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, u16 data) return 0; } -static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie) +static int imx8mq_pcie_init_phy(struct imx6_pcie *imx6_pcie) { - switch (imx6_pcie->drvdata->variant) { - case IMX8MM: - case IMX8MM_EP: - case IMX8MP: - case IMX8MP_EP: - /* - * The PHY initialization had been done in the PHY - * driver, break here directly. - */ - break; - case IMX8MQ: - case IMX8MQ_EP: - /* - * TODO: Currently this code assumes external - * oscillator is being used - */ + /* + * TODO: Currently this code assumes external + * oscillator is being used + */ + regmap_update_bits(imx6_pcie->iomuxc_gpr, + imx6_pcie_grp_offset(imx6_pcie), + IMX8MQ_GPR_PCIE_REF_USE_PAD, + IMX8MQ_GPR_PCIE_REF_USE_PAD); + /* + * Regarding the datasheet, the PCIE_VPH is suggested + * to be 1.8V. If the PCIE_VPH is supplied by 3.3V, the + * VREG_BYPASS should be cleared to zero. + */ + if (imx6_pcie->vph && regulator_get_voltage(imx6_pcie->vph) > 3000000) regmap_update_bits(imx6_pcie->iomuxc_gpr, imx6_pcie_grp_offset(imx6_pcie), - IMX8MQ_GPR_PCIE_REF_USE_PAD, - IMX8MQ_GPR_PCIE_REF_USE_PAD); - /* - * Regarding the datasheet, the PCIE_VPH is suggested - * to be 1.8V. If the PCIE_VPH is supplied by 3.3V, the - * VREG_BYPASS should be cleared to zero. - */ - if (imx6_pcie->vph && - regulator_get_voltage(imx6_pcie->vph) > 3000000) - regmap_update_bits(imx6_pcie->iomuxc_gpr, - imx6_pcie_grp_offset(imx6_pcie), - IMX8MQ_GPR_PCIE_VREG_BYPASS, - 0); - break; - case IMX7D: - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, + IMX8MQ_GPR_PCIE_VREG_BYPASS, + 0); + + return 0; +} + +static int imx7d_pcie_init_phy(struct imx6_pcie *imx6_pcie) +{ + return regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, IMX7D_GPR12_PCIE_PHY_REFCLK_SEL, 0); - break; - case IMX6SX: - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, - IMX6SX_GPR12_PCIE_RX_EQ_MASK, - IMX6SX_GPR12_PCIE_RX_EQ_2); - fallthrough; - default: - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, +} + +static int imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie) +{ + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, IMX6Q_GPR12_PCIE_CTL_2, 0 << 10); - /* configure constant input signal to the pcie ctrl and phy */ - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, - IMX6Q_GPR12_LOS_LEVEL, 9 << 4); - - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR8, - IMX6Q_GPR8_TX_DEEMPH_GEN1, - imx6_pcie->tx_deemph_gen1 << 0); - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR8, - IMX6Q_GPR8_TX_DEEMPH_GEN2_3P5DB, - imx6_pcie->tx_deemph_gen2_3p5db << 6); - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR8, - IMX6Q_GPR8_TX_DEEMPH_GEN2_6DB, - imx6_pcie->tx_deemph_gen2_6db << 12); - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR8, - IMX6Q_GPR8_TX_SWING_FULL, - imx6_pcie->tx_swing_full << 18); - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR8, - IMX6Q_GPR8_TX_SWING_LOW, - imx6_pcie->tx_swing_low << 25); - break; - } + /* configure constant input signal to the pcie ctrl and phy */ + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, + IMX6Q_GPR12_LOS_LEVEL, 9 << 4); + + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR8, + IMX6Q_GPR8_TX_DEEMPH_GEN1, + imx6_pcie->tx_deemph_gen1 << 0); + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR8, + IMX6Q_GPR8_TX_DEEMPH_GEN2_3P5DB, + imx6_pcie->tx_deemph_gen2_3p5db << 6); + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR8, + IMX6Q_GPR8_TX_DEEMPH_GEN2_6DB, + imx6_pcie->tx_deemph_gen2_6db << 12); + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR8, + IMX6Q_GPR8_TX_SWING_FULL, + imx6_pcie->tx_swing_full << 18); + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR8, + IMX6Q_GPR8_TX_SWING_LOW, + imx6_pcie->tx_swing_low << 25); + return 0; +} - imx6_pcie_configure_type(imx6_pcie); +static int imx6sx_pcie_init_phy(struct imx6_pcie *imx6_pcie) +{ + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, + IMX6SX_GPR12_PCIE_RX_EQ_MASK, IMX6SX_GPR12_PCIE_RX_EQ_2); + + return imx6_pcie_init_phy(imx6_pcie); } static void imx7d_pcie_wait_for_phy_pll_lock(struct imx6_pcie *imx6_pcie) @@ -939,7 +936,11 @@ static int imx6_pcie_host_init(struct dw_pcie_rp *pp) } imx6_pcie_assert_core_reset(imx6_pcie); - imx6_pcie_init_phy(imx6_pcie); + + if (imx6_pcie->drvdata->init_phy) + imx6_pcie->drvdata->init_phy(imx6_pcie); + + imx6_pcie_configure_type(imx6_pcie); ret = imx6_pcie_clk_enable(imx6_pcie); if (ret) { @@ -1435,6 +1436,7 @@ static const struct imx6_pcie_drvdata drvdata[] = { .ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2, .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, + .init_phy = imx6_pcie_init_phy, }, [IMX6SX] = { .variant = IMX6SX, @@ -1447,6 +1449,7 @@ static const struct imx6_pcie_drvdata drvdata[] = { .ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2, .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, + .init_phy = imx6sx_pcie_init_phy, }, [IMX6QP] = { .variant = IMX6QP, @@ -1459,6 +1462,7 @@ static const struct imx6_pcie_drvdata drvdata[] = { .ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2, .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, + .init_phy = imx6_pcie_init_phy, }, [IMX7D] = { .variant = IMX7D, @@ -1468,6 +1472,7 @@ static const struct imx6_pcie_drvdata drvdata[] = { .gpr = "fsl,imx7d-iomuxc-gpr", .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, + .init_phy = imx7d_pcie_init_phy, }, [IMX8MQ] = { .variant = IMX8MQ, @@ -1479,6 +1484,7 @@ static const struct imx6_pcie_drvdata drvdata[] = { .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, .mode_off[1] = IOMUXC_GPR12, .mode_mask[1] = IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE, + .init_phy = imx8mq_pcie_init_phy, }, [IMX8MM] = { .variant = IMX8MM, @@ -1511,6 +1517,7 @@ static const struct imx6_pcie_drvdata drvdata[] = { .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, .mode_off[1] = IOMUXC_GPR12, .mode_mask[1] = IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE, + .init_phy = imx8mq_pcie_init_phy, }, [IMX8MM_EP] = { .variant = IMX8MM_EP, From patchwork Mon Dec 11 21:58:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 1874798 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=hLtZG2JI; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:45e3:2400::1; helo=sv.mirrors.kernel.org; envelope-from=linux-pci+bounces-769-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [IPv6:2604:1380:45e3:2400::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SpwfH5T5cz20H3 for ; Tue, 12 Dec 2023 09:00:23 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 6236B282552 for ; Mon, 11 Dec 2023 22:00:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 79EBE54FB6; Mon, 11 Dec 2023 22:00:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="hLtZG2JI" X-Original-To: linux-pci@vger.kernel.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2083.outbound.protection.outlook.com [40.107.241.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E46A184; Mon, 11 Dec 2023 14:00:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mJUi+L3I4a1GvTbiAIYeqZxRSz2ltP53nI5YVZC5iPpFgEIlgmL2oenPimtOT2YdJIYZRnEPnA65W4U0shxatTvgNJWqxdAwWJefybtrWaTsWl89Y9xzR91eJDLEYAqLAI7UefbTXvXe3kZg1s2sSPZifa+PwxY34Y2irr/6w/KD5cfEFULLwMOHtmzrvcP5qUpnnJ6xW/soJSokK2Zhzn8rMb7M+4qYJTnSVLP9NhXAe2D3nYO8/5v7/xhA5O8g8Lttg2gCBb0mNZL0UaOhcCoaWRL/r5sTRIs4NDY49G7/r+8JRnwkRGXwhbvFY2T1IwOPrilB0V0bUH697YjtTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=AoJCY3ZktTtXPzBt4oTAViK8W4q/hfs4cgWcegnnSzY=; b=IN1TJZ0hTFrWXMPAM+lbnBLkgVHVwbeu+EYVgH6lPCJcTOiR2xzuLVqGU42uN6idD0oLunumVKjwSXqQQiOtu6DlhmUDPEeZB7k69ZwU3YQoPUr7yBH0IJHbV/V8xsoyyxjTvA7fw5PIBU6zyi4QSrekDueLiND89S3r+T/xvvJRAySChbKrXnjjM8wciraSHnx+PlCbaQQ721MJEUTvtx/mopfUcR4zxGECN7r3VAEfPd07Pd76U96JpDCautXHgQ4yGqqPJy5Ha7ptNOShN2CEfZ5AYz2FaERsbxziX3W/3w/W5q5LZQDaZQB78A7FOC05DVmaF13TpC3qLKT9VA== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AoJCY3ZktTtXPzBt4oTAViK8W4q/hfs4cgWcegnnSzY=; b=hLtZG2JIIXfj4AZ/6ePXDaYo5W0S0PDoj1JjdKzK9xVu7NQUr6EWXEXLmvfJGjjZayzjD67n10LzhCNQiZRMgCheDe24hS4MO82it4OxcD1NjZLiyEvGPbD4iE2yshcDUhXZDgJQaUuBT57dsODuer4dEcZzsCYmTlAgCV27qL4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) by AM9PR04MB7569.eurprd04.prod.outlook.com (2603:10a6:20b:2d8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 22:00:05 +0000 Received: from VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5]) by VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 22:00:03 +0000 From: Frank Li To: frank.li@nxp.com Cc: bhelgaas@google.com, conor+dt@kernel.org, devicetree@vger.kernel.org, festevam@gmail.com, helgaas@kernel.org, hongxing.zhu@nxp.com, imx@lists.linux.dev, kernel@pengutronix.de, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, manivannan.sadhasivam@linaro.org, robh@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org Subject: [PATCH v3 08/13] dt-bindings: imx6q-pcie: Add imx95 pcie compatible string Date: Mon, 11 Dec 2023 16:58:37 -0500 Message-Id: <20231211215842.134823-9-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com> References: <20231211215842.134823-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:33a::14) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) 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: VI1PR04MB4845:EE_|AM9PR04MB7569:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e4b017f-5cb9-438d-aa2b-08dbfa94873a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /jg2M8uaehfApD8XACL8yWo2Z0gh3RD7NAaaZnPODfHjLuYoQFVezvxOHCBvqhT2ZusLRCBcyByI0xLGpWnvRH9XHvBslCPG8arPZayHQ+hdrsQUdKlIkSf5t9ntP1bd88cuECoudIRpC09QZ41KEhRv1q5qA/TCffvXx7ZcQsaoIHEvMsnYRkzfjAJ8vXm25ukKbr1iMFP0Uo4iwChx8MA+b9Zi96y9sjQ3LeGjW3Z4E9wzunQa4SNb68BOQU3tCbMce656rIlpnhrFEsodJS60fKztowjMKiXRRgjvc/6rCEvK+9RaLY7tq7xx2YFeouGnSvbpLQHPELcG8IRv1GQYUC1kY1vGMWv5IsZ+M+AS6txl11EncoSC/5PkeOaezcndQovxjZlKPp11pTkH2FVk5F8z9hRQEfThigBYlQdx9dAUsDoUoKURcj/SjL4PKwiemPV9Ta3l40MoZu4jCZt5VkxLvF4kxVSStY7f4nk/uus1ZYLuHHDe18aa0dRbip8Jb3RM0A9FR6GH0t9hQBuc34Tnv1PqRvmJ2aTFX4c6c+kYlcOG8nu3IuaPeIPg7yVTtaR7b1ddCWCkGP78JdqnEkJbcBZooebNcdIpqGZN4gVRE3gztou65Nz+Pf2H9BagGdGDlc3FpFDIM3zVsA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB4845.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(136003)(396003)(346002)(366004)(376002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(1076003)(26005)(2616005)(6666004)(6506007)(6512007)(52116002)(83380400001)(5660300002)(7416002)(41300700001)(2906002)(478600001)(6486002)(8676002)(8936002)(4326008)(66946007)(66556008)(316002)(34206002)(37006003)(66476007)(86362001)(38100700002)(36756003)(38350700005)(32563001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7HY82mVhLBj3fCSbUy0wtwhGAghOIIrLeY1/bQymzwAMynojsKs94N66Abk02O9sPLUoZIjTFq5H3ARpgQgEh5QdEgaFbTApQuFeOgUJTyVKfJS9PL0go7o3Zl92Xchg+HaSATnhU9fU1MW5zyZng5r+Mz3wFDa0NmAj3kYe7RFDXsWhAElYlby6WbMKeVCNCgkSPWwbEaTUyIdGLLc3XYcixEQrxXWrHQHD6axrpm/3iHpjEzwrF8pogO80qwfKCCbTjXHhamRvUl6+A4GFspYwMhV8qCVKXrMa4lglPil7KreJJCnDl52pB00eNTcl0FaLv5pCLVO+mn+XRmR1m9n5Fy5YdRQ3uyKkVfJY6im1BNdzvxI4oG3jZ8nbwSq/Hf9nbVJcMaKp2S9hyUlD4fgCVkSXBL4bzXUsxoENUfMpLZMIqXISxTqFPsI0pS++eD787EL4+qfgXiux8RIZQw7WPqtoonIasPj52ksf8511u+F9858/VI0GLzKLxgnvvzUKX2WKLOsoBe1J4qqS/DyixOaAu2Fwe5e8Xq9LhIKpsL1DwhEuxfd7aMa5wbr5HSz3zwX7ZDfqaeKJtqMwNOO1MqrGtclSnToYt1uT27/WRgq14dz1oSHD2II0U7q0eRoRz2YF8LNALHujOjcbuy/r7fVvtaHCKjILvq/JMuz1nTH3fJijy5h5PkvlnLER1Vwd6VRekigXtos5WM7GAA0C/Me0ikjXtTTCuhSOn5lbvjlkrhK9r3+AoAcA9nw//wW2CKRQ0eeQlqFi+scGUEElEemCP7F8v1c9EiXopMkhmB3G1J6GS48tw1JTfrl1cT0j2b89uHSXfpsfIwLe9bAvoYFbeB2DGV+2ou89RAVoMVJKFtFNrY00fxlH6co6Qt2LPYfVlyMt8mxR3DBtFeTIFgmogSfUDPt6oy9xLShI9Pj6arNwP/xk6m3qN7h4YxgqQ0PM7IkFPu0A0Hbkf4gxKyQGsR5JzbqB4yeQVrHQGc5QA8J8JMg3qmHCnT2Bi8KADVz84XjJQLknmqkSBmYa9NUftl3vBrWHJPoefflawjzh7cDQBAVHpkA+huWsqKWUl0k4HxfNlebq56aVXM7upDH+NvJVKwNPhs/+0GxFLTvROFzyYcrjHpeAHBX8/DzdtBFzvDxmfkgXAIq1VZrBZsL0HCos2WWdIMY2TlyWLpfYjKLeLXYEEznXAvaTfaOSJgTbpWlNxdgSof3WsSJhOfyyEIqq5PhtTsRe2KKYZYKeL39+qLkTxqGoDk0uu4uj0WDT/0zev7kQ3646bscJVeHY+2Z26ysOXUXGvA+LZRTdBMBVYIS0L8+93yeXnPhqwHTYpJ+Pb4WUrgPkDmP2tJsT03FzH1ESrDSATqIPgxPmnGB3pxmii4h9ByIDgv+XsVB/CkfYMm4Eis8nQAC+MbdL+Nw9t5bYH5hGcTkTuvsGDIvbOc3Wc406E3O9lhdq7vjivHNpgPGF2Yesher9lgop3L7s61UnT2UrJfr7cbGsR5YqgjzBryO2MkAe/QNTunZChlwUbiMkAMDiYujtUbkziTxwrOENBhan39R701WGU7r5OlgnoXBfZfxl X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e4b017f-5cb9-438d-aa2b-08dbfa94873a X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 22:00:03.5976 (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: yvrQwmFnQoH7ocQ8rGu5qjUyhBCLCJpX0KguezTdHA9iRw7W7JUYMp/lNndVjzH0+XEsTcsBCWt2MzKIJmhcfw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569 From: Richard Zhu Add i.MX95 PCIe "fsl,imx95-pcie" compatible string. Add "atu" and "serdes" to reg-names. Signed-off-by: Richard Zhu --- Notes: Change from v2 to v3 - Remove krzy's ACK tag - Add condition check for imx95, which required more reg-names then old platform, so need Krzy review again, Change from v1 to v2 - add Krzy's ACK tag .../bindings/pci/fsl,imx6q-pcie.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml index 81bbb8728f0f9..b8fcf8258f031 100644 --- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml +++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml @@ -29,6 +29,7 @@ properties: - fsl,imx8mq-pcie - fsl,imx8mm-pcie - fsl,imx8mp-pcie + - fsl,imx95-pcie reg: items: @@ -90,6 +91,22 @@ required: allOf: - $ref: /schemas/pci/snps,dw-pcie.yaml# - $ref: /schemas/pci/fsl,imx6q-pcie-common.yaml# + - if: + properties: + compatible: + enum: + - fsl,imx95-pcie + then: + properties: + reg: + minItems: 4 + reg-names: + items: + - const: dbi + - const: serdes + - const: atu + - const: config + - if: properties: compatible: @@ -111,6 +128,7 @@ allOf: compatible: enum: - fsl,imx8mq-pcie + - fsl,imx95-pcie then: properties: clocks: From patchwork Mon Dec 11 21:58:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 1874800 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=bMliLSw3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:45e3:2400::1; helo=sv.mirrors.kernel.org; envelope-from=linux-pci+bounces-770-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [IPv6:2604:1380:45e3:2400::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Spwff19x7z20H3 for ; Tue, 12 Dec 2023 09:00:42 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id E350F282574 for ; Mon, 11 Dec 2023 22:00:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8AF085576F; Mon, 11 Dec 2023 22:00:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="bMliLSw3" X-Original-To: linux-pci@vger.kernel.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2083.outbound.protection.outlook.com [40.107.241.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79655113; Mon, 11 Dec 2023 14:00:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XXwX3o4bvyhaJz7eTKGuK4EhT+hyDKB0GcyPFv+QngOdJ+xylaj/f3vxJjJ83asn1a4/Ggs5eoVHxRB79ATKNZzlD8AhkqaE2GUAxBxP2wwn73ZcHfPw6ny7xDCpDY3MACRywX0Dl1nAj+bsJLVh8AJRXdVPclb9EsE7ZO+Umh2DhDCMQvbBVzrYiKZeBL8NDT+psUTu8hkb8KhXGKrP3oQum4pSzoGnOkCjsdKROgwpC5XR5mN2i3W3h5bRNz3z70cYAAlGj9MFgoweEACdLXh2tASrvnp3eJLDacu+QmS5MP2wC/LFn7fRBRNTaQ69sEbdBiFqb/Ls7RwV+5s5VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=uLpS2V7K1OZ7WBb/0qCh+MtUGmX0ebHK2c8bjaDFPKk=; b=iLkOZgk50P1325zBnkpr7DNMB/x1BtVrlWKhu5sK3PCgMHjpqm+aTBpoansru05TjASyKuEdhl3W59jrCHJvy0pyizsjnHhbjVT2EQwSxhaDqgo57xggE9IWLmTYezvhtJeDHP/qzxpYXiTozyQ/qxMIoQWI4UvTYRKw+dyijHRxMcMdWVyNdS7waryWbvDClPQ9b3Wljb11gV++6EXM5SXqTKjmOZyb/mJNqoAz0Lk8zeZNDI+sKRN3ZPGQaurgh0FQu5oZFm2Uzq//6x+V7/0TjrrqVl9W4Gwzeq8WywAVkD4YaYfp2G4QDZU2UcD0rvuFI+C9SHRLv+s2f5J9PA== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uLpS2V7K1OZ7WBb/0qCh+MtUGmX0ebHK2c8bjaDFPKk=; b=bMliLSw33gPT34MY6pBHP+KxleL9TpDc7PVYiS9J6uKEEkpcMNe+qHQ/t+Z4DBhNGXzGMFEOmrsuayuWaWBa9DYyzLfCBz+9kLUpOT3YzKK9EJ0hC1IE+bmFFUNuCnJKmMGIx6t1TMP2o1b01eUVDv5WHZkUVaGB0a1NINM/ukU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) by AM9PR04MB7569.eurprd04.prod.outlook.com (2603:10a6:20b:2d8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 22:00:08 +0000 Received: from VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5]) by VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 22:00:08 +0000 From: Frank Li To: frank.li@nxp.com Cc: bhelgaas@google.com, conor+dt@kernel.org, devicetree@vger.kernel.org, festevam@gmail.com, helgaas@kernel.org, hongxing.zhu@nxp.com, imx@lists.linux.dev, kernel@pengutronix.de, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, manivannan.sadhasivam@linaro.org, robh@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org Subject: [PATCH v3 09/13] PCI: imx6: Add iMX95 PCIe support Date: Mon, 11 Dec 2023 16:58:38 -0500 Message-Id: <20231211215842.134823-10-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com> References: <20231211215842.134823-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:33a::14) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) 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: VI1PR04MB4845:EE_|AM9PR04MB7569:EE_ X-MS-Office365-Filtering-Correlation-Id: c32d5818-c808-4533-83d8-08dbfa948a60 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cQ8qijOHJ8AokE1czITLw9uJtstCAECP27DbCL2aLyRRJ63M5AYwNrT7mN9UrypkVduUEQoAGRBETd5q6hi/X3K1yV2E1RoHVvxuRdf1R1cyDk9YRXbAC9QvY+CGyJx0SbeVpGnECnkI+3NLegf/JtaFwN+hbqmp1ixJDkeoBRckHF35fwh8q9q2+gPrAMNiFnKoXPiU1HOjFCMFu0zSkQDSDwhldZcR56at3BZsPmyuC+8S73vJ0Jf+TUVLWLBqE/roS6vhCL0Q26YItb8Q+xiTFmJRHIZXugEijY1ue7MWxVn4/+CI/Sb/Rbd/IF08sr/wuEM14NYZARleucdi7i1NfTKPFXTlWamSEDMHPCoRKHPTS2Y3xb382eJdKKh2oA9RC5C7PyvQGpsaW1xyVrljei5ZspIcCPlUQSkYfWwyksG0ekLuWAiaoAyK21TOkxeOl1399hTyXdAdLsSNHGxs+171zBJpK4B/IqxXagBi6+Hq9OrdmuPU52Vvm/nr+63VMtdtXQGAcck7uGEci6Kn+uNCntX+/fa3irSn+Jlg39mB62+ACRXr1Go6jekwnQvzeJmyT7QHcATpUYNQB+WDhdoRWDbKogbk+Xz7EiTb0Aeu96cQkGzF1rUokxOE X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB4845.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(136003)(396003)(346002)(366004)(376002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(1076003)(26005)(2616005)(6666004)(6506007)(6512007)(52116002)(83380400001)(5660300002)(7416002)(41300700001)(2906002)(478600001)(6486002)(8676002)(8936002)(4326008)(66946007)(66556008)(316002)(34206002)(37006003)(66476007)(86362001)(38100700002)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6wjHYmTirznmj0i5Qo8uaYz4cAZRwaw4z5i5FlYFg78Ld9VleYSDfN0+gZAPvCZWF4sUccjJZ3Iz4WVA+mfDsIIonCDh3WgRj8s4CR4v1YcCha9sizhK3a36RFVPsDBcsJsX8um/hxzg9e8sD4LGZrndEdE+Glwwz/zo/Gnr/7WaTLdX8BPVPFMMqQhMGPMQhpltv4JCiNyPv7an2f1FJVIuWXF3yMfm80x4nbDDKHbpyeKSgpmJxbmdcdeSRj8wKqkdUvJO6Y21ABTLYlQWo0v1tVXtIcIVkFiplh1Yn1kmNZz50/y4F4qZxe2BsF7z6uJhR/ImPhJCEzDhFSeFzExjADjydH3Eoa1pl17P/uB3uQnLAltQVCpsADYDqvi8lorjK2OF2RkesICd+1YUiDGuc+gs/GjE2K5rAym9NKzc3A92Y7DrMyq8Tt/RLiba0JYhjQcL+srZpqGwTi4lDcIF27xdvSaXSDi8qD5MMWI3zkbu9lYTYDHIYbZs2Hwe9WKB6emHcDkZ9F0Hk+CLqNGVUlrjoEMQQrI9kBrtwBM2382uyRbsUdC1fpk3xJeBSfnxCvvo2N0aGsdU7/6IZYBTuAPqDdCroRIn8zsbvIs8RmG2FsLBvXgzEMn+4BTCxeA7nQqYECgi3+K9/kS71jB/TQhlU2uuWrGoKY+BdaMU6sTG8T6A4rQ/xV5ZCyy3msFMhvStt+5NSCtKfrY7HHrcJ3wfk9brpHTWbjYWhcingzXvLHrAAP282te6aFxYzForI8sBJkkw1MUZDahalC1Bmul0142op6exG8xLnbtIwcEnkxiUC3YxNUlr10wpGZ1gDVXZ2/+KQW7Yuvfbq1AuoyGSAMA21T6dUh2lVAmtz2fa1VSbJoLdw+eiac5qoNQBUO+LTyhXKab35cU8I55L6Ehcf1MBe3NaTBk2rzO44j+ZQk+GcYcDxoSzNHasUgA21nORM6K/sKcZpMilQm6NGsFis0D+5T0VXyVcatJGFgvRNgiWHaNo1RUZ2OMpmsdQ4M6L8wXI9+tntAd9X2vNCViZ2mb4XNz+rjOxRLL0opWkoi3hcRDGvs7xk+09aVd5Dpyb63XWHQ06LR3xVD9de/+Fc9tD+Rqa66i8Lha4+w66Gurg1pTnWCdLONEs+WWemW/yqlAbVivUawGKt2NGXunhfYNhNqp12iDfMCYL2kY3Hm4WNR7nVP4SqAZVzO/PiA8jKAbHxKN8oFNtv4+T6o0yf5Xt6kmpTIPfa831C9tn5XkbhyvV7WgeQ/C+Nmv+YT9T1j3VD3Ag0ZuuI7IdrDnJp+AyGLZ4D/z5oOux8jZaRflDMJ0in34YMAjvO5Ko1Q/yQUmh5rgvbwZYa4tNGDf/LQ7UB/XXFeMwgjjyRoX843/D2dJloXNA9HNDU9vDxabWXrv6BgQ5oV6dsoFj58HGOglMx5FDhK50XKjZZO6aU+/NlYNTS6GQM0x8UA5zxyYoCeG1uuxlCPp+SRG06TNqtMLCYIhTp30G6eVy0ZGcFNebFTKIkwTw/995q46mc+oGInCF+xh9DTlg0GdBa4au8tPRPz5fOWecSu08W0I+QAS7gE7tmXr42Z0Y X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c32d5818-c808-4533-83d8-08dbfa948a60 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 22:00:08.8048 (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: CKQ/chZLjVUWndkcxzuW2XBo1XSbjk8z+HyjwM8ajvSeZWmgts7DDh7B6rMgxcMs6xzydKCMLJxq/HY5hJitXg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569 Add iMX95 PCIe basic root complex function support. Signed-off-by: Frank Li --- Notes: Change from v1 to v3 - none drivers/pci/controller/dwc/pci-imx6.c | 89 +++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 4e55b629d4efb..99022efe27334 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -43,6 +43,25 @@ #define IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE GENMASK(11, 8) #define IMX8MQ_PCIE2_BASE_ADDR 0x33c00000 +#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) + +#define IMX95_PE0_GEN_CTRL_1 0x1050 +#define IMX95_PCIE_DEVICE_TYPE GENMASK(3, 0) + +#define IMX95_PE0_GEN_CTRL_3 0x1058 +#define IMX95_PCIE_LTSSM_EN BIT(0) + +#define IMX95_PE0_PM_STS 0x1064 +#define IMX95_PCIE_PM_LINKST_IN_L2 BIT(14) + #define to_imx6_pcie(x) dev_get_drvdata((x)->dev) enum imx6_pcie_variants { @@ -53,6 +72,7 @@ enum imx6_pcie_variants { IMX8MQ, IMX8MM, IMX8MP, + IMX95, IMX8MQ_EP, IMX8MM_EP, IMX8MP_EP, @@ -66,6 +86,7 @@ enum imx6_pcie_variants { #define IMX6_PCIE_FLAG_HAS_PHY BIT(5) #define IMX6_PCIE_FLAG_HAS_APP_RESET BIT(6) #define IMX6_PCIE_FLAG_HAS_PHY_RESET BIT(7) +#define IMX6_PCIE_FLAG_HAS_SERDES BIT(8) #define imx6_check_flag(pci, val) (pci->drvdata->flags & val) @@ -182,6 +203,24 @@ static unsigned int imx6_pcie_grp_offset(const struct imx6_pcie *imx6_pcie) return imx6_pcie->controller_id == 1 ? IOMUXC_GPR16 : IOMUXC_GPR14; } +static int imx95_pcie_init_phy(struct imx6_pcie *imx6_pcie) +{ + regmap_update_bits(imx6_pcie->iomuxc_gpr, + IMX95_PCIE_SS_RW_REG_0, + IMX95_PCIE_PHY_CR_PARA_SEL, + IMX95_PCIE_PHY_CR_PARA_SEL); + + regmap_update_bits(imx6_pcie->iomuxc_gpr, + IMX95_PCIE_PHY_GEN_CTRL, + IMX95_PCIE_REF_USE_PAD, 0); + regmap_update_bits(imx6_pcie->iomuxc_gpr, + IMX95_PCIE_SS_RW_REG_0, + IMX95_PCIE_REF_CLKEN, + IMX95_PCIE_REF_CLKEN); + + return 0; +} + static void imx6_pcie_configure_type(struct imx6_pcie *imx6_pcie) { const struct imx6_pcie_drvdata *drvdata = imx6_pcie->drvdata; @@ -589,6 +628,7 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) IMX6Q_GPR1_PCIE_REF_CLK_EN, 1 << 16); break; case IMX7D: + case IMX95: break; case IMX8MM: case IMX8MM_EP: @@ -732,10 +772,19 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) { struct dw_pcie *pci = imx6_pcie->pci; struct device *dev = pci->dev; + u32 val; reset_control_deassert(imx6_pcie->pciephy_reset); switch (imx6_pcie->drvdata->variant) { + case IMX95: + /* Polling the MPLL_STATE */ + if (regmap_read_poll_timeout(imx6_pcie->iomuxc_gpr, + IMX95_PCIE_PHY_MPLLA_CTRL, val, + val & IMX95_PCIE_PHY_MPLL_STATE, + 10, 10000)) + dev_err(dev, "PCIe PLL lock timeout\n"); + break; case IMX7D: /* Workaround for ERR010728, failure of PCI-e PLL VCO to * oscillate, especially when cold. This turns off "Duty-cycle @@ -1343,12 +1392,32 @@ static int imx6_pcie_probe(struct platform_device *pdev) return PTR_ERR(imx6_pcie->turnoff_reset); } + if (imx6_pcie->drvdata->gpr) { /* Grab GPR config register range */ - imx6_pcie->iomuxc_gpr = - syscon_regmap_lookup_by_compatible(imx6_pcie->drvdata->gpr); - if (IS_ERR(imx6_pcie->iomuxc_gpr)) { - dev_err(dev, "unable to find iomuxc registers\n"); - return PTR_ERR(imx6_pcie->iomuxc_gpr); + imx6_pcie->iomuxc_gpr = + syscon_regmap_lookup_by_compatible(imx6_pcie->drvdata->gpr); + if (IS_ERR(imx6_pcie->iomuxc_gpr)) + return dev_err_probe(dev, PTR_ERR(imx6_pcie->iomuxc_gpr), + "unable to find iomuxc registers\n"); + } + + if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_HAS_SERDES)) { + void __iomem *off = devm_platform_ioremap_resource_byname(pdev, "serdes"); + + if (IS_ERR(off)) + return dev_err_probe(dev, PTR_ERR(off), + "unable to find serdes registers\n"); + + static struct regmap_config regmap_config = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, + }; + + imx6_pcie->iomuxc_gpr = devm_regmap_init_mmio(dev, off, ®map_config); + if (IS_ERR(imx6_pcie->iomuxc_gpr)) + return dev_err_probe(dev, PTR_ERR(imx6_pcie->iomuxc_gpr), + "unable to find iomuxc registers\n"); } /* Grab PCIe PHY Tx Settings */ @@ -1506,6 +1575,15 @@ static const struct imx6_pcie_drvdata drvdata[] = { .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, }, + [IMX95] = { + .variant = IMX95, + .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX | IMX6_PCIE_FLAG_HAS_SERDES, + .ltssm_off = IMX95_PE0_GEN_CTRL_3, + .ltssm_mask = IMX95_PCIE_LTSSM_EN, + .mode_off[0] = IMX95_PE0_GEN_CTRL_1, + .mode_mask[0] = IMX95_PCIE_DEVICE_TYPE, + .init_phy = imx95_pcie_init_phy, + }, [IMX8MQ_EP] = { .variant = IMX8MQ_EP, .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX | @@ -1546,6 +1624,7 @@ static const struct of_device_id imx6_pcie_of_match[] = { { .compatible = "fsl,imx8mq-pcie", .data = &drvdata[IMX8MQ], }, { .compatible = "fsl,imx8mm-pcie", .data = &drvdata[IMX8MM], }, { .compatible = "fsl,imx8mp-pcie", .data = &drvdata[IMX8MP], }, + { .compatible = "fsl,imx95-pcie", .data = &drvdata[IMX95], }, { .compatible = "fsl,imx8mq-pcie-ep", .data = &drvdata[IMX8MQ_EP], }, { .compatible = "fsl,imx8mm-pcie-ep", .data = &drvdata[IMX8MM_EP], }, { .compatible = "fsl,imx8mp-pcie-ep", .data = &drvdata[IMX8MP_EP], }, From patchwork Mon Dec 11 21:58:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 1874802 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=Ob84I823; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=139.178.88.99; helo=sv.mirrors.kernel.org; envelope-from=linux-pci+bounces-772-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [139.178.88.99]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Spwg636lwz20H3 for ; Tue, 12 Dec 2023 09:01:06 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 4D8222809AA for ; Mon, 11 Dec 2023 22:01:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8105D5466B; Mon, 11 Dec 2023 22:00:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="Ob84I823" X-Original-To: linux-pci@vger.kernel.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2083.outbound.protection.outlook.com [40.107.241.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B0CBEB; Mon, 11 Dec 2023 14:00:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cfaqCIjae+pL20hgRTnQ7RdzEK9v405UH9SRSME5Y4drV2xkdjCYMZlKX600+OlEy0anz+3OcGXf4QHEaYNmZbM2P6GFtQKMqhpBwM40+sbhL7MHXnBmKWDyGexL8BGLFxKoW2Xh9w2dZO5av/iPRnlwUZeGC0D4OnCTiSOV3yfwc89kE+nZ+3So0HVicjwbX2yh/p4F8N0DkGzR9BpU/2YM96p+sBm1iHWzPyI+mic8CJUBX5K0sb+kk7dwI3eFCygnG/DyDGrsWi+4fzBynTYPbdTufUd6LDXGR3KBiBD7V1FYcN2rQ2HqIWlFmJqRC2ospwUFOXtRV2ADQcCh8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=Q+O8KDC48w0NQMLHJPGOgAGokjP/XnC90cLpCcTuKZI=; b=DA7t+XmT2uKan9+1wj5Mqq5PNfg68M5iyxVD5QfnqNFOgDTLWE1mjYh0CKqXp/i3/tn5QXrWprHxKtSgI0N5YXjAylnBt4q4jnpanXA/cs74TCYYhUpZbLg2aJhDIs3l9D+Lkp/QO5t2Eg7In+WUKZVlzO6some7B57gwJR8hxQuiPGzA0fJ0ekY/8y18R+7U4VTkmty2u0CRzQATBCIUoL3LBAiQsKzH4q0MG5WKOVUGrHJXQ5ueIJlPk27YY+LjwqBoSyZE1oTEB9SkL7rjVFXqgnQ1xbax3Xivig1g/Yxlroo6DtPusj6WvgOMheeoQC3O1w6Aj9EZ+ZkI/pHaA== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q+O8KDC48w0NQMLHJPGOgAGokjP/XnC90cLpCcTuKZI=; b=Ob84I8230pAw0LJZrknd/MazSP6D9kZgazNKEyxWGp7enDanwXMP+psZIbfBgnCUHHMYE0qrArq35+O7D6rxxua+13c1OY0nYdd0Riwnm6vdk2qLB40cv/62dSJFoQPY6jIDwTqV/Mm3w8vd5MiIeTmLFIY0GXfD/KtfHv3XwZI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) by AM9PR04MB7569.eurprd04.prod.outlook.com (2603:10a6:20b:2d8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 22:00:14 +0000 Received: from VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5]) by VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 22:00:14 +0000 From: Frank Li To: frank.li@nxp.com Cc: bhelgaas@google.com, conor+dt@kernel.org, devicetree@vger.kernel.org, festevam@gmail.com, helgaas@kernel.org, hongxing.zhu@nxp.com, imx@lists.linux.dev, kernel@pengutronix.de, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, manivannan.sadhasivam@linaro.org, robh@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org Subject: [PATCH v3 10/13] PCI: imx6: Clean up get addr_space code Date: Mon, 11 Dec 2023 16:58:39 -0500 Message-Id: <20231211215842.134823-11-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com> References: <20231211215842.134823-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:33a::14) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) 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: VI1PR04MB4845:EE_|AM9PR04MB7569:EE_ X-MS-Office365-Filtering-Correlation-Id: 1568c97e-dd86-4ad1-be57-08dbfa948da7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HYTwZ+TQNKVGmR5mzYiEEHdPCXweyrlmmC04d7xJK+Yt0mJ9xj1+4ORiAHgr86KdE0+Au6KT6IvJfA6IKDZzDkih4NIlYM8Kxi74rQE/44pKFjFUIer40izJpEZVbnPh/ec7j9/d4MVM6LdNWHbEP0eDYbxS/QFn2dWlPCiI87pagnGgnGOdt5NuYu3Id6y9caWGMoRpVvf/JJjqHbYm5/8h9+Q3fm6A8uXAZfBRlfBYWWAUDkfkIUCzINOpYT0H9UzEvYykBG48q+ZAEO4KqLTVnJYQ++86JGrvWijgHG+nX3yLeS7kodL3f0h7b1ewMpMETksvF9CaO+JVqEhlwWPktNEjd64cohxXQlmTWX8cIjJCUUKverq/lLKacGjoAWpYNj1bzZIhCCeDw9vKcwvRxBLpJ6FCSmqNai8Q79U2xYAc1EZ8j6N4V1yYcgw9TID8vwXgzc1WxpEHTBhduMfpGAilLUCo2Nk34atN0fRD4ygcg3Sj2za8jT/XBsQqHHyHeG0ChmKxLpdMlEzG79UurWFL1TprGTicaMoJiZliD0nGzopZQn+dR8S32xSuqQI++W96AlccwBVy78WVFzBR421IjFjNneDOPI0yf/bLqlM+Xdh2EU4opAVGmGMm X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB4845.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(136003)(396003)(346002)(366004)(376002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(1076003)(26005)(2616005)(6666004)(6506007)(6512007)(52116002)(83380400001)(5660300002)(7416002)(41300700001)(2906002)(478600001)(6486002)(8676002)(8936002)(4326008)(66946007)(66556008)(316002)(34206002)(37006003)(66476007)(86362001)(38100700002)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Jm2cUxnir1W/HaRcKKXDYx89XQDEHt3QSdI+Ih9JL0VUnNuiOkqNBX+AhJdPQE/NyPBzb2P4l/JzczZV9PdjWPXsTUDJr24/mLYnzoTIfEZCnkszS+VLbhLUNGZBb2CccxhjyqL7o05d2TFWBYJs6iyr/le6LhQwnTEi3T+Kn/TpZecE1h5zU0J/6ZSW5w19rTCezg4a0x7bOgk5hfOByBfboNbVy71BxdDp1fYM0iEStTnpfQHI7bJ7kb291W9I6rObIsotWoWYQE1W8nxibs5rbwYMH/ms+Vk9G3Vpe0u10hpggCwvP7IOMfTGamWlN9QJftCdHCAoFavPD++qxBxK1eaN+LizC5rqx+m0L+V3pZfBnyu7ZNfYEa87ZUquL80bQ+ncoxz55W5AKAg+SAjTh+U793na1gx8HjjYtWsZX6u4CngmBP8h0Sd9L2z2rJyLnG5ERIJm02E3GE1i+kQOeq2oJSskhq/QGOCzq1TFCHHVXJxRw/pJKz7Cp0Q+s+sqx3xJUIDx6JvMizeWk3pL1Q8tR7ESDNihLCL/i2sfvX8slKCEoqpneAy87pyaqvWWYZ2SKlUdANl6PhdtLMGPOU4DDJu4CJudCgfFfrsJUuuHw0Wu+YEHWVW7YwQRy0jWOILaBrOdztnCMKvHMgPUC9gGdoYWUH9vcMbcFGZs82NrRoiU0qydpi4mCorZPRZTCeHnqHocu0qwHnlD8mnlEMNxbNUF+L3TeHqe31m4nytkaTbpdA0bCCXI2tfKByHKGtz6oNDeSU+mAB3C/DPGj1qp0xBC1QYWxaPIPVuBq5JZK/lxQihNDDoct8yn+rEyR2Eeh2/Q8rKFPu22i/20qCehQChtDGylMJXrSUj3AKfi4j5D4NXhoqJ3yumRMUKihJjdh8BoLz7EmgO13XS6Ct/EgGpUIdLckShat/lBK2p3yqN4gDCM1fGrA2F2WnQN/OmX5NtSUcqcsU+7utALSG3nUQ7I+SqZcaZ5M2VfQiYalhI5Pe5BIj4hgAi+M++RQ2z6N9Jxk1muGRCBPKKXgmOk1GhHyFoxDV26lCejCphVNDJ/rrYsuNRljlAUIKc1xlaIJaDTdCxstetTrw5E7Kx42TqWlB/zhW9AsFMWF1v6cmdTC7/4mOAI9vjfrLHYes+mPAEMVw9FdCPc4LbAAB0lKmVSpCDX/IwShKwkUesWvNYF505VgRy4pvY21pO/da5Pbxg6inLiqEDtCP+B9XqXhYneuEVOWD1gtyRu7rGvQvPDhNOtCBXpOuDnMf3T2QfROdGUSdL04Vd/w4vgN5KJYb1QO7AghfJdOrt2gx0WKD/JfQOnlLfTMvXF5qCs4kIz3CGK+nuQ3hSIK+ZoQLf5sycMwTNyqClyCWpLckGJMPQBG0qW2LHhQF6RMw6O5i6Gqh6XMICKtSvgaybe0pCv28TTdNOYa3YifWPDgLCKOdo5DD6nYPcqD/M/Bd0UbR7hEX/BWOJkXt28vK3Xq4V2OJ83bvSL7G04GNx9OGGpT9RF6Y0ul9oGTSCEp0ThzTN7demHHnFgzShAGdZlnIaDA3shAqyMywOzxD9kVMdYpCttheYKhK3zRnXj X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1568c97e-dd86-4ad1-be57-08dbfa948da7 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 22:00:14.5335 (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: AwpIhNzJa4sG/ZNzpI9pEJstewcQiJH6ybOcWyKs7SC6mXFqWJnyYFs4LR/HXK/6r+prann2UJoRGY6A3ty5+A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569 The common dw_pcie_ep_init() already do the same thing. Needn't platform driver do it again. Signed-off-by: Frank Li --- Notes: Change from v1 to v3 - new patches drivers/pci/controller/dwc/pci-imx6.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 99022efe27334..eb4e954e3a167 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1116,7 +1116,6 @@ static int imx6_add_pcie_ep(struct imx6_pcie *imx6_pcie, int ret; unsigned int pcie_dbi2_offset; struct dw_pcie_ep *ep; - struct resource *res; struct dw_pcie *pci = imx6_pcie->pci; struct dw_pcie_rp *pp = &pci->pp; struct device *dev = pci->dev; @@ -1135,14 +1134,8 @@ static int imx6_add_pcie_ep(struct imx6_pcie *imx6_pcie, pcie_dbi2_offset = SZ_4K; break; } - pci->dbi_base2 = pci->dbi_base + pcie_dbi2_offset; - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "addr_space"); - if (!res) - return -EINVAL; - ep->phys_base = res->start; - ep->addr_size = resource_size(res); - ep->page_size = SZ_64K; + pci->dbi_base2 = pci->dbi_base + pcie_dbi2_offset; ret = dw_pcie_ep_init(ep); if (ret) { From patchwork Mon Dec 11 21:58:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 1874803 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=ss2Xytcw; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:4601:e00::3; helo=am.mirrors.kernel.org; envelope-from=linux-pci+bounces-773-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [IPv6:2604:1380:4601:e00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SpwgT3zdgz20H3 for ; Tue, 12 Dec 2023 09:01:25 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id DA67E1F215B7 for ; Mon, 11 Dec 2023 22:01:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5EB8B5577C; Mon, 11 Dec 2023 22:01:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="ss2Xytcw" X-Original-To: linux-pci@vger.kernel.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2083.outbound.protection.outlook.com [40.107.241.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9CC6198; Mon, 11 Dec 2023 14:00:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mMwohfa6DxTuveYABOuRfjrbzmXBUGtj484bf6ezpWB+C6OQ7GMlyiThz4V4axPHgapAkDHIPdVvI+xknLSP9cJaoxQ1eUDG9qjilq/BTUmSmzvB0cAjfZMIwLnnyyIFn3Fgwh6IQeKTajeUznM9TSMUMI3qCSoe4O2/ZuUjy+TGbTDmb0d3EY7DrNM7sJaxemuLtnKzcO0gfwoB233fH+yJSJv7KW/kxNvlzMZKAZ5gWHRp9LhQcbTvFmyUXgrdUJwPANcIIIMNfy+EQZM2n4LvEws8pQF1XigP+wj67l+pckx/n+/F29m8DSvuWSGtQrVkFvKV5Al7SiqO6LM7jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=s21Kia+/R5w8iqiCe6NLmZKQK2ikhDltT6roB/q7rvI=; b=M5N/bn+csUR1oTv684mlOqc9zy0glIoi5JQgY/+l8rwR01f8dQaE9Hwbp0n9pLgSR8I7AwpncxpCYemkkldxHTuSQgP1cyPCWZnyu55+ho+m5WxhF1FrayRhO//S2FdlKvyXnMIcqDcBFKSRqdgaIBJUrWAHvELcXwECrvFBXrPWLAJ6eJxdjycF12lZ76cqPAsngJsuHqxHKVYj8bOShuLp2SgDJuWBhr2cUSTzw3jyStz3jNVcORjim+lESVncRjwa2TxIyddfEoIgbQeDbkORuo8xzUMHsFbVh14TaK84rTWaT7unpgOD1HV7S+hnKOp33ZWxwoAD2am7UdiKOQ== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=s21Kia+/R5w8iqiCe6NLmZKQK2ikhDltT6roB/q7rvI=; b=ss2Xytcwlwutp0Ei0MEYKRIHH8hijq+VzBYJXC4E99y1WWLkGPxvg78cifKgvLiz1eO82cShaAhBDYq7gskoA69Jiy0/qaC/2exkIzeIBD2grgSgPKIoT3xkfNS1eKap+88hjPuHU29uXFVNWe7opKDq21tP1VxExXq3+A5kyzU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) by AM9PR04MB7569.eurprd04.prod.outlook.com (2603:10a6:20b:2d8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 22:00:19 +0000 Received: from VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5]) by VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 22:00:19 +0000 From: Frank Li To: frank.li@nxp.com Cc: bhelgaas@google.com, conor+dt@kernel.org, devicetree@vger.kernel.org, festevam@gmail.com, helgaas@kernel.org, hongxing.zhu@nxp.com, imx@lists.linux.dev, kernel@pengutronix.de, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, manivannan.sadhasivam@linaro.org, robh@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org Subject: [PATCH v3 11/13] PCI: imx6: Add epc_features in imx6_pcie_drvdata Date: Mon, 11 Dec 2023 16:58:40 -0500 Message-Id: <20231211215842.134823-12-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com> References: <20231211215842.134823-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:33a::14) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) 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: VI1PR04MB4845:EE_|AM9PR04MB7569:EE_ X-MS-Office365-Filtering-Correlation-Id: 41636d05-49b4-407b-6f94-08dbfa9490e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xkY/sjjojaQQENPgiqAEsmqQWA32Vm1cy77MnYIL3pTHyuN71TGvfe5QjCW3D4M8JnbPQ4GMFEtkNcNKEBMDITuOjQxLCAGAFHozr7wskTWI2d7kcTWeOAKBlSmtj51r5A/NoyCiSBe1D8W+u8q2NUUnBg45CF6BKZTF8mifR4av3B+exGq8o4uCaGa7JXWdM5It3cvR2YRTcdcQikaoBJFPwpxqY2sDriLzmg5yRJHXcZzhDZHYmduN+edQLTHcgDAINeCVPTQh8/fc/dv3nIAlyZJiteYGeniYcJFHIbzn2uzahlsTBQhkVgnybyPOG25FFJgsbgjw58I3pVmw1wlKRVzer3Vd+4Y0UXkopnIYGTK4F4y06jco4MwgVeMM2qs3Qp1m+OgPrCAJqWGoQcu/XXidjmWfqQyCShcIaFKMm2AYrJ7pr70OgD6mu3aosp1xUbKwmwuXCNeSfR+Q+kYkjWzmMBZYhRbPgOs2F1S47NC/aJuXICBbTdYs6lfZbLGut7WXIsxM592qVkJ0vaeQ+Wg67u72HMGJTbn4DTv9fDfx+TTGcQ7T4dBHMjohkZyCnxXyP3xrtjQ260aRouMsWcHfi9zGKWvt1cQ1AIWa4bfCmDcTRtfSj1A2C93H X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB4845.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(136003)(396003)(346002)(366004)(376002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(1076003)(26005)(2616005)(6666004)(6506007)(6512007)(52116002)(83380400001)(5660300002)(7416002)(41300700001)(2906002)(478600001)(6486002)(8676002)(8936002)(4326008)(66946007)(66556008)(316002)(34206002)(37006003)(66476007)(86362001)(38100700002)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sPGK5T44FVd+ySVZ256cT1eQZBestxU13kBmNkL3DWqK84Paq/TE6FcW+aEdgpURshHATKvcVX+5ufq2GieIvhYkPBvzt+n1j19OEk9RuZgPJxhFqmrutvKQlaDC8DQS6QSECms4783WdydukuReGJQzilRF8B8o1OlGpXB3H/RvzgWTUFEW++dy11CEk+b57yt9M+NLvsjcF3I9vtzPTss0rQowwWUbQu/lfxfU920SGOI6eqEUfdDmxN4skz+Oxrom0zTNNln43skikCafLlkE8tQK8RU5zXfhCuaeTRaF8pTpaO/TvMagSd6Rq20vLyaN9cY6tj5PuaQWdA/unDGGBncxUno5XyOlHcYOnKaqRBorju9QK5xc5OoOTgcMYScgNpqx20UMFwfCTu7s2AHeXlC/rH9XZO/BrtILVgOcHbOmKtLO5XDcmWeY1suoMovVvenPdQBGpL9xX6fV8e1lOQIcX3P0z3582j6NEOxaKByClWdrWEWWhcR4HHvEiUD1L1QjJ6DRcyTG+WTm7PtelTnPVqxqlohmneAxk19Hz6jp0q8RAqVXXoTJP94/XIXZEolx7MIDzfAEU2uJXKNzVvXPGmP0ZVTpVW6dRZz1OdT1nY8+wpsjz7C3gous0Ab/DGXV0JGUA81S1CmW3MnF74B10aL/zD/x3bDMZfdDJxHy4WfOLgF3phBo/Pfv1HTKToHQqKR89DX+bdVVVjDFZ10sy9UKdJXGXJhRSfGkMkHEU6uAORBfDg2NO+rNpOiOanz5EVROeMF5XWBb8kvh1WYUmDud0i3C0xFuDVaguiwTB0ht50Gp9PwQPBhwFR6Ai9+NKXod9I/PHXeRbn9EOogIVdBK34YCH22vl+Snc07ZbTT5+BXbpuZCTFzsliH4Wp452z9fGsdh81W80UMFOqwPMusv9BpOBSddjNqyqZgGKIjk1JCRmcE5e8dnNShvYAEUM6K+VfiUX92y4XIBsP5ArwjQND8vcHMdRTFBH+z0FT9OtHwFqHSG9s4grs9sb0g9VVfQrkjeU9aoWv/A2oQZaU1Rko+PtSVf+ugGrEQ23tnQjO8shOALUCSBR1DUUFIKBz/DCijn1f2OppVfEymgr1WTPBLa62RXMG3+xXgfRL24MfmCPHzp1S71oVE4k9Ce4d5hbLlrfCAts6uEz17sNWLqYbtRZOIHtiIBrC0MN/JvRHI0TIIxUSDFW6eqzVn6DLPxLBJaNl6nMkq2W65srkHWe/6ZteiGLXNJRJX6MiMusOnLPygmYj+SVF/kigvikkR84ul5NbTjybAtriI/j4rtEaUbQkFuXx6COwdsQkRNXR4sijK9kouIdQhzK6JwFuIKOZlx48CJZ8qM/qlG54+IJ156dJY35N/qp/z06DwF/3zplviDlQMDkGrMrKf4zw3t/DKnJ90bb54WmNem6K1MuuHsGRLUYu7OZxJONEq28fHwFw+ZIlKp3c3kvjjAKEWKF6RVvF+KLxH5CUkjp06k77pYHeY4HJd511K6VHbTVET6TVys/Ca504RFpT7/drOvOw5CPMAHnrZIO+Bs3GoNYr+7n9IjO7r0wbP+JZCkVwT8Kh6cl0OJ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41636d05-49b4-407b-6f94-08dbfa9490e5 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 22:00:19.8155 (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: B+gnfKIlfBRi53UZ951vShf2NK2xi3SKqVNCN3kSuYzyrphFsDeuGaVfACCnugQ2mkr3viCSJYgu2ryXERxtJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569 The i.MX EP exhibits variations in epc_features among different EP configurations. This introduces the addition of epc_features in imx6_pcie_drvdata to accommodate these differences. It's important to note that there are no functional changes in this commit; instead, it lays the groundwork for supporting i.MX95 EP functions. Signed-off-by: Frank Li --- Notes: Change from v1 to v3 - new patch at v3 drivers/pci/controller/dwc/pci-imx6.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index eb4e954e3a167..8fe66d3e947a6 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -104,6 +104,7 @@ struct imx6_pcie_drvdata { const u32 ltssm_mask; const u32 mode_off[IMX6_PCIE_MAX_INSTANCES]; const u32 mode_mask[IMX6_PCIE_MAX_INSTANCES]; + const struct pci_epc_features *epc_features; int (*init_phy)(struct imx6_pcie *pcie); }; @@ -1101,7 +1102,10 @@ static const struct pci_epc_features imx8m_pcie_epc_features = { static const struct pci_epc_features* imx6_pcie_ep_get_features(struct dw_pcie_ep *ep) { - return &imx8m_pcie_epc_features; + struct dw_pcie *pci = to_dw_pcie_from_ep(ep); + struct imx6_pcie *imx6_pcie = to_imx6_pcie(pci); + + return imx6_pcie->drvdata->epc_features; } static const struct dw_pcie_ep_ops pcie_ep_ops = { @@ -1588,6 +1592,7 @@ static const struct imx6_pcie_drvdata drvdata[] = { .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, .mode_off[1] = IOMUXC_GPR12, .mode_mask[1] = IMX8MQ_GPR12_PCIE2_CTRL_DEVICE_TYPE, + .epc_features = &imx8m_pcie_epc_features, .init_phy = imx8mq_pcie_init_phy, }, [IMX8MM_EP] = { @@ -1598,6 +1603,7 @@ static const struct imx6_pcie_drvdata drvdata[] = { .gpr = "fsl,imx8mm-iomuxc-gpr", .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, + .epc_features = &imx8m_pcie_epc_features, }, [IMX8MP_EP] = { .variant = IMX8MP_EP, @@ -1606,6 +1612,7 @@ static const struct imx6_pcie_drvdata drvdata[] = { .gpr = "fsl,imx8mp-iomuxc-gpr", .mode_off[0] = IOMUXC_GPR12, .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, + .epc_features = &imx8m_pcie_epc_features, }, }; From patchwork Mon Dec 11 21:58:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 1874804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=shMhsbbS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:4601:e00::3; helo=am.mirrors.kernel.org; envelope-from=linux-pci+bounces-774-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [IPv6:2604:1380:4601:e00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Spwgw6Wlbz20H3 for ; Tue, 12 Dec 2023 09:01:48 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 5D2E21F215E5 for ; Mon, 11 Dec 2023 22:01:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4BE0454FB4; Mon, 11 Dec 2023 22:01:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="shMhsbbS" X-Original-To: linux-pci@vger.kernel.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2083.outbound.protection.outlook.com [40.107.241.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81E11FE; Mon, 11 Dec 2023 14:01:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aP3EMeAGm95F/DyrQu7le5G0+bP/BNtP+saekuxUzUYgqqvOewOGcKlI6ahgSepGt9CqLwHHNP9JolWWp5uHFtsvzv3OltlCnRZDI4aGp5AhXY1FSjuCTgjPHr+D9eUrCbrhDBPRILS5xarnhxEH6Hs/2Qc5zCFLVrxUhE12Ca9y5cxubCGUzSD/MCyNw8czaRFSW5mi3+1+6hoX8Sdjd5fspt4JXFL7wFKrvD++eOi8U7rkBpMXd9iFxisd8ZLmHQr3C40zCKZHQEjfxt4N7EU2PznGq6V7uscOh39GbrHAiOj5mYd5cY4/p5kSK0Zwn6SVCOGnL0vhT5/N/YZQWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=MJn1CcAug8mZf5HSinTejzQInL2u+Dc75u0Ow+OmQ3w=; b=Vs3G1E+xryfAQH0qzWW8/2d60Y305Ofze4dCT3ZwXSGrz8m/qWiKKPCy7FqT/H2T7j6aNZQ7ldTnMqhsVPPLrwxBcgaMADwHiKCuGbs08Yr5uH3aiddmd8kiT150kl4E3ZqIxyzdurR6Xtx2ZuskqoYwfO9+VqjcQ8dDHUrWDIGk5BmFtRHYXH1Cp8+3NHoEZVlLk7egU5e6OHxHrzj7u8sQHcC+BYNz8kA7+6TWVrGgADPfHG+F2gJozGSnJoqHKCA/+esyZNIkTkRyk14TujRx2HSy8evvp9QO3W1SU4riDGAktTdSmrdfp9TA6B5YHmtNcsNAf3QGvVfCgqroxg== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MJn1CcAug8mZf5HSinTejzQInL2u+Dc75u0Ow+OmQ3w=; b=shMhsbbSzqvf/Mx4aAlyejznfajY0EfbvtLuOffEFzyRwtIaOORo7SYnMKY73uVpbsmtwLNi6e1gJ6UM806CSTen00m1pcenggheNAI0mdFkrB402IE335lU1sxeDNl49MHF9nioZrirmN3Uf0T8eCAzeHDsynWkCqVWCIhOt/c= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) by AM9PR04MB7569.eurprd04.prod.outlook.com (2603:10a6:20b:2d8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 22:00:25 +0000 Received: from VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5]) by VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 22:00:25 +0000 From: Frank Li To: frank.li@nxp.com Cc: bhelgaas@google.com, conor+dt@kernel.org, devicetree@vger.kernel.org, festevam@gmail.com, helgaas@kernel.org, hongxing.zhu@nxp.com, imx@lists.linux.dev, kernel@pengutronix.de, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, manivannan.sadhasivam@linaro.org, robh@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org Subject: [PATCH v3 12/13] dt-bindings: imx6q-pcie: Add iMX95 pcie endpoint compatible string Date: Mon, 11 Dec 2023 16:58:41 -0500 Message-Id: <20231211215842.134823-13-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com> References: <20231211215842.134823-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:33a::14) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) 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: VI1PR04MB4845:EE_|AM9PR04MB7569:EE_ X-MS-Office365-Filtering-Correlation-Id: 4c205792-e05b-406e-e6c7-08dbfa949408 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9YE7ToW4boflRLqwDkAZWA3C6bEVG2lBkx3qgrWqTE9olvuO8JbH7GTawMrKTwYEi9g8uC/IKdJkZYhTpxL+Jzgvv+FxkngqsG2GkoGyRbE/zLPF2hQ4JA+rMymnGmF6WHuyamvaBxDbYs/l//nv92Tt8aGJ9bdbzXgc5p/GLQ5meR202kWEAd2fAxn1DyW6mz46dqqdBA/GkhhT88qzUjJfOgfuuSU3PYn/gvAkLUrMD6FKxklXRQyI9trGokaykX+JP4rmvBPP1xKdYlV7ZjxBqwKFInZbr9fQufPiLlX5S6jW2QzK4fnfo4AXQTF54YD71f3VvCh3d/eWAx40+vrNoV4GJ8dDzRA+AelsPaLkhZPAG1JVrTunCyJ5QyoFSBRJK7EY9LJHo2tLqVzWfLi6VgdLJK01bMZQ3gK3Fpo2V0Y0D9iDRzl4GpJI3kIDxAWXqgKi2PL7NBlwF1GTn93GSsdJw3MSJ0zL6P81c6Ua8W5xxn8BT2xzQooLqa1dHqQnWIYN1xLq6FBcOBQMInb3IQYfKRkRcP+iPIjWkXiyZ4VOgVyb51PtD1G+V1PDpJMstgEJVz9AHA3R4Jn6j62b5340ayVYr8DGXoEaK0TInhWtRmDjRkl8irMzV5dvmM1XlU1cL2S+4pcKAGTy6w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB4845.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(136003)(396003)(346002)(366004)(376002)(230922051799003)(451199024)(1800799012)(186009)(64100799003)(1076003)(26005)(2616005)(6666004)(6506007)(6512007)(52116002)(83380400001)(5660300002)(7416002)(41300700001)(2906002)(478600001)(6486002)(8676002)(8936002)(4326008)(66946007)(66556008)(316002)(34206002)(37006003)(66476007)(86362001)(38100700002)(36756003)(38350700005)(32563001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3N+mg2QpOl9sE/+5Av7VPzeKa+pwItyCSZzlnBAlrwbhPXBrIO+6++d5aZUVgvWMjspxVGwp3uj95q+9xx1z9Z2hi8lfHZePKNafYPI4Y411KZ+jwAp5/wYS/AQpdyPH0UHrNBiGt2VTyqXnYAU0m/mXPG8qbnIWNB4Uh2cUcWVQUguPOGi1DlrnO6S7hguEUmkXR0f50+sSFrUd4JTpSEXYDYorI13xcoZEgJMukKt38EkPF0WG18/XkABzFWlCVCY09tfCSmAhHqqcC0lhtQX8Ul+FPN11pIxB7Hn4h+GyQI5CCS9y6fx2Cps8O/uMamqYrAyE0WjZaRAKL0vCkjsxrBBbbTthA5IZIAHwiv+26AcdRgD335iRprzSj6zZglEVirwJTE6iAn/UPy/glBdpKG8hVwR+BRSegJVsuGpsBQYVIA5eBnYbAYFtanOp7dfv3dsZPuvP0rEC+MOv+Ug63A/Ki5Q/9riMqt84J3oviBFhBvG8hkAm9JE8g7/XilO8uuHv729VIwhfl+4uIjgLwBcNxFR3HCQZtHtt/5txvISwtovnAfwTe4xDCxHSt99aAZn6gYMRbOecCmD/xoOp58vHNX605z/sPQWDbLJM3bl4AZQmRhT0109eOJP1714GWFt+4xtYEQKJpu3cTinqqfV2geeZxiKPXBp/DQ6bsGAfLZUfRvuFSRdQ+gmhE8AbMRtUVZSRMjueh3akyB/YXxIEjoJAgtBrmn0BQGXYX3Pn6QWfWwrbSPJsXD5kjz2JnBw9K7xnJZmgOQP3LohX4Y7OVTjCwomrYrTc3be6EUWlG/3i2eBJfRbIyAHVs0S69ufHWGqAqhm5BjNeWBibijcU+RYptQfk3FXVkJ6PorzC8cx9kG8zjAgJ8cf9aluyD6cdiDH6QwREvd5EbGKJtKk5eBDwFdPgUTBAP1U4mAkFdkz3gPhbAeZt+C1+/eQ89XQXJm0g5HTsZ59fCdYfGCS1jq5Ht63ZGBVcfi0yv6Vc+1ih2N5SGSecNrIh1DpKHtCBzGqIRUA+3YkHSznlAlkLco1JlZuOG+kbsrAhm+/bC2rWBpb7p7nr8SpP1kBP3hokNcE0++ROTDF0euYI76HflNU6H/zs7sJxbh3CRTjSAGun6fVOlxYhPXM1STjeDac8Y47BqbLgFM+Bqf4UXy0ogYNXMiVB/i3iYjVyCBPAn27JVdgmNQ29u79wsY4Essp9OCsubnXee+dRg7uzVRU+Cdln1QmKb51IMXOh9UpUeGR1LRmZAr3/Sp9r84XcFBV/zE5T1XV7f6Lz/YjBoot5jK5K2rweYG1oaETKrQGj9/10jTc25pwSE2dKptjU70s+9LTeaKf06Tbxf5bcluT5mXasAANqUdXiFbkrGWupNwBO+GPNFQLTAbDS0QfB++MuAt3Ln5KMfLgfPh9zIUDxTNggvgkZgFtKRsW4i45MSm1t580ubk0C8vgcTmtKXqZSnL7ErIiNE9xIpEQBLJdZeTZj+6aJzu0JFOnPiyoonHuMdwEweeTWn9wamfJ2YAdNDHESgxoVsUcOVL/qjF+E/9f1sykf0FmSLZ1QqM1eI1HlPeMApzYOEUxe X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c205792-e05b-406e-e6c7-08dbfa949408 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 22:00:25.0637 (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: 229KVatznAuJU9Kx8VPeook8qSfNwVcRSDBAyce5oTegobTR8AjWOckKP3r7NyMzV3UQ+tUubkJVhjg40mLV9Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7569 Add i.MX95 PCIe "fsl,imx95-pcie-ep" compatible string. Add reg-name: "atu", "dbi2", "dma" and "serdes". Signed-off-by: Frank Li Acked-by: Conor Dooley --- Notes: Change from v1 to v3 - new patches at v3 .../bindings/pci/fsl,imx6q-pcie-ep.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml index ee155ed5f1811..36d8f117fdfb3 100644 --- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml +++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml @@ -22,6 +22,7 @@ properties: - fsl,imx8mm-pcie-ep - fsl,imx8mq-pcie-ep - fsl,imx8mp-pcie-ep + - fsl,imx95-pcie-ep reg: minItems: 2 @@ -62,11 +63,30 @@ required: allOf: - $ref: /schemas/pci/snps,dw-pcie-ep.yaml# - $ref: /schemas/pci/fsl,imx6q-pcie-common.yaml# + - if: + properties: + compatible: + enum: + - fsl,imx95-pcie-ep + then: + properties: + reg: + minItems: 6 + reg-names: + items: + - const: dbi + - const: atu + - const: dbi2 + - const: serdes + - const: dma + - const: addr_space + - if: properties: compatible: enum: - fsl,imx8mq-pcie-ep + - fsl,imx95-pcie-ep then: properties: clocks: From patchwork Mon Dec 11 21:58:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 1874801 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=Uyx+Pydm; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=147.75.48.161; helo=sy.mirrors.kernel.org; envelope-from=linux-pci+bounces-771-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org [147.75.48.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Spwg267qfz20H3 for ; Tue, 12 Dec 2023 09:01:02 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 6EF73B21545 for ; Mon, 11 Dec 2023 22:01:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3D5F95576D; Mon, 11 Dec 2023 22:00:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nxp.com header.i=@nxp.com header.b="Uyx+Pydm" X-Original-To: linux-pci@vger.kernel.org Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2064.outbound.protection.outlook.com [40.107.241.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E187FAF; Mon, 11 Dec 2023 14:00:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XL7iaDeH1wh6bHmdHVnXBkUjzywulcFHPt/eob+glaVirvagRzV6Kz95kYu/ama0ykfL41fNadoY1Qgqx1KBrRHtUwyuZtACCfsFwDsyJeXPLzilP9ROj365j+WROi3XdBsNFM6rZ/zH2E59Mktzjia7jgaSrP2+7Z3UKwogstaqk2GVk6Ski9To/hqD6MbchiuUmQb0hnoDtaaBLRVicyXv8X75EfHNgeSEXY+hH4WW6+Di57T2fdnIiqmBgV/MDR08FDOQX7fnErCNojsNko+TF/peFnueDa9lGGPGYOEBNmx5juNoIHNnCmviaql5ZvrWm1tPQg6R9zVVg1LB0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=VDsMDJjPLgKGyfutpDbYr5Dtxeplfku8pilICDnyv5c=; b=ivLjLa48IDgfNXXkzBnAtIB474bgHjauEAQEHjj3xe9Ugzy4MGkAZNK8wQj8YGBj9YKLr5YZ5oVdFfepL8wF35ychvoOwuFROvmke9OV2H7QIKfhcPE+oLIW/NoAUjpM5PbTF+nKMku39P6UDCKh6SVzLC9NIH3bSFfUwj1obapYO5q6vLlslG9+aNPoXaU+51zYJbVFcWkmuM1q6bg3f2s+NUxV+CeA58TinmMfh/Yu4545GOIb2GHsRR6jjwRS1sut4r2pmGY5lwaLKa8RC6l6s87cQ5mAowkPK5Gu70OTTYd+JyqK4HTDJQy5EZBH3O2v3NF2IORbehslDqkx0w== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VDsMDJjPLgKGyfutpDbYr5Dtxeplfku8pilICDnyv5c=; b=Uyx+PydmLk3omO6PZ3PQ5Y1jgxxvV8TM18u2dcUNhA1/sFngNJFtIeK+VZFleoFHnIRnFyqxkWBeEP9sItLHQ9zCsULtQdtl/9AgbIUDDQKgRkKxQKO3EHPKkBd9ufS+wMjeZjiaC6kf9FZ+gBNY1LjzZyEwGl0sAom7ub1BBRI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) by PAWPR04MB9717.eurprd04.prod.outlook.com (2603:10a6:102:380::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.29; Mon, 11 Dec 2023 22:00:30 +0000 Received: from VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5]) by VI1PR04MB4845.eurprd04.prod.outlook.com ([fe80::dfaa:e869:45eb:76e5%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 22:00:30 +0000 From: Frank Li To: frank.li@nxp.com Cc: bhelgaas@google.com, conor+dt@kernel.org, devicetree@vger.kernel.org, festevam@gmail.com, helgaas@kernel.org, hongxing.zhu@nxp.com, imx@lists.linux.dev, kernel@pengutronix.de, krzysztof.kozlowski+dt@linaro.org, kw@linux.com, l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, lpieralisi@kernel.org, manivannan.sadhasivam@linaro.org, robh@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org Subject: [PATCH v3 13/13] PCI: imx6: Add iMX95 Endpoint (EP) function support Date: Mon, 11 Dec 2023 16:58:42 -0500 Message-Id: <20231211215842.134823-14-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com> References: <20231211215842.134823-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:33a::14) To VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) 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: VI1PR04MB4845:EE_|PAWPR04MB9717:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f3dea97-6807-4ed4-5e18-08dbfa94972c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dp+P0XzFMITKLIJ7Wf/KsBJH9cC0JHUMZkBf/RkIdQ56zyYlyPpTnyvg3UEYq2JyuPwGqio307DArGQOOz8lxMI58cxtdlgyHSGiziTAXjtPaW1Qqys4xNb8Gy1IXUICvBo7fB6YuORHpXnb7YeWDASwd+gC6k1DnM+dVBubCCp7LL/pcDQsZGhbCkDINJopXbKu8iQ6BdSmV0HMe6zvmR+OlGG3vzKUY2zSJMnNO04gr/Lg9rHMhvBDIG64zNOqA/Ea8vMsBhAK4QaVxsdFr8+qWW98eX+s30rX4nD9Kxv5U+YCt6OPpKkADUKJmroa0rPvIdU66jpYimFrD/ZyH4q7sM0/kqD/DS6k6i/eEzoMRFSJzvr1ljUQmPU4YUkaYQSqLxhLCB2S5QP9k0CrIFglBMykiDkk/FHjLQ5dLTuU7nu46xFCrbahiP0qHm67sk3bZWiPukmHbK51l7w42G72U/J3l68V8sdf098UAo/EJWB56xhSD/5KjDVmRsmS7ACaMKz9QnDwsiXkzYl68Z0+NRRmXJejsdDR1bQqDlLdG0796qlE4QjISTgAPF99QGWNtqh8fwyM0R2eAWYvuh6BgzDQGSI+On4V+06ifcb32GauViccMffxAEgWx58D X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB4845.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(39860400002)(136003)(396003)(346002)(366004)(230922051799003)(64100799003)(451199024)(1800799012)(186009)(478600001)(6512007)(1076003)(2616005)(6506007)(52116002)(6666004)(26005)(38350700005)(38100700002)(86362001)(36756003)(5660300002)(66556008)(66946007)(7416002)(41300700001)(2906002)(6486002)(66476007)(8936002)(8676002)(316002)(4326008)(34206002)(37006003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: syv46mRJQ3XpRPPB5UZ1EOtzmxa2pWkcz6EWveqDWQ/Zubne2ODMxjPIqtmruKeAvaALR4n04GFWKcKIrm0/NJcoe42p8mdsHPQ7RnMX2Sm1rdpuxMNr2PtoR26Hto4FLxLjLou3sj6WzLUkcR/biDJeNZ5a4lP5N5hWKukn9RhhFhDKag2gliOotzJxwVjBHonpVCGSYyYDtXwQDXf8dOdjx8O3EmnUQSpzPT98oI4ft2IsZQ7ouCL+nhDkLUkDijR3oMX6Q74Ag54IwQ0T6qQ9f9mSJzeEGA8q/ZcxKMncm8cia8jaiTKK9lqnHlxWyIrhmRzJ5pxo1nlsUVWaOlBwoTshzWZ1S39Fyw3mk2MPlATe9OulycfPI4XwTcHhUNDaqRziqp3iqUAJPRD/1iQtCr1ayjYevaVL7ips1Uqr5WHkaK8fQDoILe0A0aqildnknOew19C6HTEH4tyBU6h505t3D1dQZ7+Di2O3/96PJevJBSuzpHLRk/yGuE+oU2YpYaUkrFgsCO8bnd78pr+aX7SV6Ubt0xQBLbPDfReqYeYTpPt9No3bcbpYSOMrxcn6k8TRYGXCaVpR6qITkfidN2RtSfTL/ozYYP3SL1n25h6orzcmK+Z6jPjSkI+9dcob7VdmztWgdTLXnDvMnjh7Cotmoocn9llj0TDU247Tccnf5YGpAmSfO1TpuowRtEHXT3ivkQyjTTeeyv1NQdxZ6OhrbWzyJiXrOO3tuwb1yyfD6L8wq7jgIyj2qR6hW7qvBBlJn7Oo09FqVkmTRLQqWOf6IDMadK5yE4pvm+zlwL+li0TZirQ7FUG8oxUjKGPDTZX1wry6BDM4GGu5KrzstbKoeVPHOKWhoUwplfFTLFudJ4VQI0gCq5QrPapPtWPm5l7dnMcIXecADdn9kKs8JliPDh9ylUCsS5AForv4wa+xwbdae1Iv1ElpLFKdvsVUq0gq2Q0887vKe3f0OHwwL0nGgSPHTUNwbkQqCH4QyVYJRTPlc7y2IyH0lvartHSFIKtXAjQgLVTxFbBU6lVNPsebIKDyKrXwBYJJ+HlhZCC8W9+0B8hxpO2N00YtF61mjm8ciyLVRzlVN4x+cZW21e27xkbMkCVoNLP8Po7I0E5XjhY+Y+EdWWUswrYTQqWxhv2WNzgoOJYbO5/aclf1hIGv5wwTiCjrsgqbx3R64iolHGIrzYaEURUkXb+Cmp0P4uMHh9oEm9s+P+QCqP6BoZjgbSGg82I33ePgnOkxHSd0iMA3uUqJHPOOqQLpz1uLjyzXyY1GWKYGv9LUsk3/WrsmKfKbT8yj2aDZ+CNnpVYeWAbjM3ydRDlFZm2P/l0fMoHUldU/ue8rNQktT8XKlVnlf2IaWO6LJzJ2Wz4QzHtHgFSK12Pu2MDUKsF/a7FH+7A+s7O0q0FNNFKVhYCKbhMVkAdqHdXgiHG66bZMyX3wAyutNBLaH5gwKuyw0VZWirJ5fT9ZCyM4IlVxsq0DdSKyE7dwfPO6cN5q6HsXEEpwOzVw5lBHTadZJknVWDdYcnvV+Hxxn5AntxoyIMjyKhiNN9dR9dBrRkSY28xekuwk+asIbjbDntgbglqL X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f3dea97-6807-4ed4-5e18-08dbfa94972c X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4845.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 22:00:30.3430 (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: GrTVNfV54qIgVmQxTDg1xJayqvSp3dKE8ij1TA1sdFXF/BM+fZqh+em7Hp4mqxchKGdrkX6otuoYpc15VnvD8w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR04MB9717 Add iMX95 EP function support and add 64bit address support. Internal bus bridge for PCI support 64bit dma address in iMX95. So set call dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)). Signed-off-by: Frank Li --- Notes: Change from v1 to v3 - new patches at v3 drivers/pci/controller/dwc/pci-imx6.c | 44 +++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 8fe66d3e947a6..31df682432e24 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -76,6 +76,7 @@ enum imx6_pcie_variants { IMX8MQ_EP, IMX8MM_EP, IMX8MP_EP, + IMX95_EP, }; #define IMX6_PCIE_FLAG_IMX6_PHY BIT(0) @@ -87,6 +88,7 @@ enum imx6_pcie_variants { #define IMX6_PCIE_FLAG_HAS_APP_RESET BIT(6) #define IMX6_PCIE_FLAG_HAS_PHY_RESET BIT(7) #define IMX6_PCIE_FLAG_HAS_SERDES BIT(8) +#define IMX6_PCIE_FLAG_SUPPORT_64BIT BIT(9) #define imx6_check_flag(pci, val) (pci->drvdata->flags & val) @@ -630,6 +632,7 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) break; case IMX7D: case IMX95: + case IMX95_EP: break; case IMX8MM: case IMX8MM_EP: @@ -1099,6 +1102,23 @@ static const struct pci_epc_features imx8m_pcie_epc_features = { .align = SZ_64K, }; +/* + * BAR# | Default BAR enable | Default BAR Type | Default BAR Size | BAR Sizing Scheme + * ================================================================================================ + * BAR0 | Enable | 64-bit | 1 MB | Programmable Size + * BAR1 | Disable | 32-bit | 64 KB | Fixed Size + * | (BAR0 is 64-bit) | if BAR0 is 32-bit | | As Bar0 is 64bit + * BAR2 | Enable | 32-bit | 1 MB | Programmable Size + * BAR3 | Enable | 32-bit | 64 KB | Programmable Size + * BAR4 | Enable | 32-bit | 1M | Programmable Size + * BAR5 | Enable | 32-bit | 64 KB | Programmable Size + */ +static const struct pci_epc_features imx95_pcie_epc_features = { + .msi_capable = false, + .bar_fixed_size[1] = SZ_64K, + .align = SZ_64K, +}; + static const struct pci_epc_features* imx6_pcie_ep_get_features(struct dw_pcie_ep *ep) { @@ -1141,6 +1161,14 @@ static int imx6_add_pcie_ep(struct imx6_pcie *imx6_pcie, pci->dbi_base2 = pci->dbi_base + pcie_dbi2_offset; + /* + * db2 information should fetch from dtb file. dw_pcie_ep_init() can get dbi_base2 from + * "dbi2" if pci->dbi_base2 is NULL. All code related pcie_dbi2_offset should be removed + * after all dts added "dbi2" reg. + */ + if (imx6_pcie->drvdata->variant == IMX95_EP) + pci->dbi_base2 = NULL; + ret = dw_pcie_ep_init(ep); if (ret) { dev_err(dev, "failed to initialize endpoint\n"); @@ -1417,6 +1445,9 @@ static int imx6_pcie_probe(struct platform_device *pdev) "unable to find iomuxc registers\n"); } + if (imx6_check_flag(imx6_pcie, IMX6_PCIE_FLAG_SUPPORT_64BIT)) + dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)); + /* Grab PCIe PHY Tx Settings */ if (of_property_read_u32(node, "fsl,tx-deemph-gen1", &imx6_pcie->tx_deemph_gen1)) @@ -1614,6 +1645,18 @@ static const struct imx6_pcie_drvdata drvdata[] = { .mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE, .epc_features = &imx8m_pcie_epc_features, }, + [IMX95_EP] = { + .variant = IMX95_EP, + .flags = IMX6_PCIE_FLAG_HAS_CLK_AUX | IMX6_PCIE_FLAG_HAS_SERDES | + IMX6_PCIE_FLAG_SUPPORT_64BIT, + .ltssm_off = IMX95_PE0_GEN_CTRL_3, + .ltssm_mask = IMX95_PCIE_LTSSM_EN, + .mode_off[0] = IMX95_PE0_GEN_CTRL_1, + .mode_mask[0] = IMX95_PCIE_DEVICE_TYPE, + .init_phy = imx95_pcie_init_phy, + .epc_features = &imx95_pcie_epc_features, + .mode = DW_PCIE_EP_TYPE, + }, }; static const struct of_device_id imx6_pcie_of_match[] = { @@ -1628,6 +1671,7 @@ static const struct of_device_id imx6_pcie_of_match[] = { { .compatible = "fsl,imx8mq-pcie-ep", .data = &drvdata[IMX8MQ_EP], }, { .compatible = "fsl,imx8mm-pcie-ep", .data = &drvdata[IMX8MM_EP], }, { .compatible = "fsl,imx8mp-pcie-ep", .data = &drvdata[IMX8MP_EP], }, + { .compatible = "fsl,imx95-pcie-ep", .data = &drvdata[IMX95_EP], }, {}, };