[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID:
<SN7PR12MB720170AD6430415A10A3F0118BC02@SN7PR12MB7201.namprd12.prod.outlook.com>
Date: Mon, 24 Feb 2025 06:35:00 +0000
From: "Havalige, Thippeswamy" <thippeswamy.havalige@....com>
To: "Havalige, Thippeswamy" <thippeswamy.havalige@....com>,
"bhelgaas@...gle.com" <bhelgaas@...gle.com>, "lpieralisi@...nel.org"
<lpieralisi@...nel.org>, "kw@...ux.com" <kw@...ux.com>,
"manivannan.sadhasivam@...aro.org" <manivannan.sadhasivam@...aro.org>,
"robh@...nel.org" <robh@...nel.org>, "krzk+dt@...nel.org"
<krzk+dt@...nel.org>, "conor+dt@...nel.org" <conor+dt@...nel.org>
CC: "linux-pci@...r.kernel.org" <linux-pci@...r.kernel.org>,
"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, "Simek,
Michal" <michal.simek@....com>, "Gogada, Bharat Kumar"
<bharat.kumar.gogada@....com>
Subject: RE: [PATCH v3 2/2] PCI: xilinx-cpm: Add support for Versal Net CPM5NC
Root Port controller
[AMD Official Use Only - AMD Internal Distribution Only]
Hi Manivannan Sadhasivam,
Could you please provide an update on this patch.
Regards,
Thippeswamy H
> -----Original Message-----
> From: Thippeswamy Havalige <thippeswamy.havalige@....com>
> Sent: Monday, February 17, 2025 12:57 PM
> To: bhelgaas@...gle.com; lpieralisi@...nel.org; kw@...ux.com;
> manivannan.sadhasivam@...aro.org; robh@...nel.org; krzk+dt@...nel.org;
> conor+dt@...nel.org
> Cc: linux-pci@...r.kernel.org; devicetree@...r.kernel.org; linux-
> kernel@...r.kernel.org; Simek, Michal <michal.simek@....com>; Gogada,
> Bharat Kumar <bharat.kumar.gogada@....com>; Havalige, Thippeswamy
> <thippeswamy.havalige@....com>
> Subject: [PATCH v3 2/2] PCI: xilinx-cpm: Add support for Versal Net CPM5NC
> Root Port controller
>
> The Versal Net ACAP (Adaptive Compute Acceleration Platform) devices
> incorporate the Coherency and PCIe Gen5 Module, specifically the
> Next-Generation Compact Module (CPM5NC).
>
> The integrated CPM5NC block, along with the built-in bridge, can function
> as a PCIe Root Port & supports the PCIe Gen5 protocol with data transfer
> rates of up to 32 GT/s, capable of supporting up to a x16 lane-width
> configuration.
>
> Bridge errors are managed using a specific interrupt line designed for
> CPM5N. Intx interrupt support is not available.
>
> Currently in this commit platform specific Bridge errors support is not
> added.
>
> Signed-off-by: Thippeswamy Havalige <thippeswamy.havalige@....com>
> ---
> Changes in v2:
> - Update commit message.
> ---
> drivers/pci/controller/pcie-xilinx-cpm.c | 48 ++++++++++++++++--------
> 1 file changed, 32 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/pci/controller/pcie-xilinx-cpm.c
> b/drivers/pci/controller/pcie-xilinx-cpm.c
> index 81e8bfae53d0..9b241c665f0a 100644
> --- a/drivers/pci/controller/pcie-xilinx-cpm.c
> +++ b/drivers/pci/controller/pcie-xilinx-cpm.c
> @@ -84,6 +84,7 @@ enum xilinx_cpm_version {
> CPM,
> CPM5,
> CPM5_HOST1,
> + CPM5NC_HOST,
> };
>
> /**
> @@ -478,6 +479,9 @@ static void xilinx_cpm_pcie_init_port(struct
> xilinx_cpm_pcie *port)
> {
> const struct xilinx_cpm_variant *variant = port->variant;
>
> + if (variant->version != CPM5NC_HOST)
> + return;
> +
> if (cpm_pcie_link_up(port))
> dev_info(port->dev, "PCIe Link is UP\n");
> else
> @@ -493,18 +497,16 @@ static void xilinx_cpm_pcie_init_port(struct
> xilinx_cpm_pcie *port)
> XILINX_CPM_PCIE_REG_IDR);
>
> /*
> - * XILINX_CPM_PCIE_MISC_IR_ENABLE register is mapped to
> - * CPM SLCR block.
> + * XILINX_CPM_PCIE_MISC_IR_ENABLE register is mapped to CPM
> SLCR block.
> */
> writel(variant->ir_misc_value,
> port->cpm_base + XILINX_CPM_PCIE_MISC_IR_ENABLE);
>
> - if (variant->ir_enable) {
> + if (variant->ir_enable)
> writel(XILINX_CPM_PCIE_IR_LOCAL,
> port->cpm_base + variant->ir_enable);
> - }
>
> - /* Set Bridge enable bit */
> + /* Set Bridge enable bit */
> pcie_write(port, pcie_read(port, XILINX_CPM_PCIE_REG_RPSC) |
> XILINX_CPM_PCIE_REG_RPSC_BEN,
> XILINX_CPM_PCIE_REG_RPSC);
> @@ -578,16 +580,18 @@ static int xilinx_cpm_pcie_probe(struct
> platform_device *pdev)
>
> port->dev = dev;
>
> - err = xilinx_cpm_pcie_init_irq_domain(port);
> - if (err)
> - return err;
> + port->variant = of_device_get_match_data(dev);
> +
> + if (port->variant->version != CPM5NC_HOST) {
> + err = xilinx_cpm_pcie_init_irq_domain(port);
> + if (err)
> + return err;
> + }
>
> bus = resource_list_first_type(&bridge->windows,
> IORESOURCE_BUS);
> if (!bus)
> return -ENODEV;
>
> - port->variant = of_device_get_match_data(dev);
> -
> err = xilinx_cpm_pcie_parse_dt(port, bus->res);
> if (err) {
> dev_err(dev, "Parsing DT failed\n");
> @@ -596,10 +600,12 @@ static int xilinx_cpm_pcie_probe(struct
> platform_device *pdev)
>
> xilinx_cpm_pcie_init_port(port);
>
> - err = xilinx_cpm_setup_irq(port);
> - if (err) {
> - dev_err(dev, "Failed to set up interrupts\n");
> - goto err_setup_irq;
> + if (port->variant->version != CPM5NC_HOST) {
> + err = xilinx_cpm_setup_irq(port);
> + if (err) {
> + dev_err(dev, "Failed to set up interrupts\n");
> + goto err_setup_irq;
> + }
> }
>
> bridge->sysdata = port->cfg;
> @@ -612,11 +618,13 @@ static int xilinx_cpm_pcie_probe(struct
> platform_device *pdev)
> return 0;
>
> err_host_bridge:
> - xilinx_cpm_free_interrupts(port);
> + if (port->variant->version != CPM5NC_HOST)
> + xilinx_cpm_free_interrupts(port);
> err_setup_irq:
> pci_ecam_free(port->cfg);
> err_parse_dt:
> - xilinx_cpm_free_irq_domains(port);
> + if (port->variant->version != CPM5NC_HOST)
> + xilinx_cpm_free_irq_domains(port);
> return err;
> }
>
> @@ -639,6 +647,10 @@ static const struct xilinx_cpm_variant cpm5_host1 =
> {
> .ir_enable = XILINX_CPM_PCIE1_IR_ENABLE,
> };
>
> +static const struct xilinx_cpm_variant cpm5n_host = {
> + .version = CPM5NC_HOST,
> +};
> +
> static const struct of_device_id xilinx_cpm_pcie_of_match[] = {
> {
> .compatible = "xlnx,versal-cpm-host-1.00",
> @@ -652,6 +664,10 @@ static const struct of_device_id
> xilinx_cpm_pcie_of_match[] = {
> .compatible = "xlnx,versal-cpm5-host1",
> .data = &cpm5_host1,
> },
> + {
> + .compatible = "xlnx,versal-cpm5nc-host",
> + .data = &cpm5n_host,
> + },
> {}
> };
>
> --
> 2.43.0
Powered by blists - more mailing lists