Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
From:   Frank Li <Frank.Li@nxp.com>
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>
In-Reply-To: <20231211215842.134823-1-Frank.Li@nxp.com>
References: <20231211215842.134823-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?syv46mRJQ3XpRPPB5UZ1EOtzmxa2pWkcz6EWveqDWQ/Zubne2ODMxjPIqtmr?=
 =?us-ascii?Q?uKeAvaALR4n04GFWKcKIrm0/NJcoe42p8mdsHPQ7RnMX2Sm1rdpuxMNr2Pto?=
 =?us-ascii?Q?R26Hto4FLxLjLou3sj6WzLUkcR/biDJeNZ5a4lP5N5hWKukn9RhhFhDKag2g?=
 =?us-ascii?Q?liOotzJxwVjBHonpVCGSYyYDtXwQDXf8dOdjx8O3EmnUQSpzPT98oI4ft2Is?=
 =?us-ascii?Q?ZQ7ouCL+nhDkLUkDijR3oMX6Q74Ag54IwQ0T6qQ9f9mSJzeEGA8q/ZcxKMnc?=
 =?us-ascii?Q?m8cia8jaiTKK9lqnHlxWyIrhmRzJ5pxo1nlsUVWaOlBwoTshzWZ1S39Fyw3m?=
 =?us-ascii?Q?k2MPlATe9OulycfPI4XwTcHhUNDaqRziqp3iqUAJPRD/1iQtCr1ayjYevaVL?=
 =?us-ascii?Q?7ips1Uqr5WHkaK8fQDoILe0A0aqildnknOew19C6HTEH4tyBU6h505t3D1dQ?=
 =?us-ascii?Q?Z7+Di2O3/96PJevJBSuzpHLRk/yGuE+oU2YpYaUkrFgsCO8bnd78pr+aX7SV?=
 =?us-ascii?Q?6Ubt0xQBLbPDfReqYeYTpPt9No3bcbpYSOMrxcn6k8TRYGXCaVpR6qITkfid?=
 =?us-ascii?Q?N2RtSfTL/ozYYP3SL1n25h6orzcmK+Z6jPjSkI+9dcob7VdmztWgdTLXnDvM?=
 =?us-ascii?Q?njh7Cotmoocn9llj0TDU247Tccnf5YGpAmSfO1TpuowRtEHXT3ivkQyjTTee?=
 =?us-ascii?Q?yv1NQdxZ6OhrbWzyJiXrOO3tuwb1yyfD6L8wq7jgIyj2qR6hW7qvBBlJn7Oo?=
 =?us-ascii?Q?09FqVkmTRLQqWOf6IDMadK5yE4pvm+zlwL+li0TZirQ7FUG8oxUjKGPDTZX1?=
 =?us-ascii?Q?wry6BDM4GGu5KrzstbKoeVPHOKWhoUwplfFTLFudJ4VQI0gCq5QrPapPtWPm?=
 =?us-ascii?Q?5l7dnMcIXecADdn9kKs8JliPDh9ylUCsS5AForv4wa+xwbdae1Iv1ElpLFKd?=
 =?us-ascii?Q?vsVUq0gq2Q0887vKe3f0OHwwL0nGgSPHTUNwbkQqCH4QyVYJRTPlc7y2IyH0?=
 =?us-ascii?Q?lvartHSFIKtXAjQgLVTxFbBU6lVNPsebIKDyKrXwBYJJ+HlhZCC8W9+0B8hx?=
 =?us-ascii?Q?pO2N00YtF61mjm8ciyLVRzlVN4x+cZW21e27xkbMkCVoNLP8Po7I0E5XjhY+?=
 =?us-ascii?Q?Y+EdWWUswrYTQqWxhv2WNzgoOJYbO5/aclf1hIGv5wwTiCjrsgqbx3R64iol?=
 =?us-ascii?Q?HGIrzYaEURUkXb+Cmp0P4uMHh9oEm9s+P+QCqP6BoZjgbSGg82I33ePgnOkx?=
 =?us-ascii?Q?HSd0iMA3uUqJHPOOqQLpz1uLjyzXyY1GWKYGv9LUsk3/WrsmKfKbT8yj2aDZ?=
 =?us-ascii?Q?+CNnpVYeWAbjM3ydRDlFZm2P/l0fMoHUldU/ue8rNQktT8XKlVnlf2IaWO6L?=
 =?us-ascii?Q?JzJ2Wz4QzHtHgFSK12Pu2MDUKsF/a7FH+7A+s7O0q0FNNFKVhYCKbhMVkAdq?=
 =?us-ascii?Q?HdXgiHG66bZMyX3wAyutNBLaH5gwKuyw0VZWirJ5fT9ZCyM4IlVxsq0DdSKy?=
 =?us-ascii?Q?E7dwfPO6cN5q6HsXEEpwOzVw5lBHTadZJknVWDdYcnvV+Hxxn5AntxoyIMjy?=
 =?us-ascii?Q?KhiNN9dR9dBrRkSY28xekuwk+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
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 11 Dec 2023 14:01:08 -0800 (PST)

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 <Frank.Li@nxp.com>
---

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], },
 	{},
 };
 
-- 
2.34.1