From: Frank Li <Frank.Li@nxp.com>
To: manivannan.sadhasivam@linaro.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, lpieralisi@kernel.org,
robh@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org
Subject: [PATCH v5 14/16] PCI: imx6: Add epc_features in imx6_pcie_drvdata
Date: Wed, 20 Dec 2023 16:36:13 -0500 [thread overview]
Message-ID: <20231220213615.1561528-15-Frank.Li@nxp.com> (raw)
In-Reply-To: <20231220213615.1561528-1-Frank.Li@nxp.com>
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 4b2b9aafad1b4..6a58fd63a9dd2 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);
};
@@ -1065,7 +1066,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 = {
@@ -1530,6 +1534,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] = {
@@ -1540,6 +1545,7 @@ static const struct imx6_pcie_drvdata drvdata[] = {
.clk_names = {"pcie_bus", "pcie", "pcie_aux"},
.mode_off[0] = IOMUXC_GPR12,
.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
+ .epc_features = &imx8m_pcie_epc_features,
},
[IMX8MP_EP] = {
.variant = IMX8MP_EP,
@@ -1549,6 +1555,7 @@ static const struct imx6_pcie_drvdata drvdata[] = {
.clk_names = {"pcie_bus", "pcie", "pcie_aux"},
.mode_off[0] = IOMUXC_GPR12,
.mode_mask[0] = IMX6Q_GPR12_DEVICE_TYPE,
+ .epc_features = &imx8m_pcie_epc_features,
},
};
--
2.34.1
next prev parent reply other threads:[~2023-12-20 21:37 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-20 21:35 [PATCH v5 00/16] PCI: imx6: Clean up and add imx95 pci support Frank Li
2023-12-20 21:36 ` [PATCH v5 01/16] PCI: imx6: Simplify clock handling by using bulk_clk_*() function Frank Li
2023-12-20 21:36 ` [PATCH v5 02/16] PCI: imx6: Simplify phy handling by using by using IMX6_PCIE_FLAG_HAS_PHY Frank Li
2023-12-20 21:36 ` [PATCH v5 03/16] PCI: imx6: Simplify reset handling by using by using *_FLAG_HAS_*_RESET Frank Li
2023-12-20 21:36 ` [PATCH v5 04/16] dt-bindings: imx6q-pcie: Add linux,pci-domain as required for iMX8MQ Frank Li
2023-12-23 18:40 ` Krzysztof Kozlowski
2023-12-24 4:29 ` Frank Li
2023-12-24 9:02 ` Krzysztof Kozlowski
2023-12-20 21:36 ` [PATCH v5 05/16] PCI: imx6: Using "linux,pci-domain" as slot ID Frank Li
2023-12-20 21:36 ` [PATCH v5 06/16] PCI: imx6: Simplify ltssm_enable() by using ltssm_off and ltssm_mask Frank Li
2023-12-20 21:36 ` [PATCH v5 07/16] PCI: imx6: Simplify configure_type() by using mode_off and mode_mask Frank Li
2023-12-20 21:36 ` [PATCH v5 08/16] PCI: imx6: Simplify switch-case logic by involve init_phy callback Frank Li
2023-12-20 21:36 ` [PATCH v5 09/16] dt-bindings: imx6q-pcie: Clean up irrationality clocks check Frank Li
2023-12-23 18:42 ` Krzysztof Kozlowski
2023-12-24 4:43 ` Frank Li
2023-12-24 9:04 ` Krzysztof Kozlowski
2023-12-20 21:36 ` [PATCH v5 10/16] dt-bindings: imx6q-pcie: remove reg and reg-name Frank Li
2023-12-21 22:50 ` Rob Herring
2023-12-23 3:46 ` Frank Li
2023-12-23 18:43 ` Krzysztof Kozlowski
2023-12-24 4:34 ` Frank Li
2023-12-24 9:06 ` Krzysztof Kozlowski
2023-12-20 21:36 ` [PATCH v5 11/16] dt-bindings: imx6q-pcie: Add imx95 pcie compatible string Frank Li
2023-12-21 22:52 ` Rob Herring
2023-12-20 21:36 ` [PATCH v5 12/16] PCI: imx6: Add iMX95 PCIe support Frank Li
2023-12-20 21:36 ` [PATCH v5 13/16] PCI: imx6: Clean up get addr_space code Frank Li
2023-12-20 21:36 ` Frank Li [this message]
2023-12-20 21:36 ` [PATCH v5 15/16] dt-bindings: imx6q-pcie: Add iMX95 pcie endpoint compatible string Frank Li
2023-12-23 18:44 ` Krzysztof Kozlowski
2023-12-24 4:47 ` Frank Li
2023-12-24 9:09 ` Krzysztof Kozlowski
2023-12-24 9:07 ` Krzysztof Kozlowski
2023-12-20 21:36 ` [PATCH v5 16/16] PCI: imx6: Add iMX95 Endpoint (EP) function support Frank Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231220213615.1561528-15-Frank.Li@nxp.com \
--to=frank.li@nxp.com \
--cc=bhelgaas@google.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=helgaas@kernel.org \
--cc=hongxing.zhu@nxp.com \
--cc=imx@lists.linux.dev \
--cc=kernel@pengutronix.de \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=kw@linux.com \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox