Received-SPF: pass (google.com: domain of linux-kernel+bounces-53127-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Frank Li <Frank.Li@nxp.com>
To: lpieralisi@kernel.org
Cc: Frank.li@nxp.com,
	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,
	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 v10 14/14] PCI: imx6: Add iMX95 Endpoint (EP) support
Date: Mon,  5 Feb 2024 12:33:35 -0500
Message-Id: <20240205173335.1120469-15-Frank.Li@nxp.com>
In-Reply-To: <20240205173335.1120469-1-Frank.Li@nxp.com>
References: <20240205173335.1120469-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?ykQ/v4WvwNN2yWtMb4W6On1GI+wtqJ7KoRs+pSojf4tO7UUMtjTMvyT5yBAi?=
 =?us-ascii?Q?fRZKnIXoKvtjtHTvaZArpO797QHDRLhGZyz+a9DJ5/I9GxLFLHMDclz9QHSf?=
 =?us-ascii?Q?CCCMQ+/lUKHqM9+dVvhM5NHFrRsPf1l4Os2a6149H0797Poy4ujY4iontVBY?=
 =?us-ascii?Q?ah7/DDGMnOGAwyF5dvbySEsFmNLA9x+ESftmh0g60j8ZwBiP9c6kGBgwflaf?=
 =?us-ascii?Q?yMEAZBKL0hQrGaAWmCQs+1R029MonYXDpmgpKJuuoV2i15i/pSe/572VuiEv?=
 =?us-ascii?Q?nlqPJKhHAuj0nXNzo2f164yFqvNWg7Av6CNbL+5ffiqoPaTibZg1ZKay0Iay?=
 =?us-ascii?Q?ALa0svrepNNXQXU+8qN13fke6oaW/Xjd450bFj+U1v2LqfnAqsDQTRPsr5TT?=
 =?us-ascii?Q?GxxRf7Ecjwd6CDWSFpZ0Ea7HPH1wFbn0Rp9qlUgE6Xi9TQbDbWcPTK1sVWUH?=
 =?us-ascii?Q?M1T4CkIEY1z9fdPU/YyUeyE0wUJ2x7Gz6dyF/oC/TR0eX14lTdtpm9vb7HJE?=
 =?us-ascii?Q?/fVqjHTICl28en+8CrY3S9HPSOfejY+GiGPQ1FLoqU099IN81Sz90c0RwWbB?=
 =?us-ascii?Q?3MvX0oSNZxac5esbBIHrkIK4hzKMPzQ5v+OBa4yUzQ1iQSIxg9gtq72kap69?=
 =?us-ascii?Q?hTvaqhgwQESfEj8ZYWNW+qdpUqr4moG2IwGy/Mb+ZCOQQ5fQB6rV8mXb5WSB?=
 =?us-ascii?Q?rYNUKia+6sgwp01UIN1nEDY7MG+0i4E8LkzEdbEzuIcRNwm/Vr6k8MYDjkWK?=
 =?us-ascii?Q?pAequUnA3PygugO5WCL3kTHv1IJ22w/fAmqlZ09kLQXN6f4mhi+atSHTHY2k?=
 =?us-ascii?Q?jwAm0LgIBwzyBdUdz3icWF5nJezSzYKhT/4QUt6SuYFV74d0ZymoxTEFcd4U?=
 =?us-ascii?Q?2VSw//XdjKkV2+cyX6ind4GYdDqzbYiH647nZ7c17STuFb7Ohx0eQwKnRi9u?=
 =?us-ascii?Q?NGTYzUWShmWl33w1akuXYb3EcrF6yIKPiETLAEV1WAMEgGlmg39meNe6WSU6?=
 =?us-ascii?Q?t2Nmnc1WBedpc9WIbr5Z+Rt+V0hkAATYSL+ubCPD/ZaC3f9DeWn/ls61IyVO?=
 =?us-ascii?Q?4wq4VVmiyvmrhI3ws0y/zV/kZnu4sG6SpXTTloLGYuJtIB5+OewJPCFKeYS3?=
 =?us-ascii?Q?ZLGMl2vgZJJ/rrxTsVd7UA2KRX2QNntxE3AydhiNl/kI8Ueg/ZqX25WT+sDD?=
 =?us-ascii?Q?MCDBXJGn/EC+8TmfXzQ8cvx30m6cc9j0cHhewciRff+POj2OQhOn0fQhhRaI?=
 =?us-ascii?Q?9qah0JU9RlUp7XDOPWz2Zhl1lm2ybaPsVJBddGx2Wgw9zPgeI1ozbGchFw8x?=
 =?us-ascii?Q?Zqp6vRCYid9XCUMF/IKDSlIo3ygE0VyJD3E8YIUaan6Rw9BylwqOXme5QTf0?=
 =?us-ascii?Q?fAOW0+LryMXSNAK2Va1mqffay/fodLPDdMwDkPyk7v6xN9lLfjEcWNHmWD6W?=
 =?us-ascii?Q?HvDJEoOsCILx7i5FhA6op9d22IhOxw1uD2rMKK0MouJZo9i15dyMtLqqI34d?=
 =?us-ascii?Q?MskRvaQE5C1uwZnP+01/hi7/GIYPy+bJBohCIDo9MOADuGLzv72CyIlBooKC?=
 =?us-ascii?Q?IQlO8wurZXvQz7TY6RF83Gr/y+ComIbs4lbq6Rk3?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0c7c54d9-07bf-4524-3a32-08dc2670c98d
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 17:35:04.1237
 (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: 8rwC4rkRTUqkyTYgWTOyVQpVSyq8P9X3KwwvGJjTLeKRHSCSAYU1ZDfM8SON25NALPbaneUtvoMKHfODQ63rJw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7080

Add iMX95 EP support and add 64bit address support. Internal bus bridge for
PCI support 64bit dma address in iMX95. Hence, call
dma_set_mask_and_coherent() to set 64 bit DMA mask.

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

Notes:
    Change from v9 to v10
    - using if (device_property_match_string(dev, "reg-names", "dbi2")) instead of
    	if (imx6_pcie->drvdata->variant == IMX95_EP)
    - so other platform can stat use "dbi2" in dts.
    
    @Mani: I change to check device_property_match_string(), so I can update
    other platform dts file, It should be better than
    	imx6_pcie->drvdata->variant == IMX95_EP
    
    Change from v8 to v9
    - update fixme comments
    - update BAR1 comments
    - Add mani's review tag
    Change from v7 to v8
    - Update commit message
    - Using Fixme
    - Update clks_cnts by ARRAY_SIZE
    
    Change from v4 to v7
    - none
    Change from v3 to v4
    - change align to 4k for imx95
    Change from v1 to v3
    - new patches at v3

 drivers/pci/controller/dwc/pci-imx6.c | 47 +++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index c2098e59fde1e..472ff1cc17d2f 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -75,6 +75,7 @@ enum imx6_pcie_variants {
 	IMX8MQ_EP,
 	IMX8MM_EP,
 	IMX8MP_EP,
+	IMX95_EP,
 };
 
 #define IMX6_PCIE_FLAG_IMX6_PHY			BIT(0)
@@ -84,6 +85,7 @@ enum imx6_pcie_variants {
 #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_PCIE_FLAG_SUPPORT_64BIT		BIT(7)
 
 #define imx6_check_flag(pci, val)     (pci->drvdata->flags & val)
 
@@ -616,6 +618,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:
@@ -1050,6 +1053,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
+ *        BAR1 should be disabled if 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 = true,
+	.bar_fixed_size[1] = SZ_64K,
+	.align = SZ_4K,
+};
+
 static const struct pci_epc_features*
 imx6_pcie_ep_get_features(struct dw_pcie_ep *ep)
 {
@@ -1092,6 +1112,15 @@ static int imx6_add_pcie_ep(struct imx6_pcie *imx6_pcie,
 
 	pci->dbi_base2 = pci->dbi_base + pcie_dbi2_offset;
 
+	/*
+	 * FIXME: Ideally, dbi2 base address should come from DT. But since only IMX95 is defining
+	 * "dbi2" in DT, "dbi_base2" is set to NULL here for that platform alone so that the DWC
+	 * core code can fetch that from DT. But once all platform DTs were fixed, this and the
+	 * above "dbi_base2" setting should be removed.
+	 */
+	if (device_property_match_string(dev, "reg-names", "dbi2") >= 0)
+		pci->dbi_base2 = NULL;
+
 	ret = dw_pcie_ep_init(ep);
 	if (ret) {
 		dev_err(dev, "failed to initialize endpoint\n");
@@ -1343,6 +1372,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))
@@ -1561,6 +1593,20 @@ 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_SERDES |
+			 IMX6_PCIE_FLAG_SUPPORT_64BIT,
+		.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,
+		.epc_features = &imx95_pcie_epc_features,
+		.mode = DW_PCIE_EP_TYPE,
+	},
 };
 
 static const struct of_device_id imx6_pcie_of_match[] = {
@@ -1575,6 +1621,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], },
 	{},
 };
 
-- 
2.34.1