Received-SPF: pass (google.com: domain of linux-kernel+bounces-73338-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Frank Li <Frank.Li@nxp.com>
To: lpieralisi@kernel.org
Cc: Frank.li@nxp.com,
	bhelgaas@google.com,
	cassel@kernel.org,
	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,
	krzysztof.kozlowski@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,
	manivannan.sadhasivam@linaro.org,
	robh@kernel.org,
	s.hauer@pengutronix.de,
	shawnguo@kernel.org
Subject: [PATCH v11 10/14] PCI: imx6: Add iMX95 PCIe Root Complex support
Date: Tue, 20 Feb 2024 11:19:20 -0500
Message-Id: <20240220161924.3871774-11-Frank.Li@nxp.com>
In-Reply-To: <20240220161924.3871774-1-Frank.Li@nxp.com>
References: <20240220161924.3871774-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?YI0UJ/nZECsfOGAkC5y9Inh88Xa5dsB2bKeimluXnPOHTdddAJRlvHjYDhAv?=
 =?us-ascii?Q?daPUMnT8NtngyTizeIr+81It9rjsZlaCuArOWqk1UwaR3VjR06ffS/lpew7R?=
 =?us-ascii?Q?+aCoXddioCqK1NU37uF5EdqQb4Y3qYm8R0WeMG1vuEZFEKpQgmw5wps+jj7g?=
 =?us-ascii?Q?dcMq53ynpQuJtxZr4vkuhj7XYj0YGuY+3qYsL+MX4AhPjngLQ2RJQooFmEG7?=
 =?us-ascii?Q?//1A341y6RArNv+FBARaXWNPx4f6AG83XC5t8pEIEXQeaE9OZGpkPlPHHEXF?=
 =?us-ascii?Q?fmXsyXdVYjr3f9JdMyvd7mQwdu8dsCsT+uf0uLyONNxPECyTVKu0kYrTER2g?=
 =?us-ascii?Q?DERC9RTHqp3Bzp73J/vOQmByghpKRGUeepzoSjIi8Q7QCp4cQvldG93Mk8bp?=
 =?us-ascii?Q?EQrxGJW4rXTpHsXkctGZ18KHbokGO9qvLDOsY1wU7ZxO48oaTCZvImw2T0V+?=
 =?us-ascii?Q?qTMbdPuz49KWmWMus2enXTGCXq1UC1EyPrwdXGj1SSZlHhEdLqKe9sahxu0F?=
 =?us-ascii?Q?9jn6g8AxmOqHYM3fHu6/NnGkP006/Fp/0uCECl6BF8BA0r0HZkJ6B/ceNANV?=
 =?us-ascii?Q?Gk6BvPl+FcXTm88bxToLGMFbEHY8uUsXEACAtxkp5C6s5o+1L15f5U3YWEuL?=
 =?us-ascii?Q?vmjJR5ZSdtU/+0fFcxJ38LQEA3cVslzFDUbG36ln1eY5GSFPnDcQu+DA0+1V?=
 =?us-ascii?Q?oMXjoFw9ajHVi+IxCxgeOc+aklXc+v9NGn07iXtnWFl404NhcPPE61gqQGLB?=
 =?us-ascii?Q?CuS4Z8cIY3Qfo+Sje6+5BJ9E4Ik/MpbpmiJQe5iThQgkWR49Fgp6qrPQ5pdt?=
 =?us-ascii?Q?wQ+1H6jky6BCM4cGsA6ZVHzOXUPMYj1xCL/HYUfjbnWDP/K0V1sCTXw6QvwN?=
 =?us-ascii?Q?U1YzMY5HnV3mjg7ygzlBvhDjuKvvvpebcqRHuAhWfamDq8m4m1dvkRoy81vJ?=
 =?us-ascii?Q?C1H1VVFaA6/ACMpmnYCOIRrHNaoHoeeLpIj3me+KfG5T3+IhRZTEKVs2za1H?=
 =?us-ascii?Q?C7YY/pXOADkmeMmE8aGb1rqIFHx98ghuruk3L31SfP99g0YWjwI1l4SqEyXX?=
 =?us-ascii?Q?S5uBolOtoCsN9POwAGwVr6Jc7Y3WzUpFZIaemCLmeZ8wSjJJmxO4DAdNHQP8?=
 =?us-ascii?Q?cbrDaN5sWTfWECLyLUaG5pJn3mjIDPYAYoVpuk6AKHCMsmB1CW/kCB+skAYF?=
 =?us-ascii?Q?uQquCBGbo/08mHlFivKR6wqPyMYVVF29eMdXZLP7fIy403ViqP/1tr5zPaMj?=
 =?us-ascii?Q?nqnkKviTDH71QBtXyH2a8HpAljgMmkcpWIqWbme86SNsbt1D4CnJ+qQUvrf/?=
 =?us-ascii?Q?oLQdoGZH+KQEdKlmtx6MSzmzP394+A12TXbajQOq1S84CAyGa0o/MQgh5NEn?=
 =?us-ascii?Q?s/5+lUS2Jf8mgmN4TgOp5kOpOojNsJtBw0ibgDGYsU2CM5fA1itqHgk8MvRP?=
 =?us-ascii?Q?My/Yfrx720YqG0p11bLn0OrXXBeXPyse4d3k79odntOfWAGzb9RdFRqm2QS4?=
 =?us-ascii?Q?dt1TtaZP27cktLy4KbSf/w/W5FlPtledRod3mj+1e+22pg0RQrTtJoU4JjZ0?=
 =?us-ascii?Q?3/MYl2aHxKc71YW8MVUPW5m7VM/QnHQwALdSsPBK?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: aa727374-9860-4a13-6d4e-08dc322fdee5
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2024 16:20:36.5440
 (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: 3Z8rTCEl2kz6QKczF+FlPcI/DTV4a6hP+0wpsML6XJOwDQ65XdoirwEhKloGese0Nqwtmjh4ojXQwyyP+nApwA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7295

Add iMX95 PCIe Root Complex support.

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---

Notes:
    Change from v8 to v9
    - Add mani's review tag
    
    Change from v7 to v8
    - Update commit subject
    - add const from regmap
    - remove unnessary logic in imx6_pcie_deassert_core_reset()
    
    Change from v4 to v7
    - none
    Change from v1 to v3
    - none

 drivers/pci/controller/dwc/pci-imx6.c | 82 +++++++++++++++++++++++++--
 1 file changed, 77 insertions(+), 5 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 71ce6b7ac1de0..582ba00d628a1 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -42,6 +42,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 {
@@ -52,6 +71,7 @@ enum imx6_pcie_variants {
 	IMX8MQ,
 	IMX8MM,
 	IMX8MP,
+	IMX95,
 	IMX8MQ_EP,
 	IMX8MM_EP,
 	IMX8MP_EP,
@@ -63,6 +83,7 @@ enum imx6_pcie_variants {
 #define IMX6_PCIE_FLAG_HAS_PHYDRV			BIT(3)
 #define IMX6_PCIE_FLAG_HAS_APP_RESET		BIT(4)
 #define IMX6_PCIE_FLAG_HAS_PHY_RESET		BIT(5)
+#define IMX6_PCIE_FLAG_HAS_SERDES		BIT(6)
 
 #define imx6_check_flag(pci, val)     (pci->drvdata->flags & val)
 
@@ -179,6 +200,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;
@@ -575,6 +614,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:
@@ -1279,12 +1319,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, "app");
+
+		if (IS_ERR(off))
+			return dev_err_probe(dev, PTR_ERR(off),
+					     "unable to find serdes registers\n");
+
+		static const struct regmap_config regmap_config = {
+			.reg_bits = 32,
+			.val_bits = 32,
+			.reg_stride = 4,
+		};
+
+		imx6_pcie->iomuxc_gpr = devm_regmap_init_mmio(dev, off, &regmap_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 */
@@ -1457,6 +1517,17 @@ 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_SERDES,
+		.clk_names = imx8mq_clks,
+		.clks_cnt = ARRAY_SIZE(imx8mq_clks),
+		.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_APP_RESET |
@@ -1501,6 +1572,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], },
-- 
2.34.1