Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
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 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>
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?sPGK5T44FVd+ySVZ256cT1eQZBestxU13kBmNkL3DWqK84Paq/TE6FcW+aEd?=
 =?us-ascii?Q?gpURshHATKvcVX+5ufq2GieIvhYkPBvzt+n1j19OEk9RuZgPJxhFqmrutvKQ?=
 =?us-ascii?Q?laDC8DQS6QSECms4783WdydukuReGJQzilRF8B8o1OlGpXB3H/RvzgWTUFEW?=
 =?us-ascii?Q?++dy11CEk+b57yt9M+NLvsjcF3I9vtzPTss0rQowwWUbQu/lfxfU920SGOI6?=
 =?us-ascii?Q?eqEUfdDmxN4skz+Oxrom0zTNNln43skikCafLlkE8tQK8RU5zXfhCuaeTRaF?=
 =?us-ascii?Q?8pTpaO/TvMagSd6Rq20vLyaN9cY6tj5PuaQWdA/unDGGBncxUno5XyOlHcYO?=
 =?us-ascii?Q?nKaqRBorju9QK5xc5OoOTgcMYScgNpqx20UMFwfCTu7s2AHeXlC/rH9XZO/B?=
 =?us-ascii?Q?rtILVgOcHbOmKtLO5XDcmWeY1suoMovVvenPdQBGpL9xX6fV8e1lOQIcX3P0?=
 =?us-ascii?Q?z3582j6NEOxaKByClWdrWEWWhcR4HHvEiUD1L1QjJ6DRcyTG+WTm7PtelTnP?=
 =?us-ascii?Q?VqxqlohmneAxk19Hz6jp0q8RAqVXXoTJP94/XIXZEolx7MIDzfAEU2uJXKNz?=
 =?us-ascii?Q?VvXPGmP0ZVTpVW6dRZz1OdT1nY8+wpsjz7C3gous0Ab/DGXV0JGUA81S1CmW?=
 =?us-ascii?Q?3MnF74B10aL/zD/x3bDMZfdDJxHy4WfOLgF3phBo/Pfv1HTKToHQqKR89DX+?=
 =?us-ascii?Q?bdVVVjDFZ10sy9UKdJXGXJhRSfGkMkHEU6uAORBfDg2NO+rNpOiOanz5EVRO?=
 =?us-ascii?Q?eMF5XWBb8kvh1WYUmDud0i3C0xFuDVaguiwTB0ht50Gp9PwQPBhwFR6Ai9+N?=
 =?us-ascii?Q?KXod9I/PHXeRbn9EOogIVdBK34YCH22vl+Snc07ZbTT5+BXbpuZCTFzsliH4?=
 =?us-ascii?Q?Wp452z9fGsdh81W80UMFOqwPMusv9BpOBSddjNqyqZgGKIjk1JCRmcE5e8dn?=
 =?us-ascii?Q?NShvYAEUM6K+VfiUX92y4XIBsP5ArwjQND8vcHMdRTFBH+z0FT9OtHwFqHSG?=
 =?us-ascii?Q?9s4grs9sb0g9VVfQrkjeU9aoWv/A2oQZaU1Rko+PtSVf+ugGrEQ23tnQjO8s?=
 =?us-ascii?Q?hOALUCSBR1DUUFIKBz/DCijn1f2OppVfEymgr1WTPBLa62RXMG3+xXgfRL24?=
 =?us-ascii?Q?MfmCPHzp1S71oVE4k9Ce4d5hbLlrfCAts6uEz17sNWLqYbtRZOIHtiIBrC0M?=
 =?us-ascii?Q?N/JvRHI0TIIxUSDFW6eqzVn6DLPxLBJaNl6nMkq2W65srkHWe/6ZteiGLXNJ?=
 =?us-ascii?Q?RJX6MiMusOnLPygmYj+SVF/kigvikkR84ul5NbTjybAtriI/j4rtEaUbQkFu?=
 =?us-ascii?Q?Xx6COwdsQkRNXR4sijK9kouIdQhzK6JwFuIKOZlx48CJZ8qM/qlG54+IJ156?=
 =?us-ascii?Q?dJY35N/qp/z06DwF/3zplviDlQMDkGrMrKf4zw3t/DKnJ90bb54WmNem6K1M?=
 =?us-ascii?Q?uuHsGRLUYu7OZxJONEq28fHwFw+ZIlKp3c3kvjjAKEWKF6RVvF+KLxH5CUkj?=
 =?us-ascii?Q?p06k77pYHeY4HJd511K6VHbTVET6TVys/Ca504RFpT7/drOvOw5CPMAHnrZI?=
 =?us-ascii?Q?O+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
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email
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 (morse.vger.email [0.0.0.0]); Mon, 11 Dec 2023 14:01:35 -0800 (PST)

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

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